alpixel / AlpixelMediaBundle

src/Alpixel/Bundle/MediaBundle/DataTransformer/EntityToIdTransformer.php

Doc Comments +4 added lines

@@ -30,6 +30,10 @@
 
     private $unitOfWork;
 
+    /**
+     * @param string $class
+     * @param string $property
+     */
     public function __construct(EntityManager $em, $class, $property, $queryBuilder, $multiple)
     {
         if (!(null === $queryBuilder || $queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) {

Unused Use Statements -5 removed lines

@@ -5,15 +5,10 @@
 use Alpixel\Bundle\MediaBundle\Entity\Media;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\DataTransformerInterface;
-use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 /**
  * Data transformation class

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 
     public function transform($data)
     {
-        if($data instanceof Collection) {
+        if ($data instanceof Collection) {
             return $this->reverseTransform($data);
         }
 
@@ -79,7 +79,7 @@ 
 
     protected function transformSingleEntity($data)
     {
-        if($data instanceof Media)
+        if ($data instanceof Media)
             return $data->getSecretKey();
         else
             return $this->em->getRepository($this->class)->findOneBySecretKey($data);
@@ -91,7 +91,7 @@ 
             return null;
         }
 
-        if(!($data instanceof Collection)) {
+        if (!($data instanceof Collection)) {
             return $this->transform($data);
         }
 

Braces +5 added lines, -4 removed lines

@@ -79,10 +79,11 @@
 
     protected function transformSingleEntity($data)
     {
-        if($data instanceof Media)
-            return $data->getSecretKey();
-        else
-            return $this->em->getRepository($this->class)->findOneBySecretKey($data);
+        if($data instanceof Media) {
+                    return $data->getSecretKey();
+        } else {
+                    return $this->em->getRepository($this->class)->findOneBySecretKey($data);
+        }
     }
 
     public function reverseTransform($data)

src/Alpixel/Bundle/MediaBundle/Entity/Media.php

Doc Comments +4 added lines, -4 removed lines

@@ -126,8 +126,8 @@ 
     /**
      * Sets the value of uri.
      *
-     * @param string $name $uri the uri
      *
+     * @param string $uri
      * @return self
      */
     public function setUri($uri)
@@ -150,8 +150,8 @@ 
     /**
      * Sets the value of secretKey.
      *
-     * @param string $name $secretKey the secret key
      *
+     * @param string $secretKey
      * @return self
      */
     public function setSecretKey($secretKey)
@@ -174,8 +174,8 @@ 
     /**
      * Sets the value of mime.
      *
-     * @param string $name $mime the mime
      *
+     * @param string $mime
      * @return self
      */
     public function setMime($mime)
@@ -198,8 +198,8 @@ 
     /**
      * Sets the value of lifetime.
      *
-     * @param string $label $lifetime the lifetime
      *
+     * @param null|\DateTime $lifetime
      * @return self
      */
     public function setLifetime($lifetime)

src/Alpixel/Bundle/MediaBundle/Form/MediaType.php

Unused Use Statements -5 removed lines

@@ -4,11 +4,7 @@ 
 use Alpixel\Bundle\MediaBundle\DataTransformer\EntityToIdTransformer;
 use Alpixel\Bundle\MediaBundle\Entity\Media;
 use Alpixel\Bundle\MediaBundle\EventListener\MediaEvent;
-use Alpixel\Bundle\MediaBundle\EventListener\MediaListener;
 use Symfony\Bridge\Doctrine\RegistryInterface;
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
-use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -16,7 +12,6 @@ 
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class MediaType extends AbstractType

Spacing +3 added lines, -3 removed lines

@@ -48,13 +48,13 @@
     {
         $results = $event->getForm()->getData();
 
-        if($results === null)
+        if ($results === null)
             return;
 
-        if(!is_array($results))
+        if (!is_array($results))
             $results = array($results);
 
-        foreach($results as $media) {
+        foreach ($results as $media) {
             $mediaEvent = new MediaEvent($media);
             $this->dispatcher->dispatch(MediaEvent::POST_SUBMIT, $mediaEvent);
         }

Braces +6 added lines, -4 removed lines

@@ -48,11 +48,13 @@
     {
         $results = $event->getForm()->getData();
 
-        if($results === null)
-            return;
+        if($results === null) {
+                    return;
+        }
 
-        if(!is_array($results))
-            $results = array($results);
+        if(!is_array($results)) {
+                    $results = array($results);
+        }
 
         foreach($results as $media) {
             $mediaEvent = new MediaEvent($media);

src/Alpixel/Bundle/MediaBundle/Twig/Extension/MediaPreviewExtension.php

Doc Comments +3 added lines

@@ -60,6 +60,9 @@
         return (array_key_exists($mime, $this->previewIcon)) ? $this->previewIcon[$mime] : $this->previewIcon['unknown'];
     }
 
+    /**
+     * @param boolean $isIcon
+     */
     protected function generatePath($isIcon, $str)
     {
         if($isIcon === true) {

Indentation +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 
     public function generatePathFromSecretKey($secretKey)
     {
-         if($secretKey == '')
+            if($secretKey == '')
             return '';
 
         $mimeType = $this->getMimeType($secretKey);

Spacing +5 added lines, -5 removed lines

@@ -31,14 +31,14 @@ 
 
     public function previewIconFilter(\Twig_Environment $twig, $secretKey = '')
     {
-        if($secretKey == '')
+        if ($secretKey == '')
             return '';
 
         $mimeType = $this->getMimeType($secretKey);
         $icon     = '';
         $link     = '';
 
-        if(preg_match('/^image/', $mimeType) === 0) {
+        if (preg_match('/^image/', $mimeType) === 0) {
             $icon = $this->getIcon($mimeType);
             $link = $this->generatePath(true, $icon);
         }
@@ -62,7 +62,7 @@ 
 
     protected function generatePath($isIcon, $str)
     {
-        if($isIcon === true) {
+        if ($isIcon === true) {
             return $this->requestStack->getSchemeAndHttpHost().$this->requestStack->getBasePath().'/bundles/media/images/'.$str;
         }
 
@@ -71,12 +71,12 @@ 
 
     public function generatePathFromSecretKey($secretKey)
     {
-         if($secretKey == '')
+         if ($secretKey == '')
             return '';
 
         $mimeType = $this->getMimeType($secretKey);
 
-        if(preg_match('/^image/', $mimeType) === 0) {
+        if (preg_match('/^image/', $mimeType) === 0) {
             $icon = $this->getIcon($mimeType);
             return $this->generatePath(true, $icon);
         }

Braces +7 added lines, -6 removed lines

@@ -31,8 +31,9 @@ 
 
     public function previewIconFilter(\Twig_Environment $twig, $secretKey = '')
     {
-        if($secretKey == '')
-            return '';
+        if($secretKey == '') {
+                    return '';
+        }
 
         $mimeType = $this->getMimeType($secretKey);
         $icon     = '';
@@ -41,8 +42,7 @@ 
         if(preg_match('/^image/', $mimeType) === 0) {
             $icon = $this->getIcon($mimeType);
             $link = $this->generatePath(true, $icon);
-        }
-        else {
+        } else {
             $link = $this->generatePath(false, $secretKey);
         }
 
@@ -71,8 +71,9 @@ 
 
     public function generatePathFromSecretKey($secretKey)
     {
-         if($secretKey == '')
-            return '';
+         if($secretKey == '') {
+                     return '';
+         }
 
         $mimeType = $this->getMimeType($secretKey);
 

src/Alpixel/Bundle/MediaBundle/Services/MediaManager.php

Indentation +9 added lines, -9 removed lines

@@ -34,13 +34,13 @@ 
         $this->allowedMimetypes = $allowedMimetypes;
     }
 
-  /**
-   * $current_uri String actual uri of the file
-   * $dest_folder String future uri of the file starting from web/upload folder
-   * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted.
-   **/
-  public function upload(UploadedFile $file, $dest_folder = '', \DateTime $lifetime = null)
-  {
+    /**
+     * $current_uri String actual uri of the file
+     * $dest_folder String future uri of the file starting from web/upload folder
+     * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted.
+     **/
+    public function upload(UploadedFile $file, $dest_folder = '', \DateTime $lifetime = null)
+    {
 
     //Cleaning up old files before uploading this one
     $this->cleanup();
@@ -63,7 +63,7 @@ 
 
     $fs = new Filesystem();
     if (!$fs->exists($this->uploadDir.$dest_folder)) {
-      $fs->mkdir($this->uploadDir.$dest_folder);
+        $fs->mkdir($this->uploadDir.$dest_folder);
     }
 
     $em    = $this->doctrine->getManager();
@@ -117,7 +117,7 @@ 
     $em->flush();
 
     return $media;
-  }
+    }
 
     public function cleanup()
     {

Spacing +12 added lines, -12 removed lines

@@ -20,11 +20,11 @@ 
     protected $allowedMimetypes;
 
     const SIZE_OF_KIBIOCTET = 1024;
-    const OCTET_IN_KO =  1;
-    const OCTET_IN_MO =  2;
-    const OCTET_IN_GO =  3;
-    const OCTET_IN_TO =  4;
-    const OCTET_IN_PO =  5;
+    const OCTET_IN_KO = 1;
+    const OCTET_IN_MO = 2;
+    const OCTET_IN_GO = 3;
+    const OCTET_IN_TO = 4;
+    const OCTET_IN_PO = 5;
 
     public function __construct(Registry $doctrine, Kernel $kernel, $uploadDir, $allowedMimetypes)
     {
@@ -50,14 +50,14 @@ 
 
     //checking mimetypes
     $mimeTypePassed = false;
-    foreach($this->allowedMimetypes as $mimeType) {
-        if(preg_match('@'.$mimeType.'@', $file->getMimeType()))
+    foreach ($this->allowedMimetypes as $mimeType) {
+        if (preg_match('@'.$mimeType.'@', $file->getMimeType()))
         {
             $mimeTypePassed = true;
         }
     }
 
-    if(!$mimeTypePassed) {
+    if (!$mimeTypePassed) {
         throw new InvalidMimeTypeException;
     }
 
@@ -81,7 +81,7 @@ 
 
     // Checking for a media with the same name
     $mediaExists = $this->doctrine->getRepository('MediaBundle:Media')->findOneByUri($dest_folder.$filename);
-    if(count($mediaExists) === 0) {
+    if (count($mediaExists) === 0) {
         $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename);
     }
 
@@ -185,7 +185,7 @@ 
 
     public function setAllowedMimeTypes(array $type)
     {
-        if($type !== null) {
+        if ($type !== null) {
             $this->allowedMimetypes = $type;
         }
 
@@ -199,8 +199,8 @@ 
 
     public function convertOctetIn($size, $convert)
     {
-        if($convert > 0) {
-            $size  = ($size / self::SIZE_OF_KIBIOCTET) * 1;
+        if ($convert > 0) {
+            $size = ($size / self::SIZE_OF_KIBIOCTET) * 1;
             return $this->convertOctetIn($size, $convert - 1);
         }
 

src/Alpixel/Bundle/MediaBundle/EventListener/MediaListener.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 
     public function onPostSubmit(MediaEvent $event)
     {
-        $media      = $event->getMedia();
+        $media = $event->getMedia();
 
-        if($media !== null) {
+        if ($media !== null) {
             $media->setLifetime(null);
             $this->registry->getManager()->persist($media);
         }

src/Alpixel/Bundle/MediaBundle/Controller/MediaController.php

Indentation +35 added lines, -35 removed lines

@@ -32,15 +32,15 @@ 
         $mediaPreview = $this->container->get('twig.extension.media_preview_extension');
         foreach ($this->get('request')->files as $files) {
             if(!is_array($files))
-              $files = array($files);
+                $files = array($files);
             foreach($files as $file) {
-              $media   = $this->get('media')->upload($file, $this->get('request')->get('folder'), $lifetime);
-              $path    = $mediaPreview->generatePathFromSecretKey($media->getSecretKey());
-              $returnData[] = array(
-                  'id'   => $media->getSecretKey(),
-                  'path' => $path,
-                  'name' => $media->getName(),
-              );
+                $media   = $this->get('media')->upload($file, $this->get('request')->get('folder'), $lifetime);
+                $path    = $mediaPreview->generatePathFromSecretKey($media->getSecretKey());
+                $returnData[] = array(
+                    'id'   => $media->getSecretKey(),
+                    'path' => $path,
+                    'name' => $media->getName(),
+                );
             }
         }
 
@@ -81,29 +81,29 @@ 
      */
     public function showMediaAction(Media $media, $filter = null)
     {
-      $response = new Response();
+        $response = new Response();
 
-      $lastModified = new \DateTime('now');
+        $lastModified = new \DateTime('now');
 
 
-      //Checking if it is an image or not
-      $src     = $this->get('media')->getAbsolutePath($media);
-      $isImage = @getimagesize($src);
+        //Checking if it is an image or not
+        $src     = $this->get('media')->getAbsolutePath($media);
+        $isImage = @getimagesize($src);
 
-      if($isImage) {
+        if($isImage) {
         $response->headers->set('Content-disposition', 'inline;filename='.$media->getName());
         if (!empty($filter) && $isImage) {
 
-          $src           = $this->get('media')->getAbsolutePath($media, $filter);
-          $dataManager   = $this->get('liip_imagine.data.manager');    // the data manager service
-          $filterManager = $this->get('liip_imagine.filter.manager');// the filter manager service
+            $src           = $this->get('media')->getAbsolutePath($media, $filter);
+            $dataManager   = $this->get('liip_imagine.data.manager');    // the data manager service
+            $filterManager = $this->get('liip_imagine.filter.manager');// the filter manager service
 
-          $uploadDir = $this->get('media')->getUploadDir($filter);
+            $uploadDir = $this->get('media')->getUploadDir($filter);
 
-          if (!is_file($src)) {
+            if (!is_file($src)) {
             $fs = new Filesystem();
             if (!$fs->exists($uploadDir.$media->getFolder())) {
-              $fs->mkdir($uploadDir.$media->getFolder());
+                $fs->mkdir($uploadDir.$media->getFolder());
             }
 
             $path         = 'upload/'.$media->getUri();
@@ -111,33 +111,33 @@ 
             $responseData = $filterManager->applyFilter($image, $filter);         // run the filter
             $data         = $responseData->getContent();                              // get the image from the response
             file_put_contents($uploadDir.$media->getUri(), $data);
-          } else {
+            } else {
             $data = file_get_contents($src);
             $lastModified->setTimestamp(filemtime($src));
-          }
+            }
 
         } else {
-          $src  = $this->get('media')->getAbsolutePath($media);
-          $lastModified->setTimestamp(filemtime($src));
-          $data = file_get_contents($src);
+            $src  = $this->get('media')->getAbsolutePath($media);
+            $lastModified->setTimestamp(filemtime($src));
+            $data = file_get_contents($src);
         }
-      } else {
+        } else {
         $lastModified->setTimestamp(filemtime($src));
         $data = file_get_contents($src);
         $response->headers->set('Content-disposition', 'attachment;filename='.basename($media->getUri()));
-      }
+        }
 
-      $response->setLastModified($lastModified);
-      $response->setPublic();
-      $response->headers->set('Content-Type', $media->getMime());
+        $response->setLastModified($lastModified);
+        $response->setPublic();
+        $response->headers->set('Content-Type', $media->getMime());
 
-      if ($response->isNotModified($this->get('request'))) {
-          return $response;
-      }
+        if ($response->isNotModified($this->get('request'))) {
+            return $response;
+        }
 
-      $response->setContent($data);
+        $response->setContent($data);
 
-      return $response;
+        return $response;
     }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
      */
     public function uploadAction()
     {
-        $returnData    = array();
+        $returnData = array();
 
         if ($this->get('request')->get('lifetime') !== null) {
             $lifetime = new \DateTime($this->get('request')->get('lifetime'));
@@ -31,9 +31,9 @@ 
 
         $mediaPreview = $this->container->get('twig.extension.media_preview_extension');
         foreach ($this->get('request')->files as $files) {
-            if(!is_array($files))
+            if (!is_array($files))
               $files = array($files);
-            foreach($files as $file) {
+            foreach ($files as $file) {
               $media   = $this->get('media')->upload($file, $this->get('request')->get('folder'), $lifetime);
               $path    = $mediaPreview->generatePathFromSecretKey($media->getSecretKey());
               $returnData[] = array(
@@ -90,13 +90,13 @@ 
       $src     = $this->get('media')->getAbsolutePath($media);
       $isImage = @getimagesize($src);
 
-      if($isImage) {
+      if ($isImage) {
         $response->headers->set('Content-disposition', 'inline;filename='.$media->getName());
         if (!empty($filter) && $isImage) {
 
           $src           = $this->get('media')->getAbsolutePath($media, $filter);
-          $dataManager   = $this->get('liip_imagine.data.manager');    // the data manager service
-          $filterManager = $this->get('liip_imagine.filter.manager');// the filter manager service
+          $dataManager   = $this->get('liip_imagine.data.manager'); // the data manager service
+          $filterManager = $this->get('liip_imagine.filter.manager'); // the filter manager service
 
           $uploadDir = $this->get('media')->getUploadDir($filter);
 
@@ -107,9 +107,9 @@ 
             }
 
             $path         = 'upload/'.$media->getUri();
-            $image        = $dataManager->find($filter, $path);                    // find the image and determine its type
-            $responseData = $filterManager->applyFilter($image, $filter);         // run the filter
-            $data         = $responseData->getContent();                              // get the image from the response
+            $image        = $dataManager->find($filter, $path); // find the image and determine its type
+            $responseData = $filterManager->applyFilter($image, $filter); // run the filter
+            $data         = $responseData->getContent(); // get the image from the response
             file_put_contents($uploadDir.$media->getUri(), $data);
           } else {
             $data = file_get_contents($src);

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
 
         $mediaPreview = $this->container->get('twig.extension.media_preview_extension');
         foreach ($this->get('request')->files as $files) {
-            if(!is_array($files))
-              $files = array($files);
+            if(!is_array($files)) {
+                          $files = array($files);
+            }
             foreach($files as $file) {
               $media   = $this->get('media')->upload($file, $this->get('request')->get('folder'), $lifetime);
               $path    = $mediaPreview->generatePathFromSecretKey($media->getSecretKey());