Merge pull request #387 from symfony-cmf/remove-unused-config

remove unused content_basepath from phpcr configuration

Author: wouterj

CHANGELOG.md

@@ -1,6 +1,8 @@
 Changelog
 =========
 
+ * **2017-02-03**: [BC BREAK] Removed unused `cmf_routing.dynamic.persistence.phpcr.content_basepath`
+
 2.0.0-RC1
 ---------
 

UPGRADE-2.0.md

@@ -68,6 +68,51 @@
                            - cmf_sonata_admin_integration.routing.redirect_route_admin
    ```
 
+ * The settings `admin_basepath` and `content_basepath` are only relevant for the admin and thus have been moved as well.
+
+   **Before**
+   ```yaml
+   cmf_routing:
+       # ...
+       dynamic:
+           persistence:
+               phpcr:
+                   admin_basepath: '/cms/routes'
+                   content_basepath: '/cms/content'
+   ```
+   ```xml
+   <config xmlns="http://cmf.symfony.com/schema/dic/routing">
+       <dynamic>
+           <persistence>
+               <phpcr
+                   admin-basepath="/cms/routes"
+                   content-basepath="/cms/content"
+                />
+           </persistence>
+       </dynamic>
+   </config>
+   ```
+
+   **After**
+   ```yaml
+   cmf_sonata_phpcr_admin_integration:
+       # ...
+       bundles:
+           routing:
+               basepath: '/cms/routes'
+               content_basepath: '/cms/content'
+   ```
+   ```xml
+   <config xmlns="http://cmf.symfony.com/schema/dic/sonata-phpcr-admin-integration">
+       <bundles>
+           <routing
+               basepath="/cms/routes"
+               content-basepath="/cms/content"
+            />
+       </bundles>
+   </config>
+   ```
+
 ## Route Model
 
  * Removed `getAddFormatPattern()`/`setAddFormatPattern()` from the model

composer.json

@@ -30,8 +30,7 @@
     "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)",
-        "symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle"
+        "doctrine/orm": "To enable support for the ORM entities (^2.5)"
     },
     "conflict": {
         "doctrine/phpcr-odm": "<1.4"

src/DependencyInjection/CmfRoutingExtension.php

@@ -214,7 +214,6 @@ private function loadPhpcrProvider(array $config, LoaderInterface $loader, Conta
         $container->setParameter('cmf_routing.backend_type_phpcr', true);
         $container->setParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths', array_values(array_unique($config['route_basepaths'])));
 
-        $container->setParameter('cmf_routing.dynamic.persistence.phpcr.content_basepath', $config['content_basepath']);
         $container->setParameter('cmf_routing.dynamic.persistence.phpcr.manager_name', $config['manager_name']);
 
         if (0 === count($locales)) {

src/DependencyInjection/Configuration.php

@@ -117,7 +117,6 @@ private function addDynamicSection(ArrayNodeDefinition $root)
                                             ->prototype('scalar')->end()
                                             ->defaultValue(['/cms/routes'])
                                         ->end() // route_basepaths
-                                        ->scalarNode('content_basepath')->defaultValue('/cms/content')->end()
                                         ->booleanNode('enable_initializer')
                                             ->defaultValue(true)
                                         ->end()

src/Resources/config/schema/routing-1.0.xsd

@@ -82,7 +82,6 @@
 
         <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="manager-name" type="xsd:string" />
-        <xsd:attribute name="content-basepath" type="xsd:string" />
         <xsd:attribute name="enable-initializer" type="xsd:boolean" />
     </xsd:complexType>
 

tests/Resources/Fixtures/config/config.php

@@ -34,7 +34,6 @@
                     '/cms/routes',
                     '/simple',
                 ],
-                'content_basepath' => '/cms/content',
                 'enable_initializer' => true,
             ],
         ],

tests/Resources/Fixtures/config/config.xml

@@ -23,7 +23,6 @@
 
             <persistence>
                 <phpcr
-                    content-basepath="/cms/content"
                     enable-initializer="true"
                 >
                     <route-basepath>/cms/routes</route-basepath>

tests/Resources/Fixtures/config/config.yml

@@ -17,7 +17,6 @@ cmf_routing:
                 route_basepaths:
                     - /cms/routes
                     - /simple
-                content_basepath: /cms/content
                 enable_initializer: true
         locales: [en, fr]
         auto_locale_pattern: true

tests/Resources/Fixtures/config/config3.xml

@@ -3,7 +3,6 @@
         <persistence>
             <phpcr
                 manager-name="default"
-                content-basepath="/cms/content"
                 enable-initializer="true"
             >
                 <route-basepath>/cms/routes</route-basepath>

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -56,7 +56,6 @@ public function testSupportsAllConfigFormats()
                             '/cms/routes',
                             '/simple',
                         ],
-                        'content_basepath' => '/cms/content',
                         'manager_name' => null,
                         'enable_initializer' => true,
                     ],