Merge branch 'develop' into fix/logging-too-much

wintercms · Feb 26, 2025 · 9e20d92 · 9e20d92
2 parents 5ded270 + 98fd6f1
commit 9e20d92
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 28 deletions.
diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Install PHP and PHP Code Sniffer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.2
           extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
           tools: phpcs
 

diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
@@ -11,7 +11,7 @@ jobs:
     name: Update manifest
     runs-on: ubuntu-latest
     env:
-      phpVersion: '8.1'
+      phpVersion: '8.2'
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
     name: ${{ matrix.operatingSystem }} / JavaScript
     env:
       nodeVersion: 16
-      phpVersion: '8.0'
+      phpVersion: '8.2'
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:
@@ -96,7 +96,7 @@ jobs:
       max-parallel: 8
       matrix:
         operatingSystem: [ubuntu-latest, windows-latest]
-        phpVersion: ['8.0', '8.1', '8.2', '8.3']
+        phpVersion: ['8.1', '8.2', '8.3']
       fail-fast: false
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "source": "/~https://github.com/wintercms/winter"
     },
     "require": {
-        "php": "^8.0.2",
+        "php": ">=8.1",
         "winter/storm": "dev-develop as 1.2",
         "winter/wn-system-module": "dev-develop",
         "winter/wn-backend-module": "dev-develop",

diff --git a/modules/backend/composer.json b/modules/backend/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": ">=8.1",
         "composer/installers": "~1.11.0",
         "laravel/framework": "^9.1"
     },

diff --git a/modules/cms/composer.json b/modules/cms/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": ">=8.1",
         "composer/installers": "~1.11.0",
         "laravel/framework": "^9.1"
     },

diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
@@ -1,23 +1,25 @@
-<?php namespace System\Classes;
-
-use Db;
-use App;
-use Str;
-use Log;
-use File;
-use Lang;
-use View;
-use Cache;
-use Config;
-use Schema;
-use SystemException;
+<?php
+
+namespace System\Classes;
+
+use Backend\Classes\NavigationManager;
 use FilesystemIterator;
-use RecursiveIteratorIterator;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\View;
 use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use System\Models\PluginVersion;
+use SystemException;
 use Winter\Storm\Foundation\Application;
 use Winter\Storm\Support\ClassLoader;
-use Backend\Classes\NavigationManager;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 
 /**
  * Plugin manager
@@ -256,8 +258,15 @@ public function registerAll(bool $force = false): void
             return;
         }
 
-        foreach ($this->plugins as $pluginId => $plugin) {
-            $this->registerPlugin($plugin, $pluginId);
+        try {
+            foreach ($this->plugins as $pluginId => $plugin) {
+                $this->registerPlugin($plugin, $pluginId);
+            }
+        } catch (QueryException $ex) {
+            // SQLSTATE[42S02]: Base table or view not found - migrations haven't run yet
+            if ($ex->getCode() === '42S02') {
+                Log::error("$pluginId cannot be registered, missing database content. Try running migrations. Error: " . $ex->getMessage());
+            }
         }
 
         // Ensure that route attributes are properly loaded
@@ -372,8 +381,15 @@ public function bootAll(bool $force = false): void
             return;
         }
 
-        foreach ($this->plugins as $plugin) {
-            $this->bootPlugin($plugin);
+        try {
+            foreach ($this->plugins as $pluginId => $plugin) {
+                $this->bootPlugin($plugin);
+            }
+        } catch (QueryException $ex) {
+            // SQLSTATE[42S02]: Base table or view not found - migrations haven't run yet
+            if ($ex->getCode() === '42S02') {
+                Log::error("$pluginId cannot be booted, missing database content. Try running migrations. Error: " . $ex->getMessage());
+            }
         }
 
         $this->booted = true;
@@ -664,7 +680,7 @@ protected function loadDisabled(): void
         if (
             $this->app->hasDatabaseTable('system_plugin_versions')
         ) {
-            $userDisabled = Db::table('system_plugin_versions')->where('is_disabled', 1)->lists('code') ?? [];
+            $userDisabled = DB::table('system_plugin_versions')->where('is_disabled', 1)->lists('code') ?? [];
             foreach ($userDisabled as $code) {
                 $this->flagPlugin($code, static::DISABLED_BY_USER);
             }

diff --git a/modules/system/composer.json b/modules/system/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": ">=8.1",
         "composer/installers": "~1.11.0",
         "laravel/framework": "^9.1",
         "composer/semver": "^3.2"