Merge branch 'develop' of github.com:ProcessMaker/processmaker into bugfix/FOUR-27831

Author: CarliPinell

ProcessMaker/Jobs/RefreshArtisanCaches.php

@@ -23,30 +23,7 @@ class RefreshArtisanCaches implements ShouldQueue
      */
     public function handle()
     {
-        // Skip in testing environment because this reconnects the database
-        // meaning we loose transactions, and sets the console output verbosity
-        // to quiet so we loose expectsOutput assertions.
-        if (app()->environment('testing')) {
-            return;
-        }
-
-        $options = [
-            '--no-interaction' => true,
-            '--quiet' => true,
-        ];
-
-        if (app()->configurationIsCached()) {
-            // Run in a separate process to avoid the tenant being set.
-            // We do not use a tenant-specific config cache file.
-            Process::path(base_path())
-                ->env(['TENANT' => false, 'APP_URL' => false])
-                ->run(Application::formatCommandString('config:cache'))->throw();
-        } else {
-            Artisan::call('queue:restart', $options);
-
-            // We call this manually here since this job is dispatched
-            // automatically when the config *is* cached
-            RestartMessageConsumers::dispatchSync();
-        }
+        // Do not rebuild the cache and restart the queue any more.
+        // This is no longer needed.
     }
 }

ProcessMaker/Models/Setting.php

@@ -5,6 +5,8 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Validation\Rule;
 use Log;
 use ProcessMaker\Cache\Settings\SettingCacheFactory;
@@ -73,6 +75,12 @@ class Setting extends ProcessMakerModel implements HasMedia, PrometheusMetricInt
 
     public const SESSION_CONTROL_GROUP = 'Session Control';
 
+    private static bool $redisAvailable = false;
+
+    private static bool $settingsTableExists = false;
+
+    private static bool $readyToUseSettingsDatabase = false;
+
     /**
      * The attributes that aren't mass assignable.
      *
@@ -150,6 +158,10 @@ public static function messages()
      */
     public static function byKey(string $key)
     {
+        if (!self::readyToUseSettingsDatabase()) {
+            return null;
+        }
+
         $settingCache = SettingCacheFactory::getSettingsCache();
         $settingKey = $settingCache->createKey([
             'key' => $key,
@@ -520,4 +532,51 @@ public function getPrometheusMetricLabel(): string
     {
         return 'settings.' . $this->key;
     }
+
+    public static function readyToUseSettingsDatabase()
+    {
+        if (!self::$readyToUseSettingsDatabase) {
+            self::$readyToUseSettingsDatabase =
+                app('tenant-resolved') &&
+                self::databaseAvailable() &&
+                self::redisAvailable() &&
+                self::settingsTableExists();
+        }
+
+        return self::$readyToUseSettingsDatabase;
+    }
+
+    private static function databaseAvailable()
+    {
+        try {
+            DB::connection()->getPdo();
+
+            return true;
+        } catch (\PDOException $e) {
+            return false;
+        }
+    }
+
+    private static function redisAvailable()
+    {
+        if (!self::$redisAvailable) {
+            try {
+                Redis::connection()->ping();
+                self::$redisAvailable = true;
+            } catch (\Exception $e) {
+                self::$redisAvailable = false;
+            }
+        }
+
+        return self::$redisAvailable;
+    }
+
+    private static function settingsTableExists()
+    {
+        if (!self::$settingsTableExists) {
+            self::$settingsTableExists = Schema::hasTable('settings');
+        }
+
+        return self::$settingsTableExists;
+    }
 }

ProcessMaker/Providers/ProcessMakerServiceProvider.php

@@ -16,6 +16,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -99,6 +100,9 @@ public function boot(): void
         parent::boot();
 
         Route::pushMiddlewareToGroup('api', HandleEtag::class);
+
+        $this->checkConfigCache();
+
         // Hook after service providers boot
         self::$bootTime = (microtime(true) - self::$bootStart) * 1000; // Convert to milliseconds
     }
@@ -577,4 +581,22 @@ private static function actuallyRunningInConsole(): bool
     {
         return PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg';
     }
+
+    /**
+     * Ensure that config:cache is not run for tenant instances.
+     */
+    private function checkConfigCache(): void
+    {
+        // Only if app is running in console
+        if (!app()->runningInConsole()) {
+            return;
+        }
+
+        // Safety check to prevent config:cache from being run for tenant instances.
+        if (config('app.multitenancy') && app('currentTenant')) {
+            Artisan::command('config:cache', function () {
+                throw new \Exception('Cannot cache config for tenant instance. Must be run from landlord instance.');
+            });
+        }
+    }
 }

ProcessMaker/Repositories/SettingsConfigRepository.php

@@ -4,19 +4,10 @@
 
 use Illuminate\Config\Repository;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Redis;
-use Illuminate\Support\Facades\Schema;
 use ProcessMaker\Models\Setting;
 
 class SettingsConfigRepository extends Repository
 {
-    private bool $redisAvailable = false;
-
-    private bool $settingsTableExists = false;
-
-    private bool $readyToUseSettingsDatabase = false;
-
     /**
      * Determine if the given configuration value exists.
      *
@@ -86,7 +77,7 @@ public function getMany($keys)
 
     private function getFromSettings($key)
     {
-        if (!$this->readyToUseSettingsDatabase()) {
+        if (!Setting::readyToUseSettingsDatabase()) {
             return null;
         }
 
@@ -113,51 +104,4 @@ private function getFromSettings($key)
 
         return null;
     }
-
-    private function readyToUseSettingsDatabase()
-    {
-        if (!$this->readyToUseSettingsDatabase) {
-            $this->readyToUseSettingsDatabase =
-                app('tenant-resolved') &&
-                $this->databaseAvailable() &&
-                $this->redisAvailable() &&
-                $this->settingsTableExists();
-        }
-
-        return $this->readyToUseSettingsDatabase;
-    }
-
-    private function databaseAvailable()
-    {
-        try {
-            DB::connection()->getPdo();
-
-            return true;
-        } catch (\PDOException $e) {
-            return false;
-        }
-    }
-
-    private function redisAvailable()
-    {
-        if (!$this->redisAvailable) {
-            try {
-                Redis::connection()->ping();
-                $this->redisAvailable = true;
-            } catch (\Exception $e) {
-                $this->redisAvailable = false;
-            }
-        }
-
-        return $this->redisAvailable;
-    }
-
-    private function settingsTableExists()
-    {
-        if (!$this->settingsTableExists) {
-            $this->settingsTableExists = Schema::hasTable('settings');
-        }
-
-        return $this->settingsTableExists;
-    }
 }

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "4.15.11+build-0c70fa90",
+    "version": "4.15.11+mt",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -109,7 +109,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "0c70fa90",
+            "build": "1a91bb61",
             "cicd-enabled": true,
             "custom": {
                 "package-ellucian-ethos": "1.19.7",
@@ -149,7 +149,7 @@
                 "connector-docusign": "1.11.0",
                 "connector-idp": "1.14.0",
                 "connector-pdf-print": "1.23.1",
-                "connector-send-email": "1.32.10",
+                "connector-send-email": "1.32.13",
                 "connector-slack": "1.9.3",
                 "docker-executor-node-ssr": "1.7.2",
                 "package-ab-testing": "1.4.0",