Updated travis config (#65)

* Updated travis config

* Applied changes from StyleCI

* Drop support for sf2.x

* Added new line

Author: Nyholm

.travis.yml

@@ -9,30 +9,60 @@ branches:
     - /^analysis-.*$/
     - /^patch-.*$/
 
-php:
-    - 5.5
-    - 5.6
-    - 7.0
-    - 7.1
-
 env:
   global:
     - TEST_COMMAND="composer test"
 
 matrix:
-  fast_finish: true
-  include:
-    - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
-    - php: hhvm
-      dist: trusty
+    fast_finish: true
+    include:
+          # Test with lowest dependencies
+        - php: 7.1
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+        - php: 5.5
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+
+          # Test the latest stable release
+        - php: 5.5
+        - php: 5.6
+        - php: 7.0
+        - php: 7.1
+        - php: 7.2
+          env: COVERAGE=true TEST_COMMAND="composer test-ci"
+
+          # Force some major versions of Symfony
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^3"
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^4"
+
+          # Latest commit to master
+        - php: 7.2
+          env: STABILITY="dev"
+
+    allow_failures:
+          # Dev-master is allowed to fail.
+        - env: STABILITY="dev"
+
+before_install:
+    - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
+    - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
+    - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
 
 install:
-    - travis_retry composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
+    # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
+    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
+    - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    - vendor/bin/simple-phpunit install
 
 script:
+    - composer validate --strict --no-check-lock
     - $TEST_COMMAND
 
 after_success:
     - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
     - if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
+
+after_script:
+    - wget http://tnyholm.se/reporter.phar
+    - php reporter.phar build:upload

composer.json

@@ -11,14 +11,14 @@
     "require": {
         "php": "^5.5 || ^7.0",
         "nikic/php-parser": "^3.0",
-        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+        "symfony/finder": "^3.0 || ^4.0",
         "twig/twig": "^1.27 || ^2.0",
         "doctrine/annotations": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.5 || ^6.2",
+        "symfony/phpunit-bridge": "^3.4 || ^4.0",
         "symfony/translation": "^3.0 || ^4.0",
-        "symfony/validator": "^2.7 || ^3.0 || ^4.0",
+        "symfony/validator": "^3.0 || ^4.0",
         "symfony/twig-bridge": "^3.0 || ^4.0"
     },
     "autoload": {
@@ -32,8 +32,8 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
+        "test": "vendor/bin/simple-phpunit",
+        "test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml"
     },
     "extra": {
         "branch-alias": {

src/Visitor/Php/Symfony/FormTypeChoices.php

@@ -48,12 +48,12 @@ public function enterNode(Node $node)
             }
         }
 
-        if ($this->state === null && $node instanceof Node\Expr\Assign) {
+        if (null === $this->state && $node instanceof Node\Expr\Assign) {
             $this->state = 'variable';
-        } elseif ($this->state === 'variable' && $node instanceof Node\Expr\Variable) {
+        } elseif ('variable' === $this->state && $node instanceof Node\Expr\Variable) {
             $this->variables['__variable-name'] = $node->name;
             $this->state = 'value';
-        } elseif ($this->state === 'value' && $node instanceof Node\Expr\Array_) {
+        } elseif ('value' === $this->state && $node instanceof Node\Expr\Array_) {
             $this->variables[$this->variables['__variable-name']] = $node;
             $this->state = null;
         } else {