Merge remote-tracking branch 'remotes/composer/development' into midd…

…leware-wip # Conflicts: # Classes/Form/FormInterface.php # Classes/Form/FormTrait.php # Classes/Service/ViewHelper/Slot/SlotContextEntry.php # Classes/ViewHelpers/FormViewHelper.php # Tests/Unit/Service/ViewHelper/Field/FieldViewHelperServiceTest.php # Tests/Unit/Service/ViewHelper/Form/FormViewHelperServiceTest.php # Tests/Unit/ViewHelpers/ClassViewHelperTest.php # Tests/Unit/ViewHelpers/FieldViewHelperTest.php # Tests/Unit/ViewHelpers/FormatMessageViewHelperTest.php # Tests/Unit/ViewHelpers/OptionViewHelperTest.php # Tests/Unit/ViewHelpers/Slot/RenderViewHelperTest.php
romm · May 17, 2017 · 9fd8011 · 9fd8011
1 parent 7d77947
commit 9fd8011
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Classes/Service/ViewHelper/Field/FieldContextEntry.php b/Classes/Service/ViewHelper/Field/FieldContextEntry.php
@@ -13,7 +13,8 @@
 
 namespace Romm\Formz\Service\ViewHelper\Field;
 
-use Romm\Formz\Configuration\Form\Field\Field;
+
+use Romm\Formz\Form\Definition\Field\Field;
 
 class FieldContextEntry
 {

diff --git a/Classes/ViewHelpers/Step/SubstepViewHelper.php b/Classes/ViewHelpers/Step/SubstepViewHelper.php
@@ -15,7 +15,7 @@
 
 use Romm\Formz\Exceptions\ContextNotFoundException;
 use Romm\Formz\Form\Definition\Step\Step\Substep\Substep;
-use Romm\Formz\Service\ViewHelper\FormViewHelperService;
+use Romm\Formz\Service\ViewHelper\Form\FormViewHelperService;
 use Romm\Formz\ViewHelpers\AbstractViewHelper;
 use TYPO3\CMS\Extbase\Error\Error;
 use TYPO3\CMS\Extbase\Mvc\Web\Request;