@@ -44,7 +44,7 @@ discard block  | 
                                                    ||
| 44 | 44 | /**  | 
                                                        
| 45 | 45 | * Sets resource path.  | 
                                                        
| 46 | 46 | *  | 
                                                        
| 47 | - * @param $path  | 
                                                        |
| 47 | + * @param string $path  | 
                                                        |
| 48 | 48 | */  | 
                                                        
| 49 | 49 | public function setPath($path)  | 
                                                        
| 50 | 50 |      { | 
                                                        
@@ -64,7 +64,7 @@ discard block  | 
                                                    ||
| 64 | 64 | /**  | 
                                                        
| 65 | 65 | * Sets filter name.  | 
                                                        
| 66 | 66 | *  | 
                                                        
| 67 | - * @param $filter  | 
                                                        |
| 67 | + * @param string $filter  | 
                                                        |
| 68 | 68 | */  | 
                                                        
| 69 | 69 | public function setFilter($filter)  | 
                                                        
| 70 | 70 |      { | 
                                                        
@@ -84,7 +84,7 @@ discard block  | 
                                                    ||
| 84 | 84 | /**  | 
                                                        
| 85 | 85 | * Sets resource url.  | 
                                                        
| 86 | 86 | *  | 
                                                        
| 87 | - * @param $url  | 
                                                        |
| 87 | + * @param string $url  | 
                                                        |
| 88 | 88 | */  | 
                                                        
| 89 | 89 | public function setUrl($url)  | 
                                                        
| 90 | 90 |      { | 
                                                        
@@ -144,7 +144,7 @@ discard block  | 
                                                    ||
| 144 | 144 | * @see \AmazonS3::get_object_url() for available options.  | 
                                                        
| 145 | 145 | *  | 
                                                        
| 146 | 146 | * @param string $key The name of the option.  | 
                                                        
| 147 | - * @param mixed $value The value to be set.  | 
                                                        |
| 147 | + * @param boolean $value The value to be set.  | 
                                                        |
| 148 | 148 | *  | 
                                                        
| 149 | 149 | * @return AmazonS3Resolver $this  | 
                                                        
| 150 | 150 | */  | 
                                                        
@@ -173,7 +173,7 @@ discard block  | 
                                                    ||
| 173 | 173 | *  | 
                                                        
| 174 | 174 | * @param string $path  | 
                                                        
| 175 | 175 | *  | 
                                                        
| 176 | - * @return string  | 
                                                        |
| 176 | + * @return \CFResponse  | 
                                                        |
| 177 | 177 | */  | 
                                                        
| 178 | 178 | protected function getObjectUrl($path)  | 
                                                        
| 179 | 179 |      { | 
                                                        
@@ -185,7 +185,7 @@ discard block  | 
                                                    ||
| 185 | 185 | *  | 
                                                        
| 186 | 186 | * @param string $objectPath  | 
                                                        
| 187 | 187 | *  | 
                                                        
| 188 | - * @return bool  | 
                                                        |
| 188 | + * @return boolean|null  | 
                                                        |
| 189 | 189 | */  | 
                                                        
| 190 | 190 | protected function objectExists($objectPath)  | 
                                                        
| 191 | 191 |      { | 
                                                        
@@ -193,7 +193,7 @@ discard block  | 
                                                    ||
| 193 | 193 | }  | 
                                                        
| 194 | 194 | |
| 195 | 195 | /**  | 
                                                        
| 196 | - * @param mixed $message  | 
                                                        |
| 196 | + * @param string $message  | 
                                                        |
| 197 | 197 | * @param array $context  | 
                                                        
| 198 | 198 | */  | 
                                                        
| 199 | 199 | protected function logError($message, array $context = array())  | 
                                                        
@@ -192,7 +192,7 @@  | 
                                                    ||
| 192 | 192 | * Save the given content to the cache and update the cache index.  | 
                                                        
| 193 | 193 | *  | 
                                                        
| 194 | 194 | * @param string $cacheKey  | 
                                                        
| 195 | - * @param mixed $content  | 
                                                        |
| 195 | + * @param string $content  | 
                                                        |
| 196 | 196 | *  | 
                                                        
| 197 | 197 | * @return bool  | 
                                                        
| 198 | 198 | */  | 
                                                        
@@ -24,7 +24,7 @@ discard block  | 
                                                    ||
| 24 | 24 | }  | 
                                                        
| 25 | 25 | |
| 26 | 26 | /**  | 
                                                        
| 27 | - * @return \PHPUnit_Framework_MockObject_MockObject|DataManager  | 
                                                        |
| 27 | + * @return DataManager  | 
                                                        |
| 28 | 28 | */  | 
                                                        
| 29 | 29 | protected function createDataManagerMock()  | 
                                                        
| 30 | 30 |      { | 
                                                        
@@ -32,7 +32,7 @@ discard block  | 
                                                    ||
| 32 | 32 | }  | 
                                                        
| 33 | 33 | |
| 34 | 34 | /**  | 
                                                        
| 35 | - * @return \PHPUnit_Framework_MockObject_MockObject|FilterManager  | 
                                                        |
| 35 | + * @return FilterManager  | 
                                                        |
| 36 | 36 | */  | 
                                                        
| 37 | 37 | protected function createFilterManagerMock()  | 
                                                        
| 38 | 38 |      { | 
                                                        
@@ -40,7 +40,7 @@ discard block  | 
                                                    ||
| 40 | 40 | }  | 
                                                        
| 41 | 41 | |
| 42 | 42 | /**  | 
                                                        
| 43 | - * @return \PHPUnit_Framework_MockObject_MockObject|CacheManager  | 
                                                        |
| 43 | + * @return CacheManager  | 
                                                        |
| 44 | 44 | */  | 
                                                        
| 45 | 45 | protected function createCacheManagerMock()  | 
                                                        
| 46 | 46 |      { | 
                                                        
@@ -48,7 +48,7 @@ discard block  | 
                                                    ||
| 48 | 48 | }  | 
                                                        
| 49 | 49 | |
| 50 | 50 | /**  | 
                                                        
| 51 | - * @return \PHPUnit_Framework_MockObject_MockObject|\Liip\ImagineBundle\Imagine\Cache\SignerInterface  | 
                                                        |
| 51 | + * @return \Liip\ImagineBundle\Imagine\Cache\SignerInterface  | 
                                                        |
| 52 | 52 | */  | 
                                                        
| 53 | 53 | protected function createSignerMock()  | 
                                                        
| 54 | 54 |      { | 
                                                        
@@ -56,7 +56,7 @@ discard block  | 
                                                    ||
| 56 | 56 | }  | 
                                                        
| 57 | 57 | |
| 58 | 58 | /**  | 
                                                        
| 59 | - * @return \PHPUnit_Framework_MockObject_MockObject|\Psr\Log\LoggerInterface  | 
                                                        |
| 59 | + * @return null|\Psr\Log\LoggerInterface  | 
                                                        |
| 60 | 60 | */  | 
                                                        
| 61 | 61 | protected function createLoggerMock()  | 
                                                        
| 62 | 62 |      { | 
                                                        
@@ -174,16 +174,27 @@ discard block  | 
                                                    ||
| 174 | 174 | return $parser->parse($yaml);  | 
                                                        
| 175 | 175 | }  | 
                                                        
| 176 | 176 | |
| 177 | + /**  | 
                                                        |
| 178 | + * @param string $value  | 
                                                        |
| 179 | + * @param string $key  | 
                                                        |
| 180 | + */  | 
                                                        |
| 177 | 181 | private function assertAlias($value, $key)  | 
                                                        
| 178 | 182 |      { | 
                                                        
| 179 | 183 |          $this->assertEquals($value, (string) $this->containerBuilder->getAlias($key), sprintf('%s alias is correct', $key)); | 
                                                        
| 180 | 184 | }  | 
                                                        
| 181 | 185 | |
| 186 | + /**  | 
                                                        |
| 187 | + * @param string $value  | 
                                                        |
| 188 | + * @param string $key  | 
                                                        |
| 189 | + */  | 
                                                        |
| 182 | 190 | private function assertParameter($value, $key)  | 
                                                        
| 183 | 191 |      { | 
                                                        
| 184 | 192 |          $this->assertEquals($value, $this->containerBuilder->getParameter($key), sprintf('%s parameter is correct', $key)); | 
                                                        
| 185 | 193 | }  | 
                                                        
| 186 | 194 | |
| 195 | + /**  | 
                                                        |
| 196 | + * @param string $id  | 
                                                        |
| 197 | + */  | 
                                                        |
| 187 | 198 | private function assertHasDefinition($id)  | 
                                                        
| 188 | 199 |      { | 
                                                        
| 189 | 200 | $this->assertTrue(($this->containerBuilder->hasDefinition($id) ?: $this->containerBuilder->hasAlias($id)));  | 
                                                        
@@ -194,6 +205,10 @@ discard block  | 
                                                    ||
| 194 | 205 | $this->assertFalse(($this->containerBuilder->hasDefinition($id) ?: $this->containerBuilder->hasAlias($id)));  | 
                                                        
| 195 | 206 | }  | 
                                                        
| 196 | 207 | |
| 208 | + /**  | 
                                                        |
| 209 | + * @param \Symfony\Component\DependencyInjection\Definition $definition  | 
                                                        |
| 210 | + * @param Reference[] $args  | 
                                                        |
| 211 | + */  | 
                                                        |
| 197 | 212 | private function assertDICConstructorArguments($definition, $args)  | 
                                                        
| 198 | 213 |      { | 
                                                        
| 199 | 214 | $this->assertEquals($args, $definition->getArguments(), "Expected and actual DIC Service constructor arguments of definition '".$definition->getClass()."' don't match.");  | 
                                                        
@@ -371,7 +371,7 @@  | 
                                                    ||
| 371 | 371 | }  | 
                                                        
| 372 | 372 | |
| 373 | 373 | /**  | 
                                                        
| 374 | - * @return \PHPUnit_Framework_MockObject_MockObject|\AmazonS3  | 
                                                        |
| 374 | + * @return \AmazonS3  | 
                                                        |
| 375 | 375 | */  | 
                                                        
| 376 | 376 | protected function createAmazonS3Mock()  | 
                                                        
| 377 | 377 |      { | 
                                                        
@@ -22,9 +22,9 @@  | 
                                                    ||
| 22 | 22 | protected $format;  | 
                                                        
| 23 | 23 | |
| 24 | 24 | /**  | 
                                                        
| 25 | - * @param string $content  | 
                                                        |
| 26 | 25 | * @param string $mimeType  | 
                                                        
| 27 | 26 | * @param string $format  | 
                                                        
| 27 | + * @param string $path  | 
                                                        |
| 28 | 28 | */  | 
                                                        
| 29 | 29 | public function __construct($path, $mimeType, $format = null)  | 
                                                        
| 30 | 30 |      { |