Merge pull request FriendsOfSymfony#1708 from xabbuh/symfony-4.0

allow Symfony 4.0 requirements
mossotech · May 24, 2017 · cc33653 · cc33653
2 parents d62a6c0 + 59587c0
commit cc33653
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - 7.1
   - hhvm
 
 sudo: false
@@ -30,11 +29,16 @@ matrix:
       env: SYMFONY_VERSION='3.1.*'
     - php: 7.0
       env: SYMFONY_VERSION='3.2.*'
+    - php: 7.0
+      env: SYMFONY_VERSION='3.4.*'
+    - php: 7.1
+      env: SYMFONY_VERSION='4.0.*'
 
 before_install:
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
+  - if [ "$SYMFONY_VERSION" == "4.0.*" ]; then composer remove --dev --no-update jms/serializer-bundle; fi
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi
 
-install: composer update $COMPOSER_FLAGS --prefer-dist
+install: composer update $COMPOSER_FLAGS --prefer-dist --prefer-stable
 
 script: ./phpunit
diff --git a/Tests/Functional/SerializerErrorTest.php b/Tests/Functional/SerializerErrorTest.php
@@ -18,6 +18,13 @@
  */
 class SerializerErrorTest extends WebTestCase
 {
+    protected function setUp()
+    {
+        if (!class_exists('JMS\SerializerBundle\JMSSerializerBundle')) {
+            $this->markTestSkipped('JMSSerializerBundle is not installed.');
+        }
+    }
+
     /**
      * @dataProvider testCaseProvider
      */

diff --git a/Tests/Request/RequestBodyParamConverterTest.php b/Tests/Request/RequestBodyParamConverterTest.php
@@ -89,6 +89,10 @@ public function testExecutionInterceptsUnsupportedFormatException()
      */
     public function testExecutionInterceptsJMSException()
     {
+        if (!class_exists('JMS\SerializerBundle\JMSSerializerBundle')) {
+            $this->markTestSkipped('JMSSerializerBundle is not installed.');
+        }
+
         $converter = new RequestBodyParamConverter($this->serializer);
         $this->serializer
             ->expects($this->once())

diff --git a/composer.json b/composer.json
@@ -30,40 +30,41 @@
     "require": {
         "php": "^5.5.9|~7.0",
         "psr/log": "^1.0",
-        "symfony/config": "^2.7|^3.0",
-        "symfony/debug": "^2.7|^3.0",
-        "symfony/dependency-injection": "^2.7|^3.0",
-        "symfony/event-dispatcher": "^2.7|^3.0",
-        "symfony/finder": "^2.7|^3.0",
-        "symfony/framework-bundle": "^2.7|^3.0",
-        "symfony/http-foundation": "^2.7|^3.0",
-        "symfony/http-kernel": "^2.7|^3.0",
-        "symfony/routing": "^2.7|^3.0",
-        "symfony/security-core": "^2.7|^3.0",
-        "symfony/templating": "^2.7|^3.0",
+        "symfony/config": "^2.7|^3.0|^4.0",
+        "symfony/debug": "^2.7|^3.0|^4.0",
+        "symfony/dependency-injection": "^2.7|^3.0|^4.0",
+        "symfony/event-dispatcher": "^2.7|^3.0|^4.0",
+        "symfony/finder": "^2.7|^3.0|^4.0",
+        "symfony/framework-bundle": "^2.7|^3.0|^4.0",
+        "symfony/http-foundation": "^2.7|^3.0|^4.0",
+        "symfony/http-kernel": "^2.7|^3.0|^4.0",
+        "symfony/routing": "^2.7|^3.0|^4.0",
+        "symfony/security-core": "^2.7|^3.0|^4.0",
+        "symfony/templating": "^2.7|^3.0|^4.0",
         "doctrine/inflector": "^1.0",
         "willdurand/negotiation": "^2.0",
         "willdurand/jsonp-callback-validator": "^1.0"
     },
     "require-dev": {
         "sensio/framework-extra-bundle": "^3.0.13",
-        "symfony/phpunit-bridge": "^3.2",
-        "symfony/asset": "^2.7|^3.0",
-        "symfony/form": "^2.7|^3.0",
-        "symfony/validator": "^2.7|^3.0",
-        "symfony/serializer": "^2.7.11|^3.0.4",
-        "symfony/yaml": "^2.7|^3.0",
-        "symfony/security-bundle": "^2.7|^3.0",
-        "symfony/web-profiler-bundle": "^2.7|^3.0",
-        "symfony/twig-bundle": "^2.7|^3.0",
-        "symfony/browser-kit": "^2.7|^3.0",
-        "symfony/dependency-injection": "^2.7|^3.0",
-        "symfony/expression-language": "~2.7|^3.0",
-        "symfony/css-selector": "^2.7|^3.0",
+        "symfony/phpunit-bridge": "^3.2|^4.0",
+        "symfony/asset": "^2.7|^3.0|^4.0",
+        "symfony/form": "^2.7|^3.0|^4.0",
+        "symfony/validator": "^2.7|^3.0|^4.0",
+        "symfony/serializer": "^2.7.11|^3.0.4|^4.0",
+        "symfony/yaml": "^2.7|^3.0|^4.0",
+        "symfony/security-bundle": "^2.7|^3.0|^4.0",
+        "symfony/web-profiler-bundle": "^2.7|^3.0|^4.0",
+        "symfony/twig-bundle": "^2.7|^3.0|^4.0",
+        "symfony/browser-kit": "^2.7|^3.0|^4.0",
+        "symfony/dependency-injection": "^2.7|^3.0|^4.0",
+        "symfony/expression-language": "~2.7|^3.0|^4.0",
+        "symfony/css-selector": "^2.7|^3.0|^4.0",
         "phpoption/phpoption": "^1.1",
         "jms/serializer-bundle": "^1.0",
         "psr/http-message": "^1.0"
     },
+    "minimum-stability": "dev",
     "suggest": {
         "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ^3.0",
         "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ^1.0",