From 79d5bd1c187de9c514614a6ceb0b5e50ba9b7a71 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 5 Dec 2023 15:36:07 +0000 Subject: [PATCH 1/3] Adds `alias` to `6.x-dev` (#294) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fa309bc7..c8ef6460 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "6.x-dev" } }, "config": { From a88362ffcb0255b35be0bc282f6c55c50af96d7c Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 5 Dec 2023 15:58:37 +0000 Subject: [PATCH 2/3] Adds L11 support --- .github/workflows/tests.yml | 2 +- composer.json | 12 ++++++------ phpunit.xml.dist | 18 ++++-------------- src/NewCommand.php | 2 +- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 79b5bc99..01731c28 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1, 8.2, 8.3] + php: [8.2, 8.3] name: PHP ${{ matrix.php }} diff --git a/composer.json b/composer.json index c8ef6460..1bd0ef3f 100644 --- a/composer.json +++ b/composer.json @@ -10,16 +10,16 @@ } ], "require": { - "php": "^8.1", - "illuminate/filesystem": "^10.20", - "illuminate/support": "^10.20", + "php": "^8.2", + "illuminate/filesystem": "^11.0", + "illuminate/support": "^11.0", "laravel/prompts": "^0.1", - "symfony/console": "^6.0", - "symfony/process": "^6.0" + "symfony/console": "^7.0", + "symfony/process": "^7.0" }, "require-dev": { "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.4" }, "bin": [ "bin/laravel" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 53afb981..a4bf9625 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,22 +1,12 @@ - + ./tests ./tests/scaffolds + + + diff --git a/src/NewCommand.php b/src/NewCommand.php index e5225834..0903804f 100644 --- a/src/NewCommand.php +++ b/src/NewCommand.php @@ -133,7 +133,7 @@ protected function interact(InputInterface $input, OutputInterface $output) * @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->validateStackOption($input); From 1137cbe2fcd120cbd84bf83efddf0a2df84af687 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 5 Dec 2023 16:26:23 +0000 Subject: [PATCH 3/3] Fixes test suite --- phpunit.xml.dist | 3 --- 1 file changed, 3 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a4bf9625..02e7dfe3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -6,7 +6,4 @@ ./tests/scaffolds - - -