DevKit updates for 3.x branch (#3816)

.travis.yml

@@ -33,38 +33,51 @@ matrix:
     - php: '5.3'
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: '7.0'
-      env: SYMFONY_VERSION=2.3.*
+      env: SYMFONY=2.3.*
     - php: '7.0'
-      env: SYMFONY_VERSION=2.6.*
+      env: SYMFONY=2.6.*
     - php: '7.0'
-      env: SYMFONY_VERSION=2.7.*
+      env: SYMFONY=2.7.*
     - php: '7.0'
-      env: SYMFONY_VERSION=2.8.*
+      env: SYMFONY=2.8.*
     - php: '7.0'
-      env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY=3.0.*
     - php: '7.0'
-      env: SYMFONY_VERSION=dev-master@dev
+      env: SYMFONY=dev-master@dev
+    - php: '7.0'
+      env: SONATA_CORE=3.*
+    - php: '7.0'
+      env: SONATA_CORE=dev-master@dev
+    - php: '7.0'
+      env: SONATA_BLOCK=3.*
+    - php: '7.0'
+      env: SONATA_BLOCK=dev-master@dev
     - php: '7.0'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
     - php: nightly
     - php: hhvm
     - env: SYMFONY_DEPRECATIONS_HELPER=0
-    - env: SYMFONY_VERSION=dev-master@dev
+    - env: SYMFONY=dev-master@dev
+    - env: SONATA_CORE=dev-master@dev
+    - env: SONATA_BLOCK=dev-master@dev
 
 before_install:
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp; fi;
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit=3072M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
   - if [ "$TARGET" = 'test' ]; then composer self-update --stable; fi;
   - if [ "$TARGET" = 'test' ]; then composer config --quiet --global github-oauth.github.com $GITHUB_OAUTH_TOKEN; fi;
   - if [ "$TARGET" = 'test' ]; then sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json; fi;
-  - if [ "$TARGET" = 'test' -a "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
+  - if [ "$TARGET" = 'test' -a "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;
+  - if [ "$TARGET" = 'test' -a "$SONATA_CORE" != "" ]; then composer require "sonata-project/core-bundle:$SONATA_CORE" --no-update; fi;
+  - if [ "$TARGET" = 'test' -a "$SONATA_BLOCK" != "" ]; then composer require "sonata-project/block-bundle:$SONATA_BLOCK" --no-update; fi;
 
 install:
   - if [ "$TARGET" = 'test' ]; then mkdir "$HOME/bin"; fi;
   - if [[ "$TARGET" = 'test' && "$TRAVIS_PHP_VERSION" < '5.6' ]]; then wget https://phar.phpunit.de/phpunit-old.phar --output-document="$HOME/bin/phpunit"; fi
   - if [[ "$TARGET" = 'test' && ! "$TRAVIS_PHP_VERSION" < '5.6' ]]; then wget https://phar.phpunit.de/phpunit.phar --output-document="$HOME/bin/phpunit"; fi
   - if [ "$TARGET" = 'test' ]; then chmod u+x "$HOME/bin/phpunit"; fi;
-  - if [ "$TARGET" = 'test' ]; then travis_wait composer update --prefer-dist --no-interaction --prefer-stable $COMPOSER_FLAGS; fi;
+  - if [ "$TARGET" = 'test' ]; then travis_wait 30 composer update --prefer-dist --no-interaction --prefer-stable $COMPOSER_FLAGS; fi;
   - if [ "$TARGET" = 'docs' ]; then pip install -r Resources/doc/requirements.txt --user `whoami`; fi;
 
 before_script: