From 2a7d6a85a3a542f159c367dda5c0536bbdedfac8 Mon Sep 17 00:00:00 2001
From: "Andrey F. Mindubaev" <andrey@mindubaev.ru>
Date: Mon, 23 Apr 2018 17:27:47 +0300
Subject: [PATCH] Use sonata.templating service from SonataBlockBundle (#282)

---
 composer.json                     |  2 +-
 src/Resources/config/menu.xml     |  2 +-
 src/Resources/config/services.xml | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index c48567df..9546469d 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
         "doctrine/phpcr-bundle": "^1.4|^2.0",
         "doctrine/phpcr-odm": "^1.4.2|^2.0",
-        "sonata-project/block-bundle": "^3.3",
+        "sonata-project/block-bundle": "^3.11",
         "symfony-cmf/core-bundle": "^2.0"
     },
     "require-dev": {
diff --git a/src/Resources/config/menu.xml b/src/Resources/config/menu.xml
index 86628483..bd62faff 100644
--- a/src/Resources/config/menu.xml
+++ b/src/Resources/config/menu.xml
@@ -9,7 +9,7 @@
         <service id="cmf.block.menu" class="Symfony\Cmf\Bundle\BlockBundle\Block\MenuBlockService">
             <tag name="sonata.block" />
             <argument>cmf.block.reference</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="sonata.templating" />
         </service>
 
     </services>
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index e37d1c55..885c820d 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -9,19 +9,19 @@
         <service id="cmf.block.simple" class="Symfony\Cmf\Bundle\BlockBundle\Block\SimpleBlockService">
             <tag name="sonata.block" />
             <argument>cmf.block.simple</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="sonata.templating" />
         </service>
 
         <service id="cmf.block.string" class="Symfony\Cmf\Bundle\BlockBundle\Block\StringBlockService">
             <tag name="sonata.block" />
             <argument>cmf.block.string</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="sonata.templating" />
         </service>
 
         <service id="cmf.block.container" class="Symfony\Cmf\Bundle\BlockBundle\Block\ContainerBlockService">
             <tag name="sonata.block" />
             <argument>cmf.block.container</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="sonata.templating" />
             <argument type="service" id="sonata.block.renderer" />
             <argument/><!-- for template construct -->
         </service>
@@ -29,7 +29,7 @@
         <service id="cmf.block.reference" class="Symfony\Cmf\Bundle\BlockBundle\Block\ReferenceBlockService">
             <tag name="sonata.block" />
             <argument>cmf.block.reference</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="sonata.templating" />
             <argument type="service" id="sonata.block.renderer" />
             <argument type="service" id="sonata.block.context_manager" />
         </service>
@@ -38,14 +38,14 @@
             <tag name="sonata.block" />
             <argument type="service" id="request_stack" />
             <argument>cmf.block.action</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="sonata.templating" />
             <argument type="service" id="fragment.handler" />
         </service>
 
         <service id="cmf.block.slideshow" class="Symfony\Cmf\Bundle\BlockBundle\Block\ContainerBlockService">
             <tag name="sonata.block" />
             <argument>cmf.block.slideshow</argument>
-            <argument type="service" id="templating" />
+            <argument type="service" id="sonata.templating" />
             <argument type="service" id="sonata.block.renderer" />
             <argument>CmfBlockBundle:Block:block_slideshow.html.twig</argument>
         </service>