Merge pull request #1 from relthyg/knallcharge-master

Author: relthyg

.github/workflows/tests.yml

@@ -16,8 +16,8 @@ jobs:
     env:
       SYMFONY_REQUIRE: ${{ matrix.symfony }}
       SYMFONY_DEPRECATIONS_HELPER: ${{ matrix.symfony-deprecations }}
-      DB_DSN_MYSQL: mysql://test:test@127.0.0.1/craue_form_flow_tests
-      DB_DSN_POSTGRESQL: pgsql://test:test@127.0.0.1/craue_form_flow_tests
+      DB_DSN_MYSQL: mysql://test:test@127.0.0.1/craue_form_flow_tests?serverVersion=8.0.44
+      DB_DSN_POSTGRESQL: pgsql://test:test@127.0.0.1/craue_form_flow_tests?serverVersion=18.1
       DB_DSN_SQLITE: sqlite:///sqlite.db
 
     strategy:
@@ -45,7 +45,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:${{ (matrix.php == '7.3' && '5.7') || '8.0' }}
+        image: mysql:8.0.44
         env:
           MYSQL_USER: test
           MYSQL_PASSWORD: test
@@ -60,7 +60,7 @@ jobs:
           - 3306:3306
 
       postgres:
-        image: postgres
+        image: postgres:18.1
         env:
           POSTGRES_USER: test
           POSTGRES_PASSWORD: test

CraueFormFlowBundle.php

@@ -15,7 +15,7 @@ class CraueFormFlowBundle extends Bundle {
 	/**
 	 * @return void
 	 */
-	public function boot() {
+	public function boot(): void {
 		/*
 		 * Removes all temporary files created while handling file uploads.
 		 * Use a shutdown function to clean up even in case of a fatal error.

DependencyInjection/CraueFormFlowExtension.php

@@ -7,7 +7,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 /**
  * Registration of the extension via DI.
@@ -23,19 +23,19 @@ class CraueFormFlowExtension extends Extension implements CompilerPassInterface
 	/**
 	 * @return void
 	 */
-	public function load(array $config, ContainerBuilder $container) {
-		$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-		$loader->load('form_flow.xml');
-		$loader->load('twig.xml');
-		$loader->load('util.xml');
+	public function load(array $config, ContainerBuilder $container): void {
+		$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+		$loader->load('form_flow.php');
+		$loader->load('twig.php');
+		$loader->load('util.php');
 
 		$container->registerForAutoconfiguration(FormFlowInterface::class)->addTag(self::FORM_FLOW_TAG);
 	}
 
 	/**
 	 * @return void
 	 */
-	public function process(ContainerBuilder $container) {
+	public function process(ContainerBuilder $container): void {
 		$baseFlowDefinitionMethodCalls = $container->getDefinition('craue.form.flow')->getMethodCalls();
 
 		foreach (array_keys($container->findTaggedServiceIds(self::FORM_FLOW_TAG)) as $id) {

Form/FormFlow.php

@@ -538,9 +538,10 @@ protected function getRequestedStepNumber() {
 			case 'POST':
 				return intval($request->request->get($this->getFormStepKey(), $defaultStepNumber));
 			case 'GET':
-				return $this->allowDynamicStepNavigation || $this->allowRedirectAfterSubmit ?
-						intval($request->get($this->dynamicStepNavigationStepParameter, $defaultStepNumber)) :
-						$defaultStepNumber;
+                $result = $request->attributes->get($this->dynamicStepNavigationStepParameter, $request);
+                $var = ($request !== $result) ? $result : $request->query->get($this->dynamicStepNavigationStepParameter, (string)$defaultStepNumber);
+
+                return ($this->allowDynamicStepNavigation || $this->allowRedirectAfterSubmit) ? (int)$var : $defaultStepNumber;
 		}
 
 		return $defaultStepNumber;
@@ -625,7 +626,8 @@ protected function determineInstanceId() {
 		$instanceId = null;
 
 		if ($this->allowDynamicStepNavigation || $this->allowRedirectAfterSubmit) {
-			$instanceId = $request->get($this->getDynamicStepNavigationInstanceParameter());
+            $requestData = in_array($request->getMethod(), ['POST', 'PUT'], true) ? $request->request : $request->query;
+			$instanceId = $requestData->get($this->getDynamicStepNavigationInstanceParameter());
 		}
 
 		if ($instanceId === null) {
@@ -652,7 +654,7 @@ protected function bindFlow() {
 			$reset = true;
 		}
 
-		if (in_array($request->getMethod(), ['POST', 'PUT'], true) && $request->get($this->getFormStepKey()) !== null && !$this->dataManager->exists($this)) {
+		if (in_array($request->getMethod(), ['POST', 'PUT'], true) && $request->request->get($this->getFormStepKey()) !== null && !$this->dataManager->exists($this)) {
 			// flow is expired, drop posted data and reset
 			$request->request->replace();
 			$reset = true;

Resources/config/form_flow.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return static function (ContainerConfigurator $container) {
+    $services = $container->services();
+    $parameters = $container->parameters();
+    $parameters->set('craue.form.flow.class', \Craue\FormFlowBundle\Form\FormFlow::class);
+    $parameters->set('craue.form.flow.storage.class', \Craue\FormFlowBundle\Storage\SessionStorage::class);
+    $parameters->set('craue.form.flow.event_listener.previous_step_invalid.class', \Craue\FormFlowBundle\EventListener\PreviousStepInvalidEventListener::class);
+    $parameters->set('craue.form.flow.event_listener.previous_step_invalid.event', \Craue\FormFlowBundle\Form\FormFlowEvents::PREVIOUS_STEP_INVALID);
+    $parameters->set('craue.form.flow.event_listener.flow_expired.class', \Craue\FormFlowBundle\EventListener\FlowExpiredEventListener::class);
+    $parameters->set('craue.form.flow.event_listener.flow_expired.event', \Craue\FormFlowBundle\Form\FormFlowEvents::FLOW_EXPIRED);
+
+    $services->set('craue.form.flow.storage_default', '%craue.form.flow.storage.class%')
+        ->private()
+        ->args([service('request_stack')]);
+
+    $services->alias('craue.form.flow.storage', 'craue.form.flow.storage_default')
+        ->public();
+
+    $services->set('craue.form.flow.data_manager_default', \Craue\FormFlowBundle\Storage\DataManager::class)
+        ->private()
+        ->args([service('craue.form.flow.storage')]);
+
+    $services->alias('craue.form.flow.data_manager', 'craue.form.flow.data_manager_default');
+
+    $services->set('craue.form.flow', '%craue.form.flow.class%')
+        ->call('setDataManager', [service('craue.form.flow.data_manager')])
+        ->call('setFormFactory', [service('form.factory')])
+        ->call('setRequestStack', [service('request_stack')])
+        ->call('setEventDispatcher', [service('event_dispatcher')->ignoreOnInvalid()]);
+
+    $services->set('craue.form.flow.form_extension', \Craue\FormFlowBundle\Form\Extension\FormFlowFormExtension::class)
+        ->tag('form.type_extension', ['extended_type' => \Symfony\Component\Form\Extension\Core\Type\FormType::class]);
+
+    $services->set('craue.form.flow.hidden_field_extension', \Craue\FormFlowBundle\Form\Extension\FormFlowHiddenFieldExtension::class)
+        ->tag('form.type_extension', ['extended_type' => \Symfony\Component\Form\Extension\Core\Type\HiddenType::class]);
+
+    $services->set('craue.form.flow.event_listener.previous_step_invalid', '%craue.form.flow.event_listener.previous_step_invalid.class%')
+        ->tag('kernel.event_listener', ['event' => '%craue.form.flow.event_listener.previous_step_invalid.event%', 'method' => 'onPreviousStepInvalid'])
+        ->call('setTranslator', [service('translator')]);
+
+    $services->set('craue.form.flow.event_listener.flow_expired', '%craue.form.flow.event_listener.flow_expired.class%')
+        ->tag('kernel.event_listener', ['event' => '%craue.form.flow.event_listener.flow_expired.event%', 'method' => 'onFlowExpired'])
+        ->call('setTranslator', [service('translator')]);
+};

Resources/config/form_flow.xml

@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return static function (ContainerConfigurator $container) {
+    $services = $container->services();
+    $parameters = $container->parameters();
+    $parameters->set('craue_twig_extensions.formflow.class', \Craue\FormFlowBundle\Twig\Extension\FormFlowExtension::class);
+
+    $services->set('twig.extension.craue_formflow', '%craue_twig_extensions.formflow.class%')
+        ->tag('twig.extension')
+        ->call('setFormFlowUtil', [service('craue_formflow_util')]);
+};

Resources/config/twig.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return static function (ContainerConfigurator $container) {
+    $services = $container->services();
+    $parameters = $container->parameters();
+    $parameters->set('craue_formflow.util.class', \Craue\FormFlowBundle\Util\FormFlowUtil::class);
+
+    $services->set('craue_formflow_util', '%craue_formflow.util.class%')
+        ->public();
+
+    $services->alias(\Craue\FormFlowBundle\Util\FormFlowUtil::class, 'craue_formflow_util')
+        ->private();
+};