From 9284c436eb3f5692f8ee07df55a83bb6803651a9 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Wed, 6 Dec 2023 18:27:51 +0000 Subject: [PATCH] Adds Laravel 11 support (#241) --- .github/workflows/tests.yml | 14 ++++++++++++-- composer.json | 16 ++++++++-------- src/Commands/Command.php | 4 ++-- src/KeyChoiceQuestion.php | 2 +- tests/BuildContainerImageTest.php | 2 +- tests/RewriteAssetUrlsTest.php | 2 +- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index be042539..33f4c9ab 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,8 +13,8 @@ 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 @@ -22,20 +22,30 @@ jobs: 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 diff --git a/composer.json b/composer.json index cb08bbd0..42611a82 100644 --- a/composer.json +++ b/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": { diff --git a/src/Commands/Command.php b/src/Commands/Command.php index b23a5008..97dd7efa 100644 --- a/src/Commands/Command.php +++ b/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); } /** diff --git a/src/KeyChoiceQuestion.php b/src/KeyChoiceQuestion.php index 207febd1..0b6c5b9d 100644 --- a/src/KeyChoiceQuestion.php +++ b/src/KeyChoiceQuestion.php @@ -9,7 +9,7 @@ class KeyChoiceQuestion extends ChoiceQuestion /** * {@inheritdoc} */ - protected function isAssoc($array) + protected function isAssoc($array): bool { return true; } diff --git a/tests/BuildContainerImageTest.php b/tests/BuildContainerImageTest.php index 39dc96dc..a1947a66 100644 --- a/tests/BuildContainerImageTest.php +++ b/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 [ [ diff --git a/tests/RewriteAssetUrlsTest.php b/tests/RewriteAssetUrlsTest.php index 4333788e..381e6775 100644 --- a/tests/RewriteAssetUrlsTest.php +++ b/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'],