Skip to content

Commit 5099c71

Browse files
authored
[5.x] Merges develop (#302)
* [develop] Adds Laravel 11 support (#298) * Adds Laravel 11 support * Fixes return type * Fixes windows php versions * Removes `--verbose` * Keeps supporting older illuminate components * Removes double run * Fixes windows caret
1 parent 44d388a commit 5099c71

File tree

4 files changed

+22
-29
lines changed

4 files changed

+22
-29
lines changed

.github/workflows/tests.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ jobs:
1616
strategy:
1717
fail-fast: true
1818
matrix:
19-
php: [8.1, 8.2, 8.3]
19+
php: [8.2, 8.3]
20+
laravel: [10, 11]
2021

21-
name: PHP ${{ matrix.php }}
22+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
2223

2324
steps:
2425
- name: Checkout code
@@ -33,20 +34,23 @@ jobs:
3334
coverage: none
3435

3536
- name: Install dependencies
36-
run: composer install --no-interaction --prefer-dist
37+
run: |
38+
composer require "laravel/framework=^${{ matrix.laravel }}" --no-update
39+
composer update --prefer-dist --no-interaction --no-progress
3740
3841
- name: Execute tests
39-
run: vendor/bin/phpunit --verbose
42+
run: vendor/bin/phpunit
4043

4144
windows_tests:
4245
runs-on: windows-latest
4346

4447
strategy:
4548
fail-fast: true
4649
matrix:
47-
php: [8.1, 8.2]
50+
php: [8.2, 8.3]
51+
laravel: [10, 11]
4852

49-
name: PHP ${{ matrix.php }} - Windows
53+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Windows
5054

5155
steps:
5256
- name: Set git to use LF
@@ -67,7 +71,9 @@ jobs:
6771
coverage: none
6872

6973
- name: Install dependencies
70-
run: composer install --no-interaction --prefer-dist
74+
run: |
75+
composer require "laravel/framework=~${{ matrix.laravel }}" --no-update
76+
composer update --prefer-dist --no-interaction --no-progress
7177
7278
- name: Execute tests
73-
run: vendor/bin/phpunit --verbose
79+
run: vendor/bin/phpunit

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.1",
14-
"illuminate/filesystem": "^10.20",
15-
"illuminate/support": "^10.20",
13+
"php": "^8.2",
14+
"illuminate/filesystem": "^10.20|^11.0",
15+
"illuminate/support": "^10.20|^11.0",
1616
"laravel/prompts": "^0.1",
17-
"symfony/console": "^6.0",
18-
"symfony/process": "^6.0"
17+
"symfony/console": "^6.2|^7.0",
18+
"symfony/process": "^6.2|^7.0"
1919
},
2020
"require-dev": {
2121
"phpstan/phpstan": "^1.10",
22-
"phpunit/phpunit": "^9.3"
22+
"phpunit/phpunit": "^10.4"
2323
},
2424
"bin": [
2525
"bin/laravel"

phpunit.xml.dist

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
4-
beStrictAboutTestsThatDoNotTestAnything="false"
5-
bootstrap="vendor/autoload.php"
6-
colors="true"
7-
convertDeprecationsToExceptions="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnError="false"
13-
stopOnFailure="false"
14-
verbose="true"
15-
>
2+
<phpunit colors="true">
163
<testsuites>
174
<testsuite name="Laravel Installer Test Suite">
185
<directory suffix="Test.php">./tests</directory>

src/NewCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
135135
* @param \Symfony\Component\Console\Output\OutputInterface $output
136136
* @return int
137137
*/
138-
protected function execute(InputInterface $input, OutputInterface $output)
138+
protected function execute(InputInterface $input, OutputInterface $output): int
139139
{
140140
$this->validateStackOption($input);
141141

0 commit comments

Comments
 (0)