Skip to content

Commit f7b47e2

Browse files
authored
Merge pull request #31 from koossaayy/fix/composer_dependencies_and_tests
Fixing Composer Dependencies & Github Actions
2 parents 8d60aaf + de6a599 commit f7b47e2

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

.github/workflows/run-tests.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Tests
2-
32
on: [push, pull_request]
4-
53
jobs:
64
test:
75
runs-on: ${{ matrix.os }}
@@ -14,33 +12,26 @@ jobs:
1412
stability: [prefer-stable]
1513
include:
1614
- laravel: 10.*
17-
15+
testbench: 8.*
16+
- laravel: 11.*
17+
testbench: 9.*
1818
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
19-
2019
steps:
2120
- name: Checkout code
22-
uses: actions/checkout@v2
23-
21+
uses: actions/checkout@v3
2422
- name: Setup PHP
2523
uses: shivammathur/setup-php@v2
2624
with:
2725
php-version: ${{ matrix.php }}
2826
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
2927
coverage: none
30-
3128
- name: Setup problem matchers
3229
run: |
3330
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
3431
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
3532
- name: Install dependencies
36-
if: matrix.laravel == '10.*'
3733
run: |
38-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:8.*" --no-interaction --no-update
39-
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
40-
- name: Install dependencies
41-
if: matrix.laravel == '11.*'
42-
run: |
43-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:9.*" "pestphp/pest:2.*" "nunomaduro/collision:7.*" --no-interaction --no-update
34+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
4435
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4536
- name: Execute tests
4637
run: vendor/bin/pest

composer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,21 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.0|^8.1|^8.2",
20-
"illuminate/contracts": "^7.0|^8.0|^9.0|^10|^11",
21-
"spatie/laravel-package-tools": "^1.11"
19+
"php": "^8.1|^8.2|^8.3",
20+
"illuminate/contracts": "^9.0|^10.0|^11.0",
21+
"spatie/laravel-package-tools": "^1.14"
2222
},
2323
"require-dev": {
24-
"nunomaduro/collision": "^6.0|^7.0|^8.0",
24+
"nunomaduro/collision": "^7.0|^8.0",
2525
"orchestra/testbench": "^8.0|^9.0",
26-
"pestphp/pest": "^1.10",
27-
"pestphp/pest-plugin-laravel": "^1.1|^2.0",
26+
"pestphp/pest": "^2.0",
27+
"pestphp/pest-plugin-laravel": "^2.0",
2828
"phpstan/extension-installer": "^1.1",
2929
"phpstan/phpstan-deprecation-rules": "^1.0",
3030
"phpstan/phpstan-phpunit": "^1.0",
31-
"phpunit/phpunit": "^9.4|^10",
31+
"phpunit/phpunit": "^10.0",
3232
"spatie/laravel-ray": "^1.26",
3333
"mockery/mockery": "^1.4"
34-
3534
},
3635
"autoload": {
3736
"psr-4": {

0 commit comments

Comments
 (0)