Mykees / MkMediaBundle

Form/Type/MediaShowType.php

Spacing +2 added lines, -2 removed lines

@@ -21,10 +21,10 @@
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name','text',[
+            ->add('name', 'text', [
                 "label"=>"Nom de l'image"
             ])
-            ->add('file','text',[
+            ->add('file', 'text', [
                 "label"=>"Chemin de l'image"
             ])
         ;

Form/Type/MediaType.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('fileData','file')
+            ->add('fileData', 'file')
         ;
     }
     

Controller/MediasController.php

Spacing +28 added lines, -28 removed lines

@@ -26,24 +26,24 @@ 
      * @param $editor
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function indexAction( $model, $bundle, $model_id, $editor )
+    public function indexAction($model, $bundle, $model_id, $editor)
     {
         $params = [
             'medias'=>$this->get('mk.media.manager')->findMediasByModelAndId($model, $model_id),
             'entity'=>$this->getManage()->getRepository("$bundle:$model")->find($model_id),
-            'mode'=>$editor=='true' ? $editor : null,
-            'url'=>$editor == "true" ? ['model'=>$model,'bundle'=>$bundle,'model_id'=>$model_id,'mode'=>'true'] : ['model'=>$model,'bundle'=>$bundle,'model_id'=>$model_id]
+            'mode'=>$editor == 'true' ? $editor : null,
+            'url'=>$editor == "true" ? ['model'=>$model, 'bundle'=>$bundle, 'model_id'=>$model_id, 'mode'=>'true'] : ['model'=>$model, 'bundle'=>$bundle, 'model_id'=>$model_id]
         ];
         $form = $this->createForm(
             new MediaType(),
             new Media,
             [
-                'action' => $this->generateUrl('mykees_media_add',$params['url']),
+                'action' => $this->generateUrl('mykees_media_add', $params['url']),
                 'method' => 'POST',
             ]
         );
 
-        return $this->render('MykeesMediaBundle:Media:index.html.twig',[
+        return $this->render('MykeesMediaBundle:Media:index.html.twig', [
             'form'=>$form->createView(),
             'model'=>$model,
             'bundle'=> $bundle,
@@ -58,7 +58,7 @@ 
      * @throws \Exception
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function addAction( Request $request )
+    public function addAction(Request $request)
     {
         $requestArray = [
             'file'=>$request->files,
@@ -68,24 +68,24 @@ 
         $bundle = $request->get('bundle');
         $model_id = $request->get('model_id');
 
-        if( $request->isXmlHttpRequest() && $requestArray['file'] )
+        if ($request->isXmlHttpRequest() && $requestArray['file'])
         {
             //Init Event
-            $event = $this->initEvent($requestArray['file'],$model,$model_id);
+            $event = $this->initEvent($requestArray['file'], $model, $model_id);
 
-            if($event->getMedia())
+            if ($event->getMedia())
             {
                 $requestArray['entity'] = $this->getManage()->getRepository("$bundle:$model")->find($model_id);
 
 
-                return $this->render('MykeesMediaBundle:Media:upload/upload_list.html.twig',[
+                return $this->render('MykeesMediaBundle:Media:upload/upload_list.html.twig', [
                     'params'=>$requestArray,
                     'media'=>$event->getMedia(),
                     'model'=>$model,
                     'bundle'=>$bundle,
                     'model_id'=>$model_id
                 ]);
-            }else{
+            }else {
                 $response = new Response();
                 $response->setContent(json_encode(array(
                     'error'=>"Le format n'est pas valid"
@@ -97,7 +97,7 @@ 
         }
     }
 
-    private function initEvent($file,$model,$model_id)
+    private function initEvent($file, $model, $model_id)
     {
         $event = new UploadEvent();
         $event->setFile($file);
@@ -120,10 +120,10 @@ 
      * @param Request $request
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function thumbAction( $model, $bundle, $model_id, $id, Request $request )
+    public function thumbAction($model, $bundle, $model_id, $id, Request $request)
     {
-        $media  = $this->getManage()->getRepository("MykeesMediaBundle:Media")->find($id);
-        $entity  = $this->getManage()->getRepository("$bundle:$model")->find($model_id);
+        $media = $this->getManage()->getRepository("MykeesMediaBundle:Media")->find($id);
+        $entity = $this->getManage()->getRepository("$bundle:$model")->find($model_id);
         $entity->setThumb($media);
         $this->getManage()->persist($entity);
         $this->getManage()->flush();
@@ -138,16 +138,16 @@ 
      * @param Request $request
      * @return Response
      */
-    public function showAction( $model=null, $id = null, Request $request )
+    public function showAction($model = null, $id = null, Request $request)
     {
-        if( !$id )
+        if (!$id)
         {
             $params = [
                 'class'=>$request->get('class'),
                 'alt'=>$request->get('alt')
             ];
-            $params['media'] = $this->getManage()->getRepository('MykeesMediaBundle:Media')->findOneBy(['name'=>$params['alt'],'model'=>$model]);
-        }else{
+            $params['media'] = $this->getManage()->getRepository('MykeesMediaBundle:Media')->findOneBy(['name'=>$params['alt'], 'model'=>$model]);
+        }else {
             $params = [
                 'media'=>$this->getManage()->getRepository('MykeesMediaBundle:Media')->find($id),
                 'class'=>null
@@ -157,18 +157,18 @@ 
             new MediaShowType(),
             $params['media'],
             [
-                'action' => $this->generateUrl('mykees_media_show',['model'=>$model,'id'=>$id]),
+                'action' => $this->generateUrl('mykees_media_show', ['model'=>$model, 'id'=>$id]),
                 'method' => 'POST',
             ]
         );
-        if($request->getMethod() == "POST")
+        if ($request->getMethod() == "POST")
         {
             $media = $request->request->all();
-            return $this->render('MykeesMediaBundle:Media:tinymce.html.twig',['media'=>$media]);
+            return $this->render('MykeesMediaBundle:Media:tinymce.html.twig', ['media'=>$media]);
         }
 
-        return $this->render('MykeesMediaBundle:Media:show/show.html.twig',[
-            'media'=>$params['media'],'form'=>$form->createView(),'class'=>$params['class'],"model"=>$model
+        return $this->render('MykeesMediaBundle:Media:show/show.html.twig', [
+            'media'=>$params['media'], 'form'=>$form->createView(), 'class'=>$params['class'], "model"=>$model
         ]);
     }
 
@@ -180,16 +180,16 @@ 
      * @param $id
      * @return Response
      */
-    public function deleteAction( $model, $bundle, $id )
+    public function deleteAction($model, $bundle, $id)
     {
-        if( $id )
+        if ($id)
         {
             $media = $this->getManage()->getRepository('MykeesMediaBundle:Media')->find($id);
             $media_manager = $this->get('mk.media.manager');
-            $media_manager->unlink($model,$media);
+            $media_manager->unlink($model, $media);
 
             $model_referer = $this->getManage()->getRepository("$bundle:$model")->find($media->getMediableId());
-            if(method_exists($model_referer,'getThumb') && $model_referer->getThumb() !== null && $model_referer->getThumb()->getId() == $media->getId())
+            if (method_exists($model_referer, 'getThumb') && $model_referer->getThumb() !== null && $model_referer->getThumb()->getId() == $media->getId())
             {
                 $model_referer->setThumb(null);
             }

Repository/MediaRepository.php

Spacing +9 added lines, -9 removed lines

@@ -23,11 +23,11 @@ 
     {
         $query = $this->_em->createQueryBuilder()
             ->select('m')
-            ->from($this->_entityName,'m')
+            ->from($this->_entityName, 'm')
             ->where('m.model = :model')
             ->andWhere('m.modelId = :modelId')
-            ->setParameter('model',$model)
-            ->setParameter('modelId',$model_id)
+            ->setParameter('model', $model)
+            ->setParameter('modelId', $model_id)
             ->getQuery()
         ;
         return $query;
@@ -42,9 +42,9 @@ 
     {
         $query = $this->_em->createQueryBuilder()
             ->select('m')
-            ->from($this->_entityName,'m')
+            ->from($this->_entityName, 'm')
             ->where('m.model = :model')
-            ->setParameter('model',$model)
+            ->setParameter('model', $model)
             ->getQuery()
         ;
         return $query;
@@ -59,11 +59,11 @@ 
     {
         $query = $this->_em->createQueryBuilder()
             ->select('m')
-            ->from($this->_entityName,'m')
+            ->from($this->_entityName, 'm')
             ->where('m.model IN(:model)')
             ->andWhere('m.modelId IN(:modelId)')
-            ->setParameter('model',array_values($model_info['models']))
-            ->setParameter('modelId',array_values($model_info['ids']))
+            ->setParameter('model', array_values($model_info['models']))
+            ->setParameter('modelId', array_values($model_info['ids']))
             ->getQuery()
         ;
         return $query;
@@ -74,7 +74,7 @@ 
      * @param array $model_info
      * @return array
      */
-    public function findForArrayModels(array $model_info){
+    public function findForArrayModels(array $model_info) {
         return $this->queryForArray($model_info)
                     ->getResult();
     }

Twig/Extension/UploaderExtension.php

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 
     public $generator;
 
-    public function __construct(UrlGeneratorInterface $generator )
+    public function __construct(UrlGeneratorInterface $generator)
     {
         $this->generator = $generator;
     }
@@ -40,21 +40,21 @@ 
      * @param $entity
      * @return string
      */
-    public function iframeUploader(Mediable $entity )
+    public function iframeUploader(Mediable $entity)
     {
         $model    = Reflection::getClassShortName($entity);
         $model_id = $entity->getId();
         $bundle   = Reflection::getShortBundleRepository($entity);
-        if($model_id)
+        if ($model_id)
         {
-            $url = $this->generator->generate('mykees_media',[
+            $url = $this->generator->generate('mykees_media', [
                 'model' => $model,
                 'bundle'=> $bundle,
                 'model_id'=> $model_id
             ]);
 
             return '<iframe src="'.$url.'" style="width:100%;border: none;min-height:100%;" class="iframe-uploader"></iframe>';
-        }else{
+        }else {
 
             return '<h3 style="font-weight: bold;text-align: center;color:#777">The <span style="color:#DD6F6F;border-bottom:2px dashed #777;">ID</span> from your entity <span style="color:#DD6F6F;border-bottom:2px dashed #777;">'.$model.'</span> is required to use the uploader</h3>';
         }
@@ -65,13 +65,13 @@ 
      * @param $entity
      * @return
      */
-    public function wysiwygUploader( \Twig_Environment $env, Mediable $entity )
+    public function wysiwygUploader(\Twig_Environment $env, Mediable $entity)
     {
         $model    = Reflection::getClassShortName($entity);
         $model_id = $entity->getId();
         $bundle   = Reflection::getShortBundleRepository($entity);
 
-        return  $env->render('MykeesMediaBundle:Media:editor/tinymce.html.twig',[
+        return  $env->render('MykeesMediaBundle:Media:editor/tinymce.html.twig', [
             'model'=>$model,
             'model_id'=>$model_id,
             'bundle'=> $bundle,

Twig/Extension/ImageResizeExtension.php

Spacing +8 added lines, -8 removed lines

@@ -27,12 +27,12 @@ 
         ];
     }
 
-    public function getImage($image, $width, $height, $options=[])
+    public function getImage($image, $width, $height, $options = [])
     {
         $attr = false;
-        foreach($options as $k=>$opt)
+        foreach ($options as $k=>$opt)
         {
-            if( $k > 1 ){
+            if ($k > 1) {
                 $attr .= ' ';
             }
             $attr .= $k.'="'.$opt.'"';
@@ -40,13 +40,13 @@ 
 
         $webroot = $this->rootDir.'/../web/';
         $info = pathinfo($image);
-        $imageResize = $info['dirname'] . '/' . $info['filename'] . "_$width" . "x$height" . '.jpg';
-        $fullPathImageResize = $webroot . $imageResize;
+        $imageResize = $info['dirname'].'/'.$info['filename']."_$width"."x$height".'.jpg';
+        $fullPathImageResize = $webroot.$imageResize;
 
-        if(file_exists($fullPathImageResize))
+        if (file_exists($fullPathImageResize))
         {
-            return '<img src="'. $imageResize .'" '. $attr .'>';
-        } else {
+            return '<img src="'.$imageResize.'" '.$attr.'>';
+        }else {
             return false;
         }
 

Tests/Controller/MediasControllerTest.php

Spacing +12 added lines, -12 removed lines

@@ -32,28 +32,28 @@ 
     public function testListMedias()
     {
         $crawler = $this->client->request('GET', '/admin/medias/Post/MvcBlogBundle/1');
-        $this->assertEquals(200,$this->client->getResponse()->getStatusCode());
-        $this->assertEquals(2,$crawler->filter('.count-tr')->count());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertEquals(2, $crawler->filter('.count-tr')->count());
 
 
         $crawler = $this->client->request('GET', '/admin/medias/Post/MvcBlogBundle/2');
-        $this->assertEquals(200,$this->client->getResponse()->getStatusCode());
-        $this->assertEquals(1,$crawler->filter('.count-tr')->count());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertEquals(1, $crawler->filter('.count-tr')->count());
     }
 
     public function testFindAllMediasForAModel()
     {
-        $medias  = $this->manager->findMediasByModelAndId('Post',1);
-        $this->assertGreaterThan(1,count($medias));
+        $medias = $this->manager->findMediasByModelAndId('Post', 1);
+        $this->assertGreaterThan(1, count($medias));
         $this->assertEquals(2, count($medias));
     }
 
     public function testRemoveFile()
     {
         $this->client->request('GET', '/admin/medias/delete/Post/MvcBlogBundle/9');
-        $this->assertEquals(200,$this->client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $medias  = $this->manager->findMediasByModelAndId('Post',2);
+        $medias = $this->manager->findMediasByModelAndId('Post', 2);
         $this->assertEquals(0, count($medias));
     }
 
@@ -75,8 +75,8 @@ 
             ['HTTP_X-Requested-With' => 'XMLHttpRequest']
         );
 
-        $this->assertEquals(200,$this->client->getResponse()->getStatusCode());
-        $medias  = $this->manager->findMediasByModelAndId('Post',13);
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $medias = $this->manager->findMediasByModelAndId('Post', 13);
 
         $this->assertEquals(1, count($medias));
 
@@ -99,10 +99,10 @@ 
             ['HTTP_X-Requested-With' => 'XMLHttpRequest']
         );
 
-        $this->assertEquals(500,$this->client->getResponse()->getStatusCode());
+        $this->assertEquals(500, $this->client->getResponse()->getStatusCode());
 
         $this->manager = $this->container->get('mk.media.manager');
-        $medias  = $this->manager->findMediasByModelAndId('Post',17);
+        $medias = $this->manager->findMediasByModelAndId('Post', 17);
         $this->assertEquals(0, count($medias));
     }
 

Interfaces/Mediable.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 namespace Mykees\MediaBundle\Interfaces;
 
 
-Interface Mediable{
+Interface Mediable {
 
     public function getId();
 }

EventListener/UploadSubscriber.php

Spacing +28 added lines, -28 removed lines

@@ -36,57 +36,57 @@ 
     }
 
 
-    public function uploadProcess( UploadEvent $event )
+    public function uploadProcess(UploadEvent $event)
     {
-        $file  = $event->getFile()->all();
+        $file = $event->getFile()->all();
         $fileUploaded = $file['file'];
-        $model   = $event->getMediableModel();
+        $model = $event->getMediableModel();
         $model_id = $event->getMediableId();
         $resize_option = $event->getContainer()->getParameter('mykees.media.resize');
         $extension = pathinfo($fileUploaded->getClientOriginalName(), PATHINFO_EXTENSION);
         $DS = DIRECTORY_SEPARATOR;
 
 
-        if( $this->isValidExtension($extension,$event) )
+        if ($this->isValidExtension($extension, $event))
         {
             //create dir
             $webroot = $event->getRootDir().'/../web';
             $dir = $webroot.'/img';
 
-            if(!file_exists($dir)){mkdir($dir,0777);}
+            if (!file_exists($dir)) {mkdir($dir, 0777); }
 
             $dir .= $DS.date('Y');
-            if(!file_exists($dir)){mkdir($dir,0777);}
+            if (!file_exists($dir)) {mkdir($dir, 0777); }
 
             $dir .= $DS.date('m');
-            if(!file_exists($dir)){mkdir($dir,0777);}
+            if (!file_exists($dir)) {mkdir($dir, 0777); }
 
             //clean and define path filename
-            $filename = $this->cleanFilename( $fileUploaded->getClientOriginalName(), $extension );
+            $filename = $this->cleanFilename($fileUploaded->getClientOriginalName(), $extension);
             //test duplicate
-            $name = $this->mediaExist( $filename,$webroot );
+            $name = $this->mediaExist($filename, $webroot);
 
             $filePath = date('Y').'/'.date('m').'/'.$name;
             $save_media = $this->saveMedia($filePath, $name, $model, $model_id);
 
-            if($save_media)
+            if ($save_media)
             {
                 //upload
-                $fileUploaded->move($dir,$name);
+                $fileUploaded->move($dir, $name);
                 $event->setMedia($save_media);
 
-                if(!empty($resize_option[$model]))
+                if (!empty($resize_option[$model]))
                 {
                     $resize = new ResizeHelper($resize_option[$model], $webroot);
                     $resize->resize($save_media->getFile());
                 }
 
                 return true;
-            }else{
+            }else {
 
                 return new Response();
             }
-        }else{
+        }else {
 
             return new Response();
         }
@@ -98,12 +98,12 @@ 
      * @param $event
      * @return bool
      */
-    private function isValidExtension($extension,$event)
+    private function isValidExtension($extension, $event)
     {
         $extensions = $event->getContainer()->getParameter('mykees.media.extension');
-        $valid_extensions = !empty($extensions) ? $extensions : ['jpg','jpeg','JPG','JPEG'];
+        $valid_extensions = !empty($extensions) ? $extensions : ['jpg', 'jpeg', 'JPG', 'JPEG'];
 
-        return in_array($extension,$valid_extensions);
+        return in_array($extension, $valid_extensions);
     }
 
     /**
@@ -112,10 +112,10 @@ 
      * @param $extension
      * @return string
      */
-    private function cleanFilename( $filename, $extension )
+    private function cleanFilename($filename, $extension)
     {
-        $f = explode('.',$filename);
-        $cleanFilename = Urlizer::urlize(implode('.',array_slice($f,0,-1)));
+        $f = explode('.', $filename);
+        $cleanFilename = Urlizer::urlize(implode('.', array_slice($f, 0, -1)));
 
         return $cleanFilename.'.'.$extension;
     }
@@ -127,23 +127,23 @@ 
      * @param int $count
      * @return string
      */
-    private function mediaExist( $filename, $webroot, $count=0 )
+    private function mediaExist($filename, $webroot, $count = 0)
     {
         $file = $filename;
         $filePath = false;
-        if($count > 0){
-            $f = explode('.',$filename);
+        if ($count > 0) {
+            $f = explode('.', $filename);
             $file = $f[0].'_'.$count.'.'.end($f);
             $filePath = $webroot.'/img/'.date('Y').'/'.date('m').'/'.$file;
         }
         $filePath = !$filePath ? $webroot.'/img/'.date('Y').'/'.date('m').'/'.$file : $filePath;
-        if(file_exists($filePath))
+        if (file_exists($filePath))
         {
             $count++;
 
-            return $this->mediaExist( $filename, $webroot, $count );
-        }else{
-            $filename =  $file;
+            return $this->mediaExist($filename, $webroot, $count);
+        }else {
+            $filename = $file;
 
             return $filename;
         }
@@ -160,7 +160,7 @@ 
     private function saveMedia($filePath, $filename, $model, $model_id)
     {
         $media = new Media();
-        $fn = explode('.',$filename);
+        $fn = explode('.', $filename);
         $media->setName($fn[0]);
         $media->setMediableModel($model);
         $media->setMediableId($model_id);