Skip to content

Commit 4729697

Browse files
lsmith77lsmith77
committed
Merge pull request #239 from symfony-cmf/remove_unstable_bundles
Remove unstable bundles
2 parents 3c36033 + 75203a1 commit 4729697

File tree

14 files changed

+895
-959
lines changed

14 files changed

+895
-959
lines changed

‎app/AppKernel.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ public function registerBundles()
2121
// enable cmf bundles
2222
new Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle(),
2323
new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
24-
new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
2524
new Symfony\Cmf\Bundle\CoreBundle\CmfCoreBundle(),
2625
new Knp\Bundle\MenuBundle\KnpMenuBundle(),
2726
new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(),
2827
new Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle(),
2928
new Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle(),
3029
new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(),
3130
new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(),
32-
new Symfony\Cmf\Bundle\BlogBundle\CmfBlogBundle(),
3331
new Liip\SearchBundle\LiipSearchBundle(),
3432
new Symfony\Cmf\Bundle\SearchBundle\CmfSearchBundle(),
3533
new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(),

‎app/config/config.yml‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ imports:
22
- { resource: parameters.yml }
33
- { resource: phpcr.yml }
44
- { resource: security.yml }
5-
- { resource: @CmfBlogBundle/Resources/config/routing/autoroute_default.yml }
65

76
framework:
87
#esi: ~
@@ -95,10 +94,12 @@ cmf_core:
9594
persistence:
9695
phpcr:
9796
enabled: true
98-
translation_strategy: attribute
9997

100-
cmf_blog:
101-
blog_basepath: /cms/content
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
102103

103104
cmf_routing:
104105
chain:
@@ -111,8 +112,6 @@ cmf_routing:
111112
controllers_by_class:
112113
Sandbox\MainBundle\Document\DemoClassContent: sandbox_main.controller:classAction
113114
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction
114-
Symfony\Cmf\Bundle\BlogBundle\Document\Blog: cmf_blog.blog_controller:listAction
115-
Symfony\Cmf\Bundle\BlogBundle\Document\Post: cmf_blog.blog_controller:viewPostAction
116115

117116
templates_by_class:
118117
Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:StaticContent:index.html.twig
@@ -124,9 +123,10 @@ cmf_simple_cms:
124123

125124
cmf_create:
126125
editor_base_path: /bundles/cmfcreate/vendor/ckeditor/
127-
# WARNING: REMOVE THIS FOR PRODUCTION SITES
128-
# for demo purposes we are allowing anonymous inline editing
129-
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
130130

131131
sonata_block:
132132
default_contexts: [cms]
@@ -191,11 +191,6 @@ sonata_admin:
191191
items:
192192
- cmf_menu.menu_admin
193193
- cmf_menu.node_admin
194-
blog:
195-
label: Blog
196-
items:
197-
- cmf_blog.admin
198-
- cmf_post.admin
199194
simplecms:
200195
label: Simple CMS
201196
items:
@@ -251,11 +246,6 @@ sonata_doctrine_phpcr_admin:
251246
Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode:
252247
valid_children:
253248
- Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode
254-
Symfony\Cmf\Bundle\BlogBundle\Document\Blog:
255-
valid_children:
256-
- Symfony\Cmf\Bundle\BlogBundle\Document\Post
257-
Symfony\Cmf\Bundle\BlogBundle\Document\Post:
258-
valid_children: []
259249

260250
sensio_framework_extra:
261251
view: { annotations: false }

‎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/AdminTest.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@ class AdminTest extends WebTestCase
4848
'/cmf/menu/menunode/create',
4949
'/cmf/menu/menunode/{id}/edit',
5050
'/cmf/menu/menunode/{id}/delete',
51-
'/cmf/blog/blog/list',
52-
'/cmf/blog/blog/create',
53-
'/cmf/blog/blog/{id}/edit',
54-
'/cmf/blog/blog/{id}/delete',
55-
'/cmf/blog/post/list',
56-
'/cmf/blog/post/create',
57-
'/cmf/blog/post/{id}/edit',
58-
'/cmf/blog/post/{id}/delete',
5951
'/cmf/simplecms/page/list',
6052
'/cmf/simplecms/page/create',
6153
'/cmf/simplecms/page/{id}/edit',

‎app/tests/BlogAdminTest.php‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎app/tests/BlogControllerTest.php‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎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

‎app/tests/WebTestCase.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public function setUp()
1919

2020
$this->loadFixtures(array(
2121
'Sandbox\MainBundle\DataFixtures\PHPCR\LoadStaticPageData',
22-
'Sandbox\MainBundle\DataFixtures\PHPCR\LoadBlogData',
2322
'Sandbox\MainBundle\DataFixtures\PHPCR\LoadMenuData',
2423
'Sandbox\MainBundle\DataFixtures\PHPCR\LoadRoutingData',
2524
'Sandbox\MainBundle\DataFixtures\PHPCR\LoadSimpleCmsData',

‎composer.json‎

Lines changed: 17 additions & 19 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,28 +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-
"symfony-cmf/routing-auto-bundle": "1.0.0-alpha8@dev",
31-
"symfony-cmf/blog-bundle": "~1.0.0-beta7@dev",
32-
"jackalope/jackalope-doctrine-dbal": "1.0.*",
33-
"jackalope/jackalope-jackrabbit": "1.0.*",
34-
"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",
3533
"doctrine/data-fixtures": "1.0.*",
36-
"sonata-project/cache-bundle": "2.1.*",
37-
"sonata-project/doctrine-phpcr-admin-bundle": "1.0.*",
38-
"eko/feedbundle": "1.0.*",
39-
"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",
4039
"liip/imagine-bundle": "~0.12",
41-
"wjzijderveld/check-bundles": "1.0.*@dev",
42-
"helios-ag/fm-elfinder-bundle": "~1.4",
43-
"doctrine/phpcr-odm": "~1.0.1"
40+
"wjzijderveld/check-bundles": "~1.0",
41+
"helios-ag/fm-elfinder-bundle": "~1.4"
4442
},
4543
"require-dev": {
46-
"liip/functional-test-bundle": "1.0.*",
47-
"symfony-cmf/testing": "1.0.*"
44+
"liip/functional-test-bundle": "~1.0.1",
45+
"symfony-cmf/testing": "~1.0"
4846
},
4947
"scripts": {
5048
"post-install-cmd": [

0 commit comments

Comments
 (0)