alpixel / AlpixelMediaBundle

DependencyInjection/AlpixelMediaExtension.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     public function prepend(ContainerBuilder $container)
     {
         $parser = new Parser();
-        $config = $parser->parse(file_get_contents(__DIR__ . '/../Resources/config/config.yml'));
+        $config = $parser->parse(file_get_contents(__DIR__.'/../Resources/config/config.yml'));
 
         foreach ($config as $key => $configuration) {
             $container->prependExtensionConfig($key, $configuration);

DataFixtures/ORM/MediaProvider.php

Spacing +14 added lines, -14 removed lines

@@ -27,10 +27,10 @@ 
     {
         do {
             $dimensions = $this->fetchDimensions($width, $height);
-            $file = $this->fetchFromCache($dimensions['w'] . '-' . $dimensions['h']);
+            $file = $this->fetchFromCache($dimensions['w'].'-'.$dimensions['h']);
             if ($file === null) {
                 $file = $this->downloadMedia($this->generateUrl($dimensions, $type), 'jpg');
-                $this->storeInCache($dimensions['w'] . '-' . $dimensions['h'], $file);
+                $this->storeInCache($dimensions['w'].'-'.$dimensions['h'], $file);
             }
         } while (!preg_match('@^image/@', $file->getMimeType()));
 
@@ -41,7 +41,7 @@ 
 
     public function randomFile($fileType)
     {
-        $file = $this->fetchFromCache("file-" . $fileType);
+        $file = $this->fetchFromCache("file-".$fileType);
         if ($file === null) {
             switch ($fileType) {
                 case "pdf":
@@ -50,7 +50,7 @@ 
                     break;
             }
         }
-        $this->storeInCache("file-" . $fileType, $file);
+        $this->storeInCache("file-".$fileType, $file);
         $media = $this->mediaManager->upload($file);
 
         return $media;
@@ -80,17 +80,17 @@ 
             $url .= 'g/';
         }
 
-        $url .= $dimensions['w'] . '/' . $dimensions['h'];
+        $url .= $dimensions['w'].'/'.$dimensions['h'];
 
         $category = ['abstract', 'city', 'nature', 'moutains'];
-        $url .= '/' . $category[array_rand($category, 1)] . '/';
+        $url .= '/'.$category[array_rand($category, 1)].'/';
 
         return $url;
     }
 
     protected function downloadMedia($url, $ext)
     {
-        $filepath = sys_get_temp_dir() . '/' . uniqid() . '.' . $ext;
+        $filepath = sys_get_temp_dir().'/'.uniqid().'.'.$ext;
         $ch = curl_init($url);
         $fp = fopen($filepath, 'wb');
         curl_setopt($ch, CURLOPT_FILE, $fp);
@@ -105,16 +105,16 @@ 
     protected function fetchFromCache($key)
     {
         $fs = new Filesystem();
-        $cacheDir = $_SERVER['HOME'] . '/.symfony/media';
+        $cacheDir = $_SERVER['HOME'].'/.symfony/media';
         if (!$fs->exists($cacheDir)) {
             $fs->mkdir($cacheDir, 0777);
         } else {
-            $cacheDir .= '/' . $key;
+            $cacheDir .= '/'.$key;
             if (!$fs->exists($cacheDir)) {
                 $fs->mkdir($cacheDir, 0777);
             } else {
                 $finder = new Finder();
-                $files = $finder->in($cacheDir . '/')->files();
+                $files = $finder->in($cacheDir.'/')->files();
                 if (strrpos($key, "file-") !== false || $files->count() === 3) {
                     $iterator = $finder->getIterator();
                     $iterator->rewind();
@@ -122,9 +122,9 @@ 
                         $iterator->next();
                     }
                     $file = new File($iterator->current());
-                    $fs->copy($file->getRealPath(), sys_get_temp_dir() . '/' . $file->getFilename());
+                    $fs->copy($file->getRealPath(), sys_get_temp_dir().'/'.$file->getFilename());
 
-                    return new File(sys_get_temp_dir() . '/' . $file->getFilename());
+                    return new File(sys_get_temp_dir().'/'.$file->getFilename());
                 }
             }
         }
@@ -133,10 +133,10 @@ 
     protected function storeInCache($key, File $file)
     {
         $fs = new Filesystem();
-        $cacheDir = $_SERVER['HOME'] . '/.symfony/media/' . $key;
+        $cacheDir = $_SERVER['HOME'].'/.symfony/media/'.$key;
         if (!$fs->exists($cacheDir)) {
             $fs->mkdir($cacheDir, 0777);
         }
-        $fs->copy($file->getRealPath(), $cacheDir . '/' . $file->getFilename());
+        $fs->copy($file->getRealPath(), $cacheDir.'/'.$file->getFilename());
     }
 }

Services/MediaManager.php

Spacing +24 added lines, -24 removed lines

@@ -35,7 +35,7 @@ 
     {
         $this->entityManager = $entityManager;
         if (substr($uploadDir, -1) !== '/') {
-            $uploadDir = $uploadDir . '/';
+            $uploadDir = $uploadDir.'/';
         }
         $this->uploadDir = $uploadDir;
         $this->allowedMimetypes = $allowedMimetypes;
@@ -55,23 +55,23 @@ 
         }
 
         //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;
@@ -90,12 +90,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
@@ -104,35 +104,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();
@@ -181,7 +181,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);
@@ -200,7 +200,7 @@ 
     public function getUploadDir($filter = null)
     {
         if (!empty($filter)) {
-            return $this->uploadDir . 'filters/' . $filter . '/';
+            return $this->uploadDir.'filters/'.$filter.'/';
         }
 
         return $this->uploadDir;
@@ -209,18 +209,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();
         }
     }