Laravel 10 Upgrade

.github/workflows/deploy-pm4.yml

@@ -35,6 +35,7 @@ env:
   IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g")
   GITHUB_COMMENT: ${{ secrets.GH_COMMENT }}
   pull_req_id: ${{github.event.pull_request.number}}
+  BASE: ci-base-php82
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -68,9 +69,9 @@ jobs:
         if: contains(github.event.pull_request.body, 'ci:build-base') || github.event_name == 'schedule'
         run: |
           cd pm4-stm-docker
-          docker-compose build --no-cache base
+          docker-compose build --no-cache base-php82
           docker-compose build --no-cache cache
-          docker push ${REPOSITORY}:ci-base
+          docker push ${REPOSITORY}:ci-base-php82
           docker push ${REPOSITORY}:ci-cache
       - name: Build and Push the image to ECR
         run: |

.gitignore

@@ -42,3 +42,6 @@ cypress/downloads
 .php-cs-fixer.cache
 .phpunit.result.cache
 .editorconfig
+resources/lang/de
+resources/lang/es
+resources/lang/fr

ProcessMaker/Console/Commands/BuildScriptExecutors.php

@@ -141,7 +141,7 @@ public function buildExecutor()
                 $cmd .= ' --user-id=' . $this->userId;
             }
             $this->artisan($cmd);
-            $this->info("SDK is at ${sdkDir}");
+            $this->info("SDK is at {$sdkDir}");
         }
 
         $dockerfile = ScriptExecutor::initDockerfile($lang) . "\n" . $scriptExecutor->config;
@@ -152,7 +152,7 @@ public function buildExecutor()
         $this->info('Building the docker executor');
 
         $image = $scriptExecutor->dockerImageName();
-        $command = Docker::command() . " build --build-arg SDK_DIR=/sdk -t ${image} -f ${packagePath}/Dockerfile.custom ${packagePath}";
+        $command = Docker::command() . " build --build-arg SDK_DIR=/sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
 
         if ($this->userId) {
             $this->runProc(

ProcessMaker/Console/Commands/ProcessMakerTest.php

@@ -99,7 +99,7 @@ private function checkMigrationStatus()
     private function testHorizonService()
     {
         $testDispatchNow = 'Test immediate Jobs';
-        TestStatusJob::dispatchNow($testDispatchNow);
+        TestStatusJob::dispatchSync($testDispatchNow);
         $this->waitTestPassed($testDispatchNow, 5);
 
         $testDelayedWorkers = 'Test dispatch Jobs';

ProcessMaker/Console/Commands/SyncDefaultTemplates.php

@@ -43,7 +43,7 @@ public function handle()
             $randomDelay = random_int(10, 120);
             Job::dispatch()->delay(now()->addMinutes($randomDelay));
         } else {
-            Job::dispatchNow();
+            Job::dispatchSync();
         }
 
         return 0;

ProcessMaker/Events/CustomizeUiUpdated.php

@@ -14,9 +14,13 @@ class CustomizeUiUpdated implements SecurityLogEventInterface
     use FormatSecurityLogChanges;
 
     private array $data;
+
     private array $changes;
+
     private array $original;
+
     private bool $reset;
+
     private string $defaultVariables = '[
         {"id":"$primary","value":"#0872C2","title":"Primary"},
         {"id":"$secondary","value":"#6C757D","title":"Secondary"},
@@ -27,6 +31,7 @@ class CustomizeUiUpdated implements SecurityLogEventInterface
         {"id":"$dark","value":"#000000","title":"Dark"},
         {"id":"$light","value":"#FFFFFF","title":"Light"}
     ]';
+
     private string $defaultFont = '{"id":"\'Open Sans\'","title":"Default Font"}';
 
     /**

ProcessMaker/Exception/ReferentialIntegrityException.php

@@ -3,8 +3,8 @@
 namespace ProcessMaker\Exception;
 
 use Exception;
-use ProcessMaker\Models\ProcessMakerModel;
 use Illuminate\Database\Eloquent\Model;
+use ProcessMaker\Models\ProcessMakerModel;
 
 class ReferentialIntegrityException extends Exception
 {

ProcessMaker/Helpers/ArrayHelper.php

@@ -59,10 +59,10 @@ public static function replaceKeyInArray(array $array, string $oldKey, string $n
     }
 
     /**
-     * This method is analogous to the function array_diff_assoc, with the difference 
-     * that it supports the comparison of array-type elements in the content of the 
+     * This method is analogous to the function array_diff_assoc, with the difference
+     * that it supports the comparison of array-type elements in the content of the
      * compared arrays.
-     * 
+     *
      * @param array $array1
      * @param array $arrays
      * @return array
@@ -86,6 +86,7 @@ public static function customArrayDiffAssoc(array $array1, ...$arrays): array
                 $diff[$key] = $value;
             }
         }
+
         return $diff;
     }
 }

ProcessMaker/Http/Controllers/Admin/UserController.php

@@ -41,7 +41,7 @@ public function edit(User $user)
         $permissionGroups = $all_permissions->sortBy('title')->groupBy('group')->sortKeys();
 
         $langs = [];
-        foreach (scandir(resource_path('lang')) as $file) {
+        foreach (scandir(app()->langPath()) as $file) {
             preg_match('/([a-z]{2})\\.json/', $file, $matches);
             if (!empty($matches)) {
                 $langs[] = $matches[1];

ProcessMaker/Http/Controllers/Api/FileController.php

@@ -279,9 +279,7 @@ public function show(Media $file)
      */
     public function download(Media $file)
     {
-        $path = Storage::disk('public')->getAdapter()->getPathPrefix() .
-                $file->id . '/' .
-                $file->file_name;
+        $path = Storage::disk('public')->path($file->id . '/' . $file->file_name);
 
         // Register the Event
         if (!empty($file->file_name)) {

ProcessMaker/Http/Controllers/Api/NotificationController.php

@@ -152,7 +152,7 @@ public function index(Request $request)
     public function store(Request $request)
     {
         $data = json_decode($request->data, true);
-        $request->request->add(['url' => $data['url'] ?? null]);
+        $request->merge(['url' => $data['url'] ?? null]);
 
         $request->validate(Notification::rules());
         $notification = new Notification();
@@ -233,7 +233,7 @@ public function show(Notification $notification)
     public function update(Notification $notification, Request $request)
     {
         $data = json_decode($request->data, true);
-        $request->request->add(['url' => $data['url'] ?? null]);
+        $request->merge(['url' => $data['url'] ?? null]);
 
         $request->validate(Notification::rules($notification));
         $notification->fill($request->input());

ProcessMaker/Http/Controllers/Api/ProcessController.php

@@ -233,8 +233,8 @@ public function store(Request $request)
         // Validate if exists file bpmn
         if ($request->has('file')) {
             $data['bpmn'] = $request->file('file')->get();
-            $request->request->add(['bpmn' => $data['bpmn']]);
-            $request->request->remove('file');
+            $request->merge(['bpmn' => $data['bpmn']]);
+            $request->offsetUnset('file');
             unset($data['file']);
             $processCreated = ProcessCreated::BPMN_CREATION;
         }
@@ -888,7 +888,7 @@ public function destroy(Process $process)
      */
     public function export(Request $request, Process $process)
     {
-        $fileKey = ExportProcess::dispatchNow($process);
+        $fileKey = (new ExportProcess($process))->handle();
 
         if ($fileKey) {
             $url = url("/processes/{$process->id}/download/{$fileKey}");
@@ -999,7 +999,7 @@ public function import(Process $process, Request $request)
                 'code' => $code,
             ];
         }
-        $import = ImportProcess::dispatchNow($content);
+        $import = (new ImportProcess($content))->handle();
 
         return response([
             'status' => $import->status,

ProcessMaker/Http/Controllers/Api/ProcessRequestController.php

@@ -560,7 +560,7 @@ private function checkDomain($domain, $whitelist)
      */
     private function cancelRequestToken(ProcessRequest $request)
     {
-        CancelRequest::dispatchNow($request);
+        CancelRequest::dispatchSync($request);
         // Close process request
         $request->status = 'CANCELED';
         $request->save();
@@ -580,7 +580,7 @@ private function completeRequest(ProcessRequest $request)
         Notification::send($notifiables, new ProcessCanceledNotification($request));
 
         // Terminate request
-        TerminateRequest::dispatchNow($request);
+        TerminateRequest::dispatchSync($request);
 
         event(new RequestAction($request, RequestAction::ACTION_COMPLETED));
 

ProcessMaker/Http/Controllers/Api/ProcessTranslationController.php

@@ -106,7 +106,7 @@ public function getAvailableLanguages(Request $request)
 
         // Available Pm Languages (user settings)
         $pmLangs = [];
-        foreach (scandir(resource_path('lang')) as $file) {
+        foreach (scandir(app()->langPath()) as $file) {
             preg_match('/([a-z]{2})\\.json/', $file, $matches);
             if (!empty($matches)) {
                 $pmLangs[] = $matches[1];

ProcessMaker/Http/Controllers/Api/ScreenController.php

@@ -448,7 +448,7 @@ public function destroy(Screen $screen)
      */
     public function export(Request $request, Screen $screen)
     {
-        $fileKey = ExportScreen::dispatchNow($screen);
+        $fileKey = (new ExportScreen($screen))->handle();
 
         if ($fileKey) {
             return ['url' => url("/designer/screens/{$screen->id}/download/{$fileKey}")];
@@ -504,7 +504,7 @@ public function import(Request $request)
             );
         }
 
-        $import = ImportScreen::dispatchNow($content);
+        $import = (new ImportScreen($content))->handle();
 
         return ['status' => $import];
     }

ProcessMaker/Http/Controllers/Api/ScriptController.php

@@ -233,7 +233,7 @@ public function execute(Request $request, ...$scriptKey)
         $code = $script->code;
 
         if ($request->get('sync') === true) {
-            return ExecuteScript::dispatchNow($script, $request->user(), $code, $data, $watcher, $config, true);
+            return (new ExecuteScript($script, $request->user(), $code, $data, $watcher, $config, true))->handle();
         } else {
             ExecuteScript::dispatch($script, $request->user(), $code, $data, $watcher, $config)->onQueue('bpmn');
         }

ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php

@@ -241,7 +241,7 @@ public function delete(Request $request, ScriptExecutor $scriptExecutor)
             exec($cmd, $out, $return);
 
             if ($return !== 0) {
-                throw ValidationException::withMessages(['delete' => _('Error removing image.') . " ${cmd} " . implode("\n", $out)]);
+                throw ValidationException::withMessages(['delete' => _('Error removing image.') . " {$cmd} " . implode("\n", $out)]);
             }
         }
 

ProcessMaker/Http/Controllers/Api/SettingController.php

@@ -222,7 +222,7 @@ public function import(Request $request)
         $content = $request->file('file')->get();
 
         try {
-            $imported = ImportSettings::dispatchNow($content);
+            $imported = (new ImportSettings($content))->handle();
         } catch (Throwable $e) {
             return response([
                 'error' => $e->getMessage(),

ProcessMaker/Http/Controllers/Api/TemplateController.php

@@ -69,7 +69,7 @@ public function store(string $type, Request $request)
         }
         $request->validate(Template::rules($request->id, $this->types[$type][4]));
         $storeTemplate = $this->template->store($type, $request);
-        TemplatePublished::dispatch($request->request->all());
+        TemplatePublished::dispatch($request->all());
 
         return $storeTemplate;
     }

ProcessMaker/Jobs/BpmnAction.php

@@ -34,6 +34,8 @@ abstract class BpmnAction implements ShouldQueue
      */
     protected $instance;
 
+    protected $instanceId;
+
     protected $tokenId = null;
 
     protected $disableGlobalEvents = false;

ProcessMaker/Jobs/DownloadSecurityLog.php

@@ -104,7 +104,7 @@ protected function createTemporaryFilename()
 
         $s3Uri = empty(config('app.security_log_s3_uri')) ? 'security-logs' : config('app.security_log_s3_uri');
 
-        return $s3Uri .'/'. $uuid . '.' . $this->format;
+        return $s3Uri . '/' . $uuid . '.' . $this->format;
     }
 
     /**

ProcessMaker/Jobs/ImportProcess.php

@@ -879,8 +879,6 @@ protected function decodeFile()
 
     /**
      * Execute the job.
-     *
-     * @return bool
      */
     public function handle()
     {

ProcessMaker/Managers/TaskSchedulerManager.php

@@ -572,7 +572,7 @@ public function evaluateConditionals()
             ->where('status', 'ACTIVE')
             ->get();
         foreach ($processes as $process) {
-            StartEventConditional::dispatchNow($process);
+            StartEventConditional::dispatchSync($process);
         }
     }
 

ProcessMaker/Models/CallActivity.php

@@ -223,8 +223,8 @@ public function addToken(ExecutionInstanceInterface $instance, TokenInterface $t
      */
     private function synchronizeInstances(ExecutionInstanceInterface $instance, ExecutionInstanceInterface $currentInstance)
     {
-        $parentProcessId = optional($instance->getProcess()->getOwnerDocument()->getModel())->id;
-        $childProcessId = optional($currentInstance->getProcess()->getOwnerDocument()->getModel())->id;
+        $parentProcessId = $instance->getProcess()->getOwnerDocument()->getModel()?->id;
+        $childProcessId = $currentInstance->getProcess()->getOwnerDocument()->getModel()?->id;
         if ($parentProcessId !== $childProcessId) {
             $currentInstance->getProcess()->getEngine()->runToNextState();
         }

ProcessMaker/Models/EnvironmentVariable.php

@@ -77,7 +77,7 @@ public static function rules($existing = null)
         return [
             'description' => 'required',
             'value' => 'nullable',
-            'name' => ['required', "regex:${validVariableName}", $unique],
+            'name' => ['required', "regex:{$validVariableName}", $unique],
         ];
     }
 

ProcessMaker/Models/ProcessRequest.php

@@ -896,9 +896,7 @@ public function downloadFile($fileId)
             return null;
         }
 
-        $path = Storage::disk('public')->getAdapter()->getPathPrefix() .
-            $filtered['id'] . '/' .
-            $filtered['file_name'];
+        $path = Storage::disk('public')->path($filtered['id'] . '/' . $filtered['file_name']);
 
         return $path;
     }

ProcessMaker/Models/ProcessRequestToken.php

@@ -239,7 +239,7 @@ public function getNotifiableUserIds($notifiableType)
             case 'manager':
                 $process = $this->process()->first();
 
-                return collect([optional($process)->manager_id]);
+                return collect([$process?->manager_id]);
                 break;
             default:
                 return collect([]);

ProcessMaker/Models/ScriptExecutor.php

@@ -164,7 +164,7 @@ public function dockerImageName()
         $tag = $this->imageTag();
         $instance = config('app.instance');
 
-        return "processmaker4/executor-${instance}-${lang}-${id}:${tag}";
+        return "processmaker4/executor-{$instance}-{$lang}-{$id}:{$tag}";
     }
 
     public function imageTag()
@@ -202,7 +202,7 @@ public static function listOfExecutorImages($filterByLanguage = null)
         $instance = config('app.instance');
 
         return array_values(array_filter($result, function ($image) use ($filterByLanguage, $instance) {
-            $filter = "processmaker4/executor-${instance}-";
+            $filter = "processmaker4/executor-{$instance}-";
             if ($filterByLanguage) {
                 $filter .= $filterByLanguage . '-';
             }