!!! BUGFIX: Adjust to TYPO3Fluid 2.5.11 and 2.6.10 signature changes

Neos.FluidAdaptor/Classes/Core/Parser/SyntaxTree/ResourceUriNode.php

@@ -49,8 +49,6 @@ public function injectViewHelperResolver(ViewHelperResolver $viewHelperResolver)
         $this->uninitializedViewHelper = $this->viewHelperResolver->createViewHelperInstanceFromClassName($this->viewHelperClassName);
         $this->uninitializedViewHelper->setViewHelperNode($this);
         $this->argumentDefinitions = $this->viewHelperResolver->getArgumentDefinitionsForViewHelper($this->uninitializedViewHelper);
-        $this->rewriteBooleanNodesInArgumentsObjectTree($this->argumentDefinitions, $this->arguments);
-        $this->validateArguments($this->argumentDefinitions, $this->arguments);
     }
 
     /**

Neos.FluidAdaptor/Classes/Core/ViewHelper/AbstractViewHelper.php

@@ -89,16 +89,17 @@ public function injectLogger(LoggerInterface $logger): void
      * @param string $description Description of the argument
      * @param boolean $required If true, argument is required. Defaults to false.
      * @param mixed $defaultValue Default value of argument
+     * @param boolean|null $escape Can be toggled to TRUE to force escaping of variables and inline syntax passed as argument value.
      * @return FluidAbstractViewHelper $this, to allow chaining.
      * @throws Exception
      * @api
      */
-    protected function registerArgument($name, $type, $description, $required = false, $defaultValue = null)
+    protected function registerArgument($name, $type, $description, $required = false, $defaultValue = null, $escape = null)
     {
         if (array_key_exists($name, $this->argumentDefinitions)) {
             throw new Exception('Argument "' . $name . '" has already been defined, thus it should not be defined again.', 1253036401);
         }
-        return parent::registerArgument($name, $type, $description, $required, $defaultValue);
+        return parent::registerArgument($name, $type, $description, $required, $defaultValue, $escape);
     }
 
     /**
@@ -114,16 +115,17 @@ protected function registerArgument($name, $type, $description, $required = fals
      * @param string $description Description of the argument
      * @param boolean $required If true, argument is required. Defaults to false.
      * @param mixed $defaultValue Default value of argument
+     * @param boolean|null $escape Can be toggled to TRUE to force escaping of variables and inline syntax passed as argument value.
      * @return FluidAbstractViewHelper $this, to allow chaining.
      * @throws Exception
      * @api
      */
-    protected function overrideArgument($name, $type, $description, $required = false, $defaultValue = null)
+    protected function overrideArgument($name, $type, $description, $required = false, $defaultValue = null, $escape = null)
     {
         if (!array_key_exists($name, $this->argumentDefinitions)) {
             throw new Exception('Argument "' . $name . '" has not been defined, thus it can\'t be overridden.', 1279212461);
         }
-        return parent::overrideArgument($name, $type, $description, $required, $defaultValue);
+        return parent::overrideArgument($name, $type, $description, $required, $defaultValue, $escape);
     }
 
     /**

Neos.FluidAdaptor/composer.json

@@ -11,7 +11,7 @@
     "neos/cache": "*",
     "neos/utility-files": "*",
     "neos/utility-objecthandling": "*",
-    "typo3fluid/fluid": "^2.5",
+    "typo3fluid/fluid": "~2.5.11 || ^2.6.10",
     "psr/log": "^1.0"
   },
   "autoload": {

composer.json

@@ -31,7 +31,7 @@
         "neos/composer-plugin": "^2.0",
         "composer/composer": "^1.9",
         "egulias/email-validator": "^2.1",
-        "typo3fluid/fluid": "^2.5",
+        "typo3fluid/fluid": "~2.6.10",
         "guzzlehttp/psr7": "^1.4 || ~2.0",
         "ext-mbstring": "*"
     },