| @@ -30,6 +30,10 @@ | ||
| 30 | 30 | |
| 31 | 31 | private $unitOfWork; | 
| 32 | 32 | |
| 33 | + /** | |
| 34 | + * @param string $class | |
| 35 | + * @param string $property | |
| 36 | + */ | |
| 33 | 37 | public function __construct(EntityManager $em, $class, $property, $queryBuilder, $multiple) | 
| 34 | 38 |      { | 
| 35 | 39 |          if (!(null === $queryBuilder || $queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) { | 
| @@ -126,8 +126,8 @@ discard block | ||
| 126 | 126 | /** | 
| 127 | 127 | * Sets the value of uri. | 
| 128 | 128 | * | 
| 129 | - * @param string $name $uri the uri | |
| 130 | 129 | * | 
| 130 | + * @param string $uri | |
| 131 | 131 | * @return self | 
| 132 | 132 | */ | 
| 133 | 133 | public function setUri($uri) | 
| @@ -150,8 +150,8 @@ discard block | ||
| 150 | 150 | /** | 
| 151 | 151 | * Sets the value of secretKey. | 
| 152 | 152 | * | 
| 153 | - * @param string $name $secretKey the secret key | |
| 154 | 153 | * | 
| 154 | + * @param string $secretKey | |
| 155 | 155 | * @return self | 
| 156 | 156 | */ | 
| 157 | 157 | public function setSecretKey($secretKey) | 
| @@ -174,8 +174,8 @@ discard block | ||
| 174 | 174 | /** | 
| 175 | 175 | * Sets the value of mime. | 
| 176 | 176 | * | 
| 177 | - * @param string $name $mime the mime | |
| 178 | 177 | * | 
| 178 | + * @param string $mime | |
| 179 | 179 | * @return self | 
| 180 | 180 | */ | 
| 181 | 181 | public function setMime($mime) | 
| @@ -198,8 +198,8 @@ discard block | ||
| 198 | 198 | /** | 
| 199 | 199 | * Sets the value of lifetime. | 
| 200 | 200 | * | 
| 201 | - * @param string $label $lifetime the lifetime | |
| 202 | 201 | * | 
| 202 | + * @param null|\DateTime $lifetime | |
| 203 | 203 | * @return self | 
| 204 | 204 | */ | 
| 205 | 205 | public function setLifetime($lifetime) | 
| @@ -60,6 +60,9 @@ | ||
| 60 | 60 | return (array_key_exists($mime, $this->previewIcon)) ? $this->previewIcon[$mime] : $this->previewIcon['unknown']; | 
| 61 | 61 | } | 
| 62 | 62 | |
| 63 | + /** | |
| 64 | + * @param boolean $isIcon | |
| 65 | + */ | |
| 63 | 66 | protected function generatePath($isIcon, $str) | 
| 64 | 67 |      { | 
| 65 | 68 |          if($isIcon === true) { | 
| @@ -48,6 +48,9 @@ | ||
| 48 | 48 | return $url; | 
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | + /** | |
| 52 | + * @param string $url | |
| 53 | + */ | |
| 51 | 54 | protected function downloadMedia($url) | 
| 52 | 55 |      { | 
| 53 | 56 | $filepath = sys_get_temp_dir().'/tmp.jpg'; | 
| @@ -33,7 +33,7 @@ discard block | ||
| 33 | 33 |      { | 
| 34 | 34 | $this->entityManager = $entityManager; | 
| 35 | 35 |          if (substr($uploadDir, -1) !== '/') { | 
| 36 | - $uploadDir = $uploadDir . '/'; | |
| 36 | + $uploadDir = $uploadDir.'/'; | |
| 37 | 37 | } | 
| 38 | 38 | $this->uploadDir = $uploadDir; | 
| 39 | 39 | $this->allowedMimetypes = $allowedMimetypes; | 
| @@ -47,23 +47,23 @@ discard block | ||
| 47 | 47 | public function upload(File $file, $dest_folder = '', \DateTime $lifetime = null) | 
| 48 | 48 |      { | 
| 49 | 49 | //preparing dir name | 
| 50 | -        $dest_folder = date('Ymd') . '/' . date('G') . '/' . $dest_folder; | |
| 50 | +        $dest_folder = date('Ymd').'/'.date('G').'/'.$dest_folder; | |
| 51 | 51 | |
| 52 | 52 | //checking mimetypes | 
| 53 | 53 | $mimeTypePassed = false; | 
| 54 | 54 |          foreach ($this->allowedMimetypes as $mimeType) { | 
| 55 | -            if (preg_match('@' . $mimeType . '@', $file->getMimeType())) { | |
| 55 | +            if (preg_match('@'.$mimeType.'@', $file->getMimeType())) { | |
| 56 | 56 | $mimeTypePassed = true; | 
| 57 | 57 | } | 
| 58 | 58 | } | 
| 59 | 59 | |
| 60 | 60 |          if (!$mimeTypePassed) { | 
| 61 | -            throw new InvalidMimeTypeException('Only following filetypes are allowed : ' . implode(', ', $this->allowedMimetypes)); | |
| 61 | +            throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes)); | |
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | 64 | $fs = new Filesystem(); | 
| 65 | -        if (!$fs->exists($this->uploadDir . $dest_folder)) { | |
| 66 | - $fs->mkdir($this->uploadDir . $dest_folder); | |
| 65 | +        if (!$fs->exists($this->uploadDir.$dest_folder)) { | |
| 66 | + $fs->mkdir($this->uploadDir.$dest_folder); | |
| 67 | 67 | } | 
| 68 | 68 | |
| 69 | 69 | $em = $this->entityManager; | 
| @@ -82,12 +82,12 @@ discard block | ||
| 82 | 82 | $extension = $file->guessClientExtension(); | 
| 83 | 83 | } | 
| 84 | 84 | } | 
| 85 | - $filename = $slugify->slugify(basename($file->getClientOriginalName(), $extension)) . '.' . $extension; | |
| 85 | + $filename = $slugify->slugify(basename($file->getClientOriginalName(), $extension)).'.'.$extension; | |
| 86 | 86 |          } else { | 
| 87 | 87 |              if (empty($extension)) { | 
| 88 | 88 | $extension = $file->guessClientExtension(); | 
| 89 | 89 | } | 
| 90 | - $filename = $slugify->slugify(basename($file->getFilename(), $extension)) . '.' . $extension; | |
| 90 | + $filename = $slugify->slugify(basename($file->getFilename(), $extension)).'.'.$extension; | |
| 91 | 91 | } | 
| 92 | 92 | |
| 93 | 93 | // A media can have a lifetime and will be deleted with the cleanup function | 
| @@ -96,35 +96,35 @@ discard block | ||
| 96 | 96 | } | 
| 97 | 97 | |
| 98 | 98 | // Checking for a media with the same name | 
| 99 | -        $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder . $filename); | |
| 99 | +        $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder.$filename); | |
| 100 | 100 | $mediaExists = (count($mediaExists) > 0); | 
| 101 | 101 |          if ($mediaExists === false) { | 
| 102 | - $mediaExists = $fs->exists($this->uploadDir . $dest_folder . $filename); | |
| 102 | + $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); | |
| 103 | 103 | } | 
| 104 | 104 | |
| 105 | 105 |          if ($mediaExists === true) { | 
| 106 | - $filename = basename($filename, '.' . $extension); | |
| 106 | + $filename = basename($filename, '.'.$extension); | |
| 107 | 107 | $i = 1; | 
| 108 | 108 |              do { | 
| 109 | - $media->setName($filename . '-' . $i++ . '.' . $extension); | |
| 110 | - $media->setUri($dest_folder . $media->getName()); | |
| 109 | + $media->setName($filename.'-'.$i++.'.'.$extension); | |
| 110 | + $media->setUri($dest_folder.$media->getName()); | |
| 111 | 111 |                  $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri()); | 
| 112 | 112 | $mediaExists = (count($mediaExists) > 0); | 
| 113 | 113 |                  if ($mediaExists === false) { | 
| 114 | - $mediaExists = $fs->exists($this->uploadDir . $dest_folder . $filename); | |
| 114 | + $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); | |
| 115 | 115 | } | 
| 116 | 116 | } while ($mediaExists === true); | 
| 117 | 117 |          } else { | 
| 118 | 118 | $media->setName($filename); | 
| 119 | - $media->setUri($dest_folder . $media->getName()); | |
| 119 | + $media->setUri($dest_folder.$media->getName()); | |
| 120 | 120 | } | 
| 121 | 121 | |
| 122 | - $file->move($this->uploadDir . $dest_folder, $media->getName()); | |
| 123 | - chmod($this->uploadDir . $dest_folder . $media->getName(), 0664); | |
| 122 | + $file->move($this->uploadDir.$dest_folder, $media->getName()); | |
| 123 | + chmod($this->uploadDir.$dest_folder.$media->getName(), 0664); | |
| 124 | 124 | |
| 125 | 125 | // Getting the salt defined in parameters.yml | 
| 126 | 126 |          $secret = $this->container->getParameter('secret'); | 
| 127 | -        $media->setSecretKey(hash('sha256', $secret . $media->getName() . $media->getUri())); | |
| 127 | +        $media->setSecretKey(hash('sha256', $secret.$media->getName().$media->getUri())); | |
| 128 | 128 | |
| 129 | 129 | $em->persist($media); | 
| 130 | 130 | $em->flush(); | 
| @@ -145,7 +145,7 @@ discard block | ||
| 145 | 145 | $em = $this->entityManager; | 
| 146 | 146 | $fs = new Filesystem(); | 
| 147 | 147 | |
| 148 | - $file_path = $this->uploadDir . $media->getUri(); | |
| 148 | + $file_path = $this->uploadDir.$media->getUri(); | |
| 149 | 149 | |
| 150 | 150 |          try { | 
| 151 | 151 | $file = new File($file_path); | 
| @@ -165,7 +165,7 @@ discard block | ||
| 165 | 165 | public function getUploadDir($filter = null) | 
| 166 | 166 |      { | 
| 167 | 167 |          if (!empty($filter)) { | 
| 168 | - return $this->uploadDir . 'filters/' . $filter . '/'; | |
| 168 | + return $this->uploadDir.'filters/'.$filter.'/'; | |
| 169 | 169 | } | 
| 170 | 170 | |
| 171 | 171 | return $this->uploadDir; | 
| @@ -174,18 +174,18 @@ discard block | ||
| 174 | 174 | public function getWebPath(Media $media) | 
| 175 | 175 |      { | 
| 176 | 176 |          $request = $this->container->get('request'); | 
| 177 | - $dir = $request->getSchemeAndHttpHost() . $request->getBaseUrl() . '/'; | |
| 177 | + $dir = $request->getSchemeAndHttpHost().$request->getBaseUrl().'/'; | |
| 178 | 178 | |
| 179 | - return $dir . $media->getUri(); | |
| 179 | + return $dir.$media->getUri(); | |
| 180 | 180 | } | 
| 181 | 181 | |
| 182 | 182 | public function getAbsolutePath(Media $media, $filter = null) | 
| 183 | 183 |      { | 
| 184 | 184 | $imgSrc = $this->uploadDir; | 
| 185 | 185 |          if (!empty($filter)) { | 
| 186 | - return $imgSrc . 'filters/' . $filter . '/' . $media->getUri(); | |
| 186 | + return $imgSrc.'filters/'.$filter.'/'.$media->getUri(); | |
| 187 | 187 |          } else { | 
| 188 | - return $imgSrc . $media->getUri(); | |
| 188 | + return $imgSrc.$media->getUri(); | |
| 189 | 189 | } | 
| 190 | 190 | } | 
| 191 | 191 | |