Merge branch 'symfony_2_8_compat'

Author: matthiasnoback

.travis.yml

@@ -1,19 +1,27 @@
 language: php
 
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
+
 matrix:
+  allow_failures:
+    - php: hhvm
   include:
-    - php: 5.4
-      env: SYMFONY_VERSION=2.5.*
-    - php: 5.4
-      env: SYMFONY_VERSION=2.7.*
+    - php: 5.5
+      env: SYMFONY_VERSION=2.8.*
+    - php: 5.5
+      env: SYMFONY_VERSION=3.0.*
 
 env:
   global:
     - SYMFONY_VERSION=""
 
 before_install:
   - >
-    if [ "SYMFONY_VERSION" != "" ]; then
+    if [ "$SYMFONY_VERSION" != "" ]; then
       composer require --dev --no-update symfony/framework-bundle "$SYMFONY_VERSION" &&
       composer require --dev --no-update symfony/console "$SYMFONY_VERSION" &&
       composer require --dev --no-update symfony/validator "$SYMFONY_VERSION" &&
@@ -23,15 +31,11 @@ before_install:
     fi
 
 install:
-  - composer update --prefer-source
+  - composer update --prefer-dist
 
 script:
   - vendor/bin/php-cs-fixer fix -v --diff --dry-run
-  - vendor/bin/behat --tags=~symfony27
-  - >
-    if [ "SYMFONY_VERSION" == "2.7.*" ]; then
-      vendor/bin/behat --tags=symfony27
-    fi
+  - vendor/bin/behat
 
 notifications:
   email: [email protected]

composer.json

@@ -23,19 +23,19 @@
         }
     },
     "require": {
-        "php": ">=5.4",
-        "symfony/form": "~2.5",
-        "symfony/console": "~2.5"
+        "php": ">=5.5",
+        "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",
-        "symfony/finder": "~2.5",
-        "symfony/form": "~2.5",
-        "symfony/framework-bundle": "~2.5",
-        "symfony/validator": "~2.5",
-        "symfony/yaml": "~2.5"
+        "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

@@ -72,41 +72,3 @@ Feature: It is possible to interactively fill in a form from the CLI
           [color] => blue
       )
       """
-
-  @symfony27
-  Scenario: Select a value
-    When I run the command "form:color_with_choices_as_values" and I provide as input
-      """
-      Blue[enter]
-      """
-    Then the command has finished successfully
-    And the output should be
-    """
-      Select color [red]:
-        [0] Red (red)
-        [1] Blue (blue)
-        [2] Yellow (yellow)
-      > Array
-      (
-          [color] => blue
-      )
-      """
-
-  @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
-      """
-      red[enter]
-      """
-    Then the command has finished successfully
-    And the output should be
-    """
-      Select color [red]:
-        [0] Red (red)
-        [1] Blue (blue)
-        [2] Yellow (yellow)
-      > Array
-      (
-          [color] => red
-      )
-      """

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

@@ -3,9 +3,11 @@
 namespace Matthias\SymfonyConsoleForm\Bridge\FormFactory;
 
 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
@@ -68,10 +70,9 @@ public function create($formType, InputInterface $input, array $options = [])
     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('form') 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

@@ -8,6 +8,7 @@
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Form\Extension\Core\Type\ButtonType;
 use Symfony\Component\Form\FormInterface;
 
 class FieldWithNoInteractionInteractor implements FormInteractor
@@ -27,7 +28,7 @@ public function interactWith(
         InputInterface $input,
         OutputInterface $output
     ) {
-        if (FormUtil::isTypeInAncestry($form, 'button')) {
+        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/Bundle/helpers.yml

@@ -3,7 +3,7 @@ services:
         class: Matthias\SymfonyConsoleForm\Console\EventListener\RegisterHelpersEventListener
         public: true
         arguments:
-            - @matthias_symfony_console_form.helper_collection
+            - "@matthias_symfony_console_form.helper_collection"
         tags:
             - { name: kernel.event_listener, event: console.command, method: onConsoleCommand, priority: 1000 }
 

src/Bundle/services.yml

@@ -9,68 +9,68 @@ services:
         class: Matthias\SymfonyConsoleForm\Console\Helper\FormHelper
         public: false
         arguments:
-            - @matthias_symfony_console_form.console_form_factory
-            - @matthias_symfony_console_form.delegating_interactor
+            - "@matthias_symfony_console_form.console_form_factory"
+            - "@matthias_symfony_console_form.delegating_interactor"
         tags:
             - { name: console_helper }
 
     matthias_symfony_console_form.input_definition_factory:
         class: Matthias\SymfonyConsoleForm\Console\Input\CachedInputDefinitionFactory
         public: false
         arguments:
-            - @matthias_symfony_console_form.real_input_definition_factory
+            - "@matthias_symfony_console_form.real_input_definition_factory"
             - %matthias_symfony_console_form.cache_directory%
             - %kernel.debug%
 
     matthias_symfony_console_form.real_input_definition_factory:
         class: Matthias\SymfonyConsoleForm\Console\Input\FormBasedInputDefinitionFactory
         public: false
         arguments:
-            - @form.factory
+            - "@form.factory"
 
     matthias_symfony_console_form.text_transformer:
         class: Matthias\SymfonyConsoleForm\Bridge\Transformer\TextTransformer
         public: false
         tags:
-            - { name: form_to_question_transformer, form_type: text }
+            - { name: form_to_question_transformer, form_type: Symfony\Component\Form\Extension\Core\Type\TextType }
 
     matthias_symfony_console_form.date_time_transformer:
         class: Matthias\SymfonyConsoleForm\Bridge\Transformer\DateTimeTransformer
         public: false
         tags:
-            - { name: form_to_question_transformer, form_type: time }
-            - { name: form_to_question_transformer, form_type: date }
-            - { name: form_to_question_transformer, form_type: datetime }
+            - { name: form_to_question_transformer, form_type: Symfony\Component\Form\Extension\Core\Type\TimeType }
+            - { name: form_to_question_transformer, form_type: Symfony\Component\Form\Extension\Core\Type\DateType }
+            - { name: form_to_question_transformer, form_type: Symfony\Component\Form\Extension\Core\Type\DateTimeType }
 
     matthias_symfony_console_form.password_transformer:
         class: Matthias\SymfonyConsoleForm\Bridge\Transformer\PasswordTransformer
         public: false
         tags:
-            - { name: form_to_question_transformer, form_type: password }
+            - { name: form_to_question_transformer, form_type: Symfony\Component\Form\Extension\Core\Type\PasswordType }
 
     matthias_symfony_console_form.choice_transformer:
         class: Matthias\SymfonyConsoleForm\Bridge\Transformer\ChoiceTransformer
         public: false
         tags:
-            - { name: form_to_question_transformer, form_type: choice }
-            - { name: form_to_question_transformer, form_type: country }
+            - { name: form_to_question_transformer, form_type: Symfony\Component\Form\Extension\Core\Type\ChoiceType }
+            - { name: form_to_question_transformer, form_type: Symfony\Component\Form\Extension\Core\Type\CountryType }
 
     matthias_symfony_console_form.delegating_interactor:
         class: Matthias\SymfonyConsoleForm\Bridge\Interaction\DelegatingInteractor
         public: false
         calls:
             # more specific interactors (by form type acenstry) should be higher in this list
-            - [addInteractor, [@matthias_symfony_console_form.field_with_no_interaction_interactor]]
-            - [addInteractor, [@matthias_symfony_console_form.non_interactive_root_interactor]]
-            - [addInteractor, [@matthias_symfony_console_form.collection_interactor]]
-            - [addInteractor, [@matthias_symfony_console_form.compound_interactor]]
-            - [addInteractor, [@matthias_symfony_console_form.field_interactor]]
+            - [addInteractor, ["@matthias_symfony_console_form.field_with_no_interaction_interactor"]]
+            - [addInteractor, ["@matthias_symfony_console_form.non_interactive_root_interactor"]]
+            - [addInteractor, ["@matthias_symfony_console_form.collection_interactor"]]
+            - [addInteractor, ["@matthias_symfony_console_form.compound_interactor"]]
+            - [addInteractor, ["@matthias_symfony_console_form.field_interactor"]]
 
     matthias_symfony_console_form.compound_interactor:
         class: Matthias\SymfonyConsoleForm\Bridge\Interaction\CompoundInteractor
         public: false
         arguments:
-            - @matthias_symfony_console_form.delegating_interactor
+            - "@matthias_symfony_console_form.delegating_interactor"
 
     matthias_symfony_console_form.field_with_no_interaction_interactor:
         class: Matthias\SymfonyConsoleForm\Bridge\Interaction\FieldWithNoInteractionInteractor
@@ -80,19 +80,19 @@ services:
         class: Matthias\SymfonyConsoleForm\Bridge\Interaction\NonInteractiveRootInteractor
         public: false
         arguments:
-            - @matthias_symfony_console_form.delegating_interactor
+            - "@matthias_symfony_console_form.delegating_interactor"
 
     matthias_symfony_console_form.collection_interactor:
         class: Matthias\SymfonyConsoleForm\Bridge\Interaction\CollectionInteractor
         public: false
         arguments:
-            - @matthias_symfony_console_form.delegating_interactor
+            - "@matthias_symfony_console_form.delegating_interactor"
 
     matthias_symfony_console_form.field_interactor:
         class: Matthias\SymfonyConsoleForm\Bridge\Interaction\FieldInteractor
         public: false
         arguments:
-            - @matthias_symfony_console.transformer_resolver
+            - "@matthias_symfony_console.transformer_resolver"
 
     matthias_symfony_console.transformer_resolver:
         class: Matthias\SymfonyConsoleForm\Bridge\Transformer\TypeAncestryBasedTransformerResolver
@@ -102,27 +102,27 @@ services:
         class: Matthias\SymfonyConsoleForm\Console\EventListener\HandleFormBasedCommandEventListener
         public: true
         arguments:
-            - @matthias_symfony_console_form.form_helper
+            - "@matthias_symfony_console_form.form_helper"
         tags:
             - { name: kernel.event_listener, event: console.command, method: onConsoleCommand, priority: 200 }
 
     matthias_symfony_console_form.set_input_definition_of_form_based_command_event_listener:
         class: Matthias\SymfonyConsoleForm\Console\EventListener\SetInputDefinitionOfFormBasedCommandEventListener
         public: true
         arguments:
-            - @matthias_symfony_console_form.input_definition_factory
+            - "@matthias_symfony_console_form.input_definition_factory"
         tags:
             - { name: kernel.event_listener, event: console.command, method: onConsoleCommand, priority: 2000 }
 
     matthias_symfony_console_form.console_form_type_extension:
         class: Matthias\SymfonyConsoleForm\Form\ConsoleFormTypeExtension
         public: true
         tags:
-            - { name: form.type_extension, alias: form }
+            - { name: form.type_extension, alias: form, extended_type: Symfony\Component\Form\Extension\Core\Type\FormType }
 
     matthias_symfony_console_form.console_form_factory:
         class: Matthias\SymfonyConsoleForm\Bridge\FormFactory\ConsoleFormWithDefaultValuesAndOptionsFactory
         public: false
         arguments:
-            - @form.factory
-            - @form.registry
+            - "@form.factory"
+            - "@form.registry"