Sync with other CMF packages

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
   - hhvm
 
@@ -11,38 +9,35 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache/files
+    - .phpunit
 
 env:
-  - SYMFONY_VERSION=2.7.*
+  matrix: SYMFONY_VERSION=3.2.*
+  env: SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
 
 matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master
-    - php: hhvm
   include:
+    - php: 7.1
+      env: SYMFONY_VERSION=3.3.* DEPS=dev
     - php: 5.6
-      env: SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
-  allow_failures:
-    - env: SYMFONY_VERSION=2.8.*
-    - env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest"
+    - php: 7.1
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:
-  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
   - phpenv config-rm xdebug.ini || true
   - composer self-update
-  - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+  - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
 
-install: composer update --prefer-dist
+install: composer update --prefer-dist $COMPOSER_FLAGS
 
 before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
 script:
-  - phpunit
+  - vendor/bin/simple-phpunit
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/symfony-cmf/testing/bin/server & fi
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/bin/behat; fi
 

README.md

@@ -11,7 +11,7 @@ resources as provided by the
 
 ## Requirements 
 
-* Symfony 2.2.x
+* Symfony 2.8+
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation

Tests/Unit/Enhancer/SonataAdminEnhancerTest.php

@@ -21,7 +21,7 @@ class SonataAdminEnhancerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->admin = $this->prophesize('Sonata\AdminBundle\Admin\Admin');
+        $this->admin = $this->prophesize('Sonata\AdminBundle\Admin\AbstractAdmin');
         $this->pool = $this->prophesize('Sonata\AdminBundle\Admin\Pool');
         $this->visitor = $this->prophesize('JMS\Serializer\GenericSerializationVisitor');
         $this->generator = $this->prophesize('Symfony\Component\Routing\Generator\UrlGeneratorInterface');

composer.json

@@ -10,21 +10,22 @@
         }
     ],
     "require": {
-        "php": "^5.5.6|^7.0",
-        "symfony-cmf/resource-bundle": "dev-include-puli as 1.0.0",
-        "jms/serializer-bundle": "1.*"
+        "php": "^5.6|^7.0",
+        "symfony-cmf/resource-bundle": "1.0.*@dev",
+        "jms/serializer-bundle": "^1.0"
     },
     "require-dev": {
-        "symfony-cmf/testing": "^1.3",
+        "symfony-cmf/testing": "^1.3|^2.0",
+        "symfony/phpunit-bridge": "^3.2",
         "doctrine/phpcr-odm": "^1.3",
         "behat/behat": "^3.0",
-        "behat/web-api-extension" : "1.*",
-        "behat/symfony2-extension": "2.*@dev",
-        "matthiasnoback/symfony-dependency-injection-test": "~0.1",
-        "matthiasnoback/symfony-config-test": "~0.1",
-        "sonata-project/doctrine-phpcr-admin-bundle": "^1.2"
+        "behat/web-api-extension" : "^1.0@dev",
+        "behat/symfony2-extension": "^2.0",
+        "matthiasnoback/symfony-dependency-injection-test": "~0.6",
+        "matthiasnoback/symfony-config-test": "^1.3.1",
+        "sonata-project/admin-bundle": "^3.1"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "RC",
     "prefer-stable": true,
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.2)",