Merge pull request #191 from symfony-cmf/2.0-last-fixes

Last preparations before 2.0

Author: wouterj

.travis.yml

@@ -12,16 +12,18 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-env: SYMFONY_VERSION=2.8.*
+env:
+  matrix: SYMFONY_VERSION=3.2.*
+  global: SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
 
 matrix:
   include:
-    - php: 7.0
-      env: DEPS=dev SYMFONY_VERSION=3.1.*
+    - php: 7.1
+      env: DEPS=dev SYMFONY_VERSION=3.3.*
     - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 7.0
-      env: DEPS=dev COMPOSER_FLAGS="--prefer-stable" SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 7.1
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:
@@ -35,8 +37,7 @@ install: composer update $COMPOSER_FLAGS --prefer-dist
 
 before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
-script: phpunit
+script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "[email protected]"

CHANGELOG.md

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|^7.0",
+        "php": "^5.5.6|^7.0",
         "symfony/framework-bundle": "^2.8|^3.0",
         "symfony/config": "^2.8|^3.0",
         "symfony-cmf/routing-auto": "^2.0@dev",
@@ -21,19 +21,27 @@
     },
     "require-dev": {
         "symfony-cmf/testing": "^1.3|^2.0",
+        "symfony/phpunit-bridge": "^3.2",
         "symfony/yaml": "^2.8|^3.0",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "^1.3.1",
         "doctrine/phpcr-odm": "^1.3|^2.0"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",
         "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
         "symfony/yaml": "To be able to load Yaml configuration files (^2.1)"
     },
     "autoload": {
         "psr-4": {
-            "Symfony\\Cmf\\Bundle\\RoutingAutoBundle\\": ""
+            "Symfony\\Cmf\\Bundle\\RoutingAutoBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Symfony\\Cmf\\Bundle\\RoutingAutoBundle\\Tests\\": "tests/"
         }
     },
     "extra": {

README.md

@@ -8,7 +8,7 @@
 
     <testsuites>
         <testsuite name="CmfRoutingAutoBundle Test Suite">
-            <directory>./Tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
@@ -26,7 +26,7 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Resources/app" />
+        <server name="KERNEL_DIR" value="tests/Resources/app" />
     </php>
 
 </phpunit>