Skip to content

Commit

Permalink
Get things up-to-date
Browse files Browse the repository at this point in the history
  • Loading branch information
inxilpro committed Apr 12, 2024
1 parent 0e7c21d commit 9260eaa
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Install dependencies
env:
COMPOSER_DISCARD_CHANGES: true
run: composer require --no-suggest --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^10.0" "orchestra/testbench:^8.0"
run: composer require --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^10.0" "orchestra/testbench:^8.0"

- name: Run PHP CS Fixer
run: ./vendor/bin/php-cs-fixer fix --diff --dry-run
24 changes: 8 additions & 16 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,14 @@ jobs:

strategy:
matrix:
php: [ 8.0, 8.1, 8.2 ]
laravel: [ ^8.79, ^9.50.2, 10.* ]
php: [ 8.1, 8.2, 8.3 ]
laravel: [ 10.*, 11.* ]
dependency-version: [ stable, lowest ]
include:
- laravel: ^8.79
testbench: ^6.24
- laravel: ^9.50.2
testbench: ^7.22
- laravel: 10.*
testbench: 8.*
exclude:
- php: 8.2
laravel: ^8.79
- php: 8.0
laravel: 10.*
- laravel: 11.*
testbench: 9.*

timeout-minutes: 10

Expand Down Expand Up @@ -59,10 +52,9 @@ jobs:
${{ runner.os }}-composer-
- name: Install dependencies
run: composer require --no-interaction --prefer-dist --no-update "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}"

- name: Set dependency version
run: composer update --no-interaction --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }}
run: |
composer require --no-interaction --prefer-dist --no-update "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}"
composer update --no-interaction --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }}
- name: Execute tests
run: vendor/bin/phpunit -v
run: vendor/bin/phpunit
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
vendor/
composer.phar
composer.lock
phpunit.xml
.phpunit.result.cache
.php_cs.cache
.php-cs-fixer.cache
.env

.DS_Store
.phpstorm.meta.php
Expand Down
1 change: 1 addition & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
'@PSR2' => true,
'function_declaration' => [
'closure_function_spacing' => 'none',
'closure_fn_spacing' => 'none',
],
'ordered_imports' => [
'sort_algorithm' => 'alpha',
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"type": "library",
"license": "MIT",
"require": {
"illuminate/support": "^9|^10|11.x-dev|dev-master",
"illuminate/support": "^10|^11|dev-master",
"ext-json": "*"
},
"require-dev": {
"orchestra/testbench": "^6.24|^7.10|^8|9.x-dev|10.x-dev|dev-master",
"orchestra/testbench": "^8|^9|10.x-dev|dev-master",
"friendsofphp/php-cs-fixer": "^3.34",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.3"
"phpunit/phpunit": "^10.5"
},
"autoload": {
"psr-4": {
Expand Down
File renamed without changes.

0 comments on commit 9260eaa

Please sign in to comment.