alpixel / AlpixelMediaBundle

Controller/MediaController.php

Spacing +7 added lines, -7 removed lines

@@ -79,7 +79,7 @@ 
         $response = new Response();
         $response->setContent(file_get_contents($this->get('alpixel_media.manager')->getAbsolutePath($media)));
         $response->headers->set('Content-Type', 'application/force-download');
-        $response->headers->set('Content-disposition', 'filename=' . $media->getName());
+        $response->headers->set('Content-disposition', 'filename='.$media->getName());
 
         return $response;
     }
@@ -101,7 +101,7 @@ 
         $isImage = @getimagesize($src);
 
         if ($isImage) {
-            $response->headers->set('Content-disposition', 'inline;filename=' . $media->getName());
+            $response->headers->set('Content-disposition', 'inline;filename='.$media->getName());
             if (!empty($filter) && $isImage) {
                 $src = $this->get('alpixel_media.manager')->getAbsolutePath($media, $filter);
                 $dataManager = $this->get('liip_imagine.data.manager'); // the data manager service
@@ -110,11 +110,11 @@ 
 
                 if (!is_file($src)) {
                     $fs = new Filesystem();
-                    if (!$fs->exists($uploadDir . $media->getFolder())) {
-                        $fs->mkdir($uploadDir . $media->getFolder());
+                    if (!$fs->exists($uploadDir.$media->getFolder())) {
+                        $fs->mkdir($uploadDir.$media->getFolder());
                     }
 
-                    $path = 'upload/' . $media->getUri();
+                    $path = 'upload/'.$media->getUri();
 
                     // find the image and determine its type
                     $image = $dataManager->find($filter, $path);
@@ -122,7 +122,7 @@ 
                     // run the filter
                     $responseData = $filterManager->applyFilter($image, $filter);
                     $data = $responseData->getContent();
-                    file_put_contents($uploadDir . $media->getUri(), $data);
+                    file_put_contents($uploadDir.$media->getUri(), $data);
                 } else {
                     $data = file_get_contents($src);
                     $lastModified->setTimestamp(filemtime($src));
@@ -135,7 +135,7 @@ 
         } else {
             $lastModified->setTimestamp(filemtime($src));
             $data = file_get_contents($src);
-            $response->headers->set('Content-disposition', 'attachment;filename=' . basename($media->getUri()));
+            $response->headers->set('Content-disposition', 'attachment;filename='.basename($media->getUri()));
         }
 
         $response->setLastModified($lastModified);

Services/MediaManager.php

Spacing +24 added lines, -24 removed lines

@@ -33,7 +33,7 @@ 
     {
         $this->entityManager = $entityManager;
         if (substr($uploadDir, -1) !== '/') {
-            $uploadDir = $uploadDir . '/';
+            $uploadDir = $uploadDir.'/';
         }
         $this->uploadDir = $uploadDir;
         $this->allowedMimetypes = $allowedMimetypes;
@@ -47,23 +47,23 @@ 
     public function upload(File $file, $dest_folder = '', \DateTime $lifetime = null)
     {
         //preparing dir name
-        $dest_folder = date('Ymd') . '/' . date('G') . '/' . $dest_folder;
+        $dest_folder = date('Ymd').'/'.date('G').'/'.$dest_folder;
 
         //checking mimetypes
         $mimeTypePassed = false;
         foreach ($this->allowedMimetypes as $mimeType) {
-            if (preg_match('@' . $mimeType . '@', $file->getMimeType())) {
+            if (preg_match('@'.$mimeType.'@', $file->getMimeType())) {
                 $mimeTypePassed = true;
             }
         }
 
         if (!$mimeTypePassed) {
-            throw new InvalidMimeTypeException('Only following filetypes are allowed : ' . implode(', ', $this->allowedMimetypes));
+            throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes));
         }
 
         $fs = new Filesystem();
-        if (!$fs->exists($this->uploadDir . $dest_folder)) {
-            $fs->mkdir($this->uploadDir . $dest_folder);
+        if (!$fs->exists($this->uploadDir.$dest_folder)) {
+            $fs->mkdir($this->uploadDir.$dest_folder);
         }
 
         $em = $this->entityManager;
@@ -82,12 +82,12 @@ 
                     $extension = $file->guessClientExtension();
                 }
             }
-            $filename = $slugify->slugify(basename($file->getClientOriginalName(), $extension)) . '.' . $extension;
+            $filename = $slugify->slugify(basename($file->getClientOriginalName(), $extension)).'.'.$extension;
         } else {
             if (empty($extension)) {
                 $extension = $file->guessClientExtension();
             }
-            $filename = $slugify->slugify(basename($file->getFilename(), $extension)) . '.' . $extension;
+            $filename = $slugify->slugify(basename($file->getFilename(), $extension)).'.'.$extension;
         }
 
         // A media can have a lifetime and will be deleted with the cleanup function
@@ -96,35 +96,35 @@ 
         }
 
         // Checking for a media with the same name
-        $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder . $filename);
+        $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder.$filename);
         $mediaExists = (count($mediaExists) > 0);
         if ($mediaExists === false) {
-            $mediaExists = $fs->exists($this->uploadDir . $dest_folder . $filename);
+            $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename);
         }
 
         if ($mediaExists === true) {
-            $filename = basename($filename, '.' . $extension);
+            $filename = basename($filename, '.'.$extension);
             $i = 1;
             do {
-                $media->setName($filename . '-' . $i++ . '.' . $extension);
-                $media->setUri($dest_folder . $media->getName());
+                $media->setName($filename.'-'.$i++.'.'.$extension);
+                $media->setUri($dest_folder.$media->getName());
                 $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri());
                 $mediaExists = (count($mediaExists) > 0);
                 if ($mediaExists === false) {
-                    $mediaExists = $fs->exists($this->uploadDir . $dest_folder . $filename);
+                    $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename);
                 }
             } while ($mediaExists === true);
         } else {
             $media->setName($filename);
-            $media->setUri($dest_folder . $media->getName());
+            $media->setUri($dest_folder.$media->getName());
         }
 
-        $file->move($this->uploadDir . $dest_folder, $media->getName());
-        chmod($this->uploadDir . $dest_folder . $media->getName(), 0664);
+        $file->move($this->uploadDir.$dest_folder, $media->getName());
+        chmod($this->uploadDir.$dest_folder.$media->getName(), 0664);
 
         // Getting the salt defined in parameters.yml
         $secret = $this->container->getParameter('secret');
-        $media->setSecretKey(hash('sha256', $secret . $media->getName() . $media->getUri()));
+        $media->setSecretKey(hash('sha256', $secret.$media->getName().$media->getUri()));
 
         $em->persist($media);
         $em->flush();
@@ -145,7 +145,7 @@ 
         $em = $this->entityManager;
         $fs = new Filesystem();
 
-        $file_path = $this->uploadDir . $media->getUri();
+        $file_path = $this->uploadDir.$media->getUri();
 
         try {
             $file = new File($file_path);
@@ -165,7 +165,7 @@ 
     public function getUploadDir($filter = null)
     {
         if (!empty($filter)) {
-            return $this->uploadDir . 'filters/' . $filter . '/';
+            return $this->uploadDir.'filters/'.$filter.'/';
         }
 
         return $this->uploadDir;
@@ -174,18 +174,18 @@ 
     public function getWebPath(Media $media)
     {
         $request = $this->container->get('request');
-        $dir = $request->getSchemeAndHttpHost() . $request->getBaseUrl() . '/';
+        $dir = $request->getSchemeAndHttpHost().$request->getBaseUrl().'/';
 
-        return $dir . $media->getUri();
+        return $dir.$media->getUri();
     }
 
     public function getAbsolutePath(Media $media, $filter = null)
     {
         $imgSrc = $this->uploadDir;
         if (!empty($filter)) {
-            return $imgSrc . 'filters/' . $filter . '/' . $media->getUri();
+            return $imgSrc.'filters/'.$filter.'/'.$media->getUri();
         } else {
-            return $imgSrc . $media->getUri();
+            return $imgSrc.$media->getUri();
         }
     }