@@ -50,8 +50,9 @@ |
||
| 50 | 50 | return $this->transformSingleEntity($data); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - if (is_array($data)) |
|
| 54 | - return $data; |
|
| 53 | + if (is_array($data)) { |
|
| 54 | + return $data; |
|
| 55 | + } |
|
| 55 | 56 | |
| 56 | 57 | $return = []; |
| 57 | 58 | $data = explode('#&#', $data); |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | public function prepend(ContainerBuilder $container) |
| 34 | 34 | { |
| 35 | 35 | $parser = new Parser(); |
| 36 | - $config = $parser->parse(file_get_contents(__DIR__ . '/../Resources/config/config.yml')); |
|
| 36 | + $config = $parser->parse(file_get_contents(__DIR__.'/../Resources/config/config.yml')); |
|
| 37 | 37 | |
| 38 | 38 | foreach ($config as $key => $configuration) { |
| 39 | 39 | $container->prependExtensionConfig($key, $configuration); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | { |
| 36 | 36 | $this->entityManager = $entityManager; |
| 37 | 37 | if (substr($uploadDir, -1) !== '/') { |
| 38 | - $uploadDir = $uploadDir . '/'; |
|
| 38 | + $uploadDir = $uploadDir.'/'; |
|
| 39 | 39 | } |
| 40 | 40 | $this->uploadDir = $uploadDir; |
| 41 | 41 | $this->allowedMimetypes = $allowedMimetypes; |
@@ -55,23 +55,23 @@ discard block |
||
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | //preparing dir name |
| 58 | - $dest_folder = date('Ymd') . '/' . date('G') . '/' . $dest_folder; |
|
| 58 | + $dest_folder = date('Ymd').'/'.date('G').'/'.$dest_folder; |
|
| 59 | 59 | |
| 60 | 60 | //checking mimetypes |
| 61 | 61 | $mimeTypePassed = false; |
| 62 | 62 | foreach ($this->allowedMimetypes as $mimeType) { |
| 63 | - if (preg_match('@' . $mimeType . '@', $file->getMimeType())) { |
|
| 63 | + if (preg_match('@'.$mimeType.'@', $file->getMimeType())) { |
|
| 64 | 64 | $mimeTypePassed = true; |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | if (!$mimeTypePassed) { |
| 69 | - throw new InvalidMimeTypeException('Only following filetypes are allowed : ' . implode(', ', $this->allowedMimetypes)); |
|
| 69 | + throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes)); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | $fs = new Filesystem(); |
| 73 | - if (!$fs->exists($this->uploadDir . $dest_folder)) { |
|
| 74 | - $fs->mkdir($this->uploadDir . $dest_folder); |
|
| 73 | + if (!$fs->exists($this->uploadDir.$dest_folder)) { |
|
| 74 | + $fs->mkdir($this->uploadDir.$dest_folder); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | $em = $this->entityManager; |
@@ -90,12 +90,12 @@ discard block |
||
| 90 | 90 | $extension = $file->guessClientExtension(); |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | - $filename = $slugify->slugify(basename($file->getClientOriginalName(), $extension)) . '.' . $extension; |
|
| 93 | + $filename = $slugify->slugify(basename($file->getClientOriginalName(), $extension)).'.'.$extension; |
|
| 94 | 94 | } else { |
| 95 | 95 | if (empty($extension)) { |
| 96 | 96 | $extension = $file->guessClientExtension(); |
| 97 | 97 | } |
| 98 | - $filename = $slugify->slugify(basename($file->getFilename(), $extension)) . '.' . $extension; |
|
| 98 | + $filename = $slugify->slugify(basename($file->getFilename(), $extension)).'.'.$extension; |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | // A media can have a lifetime and will be deleted with the cleanup function |
@@ -104,35 +104,35 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // Checking for a media with the same name |
| 107 | - $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder . $filename); |
|
| 107 | + $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder.$filename); |
|
| 108 | 108 | $mediaExists = (count($mediaExists) > 0); |
| 109 | 109 | if ($mediaExists === false) { |
| 110 | - $mediaExists = $fs->exists($this->uploadDir . $dest_folder . $filename); |
|
| 110 | + $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | if ($mediaExists === true) { |
| 114 | - $filename = basename($filename, '.' . $extension); |
|
| 114 | + $filename = basename($filename, '.'.$extension); |
|
| 115 | 115 | $i = 1; |
| 116 | 116 | do { |
| 117 | - $media->setName($filename . '-' . $i++ . '.' . $extension); |
|
| 118 | - $media->setUri($dest_folder . $media->getName()); |
|
| 117 | + $media->setName($filename.'-'.$i++.'.'.$extension); |
|
| 118 | + $media->setUri($dest_folder.$media->getName()); |
|
| 119 | 119 | $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri()); |
| 120 | 120 | $mediaExists = (count($mediaExists) > 0); |
| 121 | 121 | if ($mediaExists === false) { |
| 122 | - $mediaExists = $fs->exists($this->uploadDir . $dest_folder . $filename); |
|
| 122 | + $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); |
|
| 123 | 123 | } |
| 124 | 124 | } while ($mediaExists === true); |
| 125 | 125 | } else { |
| 126 | 126 | $media->setName($filename); |
| 127 | - $media->setUri($dest_folder . $media->getName()); |
|
| 127 | + $media->setUri($dest_folder.$media->getName()); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - $file->move($this->uploadDir . $dest_folder, $media->getName()); |
|
| 131 | - chmod($this->uploadDir . $dest_folder . $media->getName(), 0664); |
|
| 130 | + $file->move($this->uploadDir.$dest_folder, $media->getName()); |
|
| 131 | + chmod($this->uploadDir.$dest_folder.$media->getName(), 0664); |
|
| 132 | 132 | |
| 133 | 133 | // Getting the salt defined in parameters.yml |
| 134 | 134 | $secret = $this->container->getParameter('secret'); |
| 135 | - $media->setSecretKey(hash('sha256', $secret . $media->getName() . $media->getUri())); |
|
| 135 | + $media->setSecretKey(hash('sha256', $secret.$media->getName().$media->getUri())); |
|
| 136 | 136 | |
| 137 | 137 | $em->persist($media); |
| 138 | 138 | $em->flush(); |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $em = $this->entityManager; |
| 182 | 182 | $fs = new Filesystem(); |
| 183 | 183 | |
| 184 | - $file_path = $this->uploadDir . $media->getUri(); |
|
| 184 | + $file_path = $this->uploadDir.$media->getUri(); |
|
| 185 | 185 | |
| 186 | 186 | try { |
| 187 | 187 | $file = new File($file_path); |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | public function getUploadDir($filter = null) |
| 201 | 201 | { |
| 202 | 202 | if (!empty($filter)) { |
| 203 | - return $this->uploadDir . 'filters/' . $filter . '/'; |
|
| 203 | + return $this->uploadDir.'filters/'.$filter.'/'; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | return $this->uploadDir; |
@@ -209,18 +209,18 @@ discard block |
||
| 209 | 209 | public function getWebPath(Media $media) |
| 210 | 210 | { |
| 211 | 211 | $request = $this->container->get('request'); |
| 212 | - $dir = $request->getSchemeAndHttpHost() . $request->getBaseUrl() . '/'; |
|
| 212 | + $dir = $request->getSchemeAndHttpHost().$request->getBaseUrl().'/'; |
|
| 213 | 213 | |
| 214 | - return $dir . $media->getUri(); |
|
| 214 | + return $dir.$media->getUri(); |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | public function getAbsolutePath(Media $media, $filter = null) |
| 218 | 218 | { |
| 219 | 219 | $imgSrc = $this->uploadDir; |
| 220 | 220 | if (!empty($filter)) { |
| 221 | - return $imgSrc . 'filters/' . $filter . '/' . $media->getUri(); |
|
| 221 | + return $imgSrc.'filters/'.$filter.'/'.$media->getUri(); |
|
| 222 | 222 | } else { |
| 223 | - return $imgSrc . $media->getUri(); |
|
| 223 | + return $imgSrc.$media->getUri(); |
|
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | 226 | |