Support Laravel 12

.github/workflows/manifest.yml

@@ -15,18 +15,16 @@ jobs:
     name: Update manifest
     runs-on: ubuntu-latest
     env:
-      phpVersion: "8.4"
-      extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
-      key: winter-cms-cache-develop
+      GITHUB_TOKEN: ${{ secrets.COMPOSER_GITHUB_TOKEN }}
     steps:
       - name: Checkout changes
         uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ env.phpVersion }}
-          extensions: ${{ env.extensions }}
+          php-version: 8.4
+          extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
 
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-scripts

.github/workflows/tests.yml

@@ -21,59 +21,30 @@ jobs:
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / JavaScript
     env:
-      nodeVersion: 16
-      phpVersion: '8.2'
-      extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
-      key: winter-cms-cache-develop
+      GITHUB_TOKEN: ${{ secrets.COMPOSER_GITHUB_TOKEN }}
     steps:
       - name: Checkout changes
-        uses: actions/checkout@v3
-
-      - name: Setup extension cache
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ env.phpVersion }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.extcache.outputs.key }}
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ env.phpVersion }}
-          extensions: ${{ env.extensions }}
+          php-version: 8.2
+          extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
 
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.nodeVersion }}
+          node-version: 16
 
       - name: Switch library dependency (develop)
         if: github.ref == 'refs/heads/develop' || github.base_ref == 'develop'
-        run: php ./.github/workflows/utilities/library-switcher "dev-develop as 1.2"
+        run: php ./.github/workflows/utilities/library-switcher "dev-wip/1.3 as 1.3"
 
       - name: Switch library dependency (1.2)
         if: github.head_ref == '1.2' || github.ref == 'refs/heads/1.2' || github.base_ref == '1.2'
         run: php ./.github/workflows/utilities/library-switcher "1.2.x-dev as 1.2"
 
-      - name: Setup dependency cache
-        id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-scripts
 
@@ -95,41 +66,25 @@ jobs:
       max-parallel: 8
       matrix:
         operatingSystem: [ubuntu-latest, windows-latest]
-        phpVersion: ['8.1', '8.2', '8.3', '8.4']
+        phpVersion: ['8.2', '8.3', '8.4']
       fail-fast: false
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}
     env:
-      extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
-      key: winter-cms-cache-develop
+      GITHUB_TOKEN: ${{ secrets.COMPOSER_GITHUB_TOKEN }}
     steps:
       - name: Checkout changes
-        uses: actions/checkout@v3
-
-      - name: Setup extension cache
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.phpVersion }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.extcache.outputs.key }}
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.phpVersion }}
-          extensions: ${{ env.extensions }}
+          extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
 
       - name: Switch library dependency (develop)
         if: github.ref == 'refs/heads/develop' || github.base_ref == 'develop'
-        run: php ./.github/workflows/utilities/library-switcher "dev-develop as 1.2"
+        run: php ./.github/workflows/utilities/library-switcher "dev-wip/1.3 as 1.3"
 
       - name: Switch library dependency (1.0)
         if: github.head_ref == '1.0' || github.ref == 'refs/heads/1.0' || github.base_ref == '1.0'
@@ -143,17 +98,6 @@ jobs:
         if: github.head_ref == '1.2' || github.ref == 'refs/heads/1.2' || github.base_ref == '1.2'
         run: php ./.github/workflows/utilities/library-switcher "1.2.x-dev as 1.2"
 
-      - name: Setup dependency cache
-        id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-scripts
 
@@ -165,10 +109,6 @@ jobs:
       - name: Run post-update Composer scripts
         run: php artisan package:discover
 
-      - name: Setup problem matchers for PHPUnit
-        if: matrix.phpVersion == '8.1'
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
       - name: Run Linting and Tests
         run: |
           composer lint

.gitignore

@@ -10,6 +10,7 @@ composer.lock
 selenium.php
 /bootstrap/compiled.php
 .phpunit.result.cache
+.phpunit.cache
 
 # Hosting ignores
 php_errors.log
@@ -26,6 +27,7 @@ nbproject
 .vscode
 !.devcontainer/.vscode
 _ide_helper.php
+*.code-workspace
 
 # Other ignores
 .DS_Store

composer.json

@@ -29,22 +29,28 @@
         "source": "https://github.com/wintercms/winter"
     },
     "require": {
-        "php": ">=8.1",
-        "winter/storm": "dev-develop as 1.2",
-        "winter/wn-system-module": "dev-develop",
-        "winter/wn-backend-module": "dev-develop",
-        "winter/wn-cms-module": "dev-develop",
-        "laravel/framework": "^9.1",
+        "php": "^8.2",
+        "winter/storm": "dev-wip/1.3 as 1.3",
+        "winter/wn-system-module": "dev-wip/1.3",
+        "winter/wn-backend-module": "dev-wip/1.3",
+        "winter/wn-cms-module": "dev-wip/1.3",
+        "laravel/framework": "^12.0",
         "wikimedia/composer-merge-plugin": "~2.1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.8",
+        "phpunit/phpunit": "^11.0",
         "mockery/mockery": "^1.4.4",
         "fakerphp/faker": "^1.9.2",
         "squizlabs/php_codesniffer": "^3.2",
         "php-parallel-lint/php-parallel-lint": "^1.0",
-        "dms/phpunit-arraysubset-asserts": "^0.1.0|^0.2.1"
+        "dms/phpunit-arraysubset-asserts": "dev-add-phpunit-11-support"
     },
+     "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/pieterocp/phpunit-arraysubset-asserts"
+        }
+    ],
     "scripts": {
         "post-create-project-cmd": [
             "@php artisan winter:install",
@@ -65,7 +71,6 @@
             "phpcs --colors -nq --report=\"full\" --extensions=\"php\""
         ]
     },
-    "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
         "merge-plugin": {

config/app.php

@@ -2,6 +2,32 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Name
+    |--------------------------------------------------------------------------
+    |
+    | This value is the name of your application. This value is used when the
+    | framework needs to place the application's name in a notification or
+    | any other location as required by the application or its packages.
+    |
+    */
+
+    'name' => env('APP_NAME', 'Winter CMS'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Environment
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the "environment" your application is currently
+    | running in. This may determine how you prefer to configure various
+    | services the application utilizes. Set this in your ".env" file.
+    |
+    */
+
+    'env' => env('APP_ENV', 'production'),
+
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode
@@ -20,20 +46,7 @@
     |
     */
 
-    'debug' => env('APP_DEBUG', true),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Name
-    |--------------------------------------------------------------------------
-    |
-    | This value is the name of your application. This value is used when the
-    | framework needs to place the application's name in a notification or
-    | any other location as required by the application or its packages.
-    |
-    */
-
-    'name' => env('APP_NAME', 'Winter CMS'),
+    'debug' => (bool) env('APP_DEBUG', true),
 
     /*
     |--------------------------------------------------------------------------
@@ -42,7 +55,7 @@
     |
     | This URL is used by the console to properly generate URLs when using
     | the Artisan command line tool. You should set this to the root of
-    | your application so that it is used when running Artisan tasks.
+    | the application so that it's available within Artisan commands.
     |
     */
 
@@ -183,7 +196,6 @@
     | will be used by the PHP date and date-time functions. We have gone
     | ahead and set this to a sensible default for you out of the box.
     |
-    |
     | -------- STOP! --------
     | Before you change this value, consider carefully if that is actually
     | what you want to do. It is HIGHLY recommended that this is always set
@@ -225,7 +237,7 @@
     |
     */
 
-    'locale' => 'en',
+    'locale' => env('APP_LOCALE', 'en'),
 
     /*
     |--------------------------------------------------------------------------
@@ -238,7 +250,7 @@
     |
     */
 
-    'fallback_locale' => 'en',
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
 
     /*
     |--------------------------------------------------------------------------
@@ -251,7 +263,7 @@
     |
     */
 
-    'faker_locale' => 'en_US',
+    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
 
     /*
     |--------------------------------------------------------------------------
@@ -264,9 +276,16 @@
     |
     */
 
-    'key' => env('APP_KEY'),
     'cipher' => 'AES-256-CBC',
 
+    'key' => env('APP_KEY'),
+
+    'previous_keys' => [
+        ...array_filter(
+            explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
+        ),
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

config/hashing.php

@@ -48,4 +48,17 @@
         'threads' => 1,
         'time' => 4,
     ],
+
+   /*
+    |--------------------------------------------------------------------------
+    | Password Rehashing
+    |--------------------------------------------------------------------------
+    |
+    | Laravel 11 will automatically rehash your user's passwords during
+    | authentication if your hashing algorithm's "work factor" has been updated
+    | since the password was last hashed.
+    |
+    */
+
+    'rehash_on_login' => false,
 ];

modules/backend/composer.json

@@ -23,9 +23,9 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": "^8.2",
         "composer/installers": "~1.11.0",
-        "laravel/framework": "^9.1"
+        "laravel/framework": "^12.0"
     },
     "replace": {
         "october/backend": "1.1.*"

modules/backend/controllers/Index.php

@@ -6,6 +6,8 @@
 use Backend\Classes\Controller;
 use Backend\Widgets\ReportContainer;
 
+use Winter\Storm\Support\Arr;
+
 /**
  * Dashboard controller
  *
@@ -72,10 +74,7 @@ protected function initReportContainer()
     protected function checkPermissionRedirect()
     {
         if (!$this->user->hasAccess('backend.access_dashboard')) {
-            $true = function () {
-                return true;
-            };
-            if ($first = array_first(BackendMenu::listMainMenuItems(), $true)) {
+            if ($first = Arr::first(BackendMenu::listMainMenuItems())) {
                 return Redirect::intended($first->url);
             }
             return Backend::redirect('backend/users/myaccount');