PMCORE-2948 Update the branch develop with the release/3.5.11

2021-04-13 00:10:30 -04:00
parent 5d6180e10b
commit dddd300fef
21 changed files with 960 additions and 598 deletions
--- a/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php
@@ -7,8 +7,8 @@ use Faker\Factory;
 use Google_Client;
 use Google_Service_Gmail_Message;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPMailerOAuth;
 use ProcessMaker\Core\System;
+use ProcessMaker\EmailOAuth\PHPMailerOAuth;
 use ProcessMaker\GmailOAuth\GmailOAuth;
 use ProcessMaker\Model\User;
 use RBAC;