Allow Symfony 4.0 (#407)

* DevKit updates

add version changes into composer.json

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

DevKit updates

increase config-test version

also use validator

use new validator class

try to use a switch

use the right interface to work with

do not user phpunit < 5.7

style fixes due to style CI

revert changes on deprecation helper

DevKit updates

simplify bc hack

* move composer update to before section

* revert

Author: ElectricMaxxx

.travis.yml

@@ -26,7 +26,7 @@ cache:
     - $HOME/.composer/cache/files
 
 env:
-  matrix: SYMFONY_VERSION=^3.4@dev
+  matrix: SYMFONY_VERSION=4.0.*
   global:
     - SYMFONY_DEPRECATIONS_HELPER=0
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
@@ -37,31 +37,25 @@ env:
 matrix:
   include:
     - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION=^4.0@dev
+      env: STABILITY=dev SYMFONY_VERSION=4.0.*
     - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION=^3.4@dev
+      env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.1
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
+      env: STABILITY=dev SYMFONY_VERSION=3.3.*
     - php: 7.1
-      env: SYMFONY_VERSION=3.3.*
+      env: STABILITY=dev SYMFONY_VERSION=3.4.*
     - env: TEST_INSTALLATION=true
-
   fast_finish: true
   allow_failures:
-    - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION=^4.0@dev
     - env: TEST_INSTALLATION=true
 
-
 before_install:
-  - 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
-  - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
+  - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
-
-install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
+  - travis_wait composer update --prefer-dist $COMPOSER_FLAGS
 
 script:
   - if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi

README.md

@@ -24,7 +24,7 @@ controller for redirection routes.
 ## Requirements
 
 * PHP 7.1
-* Symfony 2.8 / 3.3 / ^3.4@dev
+* Symfony 2.8 / 3.3 / 3.4 / 4.0
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation
@@ -45,7 +45,7 @@ For general support and questions, please use [StackOverflow](http://stackoverfl
 ## Contributing
 
 Pull requests are welcome. Please see our
-[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
+[CONTRIBUTING](https://github.com/symfony-cmf/blob/master/CONTRIBUTING.md)
 guide.
 
 Unit and/or functional tests exist for this package. See the

composer.json

@@ -2,7 +2,10 @@
     "name": "symfony-cmf/routing-bundle",
     "type": "symfony-bundle",
     "description": "Symfony RoutingBundle",
-    "keywords": ["routing", "database"],
+    "keywords": [
+        "routing",
+        "database"
+    ],
     "homepage": "http://cmf.symfony.com",
     "license": "MIT",
     "authors": [
@@ -14,25 +17,27 @@
     "require": {
         "php": "^7.1",
         "symfony-cmf/routing": "^2.0",
-        "symfony/framework-bundle": "^2.8|^3.3",
-        "symfony/twig-bundle": "^2.8|^3.3"
+        "symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
+        "symfony/twig-bundle": "^2.8 || ^3.3 || ^4.0"
     },
     "require-dev": {
         "doctrine/phpcr-odm": "^1.4|^2.0",
-        "symfony/phpunit-bridge": "^3.2",
-        "matthiasnoback/symfony-dependency-injection-test": "~0.6",
-        "matthiasnoback/symfony-config-test": "^1.3.1",
+        "symfony/phpunit-bridge": "^3.3 || ^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^1.0",
+        "matthiasnoback/symfony-config-test": "^2.2",
         "doctrine/orm": "^2.5",
         "symfony-cmf/testing": "^2.1@dev",
-        "doctrine/data-fixtures": "^1.0.0"
+        "doctrine/data-fixtures": "^1.0.0",
+        "symfony/validator": "^2.8 || ^3.3 || ^4.0"
     },
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.4)",
         "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
         "doctrine/orm": "To enable support for the ORM entities (^2.5)"
     },
     "conflict": {
-        "doctrine/phpcr-odm": "<1.4"
+        "doctrine/phpcr-odm": "<1.4",
+        "phpunit/phpunit": "<5.7"
     },
     "autoload": {
         "psr-4": {
@@ -48,7 +53,5 @@
         "branch-alias": {
             "dev-master": "2.1-dev"
         }
-    },
-    "minimum-stability":"dev",
-    "prefer-stable": true
+    }
 }

tests/Unit/Validator/Constraints/RouteDefaultsValidatorTest.php

@@ -12,9 +12,23 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Unit\Validator\Constraints;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Validator\Constraints\RouteDefaults;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
 
-abstract class RouteDefaultsValidatorTest extends AbstractConstraintValidatorTest
+/*
+ * @Todo: Remove this when we drop Symfony 2.x support
+ */
+if (!class_exists(ConstraintValidatorTestCase::class)) {
+    abstract class HackBaseClass extends AbstractConstraintValidatorTest
+    {
+    }
+} else {
+    abstract class HackBaseClass extends ConstraintValidatorTestCase
+    {
+    }
+}
+
+abstract class RouteDefaultsValidatorTest extends HackBaseClass
 {
     protected $controllerResolver;
     protected $engine;