Merge pull request #5742 from ProcessMaker/develop

Update feature/FOUR-11378 witgh last changes in develop...

ProcessMaker/ImportExport/Manifest.php

@@ -204,7 +204,11 @@ private static function handleCasts(&$model)
                     break;
                 case 'object':
                     if (!is_object($model->$field)) {
-                        $model->$field = json_decode($model->$field);
+                        if (gettype($model->$field) !== 'array') {
+                            $model->$field = json_decode($model->$field);
+                        } else {
+                            $model->$field = (object)$model->$field;
+                        }
                     }
                     break;
             }

ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php

@@ -10,6 +10,7 @@
 use ProcessMaker\Nayra\Bpmn\Events\ActivityActivatedEvent;
 use ProcessMaker\Nayra\Bpmn\Events\ActivityClosedEvent;
 use ProcessMaker\Nayra\Bpmn\Events\ActivityCompletedEvent;
+use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
 use ProcessMaker\Repositories\TokenRepository;
 
 trait PersistenceTokenTrait
@@ -30,9 +31,8 @@ public function persistActivityActivated(array $transaction)
         $this->tokenRepository->persistActivityActivated($activity, $token);
 
         // Event
-        $bpmnSubscriber = new BpmnSubscriber();
         $event = new ActivityActivatedEvent($activity, $token);
-        $bpmnSubscriber->onActivityActivated($event);
+        app('events')->dispatch(ActivityInterface::EVENT_ACTIVITY_ACTIVATED, $event);
     }
 
     /**
@@ -63,13 +63,8 @@ public function persistActivityCompleted(array $transaction)
         $this->tokenRepository->persistActivityCompleted($activity, $token);
 
         // Event
-        $bpmnSubscriber = new BpmnSubscriber();
         $event = new ActivityCompletedEvent($activity, $token);
-        $bpmnSubscriber->onActivityCompleted($event);
-
-        // Comments
-        $subscriber = new CommentsSubscriber();
-        $subscriber->onActivityCompleted($event);
+        app('events')->dispatch(ActivityInterface::EVENT_ACTIVITY_COMPLETED, $event);
     }
 
     /**

ProcessMaker/Providers/LicenseServiceProvider.php

@@ -2,9 +2,11 @@
 
 namespace ProcessMaker\Providers;
 
+use Illuminate\Console\Events\CommandFinished;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\PackageManifest;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\ServiceProvider;
 use Predis\Connection\ConnectionException;
@@ -17,6 +19,12 @@ class LicenseServiceProvider extends ServiceProvider
 {
     public function boot(): void
     {
+        $this->app['events']->listen(CommandFinished::class, function ($event) {
+            if ($event->command == 'clear-compiled' || $event->command == 'optimize:clear') {
+                Artisan::call('package:discover');
+            }
+        });
+
         try {
             $expires = Cache::get(LicensedPackageManifest::EXPIRE_CACHE_KEY);
         } catch (ConnectionException $e) {

composer.json

@@ -96,7 +96,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "aa23ed0e",
+            "build": "3daac8b4",
             "custom": {
                 "package-ellucian-ethos": "1.14.1",
                 "package-plaid": "1.3.1",
@@ -136,10 +136,10 @@
                 "package-actions-by-email": "1.15.0",
                 "package-advanced-user-manager": "1.8.0",
                 "package-ai": "1.3.0",
-                "package-analytics-reporting": "1.3.1",
+                "package-analytics-reporting": "1.3.2",
                 "package-auth": "1.15.2",
                 "package-cdata": "1.0.2",
-                "package-collections": "2.13.0",
+                "package-collections": "2.13.1",
                 "package-comments": "1.9.2",
                 "package-conversational-forms": "1.6.0",
                 "package-data-sources": "1.23.1",