Skip to content

Commit 75203a1

Browse files
committed
updated bundles to latest versions
1 parent 068ed6b commit 75203a1

File tree

6 files changed

+896
-801
lines changed

6 files changed

+896
-801
lines changed

app/config/config.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,12 @@ cmf_core:
9494
persistence:
9595
phpcr:
9696
enabled: true
97-
translation_strategy: attribute
97+
98+
cmf_menu:
99+
persistence:
100+
phpcr:
101+
# TODO remove once https://github.com/jackalope/jackalope-doctrine-dbal/issues/189 is fixed
102+
prefetch: 0
98103

99104
cmf_routing:
100105
chain:
@@ -118,9 +123,10 @@ cmf_simple_cms:
118123

119124
cmf_create:
120125
editor_base_path: /bundles/cmfcreate/vendor/ckeditor/
121-
# WARNING: REMOVE THIS FOR PRODUCTION SITES
122-
# for demo purposes we are allowing anonymous inline editing
123-
role: IS_AUTHENTICATED_ANONYMOUSLY
126+
security:
127+
# WARNING: REMOVE THIS FOR PRODUCTION SITES
128+
# for demo purposes we are allowing anonymous inline editing
129+
role: IS_AUTHENTICATED_ANONYMOUSLY
124130

125131
sonata_block:
126132
default_contexts: [cms]

app/tests/AdminDashboardTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public function testContents()
3636
$this->assertContains('Sonata Admin', $response->getContent());
3737

3838
$this->assertCount(2, $crawler->filter('.container-fluid'));
39-
$this->assertCount(14, $crawler->filter('.sonata-ba-list-label'));
39+
$this->assertCount(12, $crawler->filter('.sonata-ba-list-label'));
4040
}
4141
}

app/tests/HomepageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testContents()
2929
$this->assertCount(1, $crawler->filter('h1:contains(Homepage)'));
3030
$this->assertCount(1, $crawler->filter('h2:contains("Welcome to the Symfony CMF Demo")'));
3131

32-
$menuCount = $this->isSearchSupported() ? 17 : 16;
32+
$menuCount = $this->isSearchSupported() ? 16 : 15;
3333
$this->assertCount($menuCount, $crawler->filter('ul.menu_main li'));
3434
}
3535

composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"autoload": {
1313
"psr-0": { "": "src/" }
1414
},
15-
"minimum-stability": "stable",
15+
"minimum-stability": "dev",
1616
"require": {
1717
"php": ">=5.3.3",
1818
"symfony/symfony": "2.3.*",
@@ -23,26 +23,26 @@
2323
"sensio/distribution-bundle": "2.3.*",
2424
"sensio/framework-extra-bundle": "2.3.*",
2525
"sensio/generator-bundle": "2.3.*",
26-
"symfony-cmf/symfony-cmf": "1.0.*",
27-
"symfony-cmf/simple-cms-bundle": "1.0.*",
28-
"symfony-cmf/search-bundle": "1.0.*",
29-
"symfony-cmf/create-bundle": "1.0.*",
30-
"jackalope/jackalope-doctrine-dbal": "1.0.*",
31-
"jackalope/jackalope-jackrabbit": "1.0.*",
32-
"doctrine/doctrine-bundle": "1.2.*",
26+
"symfony-cmf/symfony-cmf": "~1.1",
27+
"symfony-cmf/simple-cms-bundle": "~1.1",
28+
"symfony-cmf/search-bundle": "~1.1",
29+
"symfony-cmf/create-bundle": "~1.1",
30+
"jackalope/jackalope-doctrine-dbal": "~1.1",
31+
"jackalope/jackalope-jackrabbit": "~1.1",
32+
"doctrine/doctrine-bundle": "~1.2",
3333
"doctrine/data-fixtures": "1.0.*",
34-
"sonata-project/cache-bundle": "2.1.*",
35-
"sonata-project/doctrine-phpcr-admin-bundle": "1.0.*",
36-
"eko/feedbundle": "1.0.*",
37-
"lunetics/locale-bundle": "2.2.*",
34+
"sonata-project/cache-bundle": "~2.1",
35+
"sonata-project/doctrine-phpcr-admin-bundle": "~1.1",
36+
"symfony-cmf/block-bundle": "~1.1",
37+
"eko/feedbundle": "~1.0",
38+
"lunetics/locale-bundle": "~2.2",
3839
"liip/imagine-bundle": "~0.12",
39-
"wjzijderveld/check-bundles": "1.0.*@dev",
40-
"helios-ag/fm-elfinder-bundle": "~1.4",
41-
"doctrine/phpcr-odm": "~1.0.1"
40+
"wjzijderveld/check-bundles": "~1.0",
41+
"helios-ag/fm-elfinder-bundle": "~1.4"
4242
},
4343
"require-dev": {
44-
"liip/functional-test-bundle": "1.0.*",
45-
"symfony-cmf/testing": "1.0.*"
44+
"liip/functional-test-bundle": "~1.0.1",
45+
"symfony-cmf/testing": "~1.0"
4646
},
4747
"scripts": {
4848
"post-install-cmd": [

0 commit comments

Comments
 (0)