Bladeren bron

(2.2) Pattern is deprecated in favor of path

WouterJ 10 jaren geleden
bovenliggende
commit
c5c04f1a05

+ 1 - 1
Command/ExplainAdminCommand.php

@@ -59,7 +59,7 @@ class ExplainAdminCommand extends ContainerAwareCommand
         $output->writeln('');
         $output->writeln('<info>Routes</info>');
         foreach ($admin->getRoutes()->getElements() as $route) {
-            $output->writeln(sprintf('  - % -25s %s', $route->getDefault('_sonata_name'), $route->getPattern()));
+            $output->writeln(sprintf('  - % -25s %s', $route->getDefault('_sonata_name'), $route->getPath()));
         }
 
         $output->writeln('');

+ 8 - 8
Resources/config/routing/sonata_admin.xml

@@ -4,39 +4,39 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="sonata_admin_redirect" pattern="/">
+    <route id="sonata_admin_redirect" path="/">
         <default key="_controller">FrameworkBundle:Redirect:redirect</default>
         <default key="route">sonata_admin_dashboard</default>
         <default key="permanent">true</default>
     </route>
 
-    <route id="sonata_admin_dashboard" pattern="/dashboard">
+    <route id="sonata_admin_dashboard" path="/dashboard">
         <default key="_controller">SonataAdminBundle:Core:dashboard</default>
     </route>
 
-    <route id="sonata_admin_retrieve_form_element" pattern="/core/get-form-field-element">
+    <route id="sonata_admin_retrieve_form_element" path="/core/get-form-field-element">
         <default key="_controller">sonata.admin.controller.admin:retrieveFormFieldElementAction</default>
     </route>
 
-    <route id="sonata_admin_append_form_element" pattern="/core/append-form-field-element">
+    <route id="sonata_admin_append_form_element" path="/core/append-form-field-element">
         <default key="_controller">sonata.admin.controller.admin:appendFormFieldElementAction</default>
     </route>
 
-    <route id="sonata_admin_short_object_information" pattern="/core/get-short-object-description.{_format}">
+    <route id="sonata_admin_short_object_information" path="/core/get-short-object-description.{_format}">
         <default key="_controller">sonata.admin.controller.admin:getShortObjectDescriptionAction</default>
         <default key="_format">html</default>
         <requirement key="_format">html|json</requirement>
     </route>
 
-    <route id="sonata_admin_set_object_field_value" pattern="/core/set-object-field-value">
+    <route id="sonata_admin_set_object_field_value" path="/core/set-object-field-value">
         <default key="_controller">sonata.admin.controller.admin:setObjectFieldValueAction</default>
     </route>
 
-    <route id="sonata_admin_search" pattern="/search">
+    <route id="sonata_admin_search" path="/search">
         <default key="_controller">SonataAdminBundle:Core:search</default>
     </route>
 
-    <route id="sonata_admin_retrieve_autocomplete_items" pattern="/core/get-autocomplete-items">
+    <route id="sonata_admin_retrieve_autocomplete_items" path="/core/get-autocomplete-items">
         <default key="_controller">sonata.admin.controller.admin:retrieveAutocompleteItemsAction</default>
     </route>
 </routes>

+ 3 - 3
Tests/Fixtures/Resources/config/routing/routing.xml

@@ -4,15 +4,15 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="sonata_admin_foo" pattern="/foo">
+    <route id="sonata_admin_foo" path="/foo">
         <default key="_controller">SonataAdminBundle:RouteAdminController:foo</default>
     </route>
 
-    <route id="sonata_admin_foo_param" pattern="/foo/{param1}/{param2}">
+    <route id="sonata_admin_foo_param" path="/foo/{param1}/{param2}">
         <default key="_controller">SonataAdminBundle:RouteAdminController:fooParam</default>
     </route>
 
-    <route id="sonata_admin_foo_object" pattern="/foo/obj/{param1}/{barId}/{param2}">
+    <route id="sonata_admin_foo_object" path="/foo/obj/{param1}/{barId}/{param2}">
         <default key="_controller">SonataAdminBundle:RouteAdminController:fooObject</default>
     </route>
 </routes>