Merge pull request #39 from systopia/drop-conflict-with-symfony-cache-6

Drop conflict with `symfony/cache` `>=6`
systopia · Jun 27, 2024 · 58f950e · 58f950e
2 parents f6e9c70 + d8e0db8
commit 58f950e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -46,9 +46,7 @@
         ]
     },
     "require-dev": {
+        "psr/simple-cache": "^1 || ^2 || ^3",
         "symfony/event-dispatcher-contracts": "^1 || ^2 || ^3"
-    },
-    "conflict": {
-      "symfony/cache": ">=6"
     }
 }
diff --git a/composer.json.md b/composer.json.md
diff --git a/tests/docker-prepare.sh b/tests/docker-prepare.sh
@@ -40,5 +40,8 @@ else
 fi
 
 cd "$EXT_DIR"
+# In the container used for tests there seems to be psr/cache 1 installed somewhere.
+# This conflicts with symfony/cache >=6, thus we use version 5 here.
+composer require --no-update 'symfony/cache:^5'
 composer update --no-progress --prefer-dist --optimize-autoloader --no-dev
 composer composer-phpunit -- update --no-progress --prefer-dist