Skip to content

Commit c9b053a

Browse files
wouterjwouterj
authored
Merge pull request #358 from symfony-cmf/sonata_naming_change
implement naming change in sonata integration bundle
2 parents 6f60466 + 79481d9 commit c9b053a

File tree

12 files changed

+524
-522
lines changed

12 files changed

+524
-522
lines changed

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
6-
# 7.0 is tested using composer install
5+
- 7.0
6+
# 7.1 is tested using composer install
77
- hhvm
88

99
sudo: false
@@ -15,9 +15,9 @@ cache:
1515
matrix:
1616
fast_finish: true
1717
include:
18-
- php: 7.0
18+
- php: 7.1
1919
env: TRANSPORT=jackrabbit COMPOSER_INSTALL=1
20-
- php: 7.0
20+
- php: 7.1
2121
env: TRANSPORT=doctrine_dbal COMPOSER_INSTALL=1
2222

2323
env:

‎app/AppKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function registerBundles()
4040
new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
4141
new Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle(),
4242
new Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle(),
43-
new Symfony\Cmf\Bundle\SonataAdminIntegrationBundle\CmfSonataAdminIntegrationBundle(),
43+
new Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\CmfSonataPhpcrAdminIntegrationBundle(),
4444

4545
// language switcher
4646
new Lunetics\LocaleBundle\LuneticsLocaleBundle(),

‎app/config/config.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,21 @@ cmf_menu:
114114
content_identity: ~
115115

116116
cmf_resource:
117+
description:
118+
enhancers: [sonata_phpcr_admin]
117119
repositories:
118120
default:
119-
type: doctrine_phpcr_odm
121+
type: doctrine/phpcr-odm
120122

121-
cmf_resource_rest:
122-
enhancer_map:
123-
- { repository: default, enhancer: sonata_admin }
124-
125-
cmf_sonata_admin_integration:
123+
cmf_sonata_phpcr_admin_integration:
126124
bundles:
127125
seo: ~
128126
menu: ~
129127
core: ~
130128
content: ~
131-
block: ~
129+
block:
130+
basepath: /cms/content
131+
menu_basepath: /cms/content
132132
routing: ~
133133

134134

@@ -149,30 +149,30 @@ sonata_block:
149149

150150
sonata_admin:
151151
extensions:
152-
cmf_sonata_admin_integration.core.extension.child:
152+
cmf_sonata_phpcr_admin_integration.core.extension.child:
153153
implements:
154154
- Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface
155-
cmf_sonata_admin_integration.core.extension.publish_workflow.time_period:
155+
cmf_sonata_phpcr_admin_integration.core.extension.publish_workflow.time_period:
156156
implements:
157157
- Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface
158-
cmf_sonata_admin_integration.core.extension.publish_workflow.publishable:
158+
cmf_sonata_phpcr_admin_integration.core.extension.publish_workflow.publishable:
159159
implements:
160160
- Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableInterface
161-
cmf_sonata_admin_integration.menu.extension.menu_node_referrers:
161+
cmf_sonata_phpcr_admin_integration.menu.extension.menu_node_referrers:
162162
implements:
163163
- Symfony\Cmf\Bundle\MenuBundle\Model\MenuNodeReferrersInterface
164-
cmf_sonata_admin_integration.menu.extension.menu_options:
164+
cmf_sonata_phpcr_admin_integration.menu.extension.menu_options:
165165
implements:
166166
- Symfony\Cmf\Bundle\MenuBundle\Model\MenuOptionsInterface
167-
cmf_sonata_admin_integration.routing.extension.route_referrers:
167+
cmf_sonata_phpcr_admin_integration.routing.extension.route_referrers:
168168
implements:
169169
- Symfony\Cmf\Component\Routing\RouteReferrersInterface
170-
cmf_sonata_admin_integration.routing.extension.frontend_link:
170+
cmf_sonata_phpcr_admin_integration.routing.extension.frontend_link:
171171
implements:
172172
- Symfony\Cmf\Component\Routing\RouteReferrersReadInterface
173173
extends:
174174
- Symfony\Component\Routing\Route
175-
cmf_sonata_admin_integration.seo.extension.metadata:
175+
cmf_sonata_phpcr_admin_integration.seo.extension.metadata:
176176
implements:
177177
- Symfony\Cmf\Bundle\SeoBundle\SeoAwareInterface
178178

@@ -188,23 +188,23 @@ sonata_admin:
188188
label: Content
189189
icon: '<i class="fa fa-file-text-o"></i>'
190190
items:
191-
- cmf_sonata_admin_integration.content.admin
192-
- cmf_sonata_admin_integration.block.simple_admin
193-
- cmf_sonata_admin_integration.block.container_admin
194-
- cmf_sonata_admin_integration.block.reference_admin
195-
- cmf_sonata_admin_integration.block.action_admin
191+
- cmf_sonata_phpcr_admin_integration.content.admin
192+
- cmf_sonata_phpcr_admin_integration.block.simple_admin
193+
- cmf_sonata_phpcr_admin_integration.block.container_admin
194+
- cmf_sonata_phpcr_admin_integration.block.reference_admin
195+
- cmf_sonata_phpcr_admin_integration.block.action_admin
196196
routing:
197197
label: URLs
198198
icon: '<i class="fa fa-link"></i>'
199199
items:
200-
- cmf_sonata_admin_integration.routing.route_admin
201-
- cmf_sonata_admin_integration.routing.redirect_route_admin
200+
- cmf_sonata_phpcr_admin_integration.routing.route_admin
201+
- cmf_sonata_phpcr_admin_integration.routing.redirect_route_admin
202202
menu:
203203
label: Menu
204204
icon: '<i class="fa fa-bars"></i>'
205205
items:
206-
- cmf_sonata_admin_integration.menu.menu_admin
207-
- cmf_sonata_admin_integration.menu.node_admin
206+
- cmf_sonata_phpcr_admin_integration.menu.menu_admin
207+
- cmf_sonata_phpcr_admin_integration.menu.node_admin
208208

209209
sonata_doctrine_phpcr_admin:
210210
templates:

‎app/config/services.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ services:
1515
arguments: ['@knp_menu.helper', '@knp_menu.matcher']
1616
tags:
1717
- { name: twig.extension }
18+
19+
app.resource_voter:
20+
class: AppBundle\Security\ResourceVoter
21+
tags:
22+
- { name: security.voter }

‎composer.json

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,48 @@
1717
"psr-4": { "Tests\\": "tests/" }
1818
},
1919
"require": {
20-
"php": "^5.5.9|^7.0",
21-
"symfony/symfony": "^3.0",
20+
"php": "^5.6|^7.0",
21+
"symfony/symfony": "^3.2",
2222
"symfony/assetic-bundle": "^2.8",
23-
"symfony/swiftmailer-bundle": "^2.3",
24-
"symfony/monolog-bundle": "^2.8",
23+
"symfony/swiftmailer-bundle": "^2.3.10",
24+
"symfony/monolog-bundle": "^3.0.2",
25+
"symfony/polyfill-apcu": "^1.0",
2526
"sensio/distribution-bundle": "^5.0",
2627
"sensio/framework-extra-bundle": "^3.0.2",
2728
"incenteev/composer-parameter-handler": "^2.0",
2829

29-
"symfony-cmf/symfony-cmf": "^2.0",
30-
"symfony-cmf/seo-bundle": "2.0.*",
31-
"symfony-cmf/routing-auto-bundle": "2.0.*",
30+
"symfony-cmf/symfony-cmf": "^2.0@dev",
31+
"symfony-cmf/seo-bundle": "^2.0",
32+
"symfony-cmf/tree-browser-bundle": "^2.0@dev",
33+
"symfony-cmf/content-bundle": "^2.0@dev",
34+
"symfony-cmf/block-bundle": "^2.0@dev",
35+
"symfony-cmf/routing-auto-bundle": "^2.0",
36+
"symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0@dev",
3237

3338
"jackalope/jackalope-doctrine-dbal": "1.2.*",
3439
"jackalope/jackalope-jackrabbit": "1.2.*",
3540
"doctrine/doctrine-bundle": "^1.6",
3641
"doctrine/data-fixtures": "^1.0",
37-
"doctrine/doctrine-cache-bundle": "^1.0",
38-
"doctrine/phpcr-odm": "^2.0",
42+
"doctrine/doctrine-cache-bundle": "^1.2",
43+
"doctrine/phpcr-odm": "^1.4",
3944

4045
"sonata-project/cache-bundle": "^2.1",
41-
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
42-
"sonata-project/admin-bundle": "^3.6",
4346
"sonata-project/translation-bundle": "^2.0",
47+
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0@dev",
4448

4549
"jms/serializer-bundle": "^1.1",
4650
"friendsofsymfony/rest-bundle": "~1.7",
4751
"eko/feedbundle": "^1.2.7",
4852
"lunetics/locale-bundle": "^2.5",
4953
"burgov/key-value-form-bundle": "^1.4",
50-
"egeloen/ckeditor-bundle": "^4.0",
51-
"symfony-cmf/sonata-admin-integration-bundle": "^1.0"
54+
"egeloen/ckeditor-bundle": "^4.0"
5255
},
5356
"require-dev": {
5457
"sensio/generator-bundle": "^3.0",
5558
"liip/functional-test-bundle": "^1.3",
5659
"symfony-cmf/testing": "^2.0"
5760
},
58-
"minimum-stability": "dev",
61+
"minimum-stability": "RC",
5962
"prefer-stable": true,
6063
"scripts": {
6164
"post-install-cmd": [

0 commit comments

Comments
 (0)