Merge pull request #22 from artursreiljans/master

Support Symfony 7.0 and PHP 8.3
Incenteev · Dec 13, 2023 · c79eb00 · c79eb00
2 parents 17f5bd3 + 468a1bb
commit c79eb00
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git 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:
@@ -36,7 +37,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
@@ -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
@@ -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);