End support of Symfony <2.8

Author: matthiasnoback

.travis.yml

@@ -10,10 +10,6 @@ matrix:
   allow_failures:
     - php: hhvm
   include:
-    - php: 5.5
-      env: SYMFONY_VERSION=2.5.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.7.*
     - php: 5.5
       env: SYMFONY_VERSION=2.8.*
     - php: 5.5
@@ -39,12 +35,7 @@ install:
 
 script:
   - vendor/bin/php-cs-fixer fix -v --diff --dry-run
-  - >
-    if [ "$SYMFONY_VERSION" ==  "2.5.*" ]; then
-          vendor/bin/behat --tags=~symfony27
-    else
-          vendor/bin/behat
-    fi
+  - vendor/bin/behat
 
 notifications:
   email: [email protected]

composer.json

@@ -24,18 +24,18 @@
     },
     "require": {
         "php": ">=5.5",
-        "symfony/form": "~2.5|~3.0",
-        "symfony/console": "~2.5|~3.0"
+        "symfony/form": "~2.8|~3.0",
+        "symfony/console": "~2.8|~3.0"
     },
     "require-dev": {
         "beberlei/assert": "~2.1",
         "behat/behat": "~3.0",
         "fabpot/php-cs-fixer": "^1.10",
-        "symfony/console": "~2.5|~3.0",
-        "symfony/finder": "~2.5|~3.0",
-        "symfony/form": "~2.5|~3.0",
-        "symfony/framework-bundle": "~2.5|~3.0",
-        "symfony/validator": "~2.5|~3.0",
-        "symfony/yaml": "~2.5|~3.0"
+        "symfony/console": "~2.8|~3.0",
+        "symfony/finder": "~2.8|~3.0",
+        "symfony/form": "~2.8|~3.0",
+        "symfony/framework-bundle": "~2.8|~3.0",
+        "symfony/validator": "~2.8|~3.0",
+        "symfony/yaml": "~2.8|~3.0"
     }
 }

features/interactive.feature

@@ -73,7 +73,6 @@ Feature: It is possible to interactively fill in a form from the CLI
       )
       """
 
-  @symfony27
   Scenario: Select a value
     When I run the command "form:color_with_choices_as_values" and I provide as input
       """
@@ -92,7 +91,6 @@ Feature: It is possible to interactively fill in a form from the CLI
       )
       """
 
-  @symfony27
   Scenario: Select a value by its underlying data
     When I run the command "form:color_with_choices_as_values" and I provide as input
       """

src/Bridge/FormFactory/ConsoleFormFactory.php

@@ -4,6 +4,7 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormTypeInterface;
 
 interface ConsoleFormFactory
 {

src/Bridge/FormFactory/ConsoleFormWithDefaultValuesAndOptionsFactory.php

@@ -2,12 +2,12 @@
 
 namespace Matthias\SymfonyConsoleForm\Bridge\FormFactory;
 
-use Matthias\SymfonyConsoleForm\LegacyFormHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Csrf\Type\FormTypeCsrfExtension;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormRegistryInterface;
+use Symfony\Component\Form\FormTypeInterface;
 use Symfony\Component\Form\Test\FormBuilderInterface;
 
 class ConsoleFormWithDefaultValuesAndOptionsFactory implements ConsoleFormFactory
@@ -72,7 +72,7 @@ private function addDefaultOptions(array $options)
         $defaultOptions = [];
         // hack to prevent validation error "The CSRF token is invalid."
         foreach ($this->formRegistry->getExtensions() as $extension) {
-            foreach ($extension->getTypeExtensions(LegacyFormHelper::getType(FormType::class)) as $typeExtension) {
+            foreach ($extension->getTypeExtensions(FormType::class) as $typeExtension) {
                 if ($typeExtension instanceof FormTypeCsrfExtension) {
                     $defaultOptions['csrf_protection'] = false;
                 }

src/Bridge/Interaction/CollectionInteractor.php

@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormInterface;
 
 class CollectionInteractor implements FormInteractor
@@ -49,7 +50,7 @@ public function interactWith(
             throw new CanNotInteractWithForm('This interactor only works with interactive input');
         }
 
-        if (!FormUtil::isTypeInAncestry($form, 'collection')) {
+        if (!FormUtil::isTypeInAncestry($form, CollectionType::class)) {
             throw new CanNotInteractWithForm('Expected a "collection" form');
         }
 

src/Bridge/Interaction/FieldWithNoInteractionInteractor.php

@@ -5,7 +5,6 @@
 use Matthias\SymfonyConsoleForm\Bridge\Interaction\Exception\CanNotInteractWithForm;
 use Matthias\SymfonyConsoleForm\Bridge\Interaction\Exception\NoNeedToInteractWithForm;
 use Matthias\SymfonyConsoleForm\Form\FormUtil;
-use Matthias\SymfonyConsoleForm\LegacyFormHelper;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -29,7 +28,7 @@ public function interactWith(
         InputInterface $input,
         OutputInterface $output
     ) {
-        if (FormUtil::isTypeInAncestry($form, LegacyFormHelper::getType(ButtonType::class))) {
+        if (FormUtil::isTypeInAncestry($form, ButtonType::class)) {
             throw new NoNeedToInteractWithForm();
         }
 

src/Bridge/Transformer/ChoiceTransformer.php

@@ -3,6 +3,7 @@
 namespace Matthias\SymfonyConsoleForm\Bridge\Transformer;
 
 use Matthias\SymfonyConsoleForm\Console\Helper\Question\AlwaysReturnKeyOfChoiceQuestion;
+use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Form\Form;
 
 class ChoiceTransformer extends AbstractTransformer

src/Bridge/Transformer/TypeAncestryBasedTransformerResolver.php

@@ -4,7 +4,6 @@
 
 use Matthias\SymfonyConsoleForm\Bridge\Transformer\Exception\CouldNotResolveTransformer;
 use Matthias\SymfonyConsoleForm\Form\FormUtil;
-use Matthias\SymfonyConsoleForm\LegacyFormHelper;
 use Symfony\Component\Form\FormInterface;
 
 class TypeAncestryBasedTransformerResolver implements TransformerResolver
@@ -20,7 +19,7 @@ class TypeAncestryBasedTransformerResolver implements TransformerResolver
      */
     public function addTransformer($formType, FormToQuestionTransformer $transformer)
     {
-        $this->transformers[LegacyFormHelper::getType($formType)] = $transformer;
+        $this->transformers[$formType] = $transformer;
     }
 
     /**

src/Console/Command/DynamicFormBasedCommand.php

@@ -2,8 +2,6 @@
 
 namespace Matthias\SymfonyConsoleForm\Console\Command;
 
-use Matthias\SymfonyConsoleForm\LegacyFormHelper;
-
 abstract class DynamicFormBasedCommand extends InteractiveFormCommand implements FormBasedCommand
 {
     /**
@@ -14,16 +12,16 @@ abstract class DynamicFormBasedCommand extends InteractiveFormCommand implements
     /**
      * @var string
      */
-    private $formTypeName;
+    private $commandName;
 
     /**
      * @param string $formType
-     * @param string $formTypeName
+     * @param string $commandName
      */
-    public function __construct($formType, $formTypeName)
+    public function __construct($formType, $commandName)
     {
         $this->formType = $formType;
-        $this->formTypeName = $formTypeName;
+        $this->commandName = $commandName;
 
         parent::__construct();
     }
@@ -33,14 +31,14 @@ public function __construct($formType, $formTypeName)
      */
     public function formType()
     {
-        return LegacyFormHelper::getType($this->formType, $this->formTypeName);
+        return $this->formType;
     }
 
     /**
      * @return string
      */
     protected function configure()
     {
-        $this->setName('form:'.$this->formTypeName);
+        $this->setName('form:'.$this->commandName);
     }
 }