FOUR-28520 Fix observations.

Author: gproly

ProcessMaker/Models/ProcessRequestToken.php

@@ -2,7 +2,6 @@
 
 namespace ProcessMaker\Models;
 
-use AWS\CRT\Log as CRTLog;
 use Carbon\Carbon;
 use DB;
 use DOMXPath;
@@ -1037,9 +1036,9 @@ public function getUsersFromProcessVariable(array $form_data)
 
         // Combine direct users with users from groups
         $allUserIds = array_unique(array_merge($usersIds, $usersFromGroups));
-        
+
         // Convert to numeric array and filter valid values
-        $allUserIds = array_values(array_filter($allUserIds, function($id) {
+        $allUserIds = array_values(array_filter($allUserIds, function ($id) {
             return !empty($id) && is_numeric($id) && $id > 0;
         }));
 

tests/Model/ProcessRequestTokenTest.php

@@ -2,15 +2,12 @@
 
 namespace Tests\Model;
 
-use DOMXPath;
-use Mockery;
 use ProcessMaker\Models\Group;
 use ProcessMaker\Models\GroupMember;
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
 use ProcessMaker\Models\User;
-use ProcessMaker\Nayra\Storage\BpmnDocument;
 use stdClass;
 use Tests\TestCase;
 
@@ -69,6 +66,7 @@ public function testGetUsersFromProcessVariableWithDirectUsers()
                 if ($key === 'assignedGroups') {
                     return null;
                 }
+
                 return $default;
             });
 
@@ -79,12 +77,12 @@ public function testGetUsersFromProcessVariableWithDirectUsers()
         $token = $this->getMockBuilder(ProcessRequestToken::class)
             ->onlyMethods(['getBpmnDefinition'])
             ->getMock();
-        
+
         $token->process_id = $process->id;
         $token->process_request_id = $request->id;
         $token->element_id = 'task_1';
         $token->process = $process;
-        
+
         $token->expects($this->atLeastOnce())
             ->method('getBpmnDefinition')
             ->willReturn($bpmnDefinition);
@@ -147,6 +145,7 @@ public function testGetUsersFromProcessVariableWithGroups()
                 if ($key === 'assignedGroups') {
                     return 'assigned_groups_var';
                 }
+
                 return $default;
             });
 
@@ -157,12 +156,12 @@ public function testGetUsersFromProcessVariableWithGroups()
         $token = $this->getMockBuilder(ProcessRequestToken::class)
             ->onlyMethods(['getBpmnDefinition'])
             ->getMock();
-        
+
         $token->process_id = $process->id;
         $token->process_request_id = $request->id;
         $token->element_id = 'task_1';
         $token->process = $process;
-        
+
         $token->expects($this->atLeastOnce())
             ->method('getBpmnDefinition')
             ->willReturn($bpmnDefinition);
@@ -215,6 +214,7 @@ public function testGetUsersFromProcessVariableWithUsersAndGroups()
                 if ($key === 'assignedGroups') {
                     return 'assigned_groups_var';
                 }
+
                 return $default;
             });
 
@@ -225,12 +225,12 @@ public function testGetUsersFromProcessVariableWithUsersAndGroups()
         $token = $this->getMockBuilder(ProcessRequestToken::class)
             ->onlyMethods(['getBpmnDefinition'])
             ->getMock();
-        
+
         $token->process_id = $process->id;
         $token->process_request_id = $request->id;
         $token->element_id = 'task_1';
         $token->process = $process;
-        
+
         $token->expects($this->atLeastOnce())
             ->method('getBpmnDefinition')
             ->willReturn($bpmnDefinition);
@@ -270,6 +270,7 @@ public function testGetUsersFromProcessVariableWithEmptyFormData()
                 if ($key === 'assignedGroups') {
                     return 'assigned_groups_var';
                 }
+
                 return $default;
             });
 
@@ -280,12 +281,12 @@ public function testGetUsersFromProcessVariableWithEmptyFormData()
         $token = $this->getMockBuilder(ProcessRequestToken::class)
             ->onlyMethods(['getBpmnDefinition'])
             ->getMock();
-        
+
         $token->process_id = $process->id;
         $token->process_request_id = $request->id;
         $token->element_id = 'task_1';
         $token->process = $process;
-        
+
         $token->expects($this->atLeastOnce())
             ->method('getBpmnDefinition')
             ->willReturn($bpmnDefinition);
@@ -320,6 +321,7 @@ public function testGetUsersFromProcessVariableWithNonArrayValues()
                 if ($key === 'assignedGroups') {
                     return 'assigned_groups_var';
                 }
+
                 return $default;
             });
 
@@ -330,12 +332,12 @@ public function testGetUsersFromProcessVariableWithNonArrayValues()
         $token = $this->getMockBuilder(ProcessRequestToken::class)
             ->onlyMethods(['getBpmnDefinition'])
             ->getMock();
-        
+
         $token->process_id = $process->id;
         $token->process_request_id = $request->id;
         $token->element_id = 'task_1';
         $token->process = $process;
-        
+
         $token->expects($this->atLeastOnce())
             ->method('getBpmnDefinition')
             ->willReturn($bpmnDefinition);
@@ -376,6 +378,7 @@ public function testGetUsersFromProcessVariableFiltersInvalidIds()
                 if ($key === 'assignedGroups') {
                     return null;
                 }
+
                 return $default;
             });
 
@@ -386,12 +389,12 @@ public function testGetUsersFromProcessVariableFiltersInvalidIds()
         $token = $this->getMockBuilder(ProcessRequestToken::class)
             ->onlyMethods(['getBpmnDefinition'])
             ->getMock();
-        
+
         $token->process_id = $process->id;
         $token->process_request_id = $request->id;
         $token->element_id = 'task_1';
         $token->process = $process;
-        
+
         $token->expects($this->atLeastOnce())
             ->method('getBpmnDefinition')
             ->willReturn($bpmnDefinition);