@@ -145,6 +145,9 @@ |
||
| 145 | 145 | return $this->fileSystem->has($path); |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | + /** |
|
| 149 | + * @param string $customStyleString |
|
| 150 | + */ |
|
| 148 | 151 | public function createCustomStyledImage(ResponsiveImageInterface $image, $customStyleString, $forceGenerate = false) |
| 149 | 152 | { |
| 150 | 153 | // @TODO: To avoid creating images, that already exist, check if it exists, need a way to disable this checking |
@@ -60,6 +60,9 @@ |
||
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | + /** |
|
| 64 | + * @param string $src |
|
| 65 | + */ |
|
| 63 | 66 | public function setImageAttributes(ResponsiveImageInterface $image, $styleName = null, $src = null) |
| 64 | 67 | { |
| 65 | 68 | // Use the style data to figure out the width and height for this image |
@@ -60,6 +60,9 @@ |
||
| 60 | 60 | return $this->path; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | + /** |
|
| 64 | + * @param string $path |
|
| 65 | + */ |
|
| 63 | 66 | public function setPath($path) |
| 64 | 67 | { |
| 65 | 68 | $this->path = $path; |
@@ -77,6 +77,9 @@ |
||
| 77 | 77 | return $exitCode; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | + /** |
|
| 81 | + * @param string $serviceName |
|
| 82 | + */ |
|
| 80 | 83 | protected function getService($serviceName) |
| 81 | 84 | { |
| 82 | 85 | if (empty($this->testKernel)) { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | - * @return array |
|
| 54 | + * @return \Twig_SimpleFunction[] |
|
| 55 | 55 | */ |
| 56 | 56 | public function getFunctions() |
| 57 | 57 | { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * @param $pictureSetName |
| 102 | 102 | * @param $selector |
| 103 | 103 | * |
| 104 | - * @return mixed|string |
|
| 104 | + * @return string |
|
| 105 | 105 | */ |
| 106 | 106 | public function generateBackgroundImage(\Twig_Environment $environment, ResponsiveImageInterface $image, $pictureSetName, $selector) |
| 107 | 107 | { |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * @param $pictureSetName |
| 126 | 126 | * @param bool $generate |
| 127 | 127 | * |
| 128 | - * @return mixed|string |
|
| 128 | + * @return string |
|
| 129 | 129 | */ |
| 130 | 130 | public function generatePictureImage(\Twig_Environment $environment, ResponsiveImageInterface $image, $pictureSetName, $generate = false) |
| 131 | 131 | { |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | * @internal |
| 147 | 147 | * |
| 148 | 148 | * @param array $data |
| 149 | - * @param array $keys |
|
| 149 | + * @param string[] $keys |
|
| 150 | 150 | */ |
| 151 | 151 | private function convertPathsToUrls(array &$data, array $keys) |
| 152 | 152 | { |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | * @param $pictureSetName |
| 189 | 189 | * @param bool $generate |
| 190 | 190 | * |
| 191 | - * @return mixed|string |
|
| 191 | + * @return string |
|
| 192 | 192 | */ |
| 193 | 193 | public function generateSizesImage(\Twig_Environment $environment, ResponsiveImageInterface $image, $pictureSetName, $generate = false) |
| 194 | 194 | { |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | * @param null $styleName |
| 217 | 217 | * @param bool $generate |
| 218 | 218 | * |
| 219 | - * @return mixed|string |
|
| 219 | + * @return string |
|
| 220 | 220 | */ |
| 221 | 221 | public function generateStyledImage(\Twig_Environment $environment, ResponsiveImageInterface $image, $styleName = null, $generate = false) |
| 222 | 222 | { |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | * @param string $width |
| 232 | 232 | * @param null $height |
| 233 | 233 | * |
| 234 | - * @return mixed|string |
|
| 234 | + * @return string |
|
| 235 | 235 | */ |
| 236 | 236 | public function cropImage(\Twig_Environment $environment, ResponsiveImageInterface $image, $width = '', $height = null) |
| 237 | 237 | { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * @param string $width |
| 251 | 251 | * @param string $height |
| 252 | 252 | * |
| 253 | - * @return mixed|string |
|
| 253 | + * @return string |
|
| 254 | 254 | */ |
| 255 | 255 | public function scaleImage(\Twig_Environment $environment, ResponsiveImageInterface $image, $width = '', $height = '') |
| 256 | 256 | { |
@@ -266,9 +266,9 @@ discard block |
||
| 266 | 266 | /** |
| 267 | 267 | * @param \Twig_Environment $environment |
| 268 | 268 | * @param ResponsiveImageInterface $image |
| 269 | - * @param null $styleName |
|
| 269 | + * @param null|string $styleName |
|
| 270 | 270 | * |
| 271 | - * @return mixed|string |
|
| 271 | + * @return string |
|
| 272 | 272 | */ |
| 273 | 273 | protected function renderImage(\Twig_Environment $environment, ResponsiveImageInterface $image, $styleName = null) |
| 274 | 274 | { |
@@ -45,21 +45,21 @@ |
||
| 45 | 45 | |
| 46 | 46 | // Mock the EntityManager to return the mock of the repository |
| 47 | 47 | $entityManager = $this->getMockBuilder(EntityManager::class) |
| 48 | - ->disableOriginalConstructor() |
|
| 49 | - ->getMock(); |
|
| 48 | + ->disableOriginalConstructor() |
|
| 49 | + ->getMock(); |
|
| 50 | 50 | |
| 51 | 51 | $entityManager->expects($this->any()) |
| 52 | - ->method('getRepository') |
|
| 53 | - ->will($this->returnValue($imageRepository)); |
|
| 52 | + ->method('getRepository') |
|
| 53 | + ->will($this->returnValue($imageRepository)); |
|
| 54 | 54 | |
| 55 | 55 | // The mock the ImageEntityName |
| 56 | 56 | $nameResolver = $this->getMockBuilder(ImageEntityNameResolver::class) |
| 57 | - ->disableOriginalConstructor() |
|
| 58 | - ->getMock(); |
|
| 57 | + ->disableOriginalConstructor() |
|
| 58 | + ->getMock(); |
|
| 59 | 59 | |
| 60 | 60 | $nameResolver->expects($this->once()) |
| 61 | - ->method('getClassName') |
|
| 62 | - ->will($this->returnValue('ResponsiveImage')); |
|
| 61 | + ->method('getClassName') |
|
| 62 | + ->will($this->returnValue('ResponsiveImage')); |
|
| 63 | 63 | |
| 64 | 64 | $fileToObject = new FileToObject($entityManager, $nameResolver); |
| 65 | 65 | |
@@ -20,29 +20,29 @@ |
||
| 20 | 20 | { |
| 21 | 21 | // Mock the repository so it returns the mock of the Image repository. |
| 22 | 22 | $fileToObject = $this->getMockBuilder(FileToObject::class) |
| 23 | - ->disableOriginalConstructor() |
|
| 24 | - ->getMock(); |
|
| 23 | + ->disableOriginalConstructor() |
|
| 24 | + ->getMock(); |
|
| 25 | 25 | |
| 26 | 26 | $fileToObject->expects($this->any()) |
| 27 | - ->method('getObjectFromFilename') |
|
| 28 | - ->will( |
|
| 29 | - $this->returnCallback( |
|
| 30 | - function ($filename) { |
|
| 31 | - $existingFilenames = [ |
|
| 32 | - 'test.jpg', |
|
| 33 | - 'test_1.jpg', |
|
| 34 | - ]; |
|
| 35 | - if (in_array($filename, $existingFilenames)) { |
|
| 36 | - $image = new TestImage(); |
|
| 37 | - |
|
| 38 | - return $image; |
|
| 39 | - } |
|
| 40 | - else { |
|
| 41 | - return null; |
|
| 42 | - } |
|
| 43 | - } |
|
| 44 | - ) |
|
| 45 | - ); |
|
| 27 | + ->method('getObjectFromFilename') |
|
| 28 | + ->will( |
|
| 29 | + $this->returnCallback( |
|
| 30 | + function ($filename) { |
|
| 31 | + $existingFilenames = [ |
|
| 32 | + 'test.jpg', |
|
| 33 | + 'test_1.jpg', |
|
| 34 | + ]; |
|
| 35 | + if (in_array($filename, $existingFilenames)) { |
|
| 36 | + $image = new TestImage(); |
|
| 37 | + |
|
| 38 | + return $image; |
|
| 39 | + } |
|
| 40 | + else { |
|
| 41 | + return null; |
|
| 42 | + } |
|
| 43 | + } |
|
| 44 | + ) |
|
| 45 | + ); |
|
| 46 | 46 | |
| 47 | 47 | $transliterator = new FilenameTransliterator($fileToObject); |
| 48 | 48 | |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | $uploadedFile = $this->getMockFileUpload(); |
| 29 | 29 | $uploadedFile->expects($this->once()) |
| 30 | - ->method('getClientOriginalExtension') |
|
| 31 | - ->will( |
|
| 32 | - $this->returnValue('jpg') |
|
| 33 | - ); |
|
| 30 | + ->method('getClientOriginalExtension') |
|
| 31 | + ->will( |
|
| 32 | + $this->returnValue('jpg') |
|
| 33 | + ); |
|
| 34 | 34 | $uploadedFile->expects($this->once()) |
| 35 | - ->method('guessExtension') |
|
| 36 | - ->will( |
|
| 37 | - $this->returnValue('jpg') |
|
| 38 | - ); |
|
| 35 | + ->method('guessExtension') |
|
| 36 | + ->will( |
|
| 37 | + $this->returnValue('jpg') |
|
| 38 | + ); |
|
| 39 | 39 | |
| 40 | 40 | // Test the validator. |
| 41 | 41 | $validator = new FileValidator(); |
@@ -49,15 +49,15 @@ discard block |
||
| 49 | 49 | { |
| 50 | 50 | $uploadedFile = $this->getMockFileUpload(); |
| 51 | 51 | $uploadedFile->expects($this->once()) |
| 52 | - ->method('getClientOriginalExtension') |
|
| 53 | - ->will( |
|
| 54 | - $this->returnValue('doc') |
|
| 55 | - ); |
|
| 52 | + ->method('getClientOriginalExtension') |
|
| 53 | + ->will( |
|
| 54 | + $this->returnValue('doc') |
|
| 55 | + ); |
|
| 56 | 56 | $uploadedFile->expects($this->once()) |
| 57 | - ->method('guessExtension') |
|
| 58 | - ->will( |
|
| 59 | - $this->returnValue('doc') |
|
| 60 | - ); |
|
| 57 | + ->method('guessExtension') |
|
| 58 | + ->will( |
|
| 59 | + $this->returnValue('doc') |
|
| 60 | + ); |
|
| 61 | 61 | |
| 62 | 62 | // Test the validator. |
| 63 | 63 | $validator = new FileValidator(); |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $uploadedFile = $this->getMockFileUpload(); |
| 73 | 73 | $uploadedFile->expects($this->once()) |
| 74 | - ->method('getClientOriginalExtension') |
|
| 75 | - ->will( |
|
| 76 | - $this->returnValue('jpg') |
|
| 77 | - ); |
|
| 74 | + ->method('getClientOriginalExtension') |
|
| 75 | + ->will( |
|
| 76 | + $this->returnValue('jpg') |
|
| 77 | + ); |
|
| 78 | 78 | $uploadedFile->expects($this->once()) |
| 79 | - ->method('guessExtension') |
|
| 80 | - ->will( |
|
| 81 | - $this->returnValue('png') |
|
| 82 | - ); |
|
| 79 | + ->method('guessExtension') |
|
| 80 | + ->will( |
|
| 81 | + $this->returnValue('png') |
|
| 82 | + ); |
|
| 83 | 83 | |
| 84 | 84 | // Test the validator. |
| 85 | 85 | $validator = new FileValidator(); |
@@ -53,8 +53,8 @@ |
||
| 53 | 53 | |
| 54 | 54 | if (!$valid) { |
| 55 | 55 | $this->context->buildViolation($constraint->message) |
| 56 | - ->setParameter('{{ string }}', $value) |
|
| 57 | - ->addViolation() |
|
| 56 | + ->setParameter('{{ string }}', $value) |
|
| 57 | + ->addViolation() |
|
| 58 | 58 | ; |
| 59 | 59 | } |
| 60 | 60 | } |