Merge pull request #189 from netglue/remove-conflicts

Remove composer conflicts with previously incompatible libs
netglue · Apr 5, 2023 · 052f06a · 052f06a
2 parents 1557118 + 0aa155d
commit 052f06a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,5 @@
 /.github/ export-ignore
-/tests/ export-ignore=
+/tests/ export-ignore
 /composer.lock export-ignore
 /composer-require-checker.json export-ignore
 /renovate.json export-ignore
@@ -9,3 +9,4 @@
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore
 /psalm-baseline.xml export-ignore
+/.laminas-ci.json export-ignore
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -0,0 +1,6 @@
+{
+    "extensions": [
+        "redis",
+        "igbinary"
+    ]
+}
diff --git a/composer.json b/composer.json
@@ -47,10 +47,6 @@
         "symfony/redis-messenger": "^5.4.22 || ^6.0",
         "vimeo/psalm": "^5.9"
     },
-    "conflict": {
-        "symfony/redis-messenger": ">=6",
-        "symfony/amqp-messenger": ">=6"
-    },
     "suggest": {
         "laminas/laminas-cli": "To auto-wire symfony cli commands into your DI container with laminas/laminas-cli",
         "symfony/amqp-messenger": "To use AMQP transports with Messenger",

diff --git a/composer.lock b/composer.lock