MERGE: Merge branch '1.0' into master

# Conflicts: # Configuration/Settings.yaml # composer.json
neos · Sep 2, 2022 · 0f49ccc · 0f49ccc
2 parents 4def3eb + b9030f6
commit 0f49ccc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -12,8 +12,8 @@ Neos:
     collections:
       FusionForm:
         references:
-          - 'FusionForm:Helpers'
-          - 'FusionForm:RuntimeHelpers'
+          'FusionForm:Helpers': true
+          'FusionForm:RuntimeHelpers': true
     references:
       'FusionForm:Helpers':
         title: 'Fusion Form Helper Reference'

diff --git a/composer.json b/composer.json
@@ -39,5 +39,10 @@
         "test:unit": ["vendor/bin/phpunit Tests/Unit"],
         "test:stan": ["vendor/bin/phpstan analyse -l 8 Classes"],
         "test": ["composer install", "composer test:functional", "composer test:unit" ,"composer  test:stan"]
+    },
+    "config": {
+        "allow-plugins": {
+            "neos/composer-plugin": true
+        }
     }
 }