diff --git a/Classes/Domain/AbstractFormObject.php b/Classes/Domain/AbstractFormObject.php index ed54d26..d09ce7e 100644 --- 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 index 15f83b3..0a318fd 100644 --- 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 index f8f196c..1d30f2e 100644 --- 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 index d4388a4..850ee44 100644 --- 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 index 1039ca9..c6a8dfe 100644 --- 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 index 918a192..4fd6797 100644 --- 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 index 35e6b42..527c636 100644 --- 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 index f9f7c18..8bec956 100644 --- 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 index 012fdaf..643c68f 100644 --- 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 index e03ca75..fc7760d 100644 --- 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