Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.x] Merges develop #302

Merged
merged 5 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,20 +34,23 @@ 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

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
Expand All @@ -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
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 1 addition & 14 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="vendor/autoload.php"
colors="true"
convertDeprecationsToExceptions="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
verbose="true"
>
<phpunit colors="true">
<testsuites>
<testsuite name="Laravel Installer Test Suite">
<directory suffix="Test.php">./tests</directory>
Expand Down
2 changes: 1 addition & 1 deletion src/NewCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down