Merge branch '4.x' into develop

Author: daftspunk

.github/workflows/tests.yml

@@ -21,11 +21,16 @@ jobs:
     steps:
       - name: Checkout changes
         uses: actions/checkout@v1
+
       - name: Install PHP
         uses: shivammathur/setup-php@master
         with:
           php-version: ${{ matrix.phpVersions }}
+
       - name: Install Composer dependencies
-        run: composer install --no-interaction --no-progress --no-suggest --no-scripts
+        run: |
+            composer config --no-interaction allow-plugins.composer/installers true
+            composer install --no-interaction --no-progress --no-scripts
+
       - name: Run Tests
         run: ./vendor/bin/phpunit ./tests

composer.json

@@ -16,6 +16,7 @@
     "require": {
         "php": "^8.0.2",
         "composer/composer": "^2.0.0",
+        "composer/installers": "^1 || ^2",
         "doctrine/dbal": "^2.13.3|^3.1.4",
         "intervention/image": "^3.10",
         "linkorb/jsmin-php": "~1.0",

src/Exception/ErrorHandler.php

@@ -85,9 +85,12 @@ public function handleException(Throwable $proposedException)
      */
     protected function isNotFoundException($exception)
     {
-        return array_first($this->notFoundExceptions, function($type) use ($exception) {
-            return $exception instanceof $type;
-        });
+        foreach ($this->notFoundExceptions as $type) {
+            if ($exception instanceof $type) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**

src/Foundation/Console/ProjectSetCommand.php

@@ -69,23 +69,22 @@ public function handle()
     protected function storeProjectDetails($result)
     {
         // Save project locally
-        if (class_exists(\System\Models\Parameter::class)) {
-            \System\Models\Parameter::set([
-                'system::project.id' => $result['id'],
-                'system::project.key' => $result['project_id'],
-                'system::project.name' => $result['name'],
-                'system::project.owner' => $result['owner'],
-                'system::project.is_active' => $result['is_active']
-            ]);
-        }
-        else {
-            if (!is_dir($cmsStorePath = storage_path('cms'))) {
-                mkdir($cmsStorePath);
+        try {
+            if (class_exists(\System\Models\Parameter::class)) {
+                \System\Models\Parameter::set([
+                    'system::project.id' => $result['id'],
+                    'system::project.key' => $result['project_id'],
+                    'system::project.name' => $result['name'],
+                    'system::project.owner' => $result['owner'],
+                    'system::project.is_active' => $result['is_active']
+                ]);
+            }
+            else {
+               $this->storeProjectDetailsLocally($result);
             }
-
-            $this->injectJsonToFile(storage_path('cms/project.json'), [
-                'project' => $result['project_id']
-            ]);
+        }
+        catch (Exception $ex) {
+            $this->storeProjectDetailsLocally($result);
         }
 
         // Save authentication token
@@ -96,6 +95,20 @@ protected function storeProjectDetails($result)
         );
     }
 
+    /**
+     * storeProjectDetailsLocally instead
+     */
+    protected function storeProjectDetailsLocally($result)
+    {
+        if (!is_dir($cmsStorePath = storage_path('cms'))) {
+            mkdir($cmsStorePath);
+        }
+
+        $this->injectJsonToFile(storage_path('cms/project.json'), [
+            'project' => $result['project_id']
+        ]);
+    }
+
     /**
      * requestServerData contacts the update server for a response.
      * @param  string $uri      Gateway API URI