Support Laravel 12

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-apache-bookworm
+FROM php:8.4-apache-bookworm
 
 # Install PHP extensions
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/debian
 {
-    "name": "Winter on PHP 8.3",
+    "name": "Winter 1.3 on PHP 8.4",
     "build": {
         "dockerfile": "./Dockerfile",
         "context": "."
@@ -13,7 +13,7 @@
             "username": "vscode",
             "userUid": "1000",
             "userGid": "1000",
-            "upgradePackages": "true"
+            "upgradePackages": "false"
         },
         "ghcr.io/devcontainers/features/node:1": {
             "version": "22"

.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

@@ -7,6 +7,10 @@ on:
       - develop
   pull_request:
 
+concurrency:
+  group: tests-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   frontendTests:
     strategy:
@@ -17,64 +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: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - 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
 
@@ -96,46 +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: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout changes
-        uses: actions/checkout@v2
-
-      - 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'
@@ -149,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
 
@@ -171,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/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/phpunit.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     backupGlobals="false"
-    backupStaticAttributes="false"
+    backupStaticProperties="false"
+    cacheDirectory=".phpunit.cache"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 >
-    <testsuites>
-        <testsuite name="Winter Backend Module">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
+  <testsuites>
+    <testsuite name="Winter Backend Module">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

modules/backend/tests/classes/AuthManagerTest.php

@@ -2,9 +2,9 @@
 
 namespace Backend\Tests\Classes;
 
+use Backend\Classes\AuthManager;
 use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\SystemException;
-use Backend\Classes\AuthManager;
 
 class AuthManagerTest extends TestCase
 {
@@ -44,6 +44,7 @@ protected function listNewPermissions()
     public function tearDown(): void
     {
         AuthManager::forgetInstance();
+        parent::tearDown();
     }
 
     public function testListPermissions()

modules/backend/tests/traits/WidgetMakerTest.php

@@ -9,6 +9,8 @@ class ExampleTraitClass
 {
     use \Backend\Traits\WidgetMaker;
 
+    protected Controller $controller;
+
     public function __construct()
     {
         $this->controller = new Controller;
@@ -35,8 +37,9 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $traitName = 'Backend\Traits\WidgetMaker';
-        $this->traitObject = $this->getObjectForTrait($traitName);
+        $this->traitObject = new class {
+            use \Backend\Traits\WidgetMaker;
+        };
     }
 
     public function testTraitObject()

modules/cms/classes/ComponentManager.php

@@ -1,9 +1,11 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
-use Str;
-use System\Classes\PluginManager;
-use SystemException;
 use Illuminate\Support\Facades\App;
+use System\Classes\PluginManager;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Str;
 
 /**
  * Component manager

modules/cms/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/cms": "1.1.*"