Skip to content

Commit

Permalink
Merge pull request #36 from markwalet/php-84-support
Browse files Browse the repository at this point in the history
Add PHP 8.4 in test matrix
  • Loading branch information
markwalet authored Nov 19, 2024
2 parents c62c0d7 + 8913a7b commit db90b0b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Cache dependencies
uses: actions/cache@v4
with:
path: ~/.composer/cache/files
key: dependencies-php-8.3-illuminate-11.*-composer-${{ hashFiles('composer.json') }}

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

Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.1, 8.2, 8.3 ]
php: [ 8.1, 8.2, 8.3, 8.4 ]
illuminate: [^10.0, ^11.0]
stability: [prefer-lowest, prefer-stable]
include:
Expand All @@ -34,12 +34,6 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Cache dependencies
uses: actions/cache@v4
with:
path: ~/.composer/cache/files
key: dependencies-php-${{ matrix.php }}-illuminate-${{ matrix.illuminate }}-composer-${{ hashFiles('composer.json') }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "8.*",
"php": "^8.1",
"laravel/framework": "^10.0|^11.0",
"phpoption/phpoption": ">=1.8",
"webmozart/assert": "^1.10"
Expand Down
2 changes: 1 addition & 1 deletion src/GitStateManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function __construct(GitDriverFactory $factory, array $config)
*
* @return GitDriver
*/
public function driver(string $name = null): GitDriver
public function driver(string|null $name = null): GitDriver
{
// Set the name to default when null.
$name = $name ?: $this->getDefaultDriver();
Expand Down

0 comments on commit db90b0b

Please sign in to comment.