From a7629367a365822a856084b360e448e34458d33d Mon Sep 17 00:00:00 2001 From: artursreiljans Date: Sun, 10 Dec 2023 01:44:04 +0200 Subject: [PATCH 1/2] Allow usage with Symfony 7. Add PHP 8.2 and 8.3 to tests. --- .github/workflows/ci.yml | 2 +- composer.json | 16 ++++++++-------- src/CacheWarmer/HashCacheWarmer.php | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6da88d7..7a1fe3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0', '8.1' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] min_stability: [ '' ] name_suffix: [ '' ] composer_flags: [ '' ] diff --git a/composer.json b/composer.json index c513957..13cdc2f 100644 --- a/composer.json +++ b/composer.json @@ -12,13 +12,13 @@ ], "require": { "php": ">=7.4", - "symfony/asset": "^4.4.13 || ^5.3 || ^6.0", - "symfony/cache": "^4.4.13 || ^5.3 || ^6.0", - "symfony/config": "^4.4 || ^5.3 || ^6.0", - "symfony/dependency-injection": "^4.4.13 || ^5.3 || ^6.0", - "symfony/finder": "^4.4.13 || ^5.3 || ^6.0", - "symfony/framework-bundle": "^4.4.13 || ^5.3 || ^6.0", - "symfony/http-kernel": "^4.4.13 || ^5.3 || ^6.0" + "symfony/asset": "^4.4.13 || ^5.3 || ^6.0 || ^7.0", + "symfony/cache": "^4.4.13 || ^5.3 || ^6.0 || ^7.0", + "symfony/config": "^4.4 || ^5.3 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^4.4.13 || ^5.3 || ^6.0 || ^7.0", + "symfony/finder": "^4.4.13 || ^5.3 || ^6.0 || ^7.0", + "symfony/framework-bundle": "^4.4.13 || ^5.3 || ^6.0 || ^7.0", + "symfony/http-kernel": "^4.4.13 || ^5.3 || ^6.0 || ^7.0" }, "require-dev": { "jangregor/phpstan-prophecy": "^1.0", @@ -28,7 +28,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-symfony": "^1.1", "phpunit/phpunit": "^9.5", - "symfony/phpunit-bridge": "^5.3 || ^6.0" + "symfony/phpunit-bridge": "^5.3 || ^6.0 || ^7.0" }, "autoload": { "psr-4": { diff --git a/src/CacheWarmer/HashCacheWarmer.php b/src/CacheWarmer/HashCacheWarmer.php index ec27fea..e9720d5 100644 --- a/src/CacheWarmer/HashCacheWarmer.php +++ b/src/CacheWarmer/HashCacheWarmer.php @@ -36,7 +36,7 @@ public function __construct(AssetFinder $assetFinder, string $cacheFile, AssetHa * * @return string[] */ - public function warmUp($cacheDir): array + public function warmUp($cacheDir, string $buildDir = null): array { $phpArrayPool = new PhpArrayAdapter($this->cacheFile, $this->fallbackPool); $arrayPool = new ArrayAdapter(0, false); From 468a1bb7604e23b8c2b544ce59ad2379f949164c Mon Sep 17 00:00:00 2001 From: artursreiljans Date: Sun, 10 Dec 2023 01:45:50 +0200 Subject: [PATCH 2/2] Allow manual running of a CI workflow. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a1fe3c..a9370f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: CI on: push: pull_request: + workflow_dispatch: jobs: check_composer: