Merge branch 'release/2.1.0'

2019-11-12 12:35:21 +01:00 · 2019-11-12 12:35:21 +01:00 · d16ca767c1
commit d16ca767c1
parent 4dd8d9026b 40aaaa930b
2 changed files with 4 additions and 2 deletions
--- a/Classes/Validation/Validator/SettingsValidator.php
+++ b/Classes/Validation/Validator/SettingsValidator.php
@ -40,6 +40,7 @@ class SettingsValidator extends AbstractValidator
    /**
     * @var ReflectionService
     * @Flow\Inject
+     * @deprecated
     */
    protected $reflectionService;

--- a/composer.json
+++ b/composer.json
@ -18,7 +18,7 @@
        "validation"
    ],
    "require": {
-        "neos/flow": "~4.1"
+        "neos/flow": "~4.1|^5.3"
    },
    "autoload": {
        "psr-4": {
@ -66,7 +66,8 @@
            "Neos.Media-20161219094126",
            "Neos.Flow-20170125103800",
            "Neos.Flow-20170127183102",
-            "DigiComp.SettingValidator-20170603120900"
+            "DigiComp.SettingValidator-20170603120900",
+            "Neos.Flow-20180415105700"
        ]
    }
 }