diff --git a/Binary/Loader/AbstractDoctrineLoader.php b/Binary/Loader/AbstractDoctrineLoader.php
index 9122f8555..f6c8e584a 100644
--- a/Binary/Loader/AbstractDoctrineLoader.php
+++ b/Binary/Loader/AbstractDoctrineLoader.php
@@ -46,7 +46,7 @@ abstract protected function mapPathToId($path);
     abstract protected function getStreamFromImage($image);
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($path)
     {
diff --git a/Binary/Loader/FileSystemLoader.php b/Binary/Loader/FileSystemLoader.php
index ccdd3eafe..6dafe9b22 100644
--- a/Binary/Loader/FileSystemLoader.php
+++ b/Binary/Loader/FileSystemLoader.php
@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($path)
     {
diff --git a/Binary/Loader/GridFSLoader.php b/Binary/Loader/GridFSLoader.php
index d32b9ccfe..ac2646674 100644
--- a/Binary/Loader/GridFSLoader.php
+++ b/Binary/Loader/GridFSLoader.php
@@ -28,7 +28,7 @@ public function __construct(DocumentManager $dm, $class)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($id)
     {
diff --git a/Binary/Loader/StreamLoader.php b/Binary/Loader/StreamLoader.php
index 73376e8b6..465594aba 100644
--- a/Binary/Loader/StreamLoader.php
+++ b/Binary/Loader/StreamLoader.php
@@ -38,7 +38,7 @@ public function __construct($wrapperPrefix, $context = null)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($path)
     {
diff --git a/Binary/SimpleMimeTypeGuesser.php b/Binary/SimpleMimeTypeGuesser.php
index 5f2f83135..27e88c6cd 100644
--- a/Binary/SimpleMimeTypeGuesser.php
+++ b/Binary/SimpleMimeTypeGuesser.php
@@ -20,7 +20,7 @@ public function __construct(SymfonyMimeTypeGuesserInterface $mimeTypeGuesser)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function guess($binary)
     {
diff --git a/Command/RemoveCacheCommand.php b/Command/RemoveCacheCommand.php
index 967b5d0ec..cc4eda7d6 100644
--- a/Command/RemoveCacheCommand.php
+++ b/Command/RemoveCacheCommand.php
@@ -16,11 +16,11 @@ protected function configure()
         $this
             ->setName('liip:imagine:cache:remove')
             ->setDescription('Remove cache for given paths and set of filters.')
-            ->addArgument('paths', InputArgument::OPTIONAL|InputArgument::IS_ARRAY, 'Image paths')
+            ->addArgument('paths', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Image paths')
             ->addOption(
                 'filters',
                 'f',
-                InputOption::VALUE_OPTIONAL|InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 'Filters list'
             )
             ->setHelp(<<<EOF
@@ -46,14 +46,14 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $paths = $input->getArgument('paths');
-        $filters =  $input->getOption('filters');
+        $filters = $input->getOption('filters');
 
         if (empty($filters)) {
             $filters = null;
         }
 
         /* @var CacheManager cacheManager */
-        $cacheManager  = $this->getContainer()->get('liip_imagine.cache.manager');
+        $cacheManager = $this->getContainer()->get('liip_imagine.cache.manager');
 
         $cacheManager->remove($paths, $filters);
     }
diff --git a/Command/ResolveCacheCommand.php b/Command/ResolveCacheCommand.php
index e0112dea2..d31c04d7b 100644
--- a/Command/ResolveCacheCommand.php
+++ b/Command/ResolveCacheCommand.php
@@ -18,11 +18,11 @@ protected function configure()
         $this
             ->setName('liip:imagine:cache:resolve')
             ->setDescription('Resolve cache for given path and set of filters.')
-            ->addArgument('paths', InputArgument::REQUIRED|InputArgument::IS_ARRAY, 'Image paths')
+            ->addArgument('paths', InputArgument::REQUIRED | InputArgument::IS_ARRAY, 'Image paths')
             ->addOption(
                 'filters',
                 'f',
-                InputOption::VALUE_OPTIONAL|InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 'Filters list'
             )->setHelp(<<<EOF
 The <info>%command.name%</info> command resolves cache by specified parameters.
@@ -57,9 +57,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /* @var FilterManager filterManager */
         $filterManager = $this->getContainer()->get('liip_imagine.filter.manager');
         /* @var CacheManager cacheManager */
-        $cacheManager  = $this->getContainer()->get('liip_imagine.cache.manager');
+        $cacheManager = $this->getContainer()->get('liip_imagine.cache.manager');
         /* @var DataManager dataManager */
-        $dataManager   = $this->getContainer()->get('liip_imagine.data.manager');
+        $dataManager = $this->getContainer()->get('liip_imagine.data.manager');
 
         if (empty($filters)) {
             $filters = array_keys($filterManager->getFilterConfiguration()->all());
diff --git a/Controller/ImagineController.php b/Controller/ImagineController.php
index ce849cd18..4b2988f1c 100644
--- a/Controller/ImagineController.php
+++ b/Controller/ImagineController.php
@@ -78,7 +78,7 @@ public function filterAction(Request $request, $path, $filter)
     {
         // decoding special characters and whitespaces from path obtained from url
         $path = urldecode($path);
-        
+
         try {
             if (!$this->cacheManager->isStored($path, $filter)) {
                 try {
diff --git a/DependencyInjection/Compiler/FiltersCompilerPass.php b/DependencyInjection/Compiler/FiltersCompilerPass.php
index e9f587355..6daabe13e 100644
--- a/DependencyInjection/Compiler/FiltersCompilerPass.php
+++ b/DependencyInjection/Compiler/FiltersCompilerPass.php
@@ -9,7 +9,7 @@
 class FiltersCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/DependencyInjection/Compiler/LoadersCompilerPass.php b/DependencyInjection/Compiler/LoadersCompilerPass.php
index 84877db96..cec797ac7 100644
--- a/DependencyInjection/Compiler/LoadersCompilerPass.php
+++ b/DependencyInjection/Compiler/LoadersCompilerPass.php
@@ -9,7 +9,7 @@
 class LoadersCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/DependencyInjection/Compiler/PostProcessorsCompilerPass.php b/DependencyInjection/Compiler/PostProcessorsCompilerPass.php
index e90996da5..843c823e3 100644
--- a/DependencyInjection/Compiler/PostProcessorsCompilerPass.php
+++ b/DependencyInjection/Compiler/PostProcessorsCompilerPass.php
@@ -14,7 +14,7 @@
 class PostProcessorsCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/DependencyInjection/Compiler/ResolversCompilerPass.php b/DependencyInjection/Compiler/ResolversCompilerPass.php
index efb222153..b13484a2c 100644
--- a/DependencyInjection/Compiler/ResolversCompilerPass.php
+++ b/DependencyInjection/Compiler/ResolversCompilerPass.php
@@ -9,7 +9,7 @@
 class ResolversCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 554ba2edf..426c914bf 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -31,7 +31,7 @@ public function __construct(array $resolversFactories, array $loadersFactories)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getConfigTreeBuilder()
     {
diff --git a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php
index 906dfcddb..c08fadc55 100644
--- a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php
+++ b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php
@@ -9,7 +9,7 @@
 class FileSystemLoaderFactory implements LoaderFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $loaderName, array $config)
     {
@@ -26,7 +26,7 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -34,7 +34,7 @@ public function getName()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
diff --git a/DependencyInjection/Factory/Loader/StreamLoaderFactory.php b/DependencyInjection/Factory/Loader/StreamLoaderFactory.php
index eaacb0536..98e3bb585 100644
--- a/DependencyInjection/Factory/Loader/StreamLoaderFactory.php
+++ b/DependencyInjection/Factory/Loader/StreamLoaderFactory.php
@@ -9,7 +9,7 @@
 class StreamLoaderFactory implements LoaderFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $loaderName, array $config)
     {
@@ -27,7 +27,7 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -35,7 +35,7 @@ public function getName()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
diff --git a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php
index 3b2bc0bee..97d1f47e2 100644
--- a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php
+++ b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php
@@ -11,7 +11,7 @@
 class AwsS3ResolverFactory implements ResolverFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $resolverName, array $config)
     {
@@ -72,7 +72,7 @@ public function create(ContainerBuilder $container, $resolverName, array $config
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -80,7 +80,7 @@ public function getName()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
diff --git a/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php b/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php
index 7009e105e..7b01b5a7d 100644
--- a/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php
+++ b/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php
@@ -9,7 +9,7 @@
 class WebPathResolverFactory implements ResolverFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $resolverName, array $config)
     {
@@ -27,7 +27,7 @@ public function create(ContainerBuilder $container, $resolverName, array $config
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -35,7 +35,7 @@ public function getName()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
diff --git a/Exception/Imagine/Filter/NonExistingFilterException.php b/Exception/Imagine/Filter/NonExistingFilterException.php
index 6a7dfd4e6..cbd1b2986 100644
--- a/Exception/Imagine/Filter/NonExistingFilterException.php
+++ b/Exception/Imagine/Filter/NonExistingFilterException.php
@@ -6,5 +6,4 @@
 
 class NonExistingFilterException extends \RuntimeException implements ExceptionInterface
 {
-
 }
diff --git a/Form/Type/ImageType.php b/Form/Type/ImageType.php
index baafa153b..9ceb77ad7 100644
--- a/Form/Type/ImageType.php
+++ b/Form/Type/ImageType.php
@@ -20,12 +20,12 @@ class ImageType extends AbstractType
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['image_path']   = $options['image_path'];
+        $view->vars['image_path'] = $options['image_path'];
         $view->vars['image_filter'] = $options['image_filter'];
-        $view->vars['image_attr']   = $options['image_attr'];
-        $view->vars['link_url']     = $options['link_url'];
-        $view->vars['link_filter']  = $options['link_filter'];
-        $view->vars['link_attr']    = $options['link_attr'];
+        $view->vars['image_attr'] = $options['image_attr'];
+        $view->vars['link_url'] = $options['link_url'];
+        $view->vars['link_filter'] = $options['link_filter'];
+        $view->vars['link_attr'] = $options['link_attr'];
     }
 
     /**
diff --git a/Imagine/Cache/Resolver/AbstractFilesystemResolver.php b/Imagine/Cache/Resolver/AbstractFilesystemResolver.php
index 498123eed..d1b0c169d 100644
--- a/Imagine/Cache/Resolver/AbstractFilesystemResolver.php
+++ b/Imagine/Cache/Resolver/AbstractFilesystemResolver.php
@@ -43,7 +43,7 @@ abstract class AbstractFilesystemResolver implements ResolverInterface, CacheMan
      */
     public function __construct(Filesystem $filesystem)
     {
-        $this->filesystem   = $filesystem;
+        $this->filesystem = $filesystem;
     }
 
     /**
@@ -81,7 +81,7 @@ public function setFolderPermissions($folderPermissions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
@@ -89,7 +89,7 @@ public function isStored($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $path, $filter)
     {
@@ -103,7 +103,7 @@ public function store(BinaryInterface $binary, $path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
diff --git a/Imagine/Cache/Resolver/AmazonS3Resolver.php b/Imagine/Cache/Resolver/AmazonS3Resolver.php
index c6ce743d2..054efce25 100644
--- a/Imagine/Cache/Resolver/AmazonS3Resolver.php
+++ b/Imagine/Cache/Resolver/AmazonS3Resolver.php
@@ -58,7 +58,7 @@ public function setLogger(LoggerInterface $logger)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
@@ -66,7 +66,7 @@ public function isStored($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function resolve($path, $filter)
     {
@@ -74,7 +74,7 @@ public function resolve($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $path, $filter)
     {
@@ -99,7 +99,7 @@ public function store(BinaryInterface $binary, $path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
@@ -110,8 +110,8 @@ public function remove(array $paths, array $filters)
         if (empty($paths)) {
             if (!$this->storage->delete_all_objects($this->bucket, sprintf('/%s/i', implode('|', $filters)))) {
                 $this->logError('The objects could not be deleted from Amazon S3.', array(
-                    'filters'      => implode(', ', $filters),
-                    'bucket'      => $this->bucket,
+                    'filters' => implode(', ', $filters),
+                    'bucket' => $this->bucket,
                 ));
             }
 
@@ -127,9 +127,9 @@ public function remove(array $paths, array $filters)
 
                 if (!$this->storage->delete_object($this->bucket, $objectPath)->isOK()) {
                     $this->logError('The objects could not be deleted from Amazon S3.', array(
-                        'filter'      => $filter,
-                        'bucket'      => $this->bucket,
-                        'path'        => $path,
+                        'filter' => $filter,
+                        'bucket' => $this->bucket,
+                        'path' => $path,
                     ));
                 }
             }
diff --git a/Imagine/Cache/Resolver/AwsS3Resolver.php b/Imagine/Cache/Resolver/AwsS3Resolver.php
index 39259503a..94d7226c8 100644
--- a/Imagine/Cache/Resolver/AwsS3Resolver.php
+++ b/Imagine/Cache/Resolver/AwsS3Resolver.php
@@ -81,7 +81,7 @@ public function setCachePrefix($cachePrefix)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
@@ -89,7 +89,7 @@ public function isStored($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function resolve($path, $filter)
     {
@@ -97,7 +97,7 @@ public function resolve($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $path, $filter)
     {
@@ -108,20 +108,20 @@ public function store(BinaryInterface $binary, $path, $filter)
                 array_merge(
                     $this->putOptions,
                     array(
-                        'ACL'           => $this->acl,
-                        'Bucket'        => $this->bucket,
-                        'Key'           => $objectPath,
-                        'Body'          => $binary->getContent(),
-                        'ContentType'   => $binary->getMimeType(),
+                        'ACL' => $this->acl,
+                        'Bucket' => $this->bucket,
+                        'Key' => $objectPath,
+                        'Body' => $binary->getContent(),
+                        'ContentType' => $binary->getMimeType(),
                     )
                 )
             );
         } catch (\Exception $e) {
             $this->logError('The object could not be created on Amazon S3.', array(
-                'objectPath'  => $objectPath,
-                'filter'      => $filter,
-                'bucket'      => $this->bucket,
-                'exception'   => $e,
+                'objectPath' => $objectPath,
+                'filter' => $filter,
+                'bucket' => $this->bucket,
+                'exception' => $e,
             ));
 
             throw new NotStorableException('The object could not be created on Amazon S3.', null, $e);
@@ -129,7 +129,7 @@ public function store(BinaryInterface $binary, $path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
@@ -145,9 +145,9 @@ public function remove(array $paths, array $filters)
                 ));
             } catch (\Exception $e) {
                 $this->logError('The objects could not be deleted from Amazon S3.', array(
-                    'filter'      => implode(', ', $filters),
-                    'bucket'      => $this->bucket,
-                    'exception'   => $e,
+                    'filter' => implode(', ', $filters),
+                    'bucket' => $this->bucket,
+                    'exception' => $e,
                 ));
             }
 
@@ -164,14 +164,14 @@ public function remove(array $paths, array $filters)
                 try {
                     $this->storage->deleteObject(array(
                         'Bucket' => $this->bucket,
-                        'Key'    => $objectPath,
+                        'Key' => $objectPath,
                     ));
                 } catch (\Exception $e) {
                     $this->logError('The object could not be deleted from Amazon S3.', array(
-                        'objectPath'  => $objectPath,
-                        'filter'      => $filter,
-                        'bucket'      => $this->bucket,
-                        'exception'   => $e,
+                        'objectPath' => $objectPath,
+                        'filter' => $filter,
+                        'bucket' => $this->bucket,
+                        'exception' => $e,
                     ));
                 }
             }
diff --git a/Imagine/Cache/Resolver/CacheResolver.php b/Imagine/Cache/Resolver/CacheResolver.php
index d61a3e92c..69de06af9 100644
--- a/Imagine/Cache/Resolver/CacheResolver.php
+++ b/Imagine/Cache/Resolver/CacheResolver.php
@@ -52,7 +52,7 @@ public function __construct(Cache $cache, ResolverInterface $cacheResolver, arra
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
@@ -65,7 +65,7 @@ public function isStored($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function resolve($path, $filter)
     {
@@ -82,7 +82,7 @@ public function resolve($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $path, $filter)
     {
@@ -90,7 +90,7 @@ public function store(BinaryInterface $binary, $path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
@@ -238,13 +238,12 @@ protected function configureOptions(OptionsResolver $resolver)
         );
 
         if (version_compare(Kernel::VERSION_ID, '20600') >= 0) {
-          foreach ($allowedTypesList as $option => $allowedTypes) {
-            $resolver->setAllowedTypes($option, $allowedTypes);
-          }
+            foreach ($allowedTypesList as $option => $allowedTypes) {
+                $resolver->setAllowedTypes($option, $allowedTypes);
+            }
         } else {
-          $resolver->setAllowedTypes($allowedTypesList);
+            $resolver->setAllowedTypes($allowedTypesList);
         }
-
     }
 
     protected function setDefaultOptions(OptionsResolverInterface $resolver)
diff --git a/Imagine/Cache/Resolver/NoCacheWebPathResolver.php b/Imagine/Cache/Resolver/NoCacheWebPathResolver.php
index c09fe7e27..8b4d2ec5e 100644
--- a/Imagine/Cache/Resolver/NoCacheWebPathResolver.php
+++ b/Imagine/Cache/Resolver/NoCacheWebPathResolver.php
@@ -16,7 +16,7 @@ public function __construct(RequestContext $requestContext)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
@@ -24,7 +24,7 @@ public function isStored($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function resolve($path, $filter)
     {
@@ -36,14 +36,14 @@ public function resolve($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $path, $filter)
     {
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
diff --git a/Imagine/Cache/Resolver/ProxyResolver.php b/Imagine/Cache/Resolver/ProxyResolver.php
index 11bde16ea..db5b1a392 100644
--- a/Imagine/Cache/Resolver/ProxyResolver.php
+++ b/Imagine/Cache/Resolver/ProxyResolver.php
@@ -34,7 +34,7 @@ public function __construct(ResolverInterface $resolver, array $hosts)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function resolve($path, $filter)
     {
@@ -42,7 +42,7 @@ public function resolve($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $targetPath, $filter)
     {
@@ -50,7 +50,7 @@ public function store(BinaryInterface $binary, $targetPath, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
@@ -58,7 +58,7 @@ public function isStored($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
diff --git a/Imagine/Cache/Resolver/WebPathResolver.php b/Imagine/Cache/Resolver/WebPathResolver.php
index 3ff4d01d8..d088de42a 100644
--- a/Imagine/Cache/Resolver/WebPathResolver.php
+++ b/Imagine/Cache/Resolver/WebPathResolver.php
@@ -48,7 +48,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function resolve($path, $filter)
     {
@@ -59,7 +59,7 @@ public function resolve($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
@@ -67,7 +67,7 @@ public function isStored($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $path, $filter)
     {
@@ -78,7 +78,7 @@ public function store(BinaryInterface $binary, $path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
@@ -105,7 +105,7 @@ public function remove(array $paths, array $filters)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getFilePath($path, $filter)
     {
@@ -113,7 +113,7 @@ protected function getFilePath($path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getFileUrl($path, $filter)
     {
@@ -130,11 +130,11 @@ protected function getBaseUrl()
     {
         $port = '';
         if ('https' == $this->requestContext->getScheme() && $this->requestContext->getHttpsPort() != 443) {
-            $port =  ":{$this->requestContext->getHttpsPort()}";
+            $port = ":{$this->requestContext->getHttpsPort()}";
         }
 
         if ('http' == $this->requestContext->getScheme() && $this->requestContext->getHttpPort() != 80) {
-            $port =  ":{$this->requestContext->getHttpPort()}";
+            $port = ":{$this->requestContext->getHttpPort()}";
         }
 
         $baseUrl = $this->requestContext->getBaseUrl();
diff --git a/Imagine/Filter/Loader/AutoRotateFilterLoader.php b/Imagine/Filter/Loader/AutoRotateFilterLoader.php
index 7a75ba58b..348b0b484 100644
--- a/Imagine/Filter/Loader/AutoRotateFilterLoader.php
+++ b/Imagine/Filter/Loader/AutoRotateFilterLoader.php
@@ -17,7 +17,7 @@ class AutoRotateFilterLoader implements LoaderInterface
     );
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/Loader/BackgroundFilterLoader.php b/Imagine/Filter/Loader/BackgroundFilterLoader.php
index a09229cf6..21c0dd3e8 100644
--- a/Imagine/Filter/Loader/BackgroundFilterLoader.php
+++ b/Imagine/Filter/Loader/BackgroundFilterLoader.php
@@ -15,7 +15,7 @@ public function __construct(ImagineInterface $imagine)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/Loader/CropFilterLoader.php b/Imagine/Filter/Loader/CropFilterLoader.php
index 7c9a72093..f46100a05 100644
--- a/Imagine/Filter/Loader/CropFilterLoader.php
+++ b/Imagine/Filter/Loader/CropFilterLoader.php
@@ -10,7 +10,7 @@
 class CropFilterLoader implements LoaderInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/Loader/InterlaceFilterLoader.php b/Imagine/Filter/Loader/InterlaceFilterLoader.php
index 8a9986d11..371e52946 100644
--- a/Imagine/Filter/Loader/InterlaceFilterLoader.php
+++ b/Imagine/Filter/Loader/InterlaceFilterLoader.php
@@ -7,7 +7,7 @@
 class InterlaceFilterLoader implements LoaderInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/Loader/RelativeResizeFilterLoader.php b/Imagine/Filter/Loader/RelativeResizeFilterLoader.php
index 659da9ca1..9e863e454 100644
--- a/Imagine/Filter/Loader/RelativeResizeFilterLoader.php
+++ b/Imagine/Filter/Loader/RelativeResizeFilterLoader.php
@@ -14,7 +14,7 @@
 class RelativeResizeFilterLoader implements LoaderInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/Loader/ResizeFilterLoader.php b/Imagine/Filter/Loader/ResizeFilterLoader.php
index 6ac2b9a55..bf4f759d5 100644
--- a/Imagine/Filter/Loader/ResizeFilterLoader.php
+++ b/Imagine/Filter/Loader/ResizeFilterLoader.php
@@ -14,7 +14,7 @@
 class ResizeFilterLoader implements LoaderInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/Loader/RotateFilterLoader.php b/Imagine/Filter/Loader/RotateFilterLoader.php
index aac46ea95..57545a47b 100644
--- a/Imagine/Filter/Loader/RotateFilterLoader.php
+++ b/Imagine/Filter/Loader/RotateFilterLoader.php
@@ -6,7 +6,7 @@
 use Imagine\Image\ManipulatorInterface;
 
 /**
- * Loader for Imagine's basic rotate method
+ * Loader for Imagine's basic rotate method.
  *
  * @author Bocharsky Victor <bocharsky.bw@gmail.com>
  */
diff --git a/Imagine/Filter/Loader/ThumbnailFilterLoader.php b/Imagine/Filter/Loader/ThumbnailFilterLoader.php
index 1f0fa290e..53b31e9f2 100644
--- a/Imagine/Filter/Loader/ThumbnailFilterLoader.php
+++ b/Imagine/Filter/Loader/ThumbnailFilterLoader.php
@@ -9,7 +9,7 @@
 class ThumbnailFilterLoader implements LoaderInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/Loader/UpscaleFilterLoader.php b/Imagine/Filter/Loader/UpscaleFilterLoader.php
index 13c56454a..095a57007 100644
--- a/Imagine/Filter/Loader/UpscaleFilterLoader.php
+++ b/Imagine/Filter/Loader/UpscaleFilterLoader.php
@@ -14,7 +14,7 @@
 class UpscaleFilterLoader implements LoaderInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ImageInterface $image, array $options = array())
     {
diff --git a/Imagine/Filter/RelativeResize.php b/Imagine/Filter/RelativeResize.php
index c9f7993a7..9937d32fc 100644
--- a/Imagine/Filter/RelativeResize.php
+++ b/Imagine/Filter/RelativeResize.php
@@ -35,7 +35,7 @@ public function __construct($method, $parameter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function apply(ImageInterface $image)
     {
diff --git a/LiipImagineBundle.php b/LiipImagineBundle.php
index f104d3481..5894f33a7 100644
--- a/LiipImagineBundle.php
+++ b/LiipImagineBundle.php
@@ -17,7 +17,7 @@
 class LiipImagineBundle extends Bundle
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function build(ContainerBuilder $container)
     {
diff --git a/Templating/Helper/ImagineHelper.php b/Templating/Helper/ImagineHelper.php
index 77c79fa9d..3441965d5 100644
--- a/Templating/Helper/ImagineHelper.php
+++ b/Templating/Helper/ImagineHelper.php
@@ -35,7 +35,7 @@ public function filter($path, $filter, array $runtimeConfig = array())
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
diff --git a/Templating/ImagineExtension.php b/Templating/ImagineExtension.php
index 0ff0c949e..321c703ac 100644
--- a/Templating/ImagineExtension.php
+++ b/Templating/ImagineExtension.php
@@ -22,12 +22,12 @@ public function __construct(CacheManager $cacheManager)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getFilters()
     {
         return array(
-            new \Twig_SimpleFilter('imagine_filter', array($this, 'filter'))
+            new \Twig_SimpleFilter('imagine_filter', array($this, 'filter')),
         );
     }
 
@@ -46,7 +46,7 @@ public function filter($path, $filter, array $runtimeConfig = array())
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
diff --git a/Tests/AbstractTest.php b/Tests/AbstractTest.php
index ea355f251..b837c85a3 100644
--- a/Tests/AbstractTest.php
+++ b/Tests/AbstractTest.php
@@ -6,7 +6,6 @@
 use Liip\ImagineBundle\Imagine\Filter\FilterConfiguration;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 abstract class AbstractTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/DependencyInjection/Factory/Resolver/AwsS3ResolverFactoryTest.php b/Tests/DependencyInjection/Factory/Resolver/AwsS3ResolverFactoryTest.php
index ca5732e73..470f5e556 100644
--- a/Tests/DependencyInjection/Factory/Resolver/AwsS3ResolverFactoryTest.php
+++ b/Tests/DependencyInjection/Factory/Resolver/AwsS3ResolverFactoryTest.php
@@ -134,7 +134,6 @@ public function testCreateS3ClientDefinitionWithFactoryOnCreate()
 
         $clientDefinition = $container->getDefinition('liip_imagine.cache.resolver.theresolvername.client');
         $this->assertEquals(array('Aws\S3\S3Client', 'factory'), $clientDefinition->getFactory());
-
     }
 
     public function testLegacyCreateS3ClientDefinitionWithFactoryOnCreate()
diff --git a/Tests/Form/Type/ImageTypeTest.php b/Tests/Form/Type/ImageTypeTest.php
index f4fa4af64..6c364d668 100644
--- a/Tests/Form/Type/ImageTypeTest.php
+++ b/Tests/Form/Type/ImageTypeTest.php
@@ -69,12 +69,12 @@ public function testLegacySetDefaultOptions()
     public function testBuildView()
     {
         $options = array(
-            'image_path'   => 'foo',
+            'image_path' => 'foo',
             'image_filter' => 'bar',
-            'image_attr'   => 'bazz',
-            'link_url'     => 'http://liip.com',
-            'link_filter'  => 'foo',
-            'link_attr'    => 'bazz',
+            'image_attr' => 'bazz',
+            'link_url' => 'http://liip.com',
+            'link_filter' => 'foo',
+            'link_attr' => 'bazz',
         );
 
         $view = new FormView();
diff --git a/Tests/Functional/Controller/ImagineControllerTest.php b/Tests/Functional/Controller/ImagineControllerTest.php
index ab81b84de..7a78b0c38 100644
--- a/Tests/Functional/Controller/ImagineControllerTest.php
+++ b/Tests/Functional/Controller/ImagineControllerTest.php
@@ -102,7 +102,7 @@ public function testShouldThrowNotFoundHttpExceptionIfFiltersNotArray()
     {
         $this->client->request('GET', '/media/cache/resolve/thumbnail_web_path/rc/invalidHash/images/cats.jpeg?'.http_build_query(array(
             'filters' => 'some-string',
-            '_hash'   => 'hash',
+            '_hash' => 'hash',
         )));
     }
 
@@ -199,8 +199,8 @@ public function testShouldResolvePathWithSpecialCharactersAndWhiteSpaces()
         );
 
         // we are calling url with encoded file name as it will be called by browser
-        $urlEncodedFileName = "ma%C4%8Dac%C3%AD+obr%C3%A1zok";
-        $this->client->request('GET', '/media/cache/resolve/thumbnail_web_path/images/' . $urlEncodedFileName . '.jpeg');
+        $urlEncodedFileName = 'ma%C4%8Dac%C3%AD+obr%C3%A1zok';
+        $this->client->request('GET', '/media/cache/resolve/thumbnail_web_path/images/'.$urlEncodedFileName.'.jpeg');
 
         $response = $this->client->getResponse();
 
diff --git a/Tests/Functional/Imagine/Filter/Loader/RotateFilterLoaderTest.php b/Tests/Functional/Imagine/Filter/Loader/RotateFilterLoaderTest.php
index 34e2410a2..604f6d1aa 100644
--- a/Tests/Functional/Imagine/Filter/Loader/RotateFilterLoaderTest.php
+++ b/Tests/Functional/Imagine/Filter/Loader/RotateFilterLoaderTest.php
@@ -5,7 +5,7 @@
 use Liip\ImagineBundle\Tests\Functional\WebTestCase;
 
 /**
- * Functional test cases for RotateFilterLoader class
+ * Functional test cases for RotateFilterLoader class.
  *
  * @author Bocharsky Victor <bocharsky.bw@gmail.com>
  */
diff --git a/Tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php b/Tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php
index b4e33408b..35b6ba08b 100644
--- a/Tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php
+++ b/Tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php
@@ -97,12 +97,12 @@ public function testObjectOptionsPassedToS3ClintOnCreate()
             ->expects($this->once())
             ->method('putObject')
             ->with(array(
-                'CacheControl'  => 'max-age=86400',
-                'ACL'           => 'public-read',
-                'Bucket'        => 'images.example.com',
-                'Key'           => 'filter/images/foobar.jpg',
-                'Body'          => 'aContent',
-                'ContentType'   => 'image/jpeg',
+                'CacheControl' => 'max-age=86400',
+                'ACL' => 'public-read',
+                'Bucket' => 'images.example.com',
+                'Key' => 'filter/images/foobar.jpg',
+                'Body' => 'aContent',
+                'ContentType' => 'image/jpeg',
             ))
         ;
 
@@ -178,7 +178,7 @@ public function testRemoveCacheForPathAndFilterOnRemove()
             ->method('deleteObject')
             ->with(array(
                 'Bucket' => 'images.example.com',
-                'Key'    => 'thumb/some-folder/path.jpg',
+                'Key' => 'thumb/some-folder/path.jpg',
             ))
             ->will($this->returnValue($this->getS3ResponseMock(true)))
         ;
@@ -202,7 +202,7 @@ public function testRemoveCacheForSomePathsAndFilterOnRemove()
             ->method('deleteObject')
             ->with(array(
                 'Bucket' => 'images.example.com',
-                'Key'    => 'thumb/pathOne.jpg',
+                'Key' => 'thumb/pathOne.jpg',
             ))
             ->will($this->returnValue($this->getS3ResponseMock(true)))
         ;
@@ -217,7 +217,7 @@ public function testRemoveCacheForSomePathsAndFilterOnRemove()
             ->method('deleteObject')
             ->with(array(
                 'Bucket' => 'images.example.com',
-                'Key'    => 'thumb/pathTwo.jpg',
+                'Key' => 'thumb/pathTwo.jpg',
             ))
             ->will($this->returnValue($this->getS3ResponseMock(true)))
         ;
@@ -244,7 +244,7 @@ public function testRemoveCacheForSomePathsAndSomeFiltersOnRemove()
             ->method('deleteObject')
             ->with(array(
                 'Bucket' => 'images.example.com',
-                'Key'    => 'filterOne/pathOne.jpg',
+                'Key' => 'filterOne/pathOne.jpg',
             ))
             ->will($this->returnValue($this->getS3ResponseMock(true)))
         ;
@@ -259,7 +259,7 @@ public function testRemoveCacheForSomePathsAndSomeFiltersOnRemove()
             ->method('deleteObject')
             ->with(array(
                 'Bucket' => 'images.example.com',
-                'Key'    => 'filterOne/pathTwo.jpg',
+                'Key' => 'filterOne/pathTwo.jpg',
             ))
             ->will($this->returnValue($this->getS3ResponseMock(true)))
         ;
@@ -274,7 +274,7 @@ public function testRemoveCacheForSomePathsAndSomeFiltersOnRemove()
             ->method('deleteObject')
             ->with(array(
                 'Bucket' => 'images.example.com',
-                'Key'    => 'filterTwo/pathOne.jpg',
+                'Key' => 'filterTwo/pathOne.jpg',
             ))
             ->will($this->returnValue($this->getS3ResponseMock(true)))
         ;
@@ -289,7 +289,7 @@ public function testRemoveCacheForSomePathsAndSomeFiltersOnRemove()
             ->method('deleteObject')
             ->with(array(
                 'Bucket' => 'images.example.com',
-                'Key'    => 'filterTwo/pathTwo.jpg',
+                'Key' => 'filterTwo/pathTwo.jpg',
             ))
             ->will($this->returnValue($this->getS3ResponseMock(true)))
         ;
diff --git a/Tests/Imagine/Cache/Resolver/WebPathResolverTest.php b/Tests/Imagine/Cache/Resolver/WebPathResolverTest.php
index c66eff016..243a0abe8 100644
--- a/Tests/Imagine/Cache/Resolver/WebPathResolverTest.php
+++ b/Tests/Imagine/Cache/Resolver/WebPathResolverTest.php
@@ -24,8 +24,8 @@ class WebPathResolverTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->filesystem = new Filesystem();
-        $this->basePath = sys_get_temp_dir() . '/aWebRoot';
-        $this->existingFile = $this->basePath . '/aCachePrefix/aFilter/existingPath';
+        $this->basePath = sys_get_temp_dir().'/aWebRoot';
+        $this->existingFile = $this->basePath.'/aCachePrefix/aFilter/existingPath';
         $this->filesystem->mkdir(dirname($this->existingFile));
         $this->filesystem->touch($this->existingFile);
     }
diff --git a/Tests/Imagine/Filter/Loader/FloatToIntCastByRoundUpscaleFilterLoaderTest.php b/Tests/Imagine/Filter/Loader/FloatToIntCastByRoundUpscaleFilterLoaderTest.php
index b4ca1565c..641405157 100644
--- a/Tests/Imagine/Filter/Loader/FloatToIntCastByRoundUpscaleFilterLoaderTest.php
+++ b/Tests/Imagine/Filter/Loader/FloatToIntCastByRoundUpscaleFilterLoaderTest.php
@@ -2,7 +2,6 @@
 
 namespace Liip\ImagineBundle\Tests\Filter;
 
-use Imagine\Gd\Image;
 use Imagine\Gd\Imagine;
 use Liip\ImagineBundle\Imagine\Filter\Loader\UpscaleFilterLoader;
 use Liip\ImagineBundle\Tests\AbstractTest;
diff --git a/Tests/Imagine/Filter/Loader/RotateFilterLoaderTest.php b/Tests/Imagine/Filter/Loader/RotateFilterLoaderTest.php
index 8f3486a58..116209759 100644
--- a/Tests/Imagine/Filter/Loader/RotateFilterLoaderTest.php
+++ b/Tests/Imagine/Filter/Loader/RotateFilterLoaderTest.php
@@ -6,9 +6,10 @@
 use Liip\ImagineBundle\Tests\AbstractTest;
 
 /**
- * Test cases for RotateFilterLoader class
+ * Test cases for RotateFilterLoader class.
  *
  * @covers Liip\ImagineBundle\Imagine\Filter\Loader\RotateFilterLoader
+ *
  * @author Bocharsky Victor <bocharsky.bw@gmail.com>
  */
 class RotateFilterLoaderTest extends AbstractTest