Skip to content

Commit 8a046db

Browse files
dbudbu
committed
Merge pull request #328 from symfony-cmf/remove_abandoned_features
Remove abandoned bundles
2 parents 347d1ea + d0b0d29 commit 8a046db

File tree

18 files changed

+238
-413
lines changed

18 files changed

+238
-413
lines changed

‎app/AppKernel.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,8 @@ public function registerBundles()
3636
new Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle(),
3737
new Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle(),
3838
new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(),
39-
new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(),
4039
new Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),
41-
new \Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
42-
new Liip\SearchBundle\LiipSearchBundle(),
43-
new Symfony\Cmf\Bundle\SearchBundle\CmfSearchBundle(),
44-
new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(),
45-
new FM\ElfinderBundle\FMElfinderBundle(),
40+
new Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
4641
new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
4742

4843
// language switcher
@@ -63,9 +58,6 @@ public function registerBundles()
6358
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
6459
new Ivory\CKEditorBundle\IvoryCKEditorBundle(),
6560

66-
// Media support
67-
new Liip\ImagineBundle\LiipImagineBundle(),
68-
6961
// jackalope doctrine caching
7062
new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),
7163

‎app/Resources/CmfSimpleCmsBundle/views/Page/index.html.twig

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

‎app/Resources/LiipSearchBundle/views/layout.html.twig

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/Resources/views/base.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@
101101
<div class="footer">
102102
<div class="container">
103103
<div class="row">
104-
<div class="col-sm-4">
105-
{{ knp_menu_render("simple", { template: 'includes/footer_menu.html.twig' }) }}
104+
<div class="col-sm-7">
105+
{{ knp_menu_render("main", { depth: 1, template: 'includes/footer_menu.html.twig' }) }}
106106
</div>
107107

108-
<div class="col-sm-8 text-right">
108+
<div class="col-sm-5 text-right">
109109
{% block footer %}
110110
<p>Powered by <a href="http://cmf.symfony.com/">Symfony CMF</a> | Frontend editing funded in part by <a href="http://www.iks-project.eu/">IKS</a></p>
111111
{% endblock %}

‎app/config/config.yml

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ framework:
2222
twig:
2323
debug: '%kernel.debug%'
2424
strict_variables: '%kernel.debug%'
25-
form:
26-
resources:
27-
- 'CmfMediaBundle:Form:fields.html.twig'
2825
exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction'
2926

3027
# Assetic Configuration
@@ -110,7 +107,6 @@ cmf_routing:
110107
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction
111108

112109
templates_by_class:
113-
Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig
114110
Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: static_content/index.html.twig
115111

116112
cmf_seo:
@@ -183,8 +179,6 @@ sonata_admin:
183179
- cmf_block.container_admin
184180
- cmf_block.reference_admin
185181
- cmf_block.action_admin
186-
- cmf_block.imagine.slideshow_admin
187-
- cmf_block.imagine.imagine_admin
188182
routing:
189183
label: URLs
190184
icon: '<i class="fa fa-link"></i>'
@@ -197,11 +191,6 @@ sonata_admin:
197191
items:
198192
- cmf_menu.menu_admin
199193
- cmf_menu.node_admin
200-
simplecms:
201-
label: Simple CMS
202-
icon: '<i class="fa fa-puzzle-piece"></i>'
203-
items:
204-
- cmf_simple_cms.persistence.phpcr.admin.page
205194

206195
sonata_doctrine_phpcr_admin:
207196
templates:
@@ -218,7 +207,6 @@ sonata_doctrine_phpcr_admin:
218207
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
219208
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
220209
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
221-
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
222210
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
223211
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock:
224212
valid_children: []
@@ -241,9 +229,6 @@ sonata_doctrine_phpcr_admin:
241229
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
242230
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
243231
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
244-
Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page:
245-
valid_children:
246-
- Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page
247232
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route:
248233
valid_children:
249234
- Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route
@@ -271,23 +256,12 @@ sonata_seo:
271256

272257
ivory_ck_editor:
273258
configs:
274-
cmf_simple_cms: { toolbar: standard }
275259
cmf_content: { toolbar: standard }
276260

277261
sensio_framework_extra:
278262
router: { annotations: true }
279263
request: { converters: true }
280264

281-
liip_search:
282-
restrict_by_language: true
283-
284-
cmf_search:
285-
persistence:
286-
phpcr:
287-
search_fields:
288-
title: title
289-
summary: body
290-
291265
lunetics_locale:
292266
strict_mode: true
293267
guessing_order:
@@ -296,41 +270,6 @@ lunetics_locale:
296270
- browser
297271
allowed_locales: '%locales%'
298272

299-
# The LiipImagineBundle can be used if you want to convert on demand an image
300-
# to a specific format. (ie a controller render the file)
301-
# more information can be found here : https://github.com/liip/LiipImagineBundle
302-
liip_imagine:
303-
filter_sets:
304-
# define the filter to be used with the image preview
305-
image_upload_thumbnail:
306-
data_loader: cmf_media_doctrine_phpcr
307-
filters:
308-
thumbnail: { size: [100, 100], mode: outbound }
309-
310-
# default filter to be used for elfinder thumbnails
311-
elfinder_thumbnail:
312-
data_loader: cmf_media_doctrine_phpcr
313-
quality: 85
314-
filters:
315-
thumbnail: { size: [48, 48], mode: inset }
316-
317-
cmf_block:
318-
data_loader: cmf_media_doctrine_phpcr
319-
quality: 85
320-
filters:
321-
thumbnail: { size: [50, 50], mode: outbound }
322-
323-
fm_elfinder:
324-
locale: %locale%
325-
editor: ckeditor
326-
connector:
327-
roots:
328-
media:
329-
driver: cmf_media.adapter.elfinder.phpcr_driver
330-
path: %cmf_media.persistence.phpcr.media_basepath%
331-
upload_allow: ['all']
332-
upload_max_size: 2M
333-
334273
doctrine_cache:
335274
providers:
336275
phpcr_meta:

‎app/config/routing.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,13 @@ sonata_admin:
4545
type: sonata_admin
4646
prefix: /{_locale}/admin
4747

48-
_liip_imagine:
49-
resource: '@LiipImagineBundle/Resources/config/routing.xml'
50-
5148
fos_js_routing:
5249
resource: '@FOSJsRoutingBundle/Resources/config/routing/routing.xml'
5350

5451
cmf_tree:
5552
resource: .
5653
type: 'cmf_tree'
5754

58-
liip_search:
59-
resource: '@CmfSearchBundle/Resources/config/routing/phpcr/search.xml'
60-
6155
block_cache:
6256
resource: '@CmfBlockBundle/Resources/config/routing/cache.xml'
6357
prefix: /
64-
65-
cmf_media_file:
66-
resource: '@CmfMediaBundle/Resources/config/routing/file.xml'
67-
68-
cmf_media_image:
69-
resource: '@CmfMediaBundle/Resources/config/routing/image.xml'
70-
71-
elfinder:
72-
resource: '@FMElfinderBundle/Resources/config/routing.yml'

‎app/tests/AdminDashboardTest.php

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

4545
$this->assertCount(1, $crawler->filter('.container-fluid'));
46-
$this->assertCount(12, $crawler->filter('.sonata-ba-list-label'));
46+
$this->assertCount(9, $crawler->filter('.sonata-ba-list-label'));
4747
}
4848
}

‎app/tests/AdminTest.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ class AdminTest extends WebTestCase
3737
'/cmf/block/actionblock/create',
3838
'/cmf/block/actionblock/{id}/edit',
3939
'/cmf/block/actionblock/{id}/delete',
40-
'/cmf/block/imagineblock/list',
41-
'/cmf/block/imagineblock/create',
4240
'/cmf/routing/route/list',
4341
'/cmf/routing/route/create',
4442
'/cmf/routing/route/{id}/edit',
@@ -55,10 +53,6 @@ class AdminTest extends WebTestCase
5553
'/cmf/menu/menunode/create',
5654
'/cmf/menu/menunode/{id}/edit',
5755
'/cmf/menu/menunode/{id}/delete',
58-
'/cmf/simplecms/page/list',
59-
'/cmf/simplecms/page/create',
60-
'/cmf/simplecms/page/{id}/edit',
61-
'/cmf/simplecms/page/{id}/delete',
6256
);
6357

6458
protected $testedPatterns = array();

‎app/tests/HomepageTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ public function testContents()
3636
$this->assertCount(1, $crawler->filter('h1:contains(Homepage)'));
3737
$this->assertCount(1, $crawler->filter('h2:contains("Welcome to the Symfony CMF Demo")'));
3838

39-
$menuCount = $this->isSearchSupported() ? 22 : 21;
40-
$this->assertCount($menuCount, $crawler->filter('.panel-nav li'));
39+
$this->assertCount(23, $crawler->filter('.panel-nav li'));
4140
}
4241

4342
public function testJsonContents()

‎app/tests/SearchTest.php

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

0 commit comments

Comments
 (0)