Skip to content

Commit

Permalink
Add support for Laravel 10 (#25)
Browse files Browse the repository at this point in the history
* Add support for Laravel 10

* Exclude Laravel 7 for PHP 8.2
  • Loading branch information
markwalet authored Feb 16, 2023
1 parent e0a3cf4 commit 6b80dfb
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v1
uses: actions/checkout@v2

- name: Cache dependencies
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.composer/cache/files
key: dependencies-php-8.1-illuminate-9.*-composer-${{ hashFiles('composer.json') }}
key: dependencies-php-8.2-illuminate-10.*-composer-${{ hashFiles('composer.json') }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1
php-version: 8.2
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd
coverage: xdebug

Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,27 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [7.4, 8.0, 8.1]
illuminate: [~6.20, ~7.29, ~8.74, ^9.0]
php: [ 8.0, 8.1, 8.2 ]
illuminate: [~7.29, ~8.74, ^9.0, ^10.0]
stability: [prefer-lowest, prefer-stable]
include:
- illuminate: ~6.20
testbench: ~4.13
- illuminate: ~7.29
testbench: ~5.12
- illuminate: ~8.74
testbench: 6.*
- illuminate: ^9.0
testbench: 7.*
- illuminate: ^10.0
testbench: 8.*
exclude:
- php: 7.4
illuminate: ^9.0
- php: 8.1
illuminate: ~7.29
- php: 8.1
illuminate: ~6.20
- php: 8.0
illuminate: ^10.0
- php: 8.2
illuminate: ~7.29

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

Expand All @@ -40,7 +42,7 @@ jobs:
uses: actions/checkout@v2

- name: Cache dependencies
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.composer/cache/files
key: dependencies-php-${{ matrix.php }}-illuminate-${{ matrix.illuminate }}-composer-${{ hashFiles('composer.json') }}
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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

### Added
- Added support for Laravel 10
- Added support for PHP 8.2

### Removed
- Removed support for PHP 7.4
- Removed support for Laravel 6

## [v1.6.1 (2022-04-22)](https://github.com/markwalet/laravel-git-state/compare/v1.6.0...v1.6.1)

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
}
],
"require": {
"php": "~7.4|8.*",
"laravel/framework": "~6.20|~7.29|~8.74|^9.0",
"php": "8.*",
"laravel/framework": "~7.29|~8.74|^9.0|^10.0",
"phpoption/phpoption": ">=1.8",
"webmozart/assert": "^1.10"
},
"require-dev": {
"phpunit/phpunit": "~9.3",
"orchestra/testbench": "~4.13|~5.12|6.*|7.*"
"orchestra/testbench": "~5.12|6.*|7.*|8.*"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/Exceptions/MissingConfigurationExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ public function it_can_create_an_exception_instance(): void

$this->assertEquals('Configuration key `config` is missing.', $message);
}
}
}
2 changes: 1 addition & 1 deletion tests/Exceptions/MissingDriverExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ public function it_can_create_an_exception_instance(): void

$this->assertEquals('Driver `invalid-driver` is not supported for git-state.', $message);
}
}
}
2 changes: 1 addition & 1 deletion tests/Exceptions/NoGitRepositoryExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ public function it_can_create_an_exception_instance(): void

$this->assertEquals('`example-path` is not a valid git repository.', $message);
}
}
}

0 comments on commit 6b80dfb

Please sign in to comment.