Skip to content

Commit b9cd6d8

Browse files
authored
Merge pull request #25 from artursreiljans/master
Fix PHP 8.4 deprecations (implicitly nullable arguments). Add PHP 8.4 to CI workflow.
2 parents b4094e8 + 88f5fe1 commit b9cd6d8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: shivammathur/setup-php@v2
1515
with:
1616
coverage: none
17-
php-version: '8.3'
17+
php-version: '8.4'
1818
- run: composer validate --strict --no-check-lock
1919

2020
static_analysis:
@@ -25,7 +25,7 @@ jobs:
2525
- uses: shivammathur/setup-php@v2
2626
with:
2727
coverage: none
28-
php-version: '8.3'
28+
php-version: '8.4'
2929
- name: Install dependencies
3030
run: composer update --ansi --no-progress --prefer-dist --no-interaction
3131
- run: vendor/bin/phpstan analyze
@@ -37,12 +37,12 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]
40+
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
4141
min_stability: [ '' ]
4242
name_suffix: [ '' ]
4343
composer_flags: [ '' ]
4444
include:
45-
- php: '8.3'
45+
- php: '8.4'
4646
min_stability: 'dev'
4747
name_suffix: ' (dev deps)'
4848
- php: '7.4'

src/Asset/HashingVersionStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class HashingVersionStrategy implements VersionStrategyInterface
1010
private AssetHasherInterface $hasher;
1111
private string $format;
1212

13-
public function __construct(AssetHasherInterface $hasher, string $format = null)
13+
public function __construct(AssetHasherInterface $hasher, ?string $format = null)
1414
{
1515
$this->format = $format ?: '%s?%s';
1616
$this->hasher = $hasher;

src/CacheWarmer/HashCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(AssetFinder $assetFinder, string $cacheFile, AssetHa
3636
*
3737
* @return string[]
3838
*/
39-
public function warmUp($cacheDir, string $buildDir = null): array
39+
public function warmUp($cacheDir, ?string $buildDir = null): array
4040
{
4141
$phpArrayPool = new PhpArrayAdapter($this->cacheFile, $this->fallbackPool);
4242
$arrayPool = new ArrayAdapter(0, false);

0 commit comments

Comments
 (0)