Merge pull request #301 from garak/sf6

fix Symfony deps
KnpLabs · Dec 4, 2021 · d990ef1 · d990ef1
2 parents b19a08a + 1e55dfa
commit d990ef1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -27,6 +27,7 @@ jobs:
     tests:
         runs-on: ubuntu-20.04
         strategy:
+            fail-fast: false
             matrix:
                 php:
                     - '7.3'

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "require": {
         "php": "^7.3 || ^8.0",
         "symfony/event-dispatcher-contracts": "^1.1 || ^2.0",
-        "symfony/http-foundation": "^4.4 || ^5.3 || ^6.0"
+        "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
@@ -36,8 +36,8 @@
         "propel/propel1": "^1.7",
         "ruflin/elastica": "^7.0",
         "solarium/solarium": "^6.0",
-        "symfony/http-kernel": "^4.4 || ^5.2",
-        "symfony/property-access": "^4.4 || ^5.3 || ^6.0"
+        "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
+        "symfony/property-access": "^4.4 || ^5.4 || ^6.0"
     },
     "suggest": {
         "doctrine/common": "to allow usage pagination with Doctrine ArrayCollection",

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -4,6 +4,7 @@
 
 \Doctrine\Common\Annotations\AnnotationRegistry::registerLoader('class_exists');
 $reader = new \Doctrine\Common\Annotations\AnnotationReader();
-$reader = new \Doctrine\Common\Annotations\CachedReader($reader, new \Doctrine\Common\Cache\ArrayCache());
+if (class_exists('Doctrine\Common\Cache\ArrayCache')) {
+    $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new \Doctrine\Common\Cache\ArrayCache());
+}
 $_ENV['annotation_reader'] = $reader;
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ jobs: @@
         tests:
             runs-on: ubuntu-20.04
             strategy:
+                fail-fast: false
                 matrix:
                     php:
                         - '7.3'
@@ Expand Down @@