BUGFIX: Fix broken merge of .composer.json template

neos · Jun 14, 2024 · b598ae9 · b598ae9
1 parent e3db78e
commit b598ae9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.composer.json b/.composer.json
@@ -7,19 +7,17 @@
     "test:behavioral": [
       "../../flow doctrine:migrate --quiet",
       "../../bin/behat -f progress -c Neos.Flow/Tests/Behavior/behat.yml"
+    ],
+    "lint:phpstan": "../../bin/phpstan analyse",
+    "lint": [
+      "@lint:phpstan"
     ]
   },
   "require": {
     "behat/behat": "^3.10"
   },
   "replace": {
   },
-  "scripts": {
-    "lint:phpstan": "../../bin/phpstan analyse",
-    "lint": [
-      "@lint:phpstan"
-    ]
-  },
   "suggest": {
   },
   "autoload": {

diff --git a/composer.json b/composer.json
@@ -6,6 +6,10 @@
     ],
     "type": "neos-package-collection",
     "scripts": {
+        "test:behavioral": [
+            "../../flow doctrine:migrate --quiet",
+            "../../bin/behat -f progress -c Neos.Flow/Tests/Behavior/behat.yml"
+        ],
         "lint:phpstan": "../../bin/phpstan analyse",
         "lint": [
             "@lint:phpstan"
@@ -135,6 +139,11 @@
         "mikey179/vfsstream": "^1.6.10",
         "phpunit/phpunit": "~9.1"
     },
+    "provide": {
+        "psr/cache-implementation": "2.0.0 || 3.0.0",
+        "psr/simple-cache-implementation": "2.0.0 || 3.0.0",
+        "psr/log-implementation": "2.0.0 || 3.0.0"
+    },
     "autoload-dev": {
         "psr-4": {
             "Neos\\Cache\\Tests\\": [