Merge pull request #192 from symfony-cmf/prepare-next-version

[WIP] update for next release
symfony-cmf · Aug 22, 2013 · 42ed356 · 42ed356
2 parents 1cf3fd4 + 12d2daf
commit 42ed356
Show file tree

Hide file tree

Showing 11 changed files with 599 additions and 320 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@ web/js/
 web/css/
 app/cache/*
 app/logs/*
+web/media
+web/assetic
 build/
 vendor/
 vendor

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -32,6 +32,7 @@ public function registerBundles()
             new Symfony\Cmf\Bundle\BlogBundle\CmfBlogBundle(),
             new Liip\SearchBundle\LiipSearchBundle(),
             new Symfony\Cmf\Bundle\SearchBundle\CmfSearchBundle(),
+            new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(),
 
             // language switcher
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),
@@ -52,6 +53,9 @@ public function registerBundles()
             new Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
 
+            // Media support
+            new Liip\ImagineBundle\LiipImagineBundle(),
+
             // jackalope doctrine caching
             // new Liip\DoctrineCacheBundle\LiipDoctrineCacheBundle(),
 

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -21,6 +21,9 @@ framework:
 twig:
     debug:            %kernel.debug%
     strict_variables: %kernel.debug%
+    form:
+        resources:
+            - 'CmfMediaBundle:Form:fields.html.twig'
 
 # Assetic Configuration
 assetic:
@@ -113,20 +116,13 @@ cmf_routing:
             Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:MultilangStaticContent:index.html.twig
 
 cmf_simple_cms:
-    multilang:
-        locales: %locales%
     routing:
         templates_by_class:
-            Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page:  CmfSimpleCmsBundle:Page:index.html.twig
+            Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page:  CmfSimpleCmsBundle:Page:index.html.twig
 
 cmf_create:
-    phpcr_odm: true
     map:
-        'http://rdfs.org/sioc/ns#Post': 'Symfony\Cmf\Bundle\ContentBundle\Document\MultilangStaticContent'
-    image:
-        enabled: true
-        model_class: Symfony\Cmf\Bundle\CreateBundle\Document\Image
-        controller_class: Symfony\Cmf\Bundle\CreateBundle\Controller\PHPCRImageController
+        'http://rdfs.org/sioc/ns#Post': 'Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent'
 
 sonata_block:
     default_contexts: [cms]
@@ -138,7 +134,7 @@ sonata_block:
                 id: '/cms'
             contexts:   [admin]
     blocks_by_class:
-        Symfony\Cmf\Bundle\BlockBundle\Document\RssBlock:
+        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock:
             cache: cmf.block.cache.js_async
 
 sonata_admin:
@@ -177,6 +173,8 @@ sonata_admin:
                     - cmf_block.container_admin
                     - cmf_block.reference_admin
                     - cmf_block.action_admin
+                    - cmf_block.imagine.slideshow_admin
+                    - cmf_block.imagine.imagine_admin
             routing:
                 label: URLs
                 items:
@@ -195,7 +193,7 @@ sonata_admin:
             simplecms:
                 label: Simple CMS
                 items:
-                    - cmf_simple_cms.admin.page
+                    - cmf_simple_cms.persistence.phpcr.admin.page
 
 sonata_doctrine_phpcr_admin:
     document_tree_defaults: [locale]
@@ -205,28 +203,34 @@ sonata_doctrine_phpcr_admin:
                 - all
         Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent:
             valid_children:
-                - Symfony\Cmf\Bundle\BlockBundle\Document\SimpleBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Document\ContainerBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Document\ReferenceBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Document\ActionBlock
-        Symfony\Cmf\Bundle\BlockBundle\Document\ReferenceBlock:
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
+        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock:
+            valid_children: []
+        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock:
             valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Document\ActionBlock:
+        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock:
             valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Document\SimpleBlock:
+        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock:
+            valid_children:
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock
+        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock:
             valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Document\ContainerBlock:
+        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock:
             valid_children:
-                - Symfony\Cmf\Bundle\BlockBundle\Document\SimpleBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Document\ContainerBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Document\ReferenceBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Document\ActionBlock
-        Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page: ~
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
+                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
+        Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: ~
         Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route:
             valid_children:
                 - Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route
                 - Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute
-        Symfony\Cmf\Bundle\RoutingBundle\Document\RedirectRoute:
+        Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:
             valid_children: []
         Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu:
             valid_children:
@@ -272,3 +276,20 @@ lunetics_locale:
 #            type: file_system
 #        nodes:
 #            type: file_system
+
+# The LiipImagineBundle can be used if you want to convert on demand an image
+# to a specific format. (ie a controller render the file)
+# more information can be found here : https://github.com/liip/LiipImagineBundle
+liip_imagine:
+    filter_sets:
+        # define the filter to be used with the image preview
+        image_upload_thumbnail:
+            data_loader: cmf_media_doctrine_phpcr
+            filters:
+                thumbnail: { size: [100, 100], mode: outbound }
+
+        cmf_block:
+            data_loader: cmf_media_doctrine_phpcr
+            quality: 85
+            filters:
+                thumbnail: { size: [50, 50], mode: outbound }
diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -41,6 +41,10 @@ sonata_admin:
     type: sonata_admin
     prefix: /{_locale}/admin
 
+_imagine:
+    resource: .
+    type:     imagine
+
 fos_js_routing:
     resource: @FOSJsRoutingBundle/Resources/config/routing/routing.xml
 
@@ -65,6 +69,12 @@ block_cache:
     resource: "@CmfBlockBundle/Resources/config/routing/cache.xml"
     prefix: /
 
+cmf_media_file:
+    resource: "@CmfMediaBundle/Resources/config/routing/file.xml"
+
+cmf_media_image:
+    resource: "@CmfMediaBundle/Resources/config/routing/image.xml"
+
 tree:
     resource: "@SonataDoctrinePHPCRAdminBundle/Resources/config/routing/phpcrodmbrowser.xml"
     prefix: /phpcrodmbrowser
diff --git a/app/tests/AdminDashboardTest.php b/app/tests/AdminDashboardTest.php
@@ -36,6 +36,6 @@ public function testContents()
         $this->assertContains('Sonata Admin', $response->getContent());
 
         $this->assertCount(2, $crawler->filter('.container-fluid'));
-        $this->assertCount(12, $crawler->filter('.sonata-ba-list-label'));
+        $this->assertCount(14, $crawler->filter('.sonata-ba-list-label'));
     }
 }
diff --git a/composer.json b/composer.json
@@ -19,22 +19,23 @@
         "sensio/distribution-bundle": "2.3.*",
         "sensio/framework-extra-bundle": "2.3.*",
         "sensio/generator-bundle": "2.3.*",
-        "symfony-cmf/symfony-cmf": "1.0.0-beta4",
-        "symfony-cmf/simple-cms-bundle": "1.0.0-beta3",
+        "symfony-cmf/symfony-cmf": "1.0.0-beta6",
+        "symfony-cmf/simple-cms-bundle": "1.0.0-RC2",
         "symfony-cmf/search-bundle": "1.0.0-beta2",
-        "symfony-cmf/create-bundle": "1.0.0-beta3",
+        "symfony-cmf/create-bundle": "1.0.0-beta4",
         "symfony-cmf/routing-auto-bundle": "1.0.0-alpha4",
-        "symfony-cmf/blog-bundle": "1.0.0-beta3",
+        "symfony-cmf/blog-bundle": "1.0.0-beta4",
         "jackalope/jackalope-doctrine-dbal": "1.0.0-beta3",
         "jackalope/jackalope-jackrabbit": "1.0.0-beta4",
         "doctrine/doctrine-bundle": "1.2.*",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/doctrine-fixtures-bundle": "2.1.*",
         "sonata-project/cache-bundle": "2.1.*",
-        "sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-beta3",
+        "sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-beta4",
         "eko/feedbundle": "1.0.*",
         "lunetics/locale-bundle": "2.2.*",
-        "liip/functional-test-bundle": "1.0.*"
+        "liip/functional-test-bundle": "1.0.*",
+        "liip/imagine-bundle": "~0.12"
     },
     "require-dev": {
         "symfony-cmf/testing": "1.0.*"