Laravel 11 migration

.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:

.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:
@@ -58,7 +58,7 @@ jobs:
 
       - 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-laravel-11 as 1.2"
 
       - name: Switch library dependency (1.2)
         if: github.head_ref == '1.2' || github.ref == 'refs/heads/1.2' || github.base_ref == '1.2'
@@ -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.2', '8.3']
       fail-fast: false
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}
@@ -135,7 +135,7 @@ jobs:
 
       - 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-laravel-11 as 1.2"
 
       - name: Switch library dependency (1.0)
         if: github.head_ref == '1.0' || github.ref == 'refs/heads/1.0' || github.base_ref == '1.0'
@@ -171,10 +171,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,21 +29,21 @@
         "source": "https://github.com/wintercms/winter"
     },
     "require": {
-        "php": "^8.0.2",
-        "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-laravel-11 as 1.2",
+        "winter/wn-system-module": "dev-wip-laravel-11",
+        "winter/wn-backend-module": "dev-wip-laravel-11",
+        "winter/wn-cms-module": "dev-wip-laravel-11",
+        "laravel/framework": "^11.0",
         "wikimedia/composer-merge-plugin": "~2.1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.8",
+        "phpunit/phpunit": "^10.5",
         "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": "^0.5.0"
     },
     "scripts": {
         "post-create-project-cmd": [
@@ -65,7 +65,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.0.2",
+        "php": "^8.2",
         "composer/installers": "~1.11.0",
-        "laravel/framework": "^9.1"
+        "laravel/framework": "^11.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/cms/composer.json

@@ -23,9 +23,9 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.2",
         "composer/installers": "~1.11.0",
-        "laravel/framework": "^9.1"
+        "laravel/framework": "^11.0"
     },
     "replace": {
         "october/cms": "1.1.*"

modules/cms/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 CMS Module">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
+  <testsuites>
+    <testsuite name="Winter CMS Module">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

modules/cms/tests/classes/ControllerTest.php

@@ -302,7 +302,7 @@ protected function configAjaxRequestMock($handler, $partials = false)
         $requestMock = $this
             ->getMockBuilder('Illuminate\Http\Request')
             ->disableOriginalConstructor()
-            ->setMethods(['ajax', 'method', 'header'])
+            ->onlyMethods(['ajax', 'method', 'header'])
             ->getMock();
 
         $map = [

modules/system/classes/UpdateManager.php

@@ -135,6 +135,13 @@ public function bindContainerObjects()
     public function update()
     {
         try {
+            $connection = Schema::getConnection();
+            if ($connection->getDriverName() === 'sqlite') {
+                if (version_compare($connection->getServerVersion(), '3.35', '<')) {
+                    throw new Exception("SQLite version minimum requirement not met (>= 3.35)");
+                }
+            };
+
             $firstUp = !Schema::hasTable($this->getMigrationTableName());
             if ($firstUp) {
                 $this->repository->createRepository();

modules/system/composer.json

@@ -23,9 +23,9 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.2",
         "composer/installers": "~1.11.0",
-        "laravel/framework": "^9.1",
+        "laravel/framework": "^11.0",
         "composer/semver": "^3.2"
     },
     "replace": {

modules/system/console/WinterInstall.php

@@ -7,6 +7,7 @@
 use File;
 use Illuminate\Encryption\Encrypter;
 use PDO;
+use Schema;
 use Str;
 use Symfony\Component\Console\Input\InputOption;
 use System\Classes\UpdateManager;

modules/system/console/WinterTest.php

@@ -33,11 +33,11 @@ class WinterTest extends Command
      * @var string The console command signature as ignoreValidationErrors causes options not to be registered.
      */
     protected $signature = 'winter:test
-        {phpunitArgs?* : Arguments to pass through to PHPUnit}
-        {?--c|configuration= : A specific phpunit xml file}
-        {?--b|bootstrap= : A custom PHPUnit bootstrap file}
-        {?--p|plugin=* : List of plugins to test}
-        {?--m|module=* : List of modules to test}
+        {phpunitArgs?* : use "--" followed by the arguments to pass through to PHPUnit such as "-- --stop-on-failure"}
+        {--c|configuration= : A specific phpunit xml file}
+        {--b|bootstrap= : A custom PHPUnit bootstrap file}
+        {--p|plugin=* : List of plugins to test}
+        {--m|module=* : List of modules to test}
     ';
 
     /**

modules/system/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 System Module">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
+  <testsuites>
+    <testsuite name="Winter System Module">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

modules/system/tests/bootstrap/TestCase.php

@@ -78,7 +78,8 @@ public static function assertFileNotExists(string $filename, string $message = '
     /**
      * Stub for `assertRegExp` to allow compatibility with both PHPUnit 8 and 9.
      *
-     * @param string $filename
+     * @param string $pattern
+     * @param string $string
      * @param string $message
      * @return void
      */
@@ -91,4 +92,22 @@ public static function assertRegExp(string $pattern, string $string, string $mes
 
         Assert::assertRegExp($pattern, $string, $message);
     }
+
+    /**
+     * Stub for `assertObjectHasAttribute` to allow compatibility with both PHPUnit 9 and 10.
+     *
+     * @param string $propertyName
+     * @param object $object
+     * @param string $message
+     * @return void
+     */
+    public static function assertObjectHasAttribute(string $propertyName, $object, string $message = ''): void
+    {
+        if (method_exists(Assert::class, 'assertObjectHasProperty')) {
+            Assert::assertObjectHasProperty($propertyName, $object, $message);
+            return;
+        }
+
+        Assert::assertObjectHasAttribute($propertyName, $object, $message);
+    }
 }

modules/system/tests/classes/MediaLibraryTest.php

@@ -20,7 +20,7 @@ public function tearDown(): void
         parent::tearDown();
     }
 
-    public function invalidPathsProvider()
+    public static function invalidPathsProvider()
     {
         return [
             ['./file'],
@@ -36,7 +36,7 @@ public function invalidPathsProvider()
         ];
     }
 
-    public function validPathsProvider()
+    public static function validPathsProvider()
     {
         return [
             ['file'],

modules/system/tests/classes/VersionManagerTest.php

@@ -157,7 +157,7 @@ public function testExtractScriptsAndComments($versionInfo, $expectedComments, $
         $this->assertEquals($expectedScripts, $scripts);
     }
 
-    public function versionInfoProvider()
+    public static function versionInfoProvider()
     {
         return [
             [