Update ImagineBlock to use CmfMedia image

Admin/Imagine/ImagineBlockAdmin.php

@@ -25,7 +25,7 @@ protected function configureFormFields(FormMapper $formMapper)
             ->with('form.group_general')
                 ->add('label', 'text', array('required' => false))
                 ->add('linkUrl', 'text', array('required' => false))
-                ->add('image', 'phpcr_odm_image', array('required' => $imageRequired, 'data_class' => 'Doctrine\ODM\PHPCR\Document\Image'))
+                ->add('image', 'cmf_media_image', array('required' => $imageRequired))
                 ->add('position', 'hidden', array('mapped' => false))
             ->end();
     }

CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* **2013-08-15**: [ImagineBlock] changed the template block_imagine.html.twig
+  to pass the image id property to the imagine_filter instead of the image
+  object.
 * **2013-08-08**: [Model] Removed every Multilang models and implement TranslatableInterface instead to fit CMF standards.
 * **2013-08-08**: [Admin] Added explicit base route name / patterns to fix broken schema. `cmf_bundle_action` becomes `cmf_block_action`.
 * **2013-08-08**: [PublishWorkflow] AbstractBlock now implements the publish

Doctrine/Phpcr/ImagineBlock.php

@@ -2,8 +2,9 @@
 
 namespace Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr;
 
-use Doctrine\ODM\PHPCR\Document\Image;
 use Symfony\Cmf\Bundle\CoreBundle\Translatable\TranslatableInterface;
+use Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\Image;
+use Symfony\Cmf\Bundle\MediaBundle\ImageInterface;
 
 /**
  * Block to hold an image
@@ -115,18 +116,20 @@ public function getFilter()
      * the document manager. Note that this block does not make much sense
      * without an image, though.
      *
-     * @param Image $image optional the image to update
+     * @param ImageInterface $image optional the image to update
      */
-    public function setImage($image)
+    public function setImage(ImageInterface $image = null)
     {
         if (!$image) {
             return;
-        } elseif ($this->image && $this->image->getFile()) {
-            // TODO: this is needed due to a bug in PHPCRODM (http://www.doctrine-project.org/jira/browse/PHPCR-98)
-            // TODO: this can be removed once the bug is fixed
-            $this->image->getFile()->setFileContent($image->getFile()->getFileContent());
-        } else {
+        } elseif ($this->image) {
+            // TODO: https://github.com/doctrine/phpcr-odm/pull/262
+            $this->image->copyContentFromFile($image);
+        } elseif ($image instanceof ImageInterface) {
             $this->image = $image;
+        } else {
+            $this->image = new Image;
+            $this->image->copyContentFromFile($image);
         }
     }
 

Resources/rdf-mappings/Symfony.Cmf.Bundle.BlockBundle.Doctrine.Phpcr.SimpleBlock.xml

@@ -4,7 +4,7 @@
         xmlns:skos="http://www.w3.org/2004/02/skos/core#"
         typeof="sioc:Post"
         >
-    <attribute key="class" value="articleContainer span3"/>
+    <attribute key="class" value="articleContainer"/>
     <children>
         <property property="dcterms:title" identifier="title" tag-name="h2"/>
         <property property="sioc:body" identifier="body" />

Resources/views/Block/block_imagine.html.twig

@@ -10,7 +10,7 @@
     {% if block.linkUrl is defined %}
         <a href="{{ block.linkUrl }}" title="{{ block.label|default('') }}">
     {% endif %}
-        <span id="label">{{ block.label }}</span><img src="{{ block.image | imagine_filter(filter) }}" alt="{{ block.label }}" />
+        <span id="label">{{ block.label }}</span><img src="{{ block.image.id | imagine_filter(filter) }}" alt="{{ block.label }}" />
     {% if block.linkUrl is defined %}
         </a>
     {% endif %}

Resources/views/Block/block_rss.html.twig

@@ -1,21 +1,19 @@
 {% extends sonata_block.templates.block_base %}
 
 {% block block %}
-    <div class="span3">
-        <h2>{{ settings.title }}</h2>
-        <p>This block displays a list of messages based on this <a href="{{ settings.url }}" title="Url rss block">rss feed</a>.</p>
+    <h2>{{ settings.title }}</h2>
+    <p>This block displays a list of messages based on this <a href="{{ settings.url }}" title="Url rss block">rss feed</a>.</p>
 
-        <div class="feed-container">
-            {% for item in items %}
-                <ul>
-                    <li>
-                        <a class="item-link" href="{{ item.link}}" rel="nofollow" title="{{ item.title }}">{{ item.title }}</a>
-                        (<span class="item-pubdate">{{ item.pubDate | date('Y-m-d')  }}</span>)
-                    </li>
-                </ul>
-            {% else %}
-                    No feeds available.
-            {% endfor %}
-        </div>
+    <div class="feed-container">
+        {% for item in items %}
+            <ul>
+                <li>
+                    <a class="item-link" href="{{ item.link}}" rel="nofollow" title="{{ item.title }}">{{ item.title }}</a>
+                    (<span class="item-pubdate">{{ item.pubDate | date('Y-m-d')  }}</span>)
+                </li>
+            </ul>
+        {% else %}
+                No feeds available.
+        {% endfor %}
     </div>
 {% endblock %}

composer.json

@@ -29,6 +29,7 @@
     "suggest": {
         "sonata-project/cache-bundle": "To add caching support for block loading",
         "liip/imagine-bundle": "When using the ImagineBlock",
+        "symfony-cmf/media-bundle": "When using the ImagineBlock",
         "eko/feedbundle": "To use the RssBlock"
     },
     "autoload":{