diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 79b5bc99..00901662 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,9 +16,10 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1, 8.2, 8.3] + php: [8.2, 8.3] + laravel: [10, 11] - name: PHP ${{ matrix.php }} + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -33,10 +34,12 @@ jobs: coverage: none - name: Install dependencies - run: composer install --no-interaction --prefer-dist + run: | + composer require "laravel/framework=^${{ matrix.laravel }}" --no-update + composer update --prefer-dist --no-interaction --no-progress - name: Execute tests - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit windows_tests: runs-on: windows-latest @@ -44,9 +47,10 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1, 8.2] + php: [8.2, 8.3] + laravel: [10, 11] - name: PHP ${{ matrix.php }} - Windows + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Windows steps: - name: Set git to use LF @@ -67,7 +71,9 @@ jobs: coverage: none - name: Install dependencies - run: composer install --no-interaction --prefer-dist + run: | + composer require "laravel/framework=~${{ matrix.laravel }}" --no-update + composer update --prefer-dist --no-interaction --no-progress - name: Execute tests - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index d4de85c3..87921fcc 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": "^10.20|^11.0", + "illuminate/support": "^10.20|^11.0", "laravel/prompts": "^0.1", - "symfony/console": "^6.0", - "symfony/process": "^6.0" + "symfony/console": "^6.2|^7.0", + "symfony/process": "^6.2|^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..02e7dfe3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,18 +1,5 @@ - + ./tests 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);