Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

Commit

Permalink
Switch from templating service to sonata.templating
Browse files Browse the repository at this point in the history
  • Loading branch information
covex-nn authored and greg0ire committed Jan 26, 2018
1 parent d25b76f commit 1cb2e14
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"conflict": {
"jms/serializer": "<0.13",
"sonata-project/block-bundle": "<3.2",
"sonata-project/block-bundle": "<3.11",
"sonata-project/doctrine-orm-admin-bundle": "<3.0 || >=4.0",
"sonata-project/notification-bundle": "<3.0 || >=4.0",
"sonata-project/seo-bundle": "<2.0 || >=3.0"
Expand All @@ -50,7 +50,7 @@
"friendsofsymfony/rest-bundle": "^1.1",
"jms/serializer-bundle": "^0.13 || ^1.0",
"nelmio/api-doc-bundle": "^2.4",
"sonata-project/block-bundle": "^3.8",
"sonata-project/block-bundle": "^3.11",
"sonata-project/doctrine-orm-admin-bundle": "^3.2",
"sonata-project/notification-bundle": "^3.3",
"sonata-project/seo-bundle": "^2.4"
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/config/block.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<service id="sonata.news.block.recent_posts" class="Sonata\NewsBundle\Block\RecentPostsBlockService">
<tag name="sonata.block"/>
<argument>sonata.news.block.recent_posts</argument>
<argument type="service" id="templating"/>
<argument type="service" id="sonata.templating"/>
<argument type="service" id="sonata.news.manager.post"/>
<argument type="service" id="sonata.admin.pool" on-invalid="ignore"/>
</service>
<service id="sonata.news.block.recent_comments" class="Sonata\NewsBundle\Block\RecentCommentsBlockService">
<tag name="sonata.block"/>
<argument>sonata.news.block.recent_comments</argument>
<argument type="service" id="templating"/>
<argument type="service" id="sonata.templating"/>
<argument type="service" id="sonata.news.manager.comment"/>
<argument type="service" id="sonata.admin.pool" on-invalid="ignore"/>
</service>
Expand All @@ -20,7 +20,7 @@
<tag name="sonata.breadcrumb"/>
<argument>news_archive</argument>
<argument>sonata.news.block.breadcrumb_archive</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>
Expand All @@ -29,7 +29,7 @@
<tag name="sonata.breadcrumb"/>
<argument>news_post</argument>
<argument>sonata.news.block.breadcrumb_post</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"/>
<argument type="service" id="sonata.news.blog"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<argument type="service" id="sonata.news.blog"/>
<argument type="service" id="sonata.news.hash.generator"/>
<argument type="service" id="router"/>
<argument type="service" id="templating"/>
<argument type="service" id="sonata.templating"/>
<argument/>
</service>
</services>
Expand Down

0 comments on commit 1cb2e14

Please sign in to comment.