diff --git a/Binary/MimeTypeGuesserInterface.php b/Binary/MimeTypeGuesserInterface.php index 084b1b451..3f3cd7bae 100644 --- a/Binary/MimeTypeGuesserInterface.php +++ b/Binary/MimeTypeGuesserInterface.php @@ -7,7 +7,7 @@ interface MimeTypeGuesserInterface /** * @param string $binary The image binary * - * @return string|null mime type or null if it could be not be guessed. + * @return string|null mime type or null if it could be not be guessed */ public function guess($binary); } diff --git a/Imagine/Cache/CacheManager.php b/Imagine/Cache/CacheManager.php index e8d89ad1f..e3617d98c 100644 --- a/Imagine/Cache/CacheManager.php +++ b/Imagine/Cache/CacheManager.php @@ -92,7 +92,7 @@ public function addResolver($filter, ResolverInterface $resolver) * * @return ResolverInterface * - * @throws \OutOfBoundsException If neither a specific nor a default resolver is available. + * @throws \OutOfBoundsException If neither a specific nor a default resolver is available */ protected function getResolver($filter, $resolver) { @@ -120,7 +120,7 @@ protected function getResolver($filter, $resolver) * Gets filtered path for rendering in the browser. * It could be the cached one or an url of filter action. * - * @param string $path The path where the resolved file is expected. + * @param string $path The path where the resolved file is expected * @param string $filter * @param array $runtimeConfig * @param string $resolver @@ -160,8 +160,8 @@ public function getRuntimePath($path, array $runtimeConfig) /** * Returns a web accessible URL. * - * @param string $path The path where the resolved file is expected. - * @param string $filter The name of the imagine filter in effect. + * @param string $path The path where the resolved file is expected + * @param string $filter The name of the imagine filter in effect * @param array $runtimeConfig * @param string $resolver * @@ -211,7 +211,7 @@ public function isStored($path, $filter, $resolver = null) * @param string $filter * @param string $resolver * - * @return string The url of resolved image. + * @return string The url of resolved image * * @throws NotFoundHttpException if the path can not be resolved */ diff --git a/Imagine/Cache/Resolver/AbstractFilesystemResolver.php b/Imagine/Cache/Resolver/AbstractFilesystemResolver.php index d1b0c169d..09823b55f 100644 --- a/Imagine/Cache/Resolver/AbstractFilesystemResolver.php +++ b/Imagine/Cache/Resolver/AbstractFilesystemResolver.php @@ -173,8 +173,8 @@ protected function makeFolder($dir) * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException * - * @param string $path The resource path to convert. - * @param string $filter The name of the imagine filter. + * @param string $path The resource path to convert + * @param string $filter The name of the imagine filter * * @return string */ diff --git a/Imagine/Cache/Resolver/AmazonS3Resolver.php b/Imagine/Cache/Resolver/AmazonS3Resolver.php index 054efce25..f1e949a4b 100644 --- a/Imagine/Cache/Resolver/AmazonS3Resolver.php +++ b/Imagine/Cache/Resolver/AmazonS3Resolver.php @@ -36,10 +36,10 @@ class AmazonS3Resolver implements ResolverInterface /** * Constructs a cache resolver storing images on Amazon S3. * - * @param \AmazonS3 $storage The Amazon S3 storage API. It's required to know authentication information. - * @param string $bucket The bucket name to operate on. + * @param \AmazonS3 $storage The Amazon S3 storage API. It's required to know authentication information + * @param string $bucket The bucket name to operate on * @param string $acl The ACL to use when storing new objects. Default: owner read/write, public read - * @param array $objUrlOptions A list of options to be passed when retrieving the object url from Amazon S3. + * @param array $objUrlOptions A list of options to be passed when retrieving the object url from Amazon S3 */ public function __construct(\AmazonS3 $storage, $bucket, $acl = \AmazonS3::ACL_PUBLIC, array $objUrlOptions = array()) { @@ -141,10 +141,10 @@ public function remove(array $paths, array $filters) * * If the option is already set, it will be overwritten. * - * @see \AmazonS3::get_object_url() for available options. + * @see \AmazonS3::get_object_url() for available options * - * @param string $key The name of the option. - * @param mixed $value The value to be set. + * @param string $key The name of the option + * @param mixed $value The value to be set * * @return AmazonS3Resolver $this */ @@ -158,10 +158,10 @@ public function setObjectUrlOption($key, $value) /** * Returns the object path within the bucket. * - * @param string $path The base path of the resource. - * @param string $filter The name of the imagine filter in effect. + * @param string $path The base path of the resource + * @param string $filter The name of the imagine filter in effect * - * @return string The path of the object on S3. + * @return string The path of the object on S3 */ protected function getObjectPath($path, $filter) { diff --git a/Imagine/Cache/Resolver/AwsS3Resolver.php b/Imagine/Cache/Resolver/AwsS3Resolver.php index 94d7226c8..a8baff8df 100644 --- a/Imagine/Cache/Resolver/AwsS3Resolver.php +++ b/Imagine/Cache/Resolver/AwsS3Resolver.php @@ -49,11 +49,11 @@ class AwsS3Resolver implements ResolverInterface /** * Constructs a cache resolver storing images on Amazon S3. * - * @param S3Client $storage The Amazon S3 storage API. It's required to know authentication information. - * @param string $bucket The bucket name to operate on. + * @param S3Client $storage The Amazon S3 storage API. It's required to know authentication information + * @param string $bucket The bucket name to operate on * @param string $acl The ACL to use when storing new objects. Default: owner read/write, public read - * @param array $getOptions A list of options to be passed when retrieving the object url from Amazon S3. - * @param array $putOptions A list of options to be passed when saving the object to Amazon S3. + * @param array $getOptions A list of options to be passed when retrieving the object url from Amazon S3 + * @param array $putOptions A list of options to be passed when saving the object to Amazon S3 */ public function __construct(S3Client $storage, $bucket, $acl = 'public-read', array $getOptions = array(), $putOptions = array()) { @@ -183,10 +183,10 @@ public function remove(array $paths, array $filters) * * If the option is already set, it will be overwritten. * - * @see Aws\S3\S3Client::getObjectUrl() for available options. + * @see Aws\S3\S3Client::getObjectUrl() for available options * - * @param string $key The name of the option. - * @param mixed $value The value to be set. + * @param string $key The name of the option + * @param mixed $value The value to be set * * @return AmazonS3Resolver $this * @@ -202,10 +202,10 @@ public function setObjectUrlOption($key, $value) * * If the option is already set, it will be overwritten. * - * @see Aws\S3\S3Client::getObjectUrl() for available options. + * @see Aws\S3\S3Client::getObjectUrl() for available options * - * @param string $key The name of the option. - * @param mixed $value The value to be set. + * @param string $key The name of the option + * @param mixed $value The value to be set * * @return AmazonS3Resolver $this */ @@ -221,10 +221,10 @@ public function setGetOption($key, $value) * * If the option is already set, it will be overwritten. * - * @see Aws\S3\S3Client::putObject() for available options. + * @see Aws\S3\S3Client::putObject() for available options * - * @param string $key The name of the option. - * @param mixed $value The value to be set. + * @param string $key The name of the option + * @param mixed $value The value to be set * * @return AmazonS3Resolver $this */ @@ -238,10 +238,10 @@ public function setPutOption($key, $value) /** * Returns the object path within the bucket. * - * @param string $path The base path of the resource. - * @param string $filter The name of the imagine filter in effect. + * @param string $path The base path of the resource + * @param string $filter The name of the imagine filter in effect * - * @return string The path of the object on S3. + * @return string The path of the object on S3 */ protected function getObjectPath($path, $filter) { diff --git a/Imagine/Cache/Resolver/CacheResolver.php b/Imagine/Cache/Resolver/CacheResolver.php index 69de06af9..7526828c8 100644 --- a/Imagine/Cache/Resolver/CacheResolver.php +++ b/Imagine/Cache/Resolver/CacheResolver.php @@ -142,8 +142,8 @@ protected function removePathAndFilter($path, $filter) * * When overriding this method, ensure generateIndexKey is adjusted accordingly. * - * @param string $path The image path in use. - * @param string $filter The filter in use. + * @param string $path The image path in use + * @param string $filter The filter in use * * @return string */ diff --git a/Imagine/Cache/Resolver/FlysystemResolver.php b/Imagine/Cache/Resolver/FlysystemResolver.php index 91f21a25c..5c7db7db8 100644 --- a/Imagine/Cache/Resolver/FlysystemResolver.php +++ b/Imagine/Cache/Resolver/FlysystemResolver.php @@ -91,10 +91,10 @@ protected function getFileUrl($path, $filter) /** * Resolves filtered path for rendering in the browser. * - * @param string $path The path where the original file is expected to be. - * @param string $filter The name of the imagine filter in effect. + * @param string $path The path where the original file is expected to be + * @param string $filter The name of the imagine filter in effect * - * @return string The absolute URL of the cached image. + * @return string The absolute URL of the cached image * * @throws NotResolvableException */ @@ -110,9 +110,9 @@ public function resolve($path, $filter) /** * Stores the content of the given binary. * - * @param BinaryInterface $binary The image binary to store. - * @param string $path The path where the original file is expected to be. - * @param string $filter The name of the imagine filter in effect. + * @param BinaryInterface $binary The image binary to store + * @param string $path The path where the original file is expected to be + * @param string $filter The name of the imagine filter in effect */ public function store(BinaryInterface $binary, $path, $filter) { @@ -123,8 +123,8 @@ public function store(BinaryInterface $binary, $path, $filter) } /** - * @param string[] $paths The paths where the original files are expected to be. - * @param string[] $filters The imagine filters in effect. + * @param string[] $paths The paths where the original files are expected to be + * @param string[] $filters The imagine filters in effect */ public function remove(array $paths, array $filters) { diff --git a/Imagine/Cache/Resolver/ResolverInterface.php b/Imagine/Cache/Resolver/ResolverInterface.php index 510adb5c8..a54ccd308 100644 --- a/Imagine/Cache/Resolver/ResolverInterface.php +++ b/Imagine/Cache/Resolver/ResolverInterface.php @@ -20,10 +20,10 @@ public function isStored($path, $filter); /** * Resolves filtered path for rendering in the browser. * - * @param string $path The path where the original file is expected to be. - * @param string $filter The name of the imagine filter in effect. + * @param string $path The path where the original file is expected to be + * @param string $filter The name of the imagine filter in effect * - * @return string The absolute URL of the cached image. + * @return string The absolute URL of the cached image * * @throws NotResolvableException */ @@ -32,15 +32,15 @@ public function resolve($path, $filter); /** * Stores the content of the given binary. * - * @param BinaryInterface $binary The image binary to store. - * @param string $path The path where the original file is expected to be. - * @param string $filter The name of the imagine filter in effect. + * @param BinaryInterface $binary The image binary to store + * @param string $path The path where the original file is expected to be + * @param string $filter The name of the imagine filter in effect */ public function store(BinaryInterface $binary, $path, $filter); /** - * @param string[] $paths The paths where the original files are expected to be. - * @param string[] $filters The imagine filters in effect. + * @param string[] $paths The paths where the original files are expected to be + * @param string[] $filters The imagine filters in effect */ public function remove(array $paths, array $filters); } diff --git a/Imagine/Filter/PostProcessor/ConfigurablePostProcessorInterface.php b/Imagine/Filter/PostProcessor/ConfigurablePostProcessorInterface.php index a727ffbf6..a39143065 100644 --- a/Imagine/Filter/PostProcessor/ConfigurablePostProcessorInterface.php +++ b/Imagine/Filter/PostProcessor/ConfigurablePostProcessorInterface.php @@ -7,7 +7,7 @@ /** * Interface to make PostProcessors configurable without breaking BC. * - * @see PostProcessorInterface for the original interface. + * @see PostProcessorInterface for the original interface * * @author Alex Wilson */ diff --git a/Imagine/Filter/PostProcessor/PostProcessorInterface.php b/Imagine/Filter/PostProcessor/PostProcessorInterface.php index 2dccef411..3d653514a 100644 --- a/Imagine/Filter/PostProcessor/PostProcessorInterface.php +++ b/Imagine/Filter/PostProcessor/PostProcessorInterface.php @@ -7,7 +7,7 @@ /** * Interface for PostProcessors - handlers which can operate on binaries prepared in FilterManager. * - * @see ConfigurablePostProcessorInterface For a means to configure these at run-time. + * @see ConfigurablePostProcessorInterface For a means to configure these at run-time * * @author Konstantin Tjuterev */ diff --git a/Tests/Imagine/Filter/Loader/AutoRotateFilterLoaderTest.php b/Tests/Imagine/Filter/Loader/AutoRotateFilterLoaderTest.php index 67e7c91d6..947777f16 100644 --- a/Tests/Imagine/Filter/Loader/AutoRotateFilterLoaderTest.php +++ b/Tests/Imagine/Filter/Loader/AutoRotateFilterLoaderTest.php @@ -18,9 +18,9 @@ class AutoRotateFilterLoaderTest extends AbstractTest /** * Starts a test with expected results. * - * @param $exifValue {String} The exif value to be returned by the metadata mock. - * @param $expectCallRotateValue {null|number} The expected rotation value, null if no rotation is expected. - * @param $expectCallFlip {Boolean} True if a horizontal flip is expected, false otherwise. + * @param $exifValue {String} The exif value to be returned by the metadata mock + * @param $expectCallRotateValue {null|number} The expected rotation value, null if no rotation is expected + * @param $expectCallFlip {Boolean} True if a horizontal flip is expected, false otherwise */ private function loadExif($exifValue, $expectCallRotateValue, $expectCallFlip) {