Skip to content

Commit 26992b2

Browse files
Merge pull request #376 from symfony-cmf/prepare_2.0
Prepare RC
2 parents 4723871 + e876865 commit 26992b2

File tree

4 files changed

+687
-435
lines changed

4 files changed

+687
-435
lines changed

app/config/config.yml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -222,51 +222,8 @@ sonata_doctrine_phpcr_admin:
222222
templates:
223223
form:
224224
- admin/form_admin_fields.html.twig
225-
document_tree_defaults: [locale]
226225
document_tree:
227-
Doctrine\ODM\PHPCR\Document\Generic:
228-
valid_children:
229-
- all
230-
AppBundle\Document\DemoSeoContent:
231-
valid_children:
232-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
233-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
234-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
235-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
236-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
237-
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock:
238-
valid_children: []
239-
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock:
240-
valid_children: []
241-
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock:
242-
valid_children: []
243-
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock:
244-
valid_children:
245-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock
246-
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock:
247-
valid_children: []
248-
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock:
249-
valid_children: []
250-
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock:
251-
valid_children:
252-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
253-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
254-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
255-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
256-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
257-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
258-
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route:
259-
valid_children:
260-
- Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route
261-
- Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute
262-
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:
263-
valid_children: []
264-
Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu:
265-
valid_children:
266-
- Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode
267-
Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode:
268-
valid_children:
269-
- Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode
226+
routing_defaults: [locale]
270227

271228
sonata_translation:
272229
locales: '%locales%'

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"symfony-cmf/seo-bundle": "^2.0",
3232
"symfony-cmf/routing": "^2.0",
3333
"symfony-cmf/routing-auto-bundle": "^2.0",
34-
"symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0@dev",
34+
"symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0",
3535

3636
"jackalope/jackalope-doctrine-dbal": "1.2.*",
3737
"jackalope/jackalope-jackrabbit": "1.2.*",
@@ -42,7 +42,7 @@
4242

4343
"sonata-project/cache-bundle": "^2.1",
4444
"sonata-project/translation-bundle": "2.1.0",
45-
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0@dev",
45+
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
4646

4747
"jms/serializer-bundle": "^1.1",
4848
"friendsofsymfony/rest-bundle": "~1.7",

0 commit comments

Comments
 (0)