Merge branch 'master' into php84

Author: duncanmcclean

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         php: [8.1, 8.2, 8.3, 8.4]
-        laravel: [10.*, 11.*]
+        laravel: [10.*, 11.*, 12.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
         include:
@@ -32,6 +32,8 @@ jobs:
         exclude:
           - php: 8.1
             laravel: 11.*
+          - php: 8.1
+            laravel: 12.*
           - php: 8.4
             laravel: 10.*
 

composer.json

@@ -9,8 +9,8 @@
     "require-dev": {
         "statamic/cms": "^5.41",
         "mockery/mockery": "^1.4.4",
-        "orchestra/testbench": "^8.28 || ^9.6.1",
-        "phpunit/phpunit": "^10.5.35"
+        "orchestra/testbench": "^8.28 || ^9.6.1 || ^10.0",
+        "phpunit/phpunit": "^10.5.35 || ^11.0"
     },
     "autoload": {
         "psr-4": {

tests/MigrateAssetContainerTest.php

@@ -299,7 +299,8 @@ public function it_migrates_disk_with_local_driver()
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app/private'),
+            'serve' => true,
             'throw' => false,
             'report' => false,
         ],
@@ -369,7 +370,8 @@ public function it_migrates_disk_with_s3_driver()
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app/private'),
+            'serve' => true,
             'throw' => false,
             'report' => false,
         ],
@@ -438,7 +440,8 @@ public function it_migrates_disk_with_terser_key_when_assets_already_exists()
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app/private'),
+            'serve' => true,
             'throw' => false,
             'report' => false,
         ],
@@ -513,7 +516,8 @@ public function it_migrates_multiple_disks_with_terser_keys_only()
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app/private'),
+            'serve' => true,
             'throw' => false,
             'report' => false,
         ],
@@ -619,7 +623,8 @@ public function it_overwrites_disks_when_forced()
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app/private'),
+            'serve' => true,
             'throw' => false,
             'report' => false,
         ],
@@ -797,11 +802,22 @@ protected function normalizeLocalConfig($config)
         ],
 EOT;
 
+        // Up until Laravel 12
+        $variants[] = <<<'EOT'
+        'local' => [
+            'driver' => 'local',
+            'root' => storage_path('app'),
+            'throw' => false,
+            'report' => false,
+        ],
+EOT;
+
         // Current version
         $current = <<<'EOT'
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app/private'),
+            'serve' => true,
             'throw' => false,
             'report' => false,
         ],