Merge pull request #89 from neos/bugfix/adjustToApiChangeInNeos90

Bugfix: Adjust to api changes in Neos 9.0
neos · Sep 10, 2023 · b53fbb1 · b53fbb1
2 parents 224a26a + 642f728
commit b53fbb1
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 11 deletions.
diff --git a/Classes/Domain/AbstractFormObject.php b/Classes/Domain/AbstractFormObject.php
@@ -19,7 +19,6 @@
 
 abstract class AbstractFormObject implements ProtectedContextAwareInterface
 {
-
     /**
      * @var PersistenceManagerInterface
      * @Flow\Inject

diff --git a/Classes/Domain/Field.php b/Classes/Domain/Field.php
@@ -25,7 +25,6 @@
  */
 class Field extends AbstractFormObject
 {
-
     /**
      * @var Form|null
      */

diff --git a/Classes/Domain/Option.php b/Classes/Domain/Option.php
@@ -22,7 +22,6 @@
  */
 class Option extends AbstractFormObject
 {
-
     /**
      * @var mixed
      */

diff --git a/Classes/FusionObjects/FieldDefinitionImplementation.php b/Classes/FusionObjects/FieldDefinitionImplementation.php
@@ -19,7 +19,6 @@
 
 class FieldDefinitionImplementation extends AbstractFusionObject
 {
-
     /**
      * @return Form|null
      */

diff --git a/Classes/FusionObjects/FormDefinitionImplementation.php b/Classes/FusionObjects/FormDefinitionImplementation.php
@@ -20,7 +20,6 @@
 
 class FormDefinitionImplementation extends AbstractFusionObject
 {
-
     /**
      * @return ActionRequest|null
      */

diff --git a/Classes/Runtime/Action/EmailAction.php b/Classes/Runtime/Action/EmailAction.php
@@ -22,7 +22,6 @@
 
 class EmailAction extends AbstractAction
 {
-
     /**
      * @return ActionResponse|null
      * @throws ActionException

diff --git a/Classes/Runtime/Domain/ActionResolver.php b/Classes/Runtime/Domain/ActionResolver.php
@@ -21,7 +21,6 @@
 
 class ActionResolver
 {
-
     /**
      * @Flow\Inject
      * @var ObjectManagerInterface

diff --git a/Classes/Runtime/FusionObjects/ActionImplementation.php b/Classes/Runtime/FusionObjects/ActionImplementation.php
@@ -22,7 +22,6 @@
 
 class ActionImplementation extends AbstractFusionObject implements ActionInterface
 {
-
     /**
      * @var ActionResolver
      * @Flow\Inject

diff --git a/Classes/Runtime/FusionObjects/RuntimeFormImplementation.php b/Classes/Runtime/FusionObjects/RuntimeFormImplementation.php
@@ -24,7 +24,6 @@
 
 class RuntimeFormImplementation extends AbstractFusionObject
 {
-
     /**
      * @var FormRequestFactory
      * @Flow\Inject
@@ -100,7 +99,15 @@ public function evaluate(): string
         $process = $this->getProcess();
 
         $formRequest = $this->formRequestFactory->createFormRequest($this->getCurrentActionRequest(), $namespace);
-        $this->runtime->pushContext('request', $formRequest);
+        $context = $this->runtime->getCurrentContext();
+        /**
+          * The internal method "pushContextArray" allows some creative use,
+          * as that we can override the "request" context.
+          * This is not permitted via public / official api and probably an unwise idea to do.
+          * {@see \Neos\Fusion\Core\FusionGlobals}
+          */
+        $context['request'] = $formRequest;
+        $this->runtime->pushContextArray($context);
         $process->handle($formRequest, $data);
         if ($process->isFinished() === false) {
             $result = $this->renderForm($process, $formRequest, $this->getAttributes());

diff --git a/Classes/Runtime/Helper/SchemaDefinition.php b/Classes/Runtime/Helper/SchemaDefinition.php
@@ -24,7 +24,6 @@
 
 class SchemaDefinition implements ProtectedContextAwareInterface, SchemaInterface
 {
-
     /**
      * @var PropertyMapper
      * @Flow\Inject