Merge remote-tracking branch 'origin/develop' into feature/FOUR-22569_deploy

Author: devmiguelangel

.github/workflows/deploy-pm4.yml

@@ -9,5 +9,5 @@ on:
 jobs:
   run:
     name: Run PM4-workflow
-    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@multitenancy
+    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@main
     secrets: inherit

ProcessMaker/Application.php

@@ -3,14 +3,27 @@
 namespace ProcessMaker;
 
 use Igaster\LaravelTheme\Facades\Theme;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Application as IlluminateApplication;
+use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
+use Illuminate\Foundation\Bootstrap\RegisterProviders;
+use Illuminate\Foundation\PackageManifest;
+use Illuminate\Support\Env;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
+use ProcessMaker\Multitenancy\Tenant;
+use ProcessMaker\Multitenancy\TenantBootstrapper;
 
 /**
  * Class Application.
  */
 class Application extends IlluminateApplication
 {
+    public $overrideTenantId = null;
+
+    public $skipCacheEvents = false;
+
     /**
      * Sets the timezone for the application and for php with the specified timezone.
      *
@@ -78,13 +91,25 @@ public function path($path = '')
         return $this->basePath . DIRECTORY_SEPARATOR . 'ProcessMaker' . ($path ? DIRECTORY_SEPARATOR . $path : $path);
     }
 
-    public function setStoragePath($path)
+    public function registerConfiguredProviders()
     {
-        $this->storagePath = $path;
+        // Must be rebound before registerConfiguredProviders() runs but after bootstrapping is done
+        // so we can access storage and cache facades.
+        $this->singleton(PackageManifest::class, fn () => new LicensedPackageManifest(
+            new Filesystem, $this->basePath(), $this->getCachedPackagesPath()
+        ));
+
+        parent::registerConfiguredProviders();
     }
 
-    public function getStoragePath()
+    public function bootstrapWith(array $bootstrappers)
     {
-        return $this->storagePath;
+        // Insert TenantBootstrapper after LoadEnvironmentVariables
+        if ($bootstrappers[0] !== LoadEnvironmentVariables::class) {
+            throw new \Exception('LoadEnvironmentVariables is not the first bootstrapper. Did a laravel upgrade change this?');
+        }
+        array_splice($bootstrappers, 1, 0, [TenantBootstrapper::class]);
+
+        return parent::bootstrapWith($bootstrappers);
     }
 }

ProcessMaker/Cache/AbstractCacheFactory.php

@@ -10,6 +10,7 @@
 abstract class AbstractCacheFactory implements CacheFactoryInterface
 {
     protected static ?CacheInterface $testInstance = null;
+
     protected static bool $storeMetrics = true;
 
     /**

ProcessMaker/Console/Commands/ProcessMakerLicenseRemove.php

@@ -34,9 +34,9 @@ class ProcessMakerLicenseRemove extends Command
      */
     public function handle()
     {
-        if (Storage::disk('root')->exists('license.json')) {
+        if (Storage::disk('local')->exists('license.json')) {
             if ($this->option('force') || $this->confirm('Are you sure you want to remove the license.json file?')) {
-                Storage::disk('root')->delete('license.json');
+                Storage::disk('local')->delete('license.json');
                 $this->info('license.json removed successfully!');
 
                 $this->info('Calling package:discover to update the package cache with enabled packages');

ProcessMaker/Console/Commands/ProcessMakerLicenseUpdate.php

@@ -40,7 +40,7 @@ public function handle()
                 return 1;
             }
 
-            Storage::disk('root')->put('license.json', $content);
+            Storage::disk('local')->put('license.json', $content);
 
             $this->info('Calling package:discover to update the package cache with enabled packages');
             Artisan::call('package:discover');

ProcessMaker/Console/Commands/SyncGuidedTemplates.php

@@ -22,28 +22,16 @@ class SyncGuidedTemplates extends Command
      */
     protected $description = 'Synchronize guided templates from a central repository';
 
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
-     *
-     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         if ($this->option('queue')) {
             $randomDelay = random_int(10, 120);
             Job::dispatch()->delay(now()->addMinutes($randomDelay));
-        } else {
-            Job::dispatchSync();
+
+            return 0;
         }
 
         Job::dispatchSync();