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

Add support for Laravel 11 #34

Merged
merged 3 commits into from
Mar 13, 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
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.composer/cache/files
key: dependencies-php-8.3-illuminate-10.*-composer-${{ hashFiles('composer.json') }}
key: dependencies-php-8.3-illuminate-11.*-composer-${{ hashFiles('composer.json') }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.composer/cache/files
key: dependencies-php-8.3-illuminate-10.*-composer-${{ hashFiles('composer.json') }}
key: dependencies-php-8.3-illuminate-11.*-composer-${{ hashFiles('composer.json') }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
26 changes: 6 additions & 20 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,17 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.0, 8.1, 8.2, 8.3 ]
illuminate: [~7.29, ~8.74, ^9.0, ^10.0]
php: [ 8.1, 8.2, 8.3 ]
illuminate: [^10.0, ^11.0]
stability: [prefer-lowest, prefer-stable]
include:
- illuminate: ~7.29
testbench: ~5.12
- illuminate: ~8.74
testbench: 6.*
- illuminate: ^9.0
testbench: 7.*
- illuminate: ^10.0
testbench: 8.*
- illuminate: ^11.0
testbench: 9.*
exclude:
- php: 8.1
illuminate: ~7.29
- php: 8.1
illuminate: ~6.20
- php: 8.0
illuminate: ^10.0
- php: 8.2
illuminate: ~7.29
- php: 8.3
illuminate: ~7.29
- php: 8.3
illuminate: ~8.74
illuminate: ^11.0

name: P${{ matrix.php }} - I${{ matrix.illuminate }} - ${{ matrix.stability }}

Expand Down Expand Up @@ -68,4 +54,4 @@ jobs:
composer update --${{ matrix.stability }} --prefer-dist --no-interaction

- name: Execute tests
run: vendor/bin/phpunit --verbose
run: vendor/bin/phpunit
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ composer.phar
clover.json
clover.xml
.phpunit.result.cache
.phpunit.cache/
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

## [Unreleased](https://github.com/markwalet/laravel-git-state/compare/v1.8.0...master)

### Added
- Added support for Laravel 11

### Removed
- Removed support for PHP 8.0
- Removed support for Laravel 7
- Removed support for Laravel 8
- Removed support for Laravel 9

### Changed
- Upgraded to PHPUnit 10.

## [v1.8.0 (2023-11-27)](https://github.com/markwalet/laravel-git-state/compare/v1.7.0...v1.8.0)

### Added
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
],
"require": {
"php": "8.*",
"laravel/framework": "~7.29|~8.74|^9.0|^10.0|^11.0",
"laravel/framework": "^10.0|^11.0",
"phpoption/phpoption": ">=1.8",
"webmozart/assert": "^1.10"
},
"require-dev": {
"phpunit/phpunit": "~9.3",
"orchestra/testbench": "~5.12|6.*|7.*|8.*|9.*"
"phpunit/phpunit": "^10.5",
"orchestra/testbench": "8.*|9.*"
},
"autoload": {
"psr-4": {
Expand Down
21 changes: 10 additions & 11 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,23 @@
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
processIsolation="false"
stopOnFailure="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage includeUncoveredFiles="true"
processUncoveredFiles="true">
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false">
<testsuites>
<testsuite name="Git Test Suite">
<directory suffix="Test.php">./tests/</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
<exclude>
<directory suffix=".php">./src/Exceptions/*</directory>
</exclude>
</coverage>
<testsuites>
<testsuite name="Git Test Suite">
<directory suffix="Test.php">./tests/</directory>
</testsuite>
</testsuites>
</source>
</phpunit>
Loading