From e0b06057cf40547e08df22da95d9cd85d17f04cf Mon Sep 17 00:00:00 2001 From: Marco Wegner Date: Mon, 11 Sep 2017 09:45:42 +0200 Subject: [PATCH 1/2] use FormFlowInterface in TwigExtension instead of concrete class --- Twig/Extension/FormFlowExtension.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Twig/Extension/FormFlowExtension.php b/Twig/Extension/FormFlowExtension.php index 8c018771..104602da 100644 --- a/Twig/Extension/FormFlowExtension.php +++ b/Twig/Extension/FormFlowExtension.php @@ -2,7 +2,6 @@ namespace Craue\FormFlowBundle\Twig\Extension; -use Craue\FormFlowBundle\Form\FormFlow; use Craue\FormFlowBundle\Util\FormFlowUtil; /** @@ -55,30 +54,30 @@ public function getFunctions() { /** * Adds route parameters for dynamic step navigation. * @param array $parameters Current route parameters. - * @param FormFlow $flow The flow involved. + * @param FormFlowInterface $flow The flow involved. * @param int $stepNumber Number of the step the link will be generated for. * @return array Route parameters plus instance and step parameter. */ - public function addDynamicStepNavigationParameters(array $parameters, FormFlow $flow, $stepNumber) { + public function addDynamicStepNavigationParameters(array $parameters, FormFlowInterface $flow, $stepNumber) { return $this->formFlowUtil->addRouteParameters($parameters, $flow, $stepNumber); } /** * Removes route parameters for dynamic step navigation. * @param array $parameters Current route parameters. - * @param FormFlow $flow The flow involved. + * @param FormFlowInterface $flow The flow involved. * @return array Route parameters without instance and step parameter. */ - public function removeDynamicStepNavigationParameters(array $parameters, FormFlow $flow) { + public function removeDynamicStepNavigationParameters(array $parameters, FormFlowInterface $flow) { return $this->formFlowUtil->removeRouteParameters($parameters, $flow); } /** - * @param FormFlow $flow The flow involved. + * @param FormFlowInterface $flow The flow involved. * @param int $stepNumber Number of the step the link will be generated for. * @return bool If the step can be linked to. */ - public function isStepLinkable(FormFlow $flow, $stepNumber) { + public function isStepLinkable(FormFlowInterface $flow, $stepNumber) { if (!$flow->isAllowDynamicStepNavigation() || $flow->getCurrentStepNumber() === $stepNumber || $flow->isStepSkipped($stepNumber)) { @@ -105,12 +104,12 @@ public function isStepLinkable(FormFlow $flow, $stepNumber) { // methods for BC with third-party templates (e.g. MopaBootstrapBundle) - public function addDynamicStepNavigationParameter(array $parameters, FormFlow $flow, $stepNumber) { + public function addDynamicStepNavigationParameter(array $parameters, FormFlowInterface $flow, $stepNumber) { @trigger_error('Twig filter craue_addDynamicStepNavigationParameter is deprecated since version 3.0. Use filter craue_addDynamicStepNavigationParameters instead.', E_USER_DEPRECATED); return $this->addDynamicStepNavigationParameters($parameters, $flow, $stepNumber); } - public function removeDynamicStepNavigationParameter(array $parameters, FormFlow $flow) { + public function removeDynamicStepNavigationParameter(array $parameters, FormFlowInterface $flow) { @trigger_error('Twig filter craue_removeDynamicStepNavigationParameter is deprecated since version 3.0. Use filter craue_removeDynamicStepNavigationParameters instead.', E_USER_DEPRECATED); return $this->removeDynamicStepNavigationParameters($parameters, $flow); } From df75c7de8246c3da0f4bf00d84dad76519584471 Mon Sep 17 00:00:00 2001 From: Marco Wegner Date: Mon, 11 Sep 2017 11:09:25 +0200 Subject: [PATCH 2/2] adds missing use statement --- Twig/Extension/FormFlowExtension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Twig/Extension/FormFlowExtension.php b/Twig/Extension/FormFlowExtension.php index 104602da..ac7364f9 100644 --- a/Twig/Extension/FormFlowExtension.php +++ b/Twig/Extension/FormFlowExtension.php @@ -2,6 +2,7 @@ namespace Craue\FormFlowBundle\Twig\Extension; +use Craue\FormFlowBundle\Form\FormFlowInterface; use Craue\FormFlowBundle\Util\FormFlowUtil; /**