Skip to content

Commit 69bde34

Browse files
committed
prepare 1.0.0-beta3
1 parent 0650e26 commit 69bde34

File tree

6 files changed

+190
-354
lines changed

6 files changed

+190
-354
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ php:
55
- 5.4
66

77
before_script:
8+
- composer self-update
89
- composer install
910
- php app/console doctrine:database:create -e=test
1011
- php app/console doctrine:phpcr:init:dbal -e=test

app/config/config.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,31 @@ liip_doctrine_cache:
7070
type: file_system
7171

7272
cmf_core:
73+
persistence:
74+
phpcr:
75+
enabled: true
76+
use_sonata_admin: false
77+
basepath: /cms
7378
publish_workflow:
7479
enabled: false
80+
multilang:
81+
locales: %locales%
7582

76-
cmf_routing:
77-
dynamic:
78-
enabled: true
83+
cmf_create:
84+
phpcr_odm: true
7985

8086
cmf_simple_cms:
8187
routing:
8288
templates_by_class:
8389
Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page: CmfSimpleCmsBundle:Page:index.html.twig
8490
controllers_by_class:
85-
Symfony\Cmf\Bundle\RoutingBundle\Document\RedirectRoute: cmf_routing.redirect_controller:redirectAction
91+
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction
8692
multilang:
8793
locales: %locales%
88-
use_sonata_admin: false
8994

9095
knp_menu:
9196
twig: true
9297

93-
cmf_menu:
94-
use_sonata_admin: false
95-
menu_basepath: /cms
96-
97-
cmf_create:
98-
phpcr_odm: true
99-
10098
lunetics_locale:
10199
strict_mode: true
102100
guessing_order:

app/config/parameters.yml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99

1010
phpcr_backend:
1111
type: doctrinedbal
12-
connection: doctrine.dbal.default_connection
12+
connection: default
1313
# Enable these lines to use file system caching for the storage API
1414
# caches:
1515
# meta: liip_doctrine_cache.ns.meta

composer.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
"symfony/monolog-bundle": "2.3.*",
1515
"symfony/assetic-bundle": "2.3.*",
1616
"sensio/distribution-bundle": "2.3.*",
17-
"doctrine/phpcr-bundle": "1.0.0-beta2",
18-
"doctrine/phpcr-odm": "1.0.0-beta2",
19-
"symfony-cmf/symfony-cmf": "1.0.0-beta2",
20-
"symfony-cmf/simple-cms-bundle": "1.0.0-beta2",
21-
"symfony-cmf/create-bundle": "1.0.0-beta2",
22-
"jackalope/jackalope-doctrine-dbal":"1.0.0-beta2",
17+
"symfony-cmf/symfony-cmf": "1.0.0-beta3",
18+
"symfony-cmf/simple-cms-bundle": "1.0.0-beta3",
19+
"symfony-cmf/create-bundle": "1.0.0-beta3",
20+
"jackalope/jackalope-doctrine-dbal":"1.0.0-beta3",
2321
"doctrine/doctrine-bundle": "1.2.*",
2422
"doctrine/doctrine-fixtures-bundle": "2.1.*",
2523
"liip/functional-test-bundle": "1.0.*",

0 commit comments

Comments
 (0)