Switch from templating service to sonata.templating

sonata-project · Jan 26, 2018 · cd0cca5 · cd0cca5
1 parent 8517f85
commit cd0cca5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -56,7 +56,7 @@
     "conflict": {
         "friendsofsymfony/rest-bundle": "<1.7.4 || >=3.0",
         "jms/serializer": "<0.13",
-        "sonata-project/block-bundle": "<3.1.1 || >=4.0",
+        "sonata-project/block-bundle": "<3.11 || >=4.0",
         "sonata-project/classification-bundle": "<3.0 || >= 5.0",
         "sonata-project/formatter-bundle": "<3.2",
         "sonata-project/seo-bundle": "<2.1 || >=3.0",
@@ -70,7 +70,7 @@
         "matthiasnoback/symfony-dependency-injection-test": "^0.7 || ^1.0",
         "nelmio/api-doc-bundle": "^2.11",
         "sonata-project/admin-bundle": "^3.11",
-        "sonata-project/block-bundle": "^3.2",
+        "sonata-project/block-bundle": "^3.11",
         "sonata-project/datagrid-bundle": "^2.2.1",
         "sonata-project/doctrine-orm-admin-bundle": "^3.0",
         "sonata-project/formatter-bundle": "^3.2",

diff --git a/src/Resources/config/block.xml b/src/Resources/config/block.xml
@@ -10,28 +10,28 @@
         <service id="sonata.media.block.media" class="%sonata.media.block.media.class%">
             <tag name="sonata.block"/>
             <argument>sonata.media.block.media</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="service_container"/>
             <argument type="service" id="sonata.media.manager.media"/>
         </service>
         <service id="sonata.media.block.feature_media" class="%sonata.media.block.feature_media.class%">
             <tag name="sonata.block"/>
             <argument>sonata.media.block.feature_media</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="service_container"/>
             <argument type="service" id="sonata.media.manager.media"/>
         </service>
         <service id="sonata.media.block.gallery" class="%sonata.media.block.gallery.class%">
             <tag name="sonata.block"/>
             <argument>sonata.media.block.gallery</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="service_container"/>
             <argument type="service" id="sonata.media.manager.gallery"/>
         </service>
         <service id="sonata.media.block.gallery_list" class="%sonata.media.block.gallery_list.class%">
             <tag name="sonata.block"/>
             <argument>sonata.media.block.gallery_list</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="sonata.media.manager.gallery"/>
             <argument type="service" id="sonata.media.pool"/>
         </service>

diff --git a/src/Resources/config/extra.xml b/src/Resources/config/extra.xml
@@ -7,7 +7,7 @@
             <argument type="service" id="sonata.media.pool"/>
             <argument type="service" id="sonata.media.manager.media"/>
             <argument type="service" id="router"/>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="service_container"/>
         </service>
     </services>

diff --git a/src/Resources/config/seo_block.xml b/src/Resources/config/seo_block.xml
@@ -11,7 +11,7 @@
             <tag name="sonata.breadcrumb"/>
             <argument>gallery_view</argument>
             <argument>sonata.media.block.breadcrumb_view</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="knp_menu.menu_provider"/>
             <argument type="service" id="knp_menu.factory"/>
         </service>
@@ -20,7 +20,7 @@
             <tag name="sonata.breadcrumb"/>
             <argument>gallery_index</argument>
             <argument>sonata.media.block.breadcrumb_view</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="knp_menu.menu_provider"/>
             <argument type="service" id="knp_menu.factory"/>
         </service>
@@ -29,7 +29,7 @@
             <tag name="sonata.breadcrumb"/>
             <argument>media_view</argument>
             <argument>sonata.media.block.breadcrumb_view_media</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
             <argument type="service" id="knp_menu.menu_provider"/>
             <argument type="service" id="knp_menu.factory"/>
         </service>