Merge pull request #3584 from core23/travis-cleanup

Travis: Cleanup configuration

.travis.yml

@@ -2,6 +2,7 @@ language: php
 
 php:
   - hhvm
+  - nightly
 
 sudo: false
 
@@ -14,18 +15,17 @@ env:
   global:
     - PATH="$HOME/.composer/vendor/bin:$PATH"
     - SYMFONY_DEPRECATIONS_HELPER=weak
+    - TARGET=test
 
 matrix:
   fast_finish: true
   include:
+    - php: 7.0
+      env: TARGET=cs_dry_run
+    - php: 7.0
+      env: TARGET=docs
     - php: 5.3
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.4
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.* CS_FIXER=run
-    - php: 5.3
-      env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
+      env: COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
     - php: 5.6
       env: SYMFONY_VERSION=2.3.*
     - php: 5.6
@@ -33,14 +33,15 @@ matrix:
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*
     - php: 5.5
-      env: SYMFONY_VERSION="3.0.*" ACL_VERSION="dev-master"
+      env: SYMFONY_VERSION=3.0.*
     - php: 5.6
-      env: SYMFONY_VERSION="3.0.*" ACL_VERSION="dev-master"
+      env: SYMFONY_VERSION=3.0.*
     - php: 7.0
-      env: SYMFONY_VERSION="3.0.*" ACL_VERSION="dev-master"
+      env: SYMFONY_VERSION=3.0.*
 
   allow_failures:
     - php: hhvm
+    - php: nightly
 
 before_script:
   - (phpenv config-rm xdebug.ini || exit 0)
@@ -50,14 +51,12 @@ before_script:
   - composer global require phpunit/phpunit:@stable fabpot/php-cs-fixer --no-update
   - composer global update --prefer-dist --no-interaction
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
-  - if [ "$ACL_VERSION" != "" ]; then composer require "symfony/security-acl:${ACL_VERSION}" --no-update; fi;
   - travis_wait composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
   - export PATH=$HOME/.local/bin:$PATH
   - pip install -r Resources/doc/requirements.txt --user `whoami`
 
 script:
- - if [ "$CS_FIXER" = "run" ]; then make cs_dry_run ; fi;
- - make test
+ - make $TARGET
 
 notifications:
   webhooks: https://sonata-project.org/bundles/admin/master/travis

Makefile

@@ -6,6 +6,8 @@ cs_dry_run:
 
 test:
 	phpunit
+
+docs:
 	cd Resources/doc && sphinx-build -W -b html -d _build/doctrees . _build/html
 
 bower:

Tests/Form/Widget/BaseWidgetTest.php

@@ -87,17 +87,16 @@ abstract class BaseWidgetTest extends TypeTestCase
 
         $this->extension = new FormExtension($renderer);
 
-        $twigPaths = array(__DIR__.'/../../../Resources/views/Form');
-
         //this is ugly workaround for different build strategies and, possibly,
         //different TwigBridge installation directories
-        if (is_dir(__DIR__.'/../../../vendor/symfony/twig-bridge/Resources/views/Form')) {
-            $twigPaths[] = __DIR__.'/../../../vendor/symfony/twig-bridge/Resources/views/Form';
-        } elseif (is_dir(__DIR__.'/../../../vendor/symfony/symfony/src/Symfony/Bridge/Twig/Resources/views/Form')) {
-            $twigPaths[] = __DIR__.'/../../../vendor/symfony/symfony/src/Symfony/Bridge/Twig/Resources/views/Form';
-        } else {
-            $twigPaths[] = __DIR__.'/../../../../../symfony/symfony/src/Symfony/Bridge/Twig/Resources/views/Form';
-        }
+        $twigPaths = array_filter(array(
+            __DIR__.'/../../../vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Resources/views/Form',
+            __DIR__.'/../../../vendor/symfony/twig-bridge/Resources/views/Form',
+            __DIR__.'/../../../vendor/symfony/symfony/src/Symfony/Bridge/Twig/Resources/views/Form',
+            __DIR__.'/../../../../../symfony/symfony/src/Symfony/Bridge/Twig/Resources/views/Form',
+        ), 'is_dir');
+
+        $twigPaths[] = __DIR__.'/../../../Resources/views/Form';
 
         $loader = new StubFilesystemLoader($twigPaths);
 

composer.json

@@ -18,23 +18,24 @@
     ],
     "require": {
         "symfony/http-foundation": "~2.3|~3.0",
-        "symfony/form": "~2.3|~3.0",
+        "symfony/form": "^2.3.5|~3.0",
         "symfony/validator": "~2.3|~3.0",
         "symfony/security-bundle": "~2.3|~3.0",
         "symfony/routing": "~2.3|~3.0",
         "symfony/config": "^2.3.9|~3.0",
         "symfony/console": "~2.3|~3.0",
-        "symfony/twig-bridge": "~2.3|~3.0",
+        "symfony/twig-bridge": "^2.3.5|~3.0",
         "symfony/class-loader":"~2.3|~3.0",
         "symfony/expression-language": "~2.4|~3.0",
+        "symfony/templating":"~2.3|~3.0",
         "symfony/translation":"~2.3|~3.0",
-        "symfony/dependency-injection": "~2.3,>=2.3.3|~3.0",
+        "symfony/dependency-injection": "^2.3.3|~3.0",
         "symfony/property-access": "~2.3|~3.0",
         "symfony/security-acl": "~2.3|~3.0",
         "twig/twig": "~1.23",
         "twig/extensions": "~1.0",
         "sonata-project/exporter": "~1.0",
-        "sonata-project/block-bundle": "~2.3,>=2.3.9",
+        "sonata-project/block-bundle": "^2.3.9",
         "sonata-project/core-bundle": "^2.3.10",
         "doctrine/common": "~2.2",
         "doctrine/inflector": "~1.0",