Updated compatibility to Symfony 3.2.

Author: Harrison Heck

Form/FormFactory.php

@@ -7,6 +7,7 @@
 use Linio\DynamicFormBundle\Exception\NonExistentFormException;
 use Linio\DynamicFormBundle\Exception\NotExistentDataProviderException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactory as SymfonyFormFactory;
 use Symfony\Component\Form\FormInterface;
@@ -117,7 +118,7 @@ public function createBuilder($key, $data = [], $options = [], $name = null)
             throw new NonExistentFormException(sprintf('The form "%s" was not found.', $key));
         }
 
-        $formBuilder = $this->formFactory->createNamedBuilder($name ?: $key, 'form', $data, $options);
+        $formBuilder = $this->formFactory->createNamedBuilder($name ?: $key, FormType::class, $data, $options);
 
         if (isset($this->eventSubscribers[$key])) {
             foreach ($this->eventSubscribers[$key] as $eventSubscriber) {

Resources/config/services.yml

@@ -108,4 +108,4 @@ services:
     form.type_extension.help_message:
         class: Linio\DynamicFormBundle\Form\Extension\HelpMessageTypeExtension
         tags:
-            - {name: form.type_extension, alias: Symfony\Component\Form\Extension\Core\Type\FormType}
+            - {name: form.type_extension, extended_type: Symfony\Component\Form\Extension\Core\Type\FormType}

Tests/Form/FormFactoryTest.php

@@ -2,9 +2,14 @@
 
 namespace Linio\DynamicFormBundle\Tests\Form\FormFactoryTest;
 
+use Linio\DynamicFormBundle\Exception\NonExistentFormException;
 use Linio\DynamicFormBundle\Form\FormFactory;
+use Linio\DynamicFormBundle\HelpMessageProvider;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormFactory as SymfonyFormFactory;
 use Symfony\Component\Validator\Constraints\IsTrue;
 
 class FormFactoryTest extends \PHPUnit_Framework_TestCase
@@ -49,7 +54,7 @@ public function testIsCreatingASimpleForm()
             ],
         ];
 
-        $this->formFactoryMock->createNamedBuilder('foo', 'form', ['foo_form_data'], ['foo_form_options'])
+        $this->formFactoryMock->createNamedBuilder('foo', FormType::class, ['foo_form_data'], ['foo_form_options'])
             ->willReturn($this->formBuilderMock->reveal());
 
         $this->formBuilderMock->create('field1', 'field1_type', ['field1_options'])
@@ -91,7 +96,7 @@ public function testIsCreatingFormWithValidators()
             ],
         ];
 
-        $this->formFactoryMock->createNamedBuilder('foo', 'form', [], [])
+        $this->formFactoryMock->createNamedBuilder('foo', FormType::class, [], [])
             ->willReturn($this->formBuilderMock->reveal());
 
         $this->formBuilderMock->create('field1', 'field1_type', $expectedFieldOptions)
@@ -113,15 +118,15 @@ public function testIsCreatingFormWithValidators()
 
     public function testIsCreatingFormWithTransformers()
     {
-        $fieldOneMock = $this->prophesize('Symfony\Component\Form\FormBuilder');
+        $fieldOneMock = $this->prophesize(FormBuilder::class);
 
         $formConfiguration = [
             'foo' => [
                 'field1' => [
                     'enabled' => true,
                     'type' => 'field1_type',
                     'transformer' => [
-                        'class' => 'Linio\DynamicFormBundle\Tests\Form\FormFactoryTest\MockTransformer',
+                        'class' => MockTransformer::class,
                         'calls' => [
                             ['setUserFormat', ['d/m/Y']],
                             ['setInputFormat', ['Y-m-d']],
@@ -137,7 +142,7 @@ public function testIsCreatingFormWithTransformers()
 
         $expectedFieldOptions = [];
 
-        $this->formFactoryMock->createNamedBuilder('foo', 'form', [], [])
+        $this->formFactoryMock->createNamedBuilder('foo', FormType::class, [], [])
             ->willReturn($this->formBuilderMock->reveal());
 
         $this->formBuilderMock->create('field1', 'field1_type', $expectedFieldOptions)
@@ -175,13 +180,13 @@ public function testIsCreatingFormWithHelpMessages()
             ],
         ];
 
-        $helpMessageProviderMock = $this->prophesize('Linio\DynamicFormBundle\HelpMessageProvider');
+        $helpMessageProviderMock = $this->prophesize(HelpMessageProvider::class);
 
         $helpMessageProviderMock->getHelpMessage('cms:message')
             ->shouldBeCalled()
             ->willReturn('message');
 
-        $this->formFactoryMock->createNamedBuilder('foo', 'form', ['foo_form_data'], $formConfiguration)
+        $this->formFactoryMock->createNamedBuilder('foo', FormType::class, ['foo_form_data'], $formConfiguration)
             ->shouldBeCalled()
             ->willReturn($this->formBuilderMock->reveal());
 
@@ -251,9 +256,6 @@ public function testIsHandlingNullName()
         $this->assertEquals($configuration, $actual);
     }
 
-    /**
-     * @expectedException \Linio\DynamicFormBundle\Exception\NonExistentFormException
-     */
     public function testIsHandlingNotExistenFormException()
     {
         $configuration = [
@@ -271,6 +273,8 @@ public function testIsHandlingNotExistenFormException()
 
         $this->formFactory->setConfiguration($configuration);
 
+        $this->expectException(NonExistentFormException::class);
+
         $this->formFactory->getConfiguration('bar');
     }
 
@@ -303,8 +307,8 @@ public function testIsCreatingValidator()
 
     public function setup()
     {
-        $this->formBuilderMock = $this->prophesize('Symfony\Component\Form\FormBuilder');
-        $this->formFactoryMock = $this->prophesize('Symfony\Component\Form\FormFactory');
+        $this->formBuilderMock = $this->prophesize(FormBuilder::class);
+        $this->formFactoryMock = $this->prophesize(SymfonyFormFactory::class);
 
         $this->formFactory = new FormFactory();
     }

Tests/FormlyMapper/FormlyMapperTest.php

@@ -2,6 +2,10 @@
 
 namespace Linio\DynamicFormBundle\Tests\FormlyMapper;
 
+use Linio\DynamicFormBundle\Exception\NonExistentFormException;
+use Linio\DynamicFormBundle\Form\FormFactory;
+use Linio\DynamicFormBundle\FormlyMapper\FormlyField;
+use Linio\DynamicFormBundle\FormlyMapper\FormlyField\FormlyFieldFactory;
 use Linio\DynamicFormBundle\FormlyMapper\FormlyMapper;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Security\Csrf\CsrfToken;
@@ -115,7 +119,7 @@ public function testIsThrowingNonExistentFormException()
         $formName = 'foo';
 
         $this->formFactoryMock->getConfiguration($formName)
-            ->willThrow('Linio\DynamicFormBundle\Exception\NonExistentFormException');
+            ->willThrow(NonExistentFormException::class);
 
         $this->formlyMapper->setFormFactory($this->formFactoryMock->reveal());
 
@@ -126,9 +130,9 @@ public function setup()
     {
         $this->csrfToken = new CsrfToken('foo', 'bar');
         $this->csrfTokenManagerMock = $this->prophesize('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface');
-        $this->formFactoryMock = $this->prophesize('Linio\DynamicFormBundle\Form\FormFactory');
-        $this->formlyFieldFactoryMock = $this->prophesize('Linio\DynamicFormBundle\FormlyMapper\FormlyField\FormlyFieldFactory');
-        $this->formlyFieldMock = $this->prophesize('Linio\DynamicFormBundle\FormlyMapper\FormlyField');
+        $this->formFactoryMock = $this->prophesize(FormFactory::class);
+        $this->formlyFieldFactoryMock = $this->prophesize(FormlyFieldFactory::class);
+        $this->formlyFieldMock = $this->prophesize(FormlyField::class);
 
         $this->formlyMapper = new FormlyMapper();
     }

composer.json

@@ -6,14 +6,13 @@
   "license": "BSD-3-Clause",
   "require": {
     "php": ">=7.1",
-    "symfony/framework-bundle": "^3.2",
-    "symfony/form": "^3.2"
+    "symfony/form": "^2.8|^3.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.7",
-    "symfony/validator": "^3.2",
+    "symfony/validator": "^2.8|^3.0",
     "friendsofphp/php-cs-fixer": "^2.0",
-    "symfony/security": "^3.2"
+    "symfony/security": "^2.8|^3.0"
   },
   "autoload": {
     "psr-4": {