[RFC] Refactor media to be framework agnostic

Adapter/LiipImagine/CmfMediaDoctrineLoader.php

@@ -5,10 +5,10 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Imagine\Image\ImagineInterface;
 use Liip\ImagineBundle\Imagine\Data\Loader\AbstractDoctrineLoader;
-use Symfony\Cmf\Bundle\MediaBundle\BinaryInterface;
-use Symfony\Cmf\Bundle\MediaBundle\FileSystemInterface;
-use Symfony\Cmf\Bundle\MediaBundle\ImageInterface;
-use Symfony\Cmf\Bundle\MediaBundle\MediaManagerInterface;
+use Media\BinaryInterface;
+use Media\FileSystemInterface;
+use Media\ImageInterface;
+use Media\MediaManagerInterface;
 use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;
 
 /**
@@ -61,7 +61,7 @@ protected function getStreamFromImage($image)
             throw new UnsupportedMediaTypeHttpException(
                 sprintf('Source image of type "%s" does not implement "%s"',
                     $type,
-                    'Symfony\Cmf\Bundle\MediaBundle\ImageInterface'
+                    'Media\ImageInterface'
                 )
             );
         }

CmfMediaBundle.php

@@ -22,7 +22,7 @@ public function build(ContainerBuilder $container)
             $container->addCompilerPass(
                 DoctrinePhpcrMappingsPass::createXmlMappingDriver(
                     array(
-                        realpath(__DIR__ . '/Resources/config/doctrine-phpcr') => 'Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr',
+                        realpath(__DIR__ . '/Resources/config/doctrine-phpcr') => 'Media\Model\Doctrine\Phpcr',
                     ),
                     array('cmf_media.persistence.phpcr.manager_name'),
                     'cmf_media.backend_type_phpcr'

Controller/FileController.php

@@ -4,11 +4,11 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
-use Symfony\Cmf\Bundle\MediaBundle\BinaryInterface;
+use Media\BinaryInterface;
+use Media\FileInterface;
+use Media\FileSystemInterface;
+use Media\MediaManagerInterface;
 use Symfony\Cmf\Bundle\MediaBundle\File\UploadFileHelper;
-use Symfony\Cmf\Bundle\MediaBundle\FileInterface;
-use Symfony\Cmf\Bundle\MediaBundle\FileSystemInterface;
-use Symfony\Cmf\Bundle\MediaBundle\MediaManagerInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -119,7 +119,7 @@ public function downloadAction($path)
 
         if (! $contentDocument || ! $contentDocument instanceof FileInterface) {
             throw new NotFoundHttpException(sprintf(
-                'Object with identifier %s cannot be resolved to a valid instance of Symfony\Cmf\Bundle\MediaBundle\FileInterface',
+                'Object with identifier %s cannot be resolved to a valid instance of Media\FileInterface',
                 $path
             ));
         }

Controller/ImageController.php

@@ -2,8 +2,8 @@
 
 namespace Symfony\Cmf\Bundle\MediaBundle\Controller;
 
-use Symfony\Cmf\Bundle\MediaBundle\FileInterface;
-use Symfony\Cmf\Bundle\MediaBundle\ImageInterface;
+use Media\FileInterface;
+use Media\ImageInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -31,7 +31,7 @@ public function displayAction($path)
 
         if (! $contentObject || ! $contentObject instanceof ImageInterface) {
             throw new NotFoundHttpException(sprintf(
-                'Object with identifier %s cannot be resolved to a valid instance of Symfony\Cmf\Bundle\MediaBundle\ImageInterface',
+                'Object with identifier %s cannot be resolved to a valid instance of Media\ImageInterface',
                 $path
             ));
         }

DependencyInjection/Configuration.php

@@ -30,10 +30,10 @@ public function getConfigTreeBuilder()
                                 ->scalarNode('enabled')->defaultNull()->end()
                                 ->scalarNode('media_basepath')->defaultValue('/cms/media')->end()
                                 ->scalarNode('manager_name')->defaultNull()->end()
-                                ->scalarNode('media_class')->defaultValue('Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\Media')->end()
-                                ->scalarNode('file_class')->defaultValue('Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\File')->end()
-                                ->scalarNode('directory_class')->defaultValue('Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\Directory')->end()
-                                ->scalarNode('image_class')->defaultValue('Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\Image')->end()
+                                ->scalarNode('media_class')->defaultValue('Media\Model\Doctrine\Phpcr\Media')->end()
+                                ->scalarNode('file_class')->defaultValue('Media\Model\Doctrine\Phpcr\File')->end()
+                                ->scalarNode('directory_class')->defaultValue('Media\Model\Doctrine\Phpcr\Directory')->end()
+                                ->scalarNode('image_class')->defaultValue('Media\ModelDoctrine\Phpcr\Image')->end()
                             ->end()
                         ->end()
                     ->end()