diff --git a/.travis.yml b/.travis.yml index 5424493b22..376b772821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: php php: - - 5.5 - 5.6 + - 7.0 - hhvm sudo: false @@ -18,7 +18,7 @@ env: matrix: finish_fast: true include: - - php: 7.0 + - php: 7.1 env: COMPOSER_CMD=install before_install: @@ -36,4 +36,3 @@ script: phpunit notifications: irc: "irc.freenode.org#symfony-cmf" - email: "symfony-cmf-devs@googlegroups.com" diff --git a/app/config/routing.yml b/app/config/routing.yml index 345c312281..781fa2c294 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,6 +1,3 @@ app: resource: '@AppBundle/Controller/' type: annotation - -_cmf_create: - resource: '@CmfCreateBundle/Resources/config/routing/rest.xml' diff --git a/composer.json b/composer.json index 2d763a4ab6..9320bc3c93 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "incenteev/composer-parameter-handler": "~2.0", "symfony/phpunit-bridge": "~3.0" }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "scripts": { "symfony-scripts": [ diff --git a/composer.lock b/composer.lock index c686374325..d283ca910f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ac54c138e6910c35be04adb1c251bea0", + "content-hash": "719a3ce8aead9a5ed8a42b3772ae68bc", "packages": [ { "name": "cocur/slugify", @@ -3515,16 +3515,16 @@ } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "RC", "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^5.5.9|^7.0" + "php": "^5.6|^7.0" }, "platform-dev": [], "platform-overrides": { "php": "5.6" }, - "hash": "da92cec9830a82fca074a5ab4de389df" + "hash": "d29ae84a4a13cae54e5359934a492caa" }