add changelog and upgrade instructions

Author: dbu

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+* **2014-03-29**: [Multilang] Added some options to support locale matching
+  without separate routes per locale. See the new configuration options
+  `match_implicit_locale` and `auto_locale_pattern`.
+
+* **2014-03-29**: [PHPCR] The route provider can now load Routes from more than
+  path in PHPCR. The configuration option `route_basepath` is renamed to
+  `route_basepaths` and accepts a list of base paths. See the changelog of
+  the SimpleCmsBundle as the main impact is on that side.
+
 * **2014-03-26**: [ORM] Applied the cleanup for the PHPCR provider to the ORM
   provider now: If the route matched a pattern with a format extension, the
   format extension is no longer set as route a default.

DependencyInjection/CmfRoutingExtension.php

@@ -277,10 +277,8 @@ public function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBu
         }
 
         $basePath = empty($config['admin_basepath']) ? reset($config['route_basepaths']) : $config['admin_basepath'];
-
         $container->setParameter($this->getAlias() . '.dynamic.persistence.phpcr.admin_basepath', $basePath);
 
-
         $loader->load('admin-phpcr.xml');
     }
 

Doctrine/Phpcr/Route.php

@@ -142,6 +142,8 @@ public function getParentDocument()
      * Note that this will change the URL this route matches.
      *
      * @param string $name the new name
+     *
+     * @return self
      */
     public function setName($name)
     {

UPGRADE-1.2.md

@@ -0,0 +1,31 @@
+UPGRADE FROM 1.1 TO 1.2
+=======================
+
+Renamed the configuration option `dynamic.persistence.phpcr.route_basepath` to
+`dynamic.persistence.phpcr.route_basepaths` and made it a list instead of a
+single value. `route_basepath` is supported for BC but deprecated.
+
+Refactored explicit properties for `addTrailingSlash` and `addFormatPattern`
+into Route options. Use setOption/getOption with `add_trailing_slash` resp
+`add_format_pattern` to interact with the options. The getters and setters are
+kept for BC. If you have stored PHPCR Routes with these options activated, you
+need to move the data into the options:
+
+```php
+/** @var $dm \Doctrine\ODM\PHPCR\DocumentManager */
+$query = $dm->createPhpcrQuery("SELECT * FROM nt:base WHERE addFormatPattern = 'true'", QueryInterface::JCR_SQL2)
+$routes = $dm->getDocumentsByPhpcrQuery($query);
+/** @var $route \Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route */
+foreach($routes as $route) {
+    $route->setOption('add_format_pattern', true);
+}
+
+$query = $dm->createPhpcrQuery("SELECT * FROM nt:base WHERE addTrailingSlash = 'true'", QueryInterface::JCR_SQL2)
+$routes = $dm->getDocumentsByPhpcrQuery($query);
+/** @var $route \Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route */
+foreach($routes as $route) {
+    $route->setOption('add_trailing_slash', true);
+}
+
+$dm->flush();
+```