[1.x] Merge develop

.github/workflows/tests.yml

@@ -13,29 +13,39 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
-        laravel: [^6.0, ^7.0, ^8.0, ^9.0, ^10.0]
+        php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3]
+        laravel: [^6.0, ^7.0, ^8.0, ^9.0, ^10.0, ^11.0]
         exclude:
           - php: 7.2
             laravel: ^8.0
           - php: 7.2
             laravel: ^9.0
           - php: 7.2
             laravel: ^10.0
+          - php: 7.2
+            laravel: ^11.0
           - php: 7.3
             laravel: ^9.0
           - php: 7.3
             laravel: ^10.0
+          - php: 7.3
+            laravel: ^11.0
           - php: 7.4
             laravel: ^9.0
           - php: 7.4
             laravel: ^10.0
+          - php: 7.4
+            laravel: ^11.0
           - php: 8.0
             laravel: ^10.0
+          - php: 8.0
+            laravel: ^11.0
           - php: 8.1
             laravel: ^6.0
           - php: 8.1
             laravel: ^7.0
+          - php: 8.1
+            laravel: ^11.0
           - php: 8.2
             laravel: ^6.0
           - php: 8.2

composer.json

@@ -20,21 +20,21 @@
         "php": "^7.2|^8.0",
         "ext-zip": "*",
         "guzzlehttp/guzzle": "^6.3|^7.0",
-        "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/filesystem": "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/filesystem": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
         "league/flysystem": "^1.0|^3.0",
         "league/flysystem-aws-s3-v3": "^1.0|^3.0",
         "ramsey/uuid": "^3.8|^4.0",
-        "symfony/console": "^4.2|^5.0|^6.0",
-        "symfony/process": "^4.2|^5.0|^6.0",
-        "symfony/var-dumper": "^4.2|^5.0|^6.0",
-        "symfony/yaml": "^4.2|^5.0|^6.0",
+        "symfony/console": "^4.2|^5.0|^6.0|^7.0",
+        "symfony/process": "^4.2|^5.0|^6.0|^7.0",
+        "symfony/var-dumper": "^4.2|^5.0|^6.0|^7.0",
+        "symfony/yaml": "^4.2|^5.0|^6.0|^7.0",
         "vlucas/phpdotenv": "^3.0|^4.0|^5.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^8.0|^9.0"
+        "phpunit/phpunit": "^8.0|^9.0|10.4"
     },
     "autoload": {
         "psr-4": {

src/Commands/Command.php

@@ -59,7 +59,7 @@ class Command extends SymfonyCommand
      * @param  \Symfony\Component\Console\Output\OutputInterface  $output
      * @return int
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->startedAt = new DateTime();
 
@@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->configureManifestPath($input);
         $this->configureOutputStyles($output);
 
-        return Helpers::app()->call([$this, 'handle']) ?: 0;
+        return (int) (Helpers::app()->call([$this, 'handle']) ?: 0);
     }
 
     /**

src/KeyChoiceQuestion.php

@@ -9,7 +9,7 @@ class KeyChoiceQuestion extends ChoiceQuestion
     /**
      * {@inheritdoc}
      */
-    protected function isAssoc($array)
+    protected function isAssoc($array): bool
     {
         return true;
     }

tests/BuildContainerImageTest.php

@@ -77,7 +77,7 @@ public function test_runtime_variable_cannot_be_overridden()
         $this->assertSame(['__VAPOR_RUNTIME=docker'], $buildArgs);
     }
 
-    public function runtimeProvider()
+    public static function runtimeProvider()
     {
         return [
             [

tests/RewriteAssetUrlsTest.php

@@ -15,7 +15,7 @@ public function test_asset_urls_are_rewritten($css, $expected)
         $this->assertEquals($expected, RewriteAssetUrls::inCssString($css, 'http://example.com'));
     }
 
-    public function assetUrlDataProvider()
+    public static function assetUrlDataProvider()
     {
         return [
             ['something url("/foo/bar.jpg") something', 'something url("http://example.com/foo/bar.jpg") something'],