Prepare 2.0.0-RC1

Author: wouterj

.travis.yml

@@ -13,20 +13,18 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-env: SYMFONY_VERSION=2.8.*
+env: SYMFONY_VERSION=3.2.*
 
 matrix:
   include:
-    - php: 5.6
-      env: DEPS=dev
+    - php: 7.1
+      env: SYMFONY_VERSION=3.3.* DEPS=dev
     - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.6
-      env: SYMFONY_VERSION=2.3.*
+      env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6
       env: SYMFONY_VERSION=2.7.*
     - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=3.1.*
   finish_fast: true
 
 before_install:

CHANGELOG.md

@@ -1,31 +1,30 @@
 Changelog
 =========
 
-2 (unreleased)
---------------
-
-* **2016-11-30**: Changed file structure to have all php code in src/
+2.0.0-RC1
+---------
 
-* **2016-05-11**: Added a ConditionalEnhancer that accepts pairs of request matcher
-  and enhancer to be called if the request matcher matches the request.
+ * **2016-11-30**: Changed file structure to have all php code in src/
+ * **2016-05-11**: Added a ConditionalEnhancer that accepts pairs of request matcher
+   and enhancer to be called if the request matcher matches the request.
 
 1.4.0
 -----
 
-* **2016-02-27**: Added ContentRepositoryEnhancer that can look up a content by
-  ID from a content repository.
+ * **2016-02-27**: Added ContentRepositoryEnhancer that can look up a content by
+   ID from a content repository.
 
 1.4.0-RC1
 ---------
 
-* **2016-01-09**: When ChainRouter::match is used with a RequestMatcher, the
-  Request is now properly rebuilt from the RequestContext if that was set on
-  the ChainRouter, and http://localhost is used otherwise to avoid issues with
-  paths starting with a double forward slash.
-* **2014-09-29**: ChainRouter does not require a RouterInterface, as a
-  RequestMatcher and UrlGenerator is fine too. Fixed chain router interface to
-  not force a RouterInterface.
-* **2014-09-29**: Deprecated DynamicRouter::match in favor of matchRequest.
+ * **2016-01-09**: When ChainRouter::match is used with a RequestMatcher, the
+   Request is now properly rebuilt from the RequestContext if that was set on
+   the ChainRouter, and http://localhost is used otherwise to avoid issues with
+   paths starting with a double forward slash.
+ * **2014-09-29**: ChainRouter does not require a RouterInterface, as a
+   RequestMatcher and UrlGenerator is fine too. Fixed chain router interface to
+   not force a RouterInterface.
+ * **2014-09-29**: Deprecated DynamicRouter::match in favor of matchRequest.
 
 1.3.0
 -----
@@ -35,8 +34,8 @@ Release 1.3.0
 1.3.0-RC1
 ---------
 
-* **2014-08-20**: Added an interface for the ChainRouter
-* **2014-06-06**: Updated to PSR-4 autoloading
+ * **2014-08-20**: Added an interface for the ChainRouter
+ * **2014-06-06**: Updated to PSR-4 autoloading
 
 1.2.0
 -----
@@ -46,9 +45,9 @@ Release 1.2.0
 1.2.0-RC1
 ---------
 
-* **2013-12-23**: add support for ChainRouter::getRouteCollection()
-* **2013-01-07**: Removed the deprecated $parameters argument in
-  RouteProviderInterface::getRouteByName and getRoutesByNames.
+ * **2013-12-23**: add support for ChainRouter::getRouteCollection()
+ * **2013-01-07**: Removed the deprecated $parameters argument in
+   RouteProviderInterface::getRouteByName and getRoutesByNames.
 
 1.1.0
 -----
@@ -58,17 +57,17 @@ Release 1.1.0
 1.1.0-RC1
 ---------
 
-* **2013-07-31**: DynamicRouter now accepts an EventDispatcher to trigger a
-  RouteMatchEvent right before the matching starts
-* **2013-07-29**: Renamed RouteAwareInterface to RouteReferrersReadInterface
-  for naming consistency and added RouteReferrersInterface for write access.
-* **2013-07-13**: NestedMatcher now expects a FinalMatcherInterface as second
-  argument of the constructor
+ * **2013-07-31**: DynamicRouter now accepts an EventDispatcher to trigger a
+   RouteMatchEvent right before the matching starts
+ * **2013-07-29**: Renamed RouteAwareInterface to RouteReferrersReadInterface
+   for naming consistency and added RouteReferrersInterface for write access.
+ * **2013-07-13**: NestedMatcher now expects a FinalMatcherInterface as second
+   argument of the constructor
 
 1.1.0-alpha1
 ------------
 
-* **2013-04-30**: Dropped Symfony 2.1 support and got rid of
-  ConfigurableUrlMatcher class
-* **2013-04-05**: [ContentAwareGenerator] Fix locale handling to always respect
-  locale but never have unnecessary ?locale=
+ * **2013-04-30**: Dropped Symfony 2.1 support and got rid of
+   ConfigurableUrlMatcher class
+ * **2013-04-05**: [ContentAwareGenerator] Fix locale handling to always respect
+   locale but never have unnecessary ?locale=

composer.json

@@ -13,25 +13,25 @@
     ],
     "require": {
         "php": "^5.5.9|^7.0",
-        "symfony/routing": "^2.2|3.*",
-        "symfony/http-kernel": "^2.2|3.*",
-        "psr/log": "1.*"
+        "symfony/routing": "^2.2|^3.0",
+        "symfony/http-kernel": "^2.2|^3.0",
+        "psr/log": "^1.0"
     },
     "require-dev": {
-        "symfony-cmf/testing": "^1.3",
-        "symfony/dependency-injection": "^2.0.5|3.*",
-        "symfony/config": "^2.2|3.*",
-        "symfony/event-dispatcher": "^2.1|3.*",
+        "symfony-cmf/testing": "^1.3|^2.0",
+        "symfony/dependency-injection": "^2.0.5|^3.0",
+        "symfony/config": "^2.2|^3.0",
+        "symfony/event-dispatcher": "^2.1|^3.0",
         "friendsofsymfony/jsrouting-bundle": "^1.1"
     },
     "suggest": {
         "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version (~2.1)"
     },
     "autoload": {
-        "psr-4": {
-            "Symfony\\Cmf\\Component\\Routing\\": "src/",
-            "Symfony\\Cmf\\Component\\Routing\\Tests\\": "tests/"
-        }
+        "psr-4": { "Symfony\\Cmf\\Component\\Routing\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Symfony\\Cmf\\Component\\Routing\\Tests\\": "tests/" }
     },
     "extra": {
         "branch-alias": {

phpunit.xml.dist

@@ -8,7 +8,7 @@
 
     <testsuites>
         <testsuite name="Symfony Cmf Routing Test Suite">
-            <directory>./Tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>