Update package

- Make it compatible with recent changes in Symfony components
- Make tests less fragile
- Add git pre-commit hook to make contributing easier
- Clean up Travis configuration file

Author: matthiasnoback

.travis.yml

@@ -1,31 +1,27 @@
 language: php
 
-php:
-    - 5.6
-    - 7.0
-
 matrix:
-  allow_failures:
-    - php: hhvm
   include:
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*
     - php: 7.0
       env: SYMFONY_VERSION=3.0.*
-
-env:
-  global:
-    - SYMFONY_VERSION=""
+    - php: 7.0
+      env: SYMFONY_VERSION=3.1.*
+    - php: 7.0
+      env: SYMFONY_VERSION=3.2.*
 
 before_install:
   - >
-    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" &&
-      composer require --dev --no-update symfony/form "$SYMFONY_VERSION" &&
-      composer require --dev --no-update symfony/yaml "$SYMFONY_VERSION" &&
-      composer require --dev --no-update symfony/finder "$SYMFONY_VERSION"
+    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" &&
+    composer require --dev --no-update symfony/form "$SYMFONY_VERSION" &&
+    composer require --dev --no-update symfony/yaml "$SYMFONY_VERSION" &&
+    composer require --dev --no-update symfony/finder "$SYMFONY_VERSION"
+
+    if [ "$SYMFONY_VERSION" = "3.2.*" ]; then
+      composer require --dev --no-update symfony/security-csrf "$SYMFONY_VERSION"
     fi
 
 install:
@@ -35,7 +31,4 @@ script:
   - vendor/bin/php-cs-fixer fix -v --diff --dry-run
   - vendor/bin/behat
 
-notifications:
-  email: [email protected]
-
 sudo: false

CONTRIBUTING.md

@@ -1,21 +1,6 @@
-## Running Coding Standards Checks
+If you want to contribute to this library, clone this project, then:
 
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
-standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
+- Run `composer install` to install dependencies.
+- Run `./install-git-hooks.sh` to install the pre-commit hook which fixes coding style problems automatically for you.
 
-To run checks only:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
-```
-
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
-```
-
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
+Take a look at `.travis.yml` to find out which versions of Symfony are currently supported by this library. The easiest way to find out if your code changes are compatible with different versions of Symfony is to register your cloned repository at Travis. Then push your code to GitHub and wait for the Travis build to finish. If the build fails for a particular Symfony version you can reproduce the build locally by exporting the same environment variables as Travis does and running the install and test scripts on your machine.

composer.json

@@ -30,12 +30,11 @@
     "require-dev": {
         "beberlei/assert": "~2.1",
         "behat/behat": "~3.0",
-        "fabpot/php-cs-fixer": "^1.10",
-        "symfony/console": "~2.8|~3.0",
+        "friendsofphp/php-cs-fixer": "^1.10",
         "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"
+        "symfony/yaml": "~2.8|~3.0",
+        "phpunit/phpunit": "^4.8"
     }
 }

features/bootstrap/FeatureContext.php

@@ -61,7 +61,10 @@ public function iRunTheCommandAndIProvideAsInputOneLine($name, $input)
      */
     public function theOutputShouldBe(PyStringNode $expectedOutput)
     {
-        Assertion::same(StringUtil::trimLines($this->getOutput()), StringUtil::trimLines((string) $expectedOutput));
+        \PHPUnit_Framework_Assert::assertSame(
+            StringUtil::trimLines((string) $expectedOutput),
+            StringUtil::trimLines($this->getOutput())
+        );
     }
 
     private function runCommandWithInteractiveInput($name, $input)

features/interactive.feature

@@ -44,14 +44,9 @@ Feature: It is possible to interactively fill in a form from the CLI
     Then the command has finished successfully
     And the output should be
       """
-      Your date of birth [1879-03-14]: Array
+      Your date of birth [1987-03-14]: Array
       (
-          [dateOfBirth] => DateTime Object
-          (
-              [date] => 2015-03-04 00:00:00.000000
-              [timezone_type] => 1
-              [timezone] => +00:00
-          )
+          [dateOfBirth] => 2015-03-04T00:00:00+0000
       )
       """
 

git-hooks/pre-commit

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Redirect output to stderr.
+exec 1>&2
+
+ROOT="$PWD"
+PHP_CS_FIXER="${ROOT}/vendor/bin/php-cs-fixer"
+PHP_CS_CONFIG="${ROOT}/.php_cs"
+
+if [ ! -f "$PHP_CS_CONFIG" ]; then
+    echo "Please run 'git commit' from the root directory of the project"
+    exit 1
+fi
+
+if [ ! -x "$PHP_CS_FIXER" ]; then
+    echo "Please run 'composer install' first"
+    exit 1
+fi
+
+git status --porcelain | grep -e '^[AM]\(.*\).php$' | cut -c 3- | while read line; do
+    $PHP_CS_FIXER fix --config-file=$PHP_CS_CONFIG --verbose "$line";
+    git add "$line";
+done

install-git-hooks.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+ROOT="$PWD"
+
+if [ ! -d git-hooks ]; then
+    echo "Run this script from the root directory of the project" >&2
+fi
+
+ln -s "$ROOT/git-hooks/pre-commit" "$ROOT/.git/hooks/pre-commit"

src/Bridge/FormFactory/ConsoleFormFactory.php

@@ -12,7 +12,7 @@ interface ConsoleFormFactory
      * @param string|FormTypeInterface $formType
      * @param InputInterface           $input
      * @param array                    $options
-     * 
+     *
      * @return FormInterface
      */
     public function create($formType, InputInterface $input, array $options = []);

src/Bridge/Interaction/CollectionInteractor.php

@@ -35,8 +35,8 @@ public function __construct(FormInteractor $formInteractor)
      * @param InputInterface  $input
      * @param OutputInterface $output
      *
-     * @throws CanNotInteractWithForm     If the input isn't interactive.
-     * @throws FormNotReadyForInteraction If the "collection" form hasn't the option "allow_add".
+     * @throws CanNotInteractWithForm     If the input isn't interactive
+     * @throws FormNotReadyForInteraction If the "collection" form hasn't the option "allow_add"
      *
      * @return array
      */
@@ -74,7 +74,7 @@ public function interactWith(
      * @param HelperSet       $helperSet
      * @param InputInterface  $input
      * @param OutputInterface $output
-     * 
+     *
      * @return string
      */
     private function askIfContinueToAdd(
@@ -94,7 +94,7 @@ private function askIfContinueToAdd(
 
     /**
      * @param HelperSet $helperSet
-     * 
+     *
      * @return QuestionHelper
      */
     private function questionHelper(HelperSet $helperSet)

src/Bridge/Interaction/CompoundInteractor.php

@@ -31,7 +31,7 @@ public function __construct(FormInteractor $formInteractor)
      * @param InputInterface  $input
      * @param OutputInterface $output
      *
-     * @throws CanNotInteractWithForm If the input isn't interactive or a compound form.
+     * @throws CanNotInteractWithForm If the input isn't interactive or a compound form
      *
      * @return array
      */