run php-cs-fixer on bundle

liip · Mar 27, 2015 · fbdabfc · fbdabfc
1 parent e58ba83
commit fbdabfc
Show file tree

Hide file tree

Showing 102 changed files with 468 additions and 482 deletions.
diff --git a/Binary/BinaryInterface.php b/Binary/BinaryInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Binary;
 
 interface BinaryInterface

diff --git a/Binary/Loader/AbstractDoctrineLoader.php b/Binary/Loader/AbstractDoctrineLoader.php
@@ -19,7 +19,7 @@ abstract class AbstractDoctrineLoader implements LoaderInterface
 
     /**
      * @param ObjectManager $manager
-     * @param string $class
+     * @param string        $class
      */
     public function __construct(ObjectManager $manager, $class = null)
     {
@@ -37,7 +37,7 @@ public function __construct(ObjectManager $manager, $class = null)
     abstract protected function mapPathToId($path);
 
     /**
-     * Return a stream resource from the Doctrine entity/document with the image content
+     * Return a stream resource from the Doctrine entity/document with the image content.
      *
      * @param object $image
      *

diff --git a/Binary/Loader/FileSystemLoader.php b/Binary/Loader/FileSystemLoader.php
@@ -2,7 +2,6 @@
 
 namespace Liip\ImagineBundle\Binary\Loader;
 
-
 use Liip\ImagineBundle\Model\Binary;
 use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesserInterface;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
@@ -34,7 +33,7 @@ public function __construct(
         MimeTypeGuesserInterface $mimeTypeGuesser,
         ExtensionGuesserInterface $extensionGuesser,
         $rootPath
-    ){
+    ) {
         $this->mimeTypeGuesser = $mimeTypeGuesser;
         $this->extensionGuesser = $extensionGuesser;
 

diff --git a/Binary/Loader/GridFSLoader.php b/Binary/Loader/GridFSLoader.php
@@ -19,7 +19,7 @@ class GridFSLoader implements LoaderInterface
 
     /**
      * @param DocumentManager $dm
-     * @param string $class
+     * @param string          $class
      */
     public function __construct(DocumentManager $dm, $class)
     {

diff --git a/Binary/Loader/LoaderInterface.php b/Binary/Loader/LoaderInterface.php
@@ -13,5 +13,5 @@ interface LoaderInterface
      *
      * @return \Liip\ImagineBundle\Binary\BinaryInterface|string An image binary content
      */
-    function find($path);
+    public function find($path);
 }
diff --git a/Binary/Loader/StreamLoader.php b/Binary/Loader/StreamLoader.php
@@ -21,7 +21,7 @@ class StreamLoader implements LoaderInterface
     protected $context;
 
     /**
-     * @param string $wrapperPrefix
+     * @param string        $wrapperPrefix
      * @param resource|null $context
      *
      * @throws \InvalidArgumentException

diff --git a/Binary/MimeTypeGuesserInterface.php b/Binary/MimeTypeGuesserInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Binary;
 
 interface MimeTypeGuesserInterface
@@ -8,5 +9,5 @@ interface MimeTypeGuesserInterface
      *
      * @return string|null mime type or null if it could be not be guessed.
      */
-    function guess($binary);
+    public function guess($binary);
 }
diff --git a/Binary/SimpleMimeTypeGuesser.php b/Binary/SimpleMimeTypeGuesser.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Binary;
 
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface as SymfonyMimeTypeGuesserInterface;

diff --git a/Command/RemoveCacheCommand.php b/Command/RemoveCacheCommand.php
@@ -52,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $filters = null;
         }
 
-        /** @var CacheManager cacheManager */
+        /* @var CacheManager cacheManager */
         $cacheManager  = $this->getContainer()->get('liip_imagine.cache.manager');
 
         $cacheManager->remove($paths, $filters);

diff --git a/Command/ResolveCacheCommand.php b/Command/ResolveCacheCommand.php
@@ -54,11 +54,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $paths = $input->getArgument('paths');
         $filters = $input->getOption('filters');
 
-        /** @var FilterManager filterManager */
+        /* @var FilterManager filterManager */
         $filterManager = $this->getContainer()->get('liip_imagine.filter.manager');
-        /** @var CacheManager cacheManager */
+        /* @var CacheManager cacheManager */
         $cacheManager  = $this->getContainer()->get('liip_imagine.cache.manager');
-        /** @var DataManager dataManager */
+        /* @var DataManager dataManager */
         $dataManager   = $this->getContainer()->get('liip_imagine.data.manager');
 
         if (empty($filters)) {

diff --git a/Controller/ImagineController.php b/Controller/ImagineController.php
@@ -57,8 +57,8 @@ public function __construct(
      * This action applies a given filter to a given image, optionally saves the image and outputs it to the browser at the same time.
      *
      * @param Request $request
-     * @param string $path
-     * @param string $filter
+     * @param string  $path
+     * @param string  $filter
      *
      * @throws \RuntimeException
      * @throws BadRequestHttpException

diff --git a/DependencyInjection/Compiler/PostProcessorsCompilerPass.php b/DependencyInjection/Compiler/PostProcessorsCompilerPass.php
@@ -7,7 +7,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Compiler pass to register post_processors tagged with liip_imagine.filter.post_processor
+ * Compiler pass to register post_processors tagged with liip_imagine.filter.post_processor.
  *
  * @author Konstantin Tjuterev <kostik.lv@gmail.com>
  */

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -22,7 +22,7 @@ class Configuration implements ConfigurationInterface
 
     /**
      * @param ResolverFactoryInterface[] $resolversFactories
-     * @param LoaderFactoryInterface[] $loadersFactories
+     * @param LoaderFactoryInterface[]   $loadersFactories
      */
     public function __construct(array $resolversFactories, array $loadersFactories)
     {
@@ -99,7 +99,7 @@ public function getConfigTreeBuilder()
             ->children()
                 ->scalarNode('driver')->defaultValue('gd')
                     ->validate()
-                        ->ifTrue(function($v) { return !in_array($v, array('gd', 'imagick', 'gmagick')); })
+                        ->ifTrue(function ($v) { return !in_array($v, array('gd', 'imagick', 'gmagick')); })
                         ->thenInvalid('Invalid imagine driver specified: %s')
                     ->end()
                 ->end()

diff --git a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\DependencyInjection\Factory\Loader;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
@@ -15,7 +16,7 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
         $loaderDefinition = new DefinitionDecorator('liip_imagine.binary.loader.prototype.filesystem');
         $loaderDefinition->replaceArgument(2, $config['data_root']);
         $loaderDefinition->addTag('liip_imagine.binary.loader', array(
-            'loader' => $loaderName
+            'loader' => $loaderName,
         ));
         $loaderId = 'liip_imagine.binary.loader.'.$loaderName;
 

diff --git a/DependencyInjection/Factory/Loader/LoaderFactoryInterface.php b/DependencyInjection/Factory/Loader/LoaderFactoryInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\DependencyInjection\Factory\Loader;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -17,16 +18,14 @@ public function create(ContainerBuilder $container, $loaderName, array $config);
 
     /**
      * The resolver factory name,
-     * For example filesystem, stream
+     * For example filesystem, stream.
      *
      * @return string
      */
     public function getName();
 
     /**
      * @param ArrayNodeDefinition $builder
-     *
-     * @return void
      */
     public function addConfiguration(ArrayNodeDefinition $builder);
 }
diff --git a/DependencyInjection/Factory/Loader/StreamLoaderFactory.php b/DependencyInjection/Factory/Loader/StreamLoaderFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\DependencyInjection\Factory\Loader;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
@@ -16,7 +17,7 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
         $loaderDefinition->replaceArgument(0, $config['wrapper']);
         $loaderDefinition->replaceArgument(1, $config['context']);
         $loaderDefinition->addTag('liip_imagine.binary.loader', array(
-            'loader' => $loaderName
+            'loader' => $loaderName,
         ));
         $loaderId = 'liip_imagine.binary.loader.'.$loaderName;
 

diff --git a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php
@@ -60,7 +60,7 @@ public function create(ContainerBuilder $container, $resolverName, array $config
         }
 
         $container->getDefinition($resolverId)->addTag('liip_imagine.cache.resolver', array(
-            'resolver' => $resolverName
+            'resolver' => $resolverName,
         ));
 
         return $resolverId;
@@ -90,7 +90,7 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                     ->useAttributeAsKey('key')
                     ->prototype('scalar')->end()
                 ->end()
-                /** @deprecated Use `get_options` instead */
+                /* @deprecated Use `get_options` instead */
                 ->arrayNode('url_options')
                     ->useAttributeAsKey('key')
                     ->prototype('scalar')->end()

diff --git a/DependencyInjection/Factory/Resolver/ResolverFactoryInterface.php b/DependencyInjection/Factory/Resolver/ResolverFactoryInterface.php
@@ -18,16 +18,14 @@ public function create(ContainerBuilder $container, $resolverName, array $config
 
     /**
      * The resolver factory name,
-     * For example web_path, aws_s3 o amazon_s3
+     * For example web_path, aws_s3 o amazon_s3.
      *
      * @return string
      */
     public function getName();
 
     /**
      * @param ArrayNodeDefinition $builder
-     *
-     * @return void
      */
     public function addConfiguration(ArrayNodeDefinition $builder);
 }
diff --git a/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php b/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php
@@ -17,7 +17,7 @@ public function create(ContainerBuilder $container, $resolverName, array $config
         $resolverDefinition->replaceArgument(2, $config['web_root']);
         $resolverDefinition->replaceArgument(3, $config['cache_prefix']);
         $resolverDefinition->addTag('liip_imagine.cache.resolver', array(
-            'resolver' => $resolverName
+            'resolver' => $resolverName,
         ));
         $resolverId = 'liip_imagine.cache.resolver.'.$resolverName;
 

diff --git a/DependencyInjection/LiipImagineExtension.php b/DependencyInjection/LiipImagineExtension.php
@@ -87,7 +87,7 @@ public function load(array $configs, ContainerBuilder $container)
     }
 
     /**
-     * @param array $config
+     * @param array            $config
      * @param ContainerBuilder $container
      */
     protected function loadResolvers(array $config, ContainerBuilder $container)
@@ -101,7 +101,7 @@ protected function loadResolvers(array $config, ContainerBuilder $container)
     }
 
     /**
-     * @param array $config
+     * @param array            $config
      * @param ContainerBuilder $container
      */
     protected function loadLoaders(array $config, ContainerBuilder $container)

diff --git a/Events/CacheResolveEvent.php b/Events/CacheResolveEvent.php
@@ -1,33 +1,37 @@
 <?php
+
 namespace Liip\ImagineBundle\Events;
 
 use Symfony\Component\EventDispatcher\Event;
 
 class CacheResolveEvent extends Event
 {
     /**
-     * Resource path
+     * Resource path.
+     *
      * @var string
      */
     protected $path;
 
     /**
-     * Filter name
+     * Filter name.
+     *
      * @var string
      */
     protected $filter;
 
     /**
-     * Resource url
+     * Resource url.
+     *
      * @var null
      */
     protected $url;
 
     /**
-     * Init default event state
+     * Init default event state.
      *
-     * @param string $path
-     * @param string $filter
+     * @param string      $path
+     * @param string      $filter
      * @param null|string $url
      */
     public function __construct($path, $filter, $url = null)
@@ -38,7 +42,7 @@ public function __construct($path, $filter, $url = null)
     }
 
     /**
-     * Sets resource path
+     * Sets resource path.
      *
      * @param $path
      */
@@ -48,7 +52,7 @@ public function setPath($path)
     }
 
     /**
-     * Returns resource path
+     * Returns resource path.
      *
      * @return string
      */
@@ -58,7 +62,7 @@ public function getPath()
     }
 
     /**
-     * Sets filter name
+     * Sets filter name.
      *
      * @param $filter
      */
@@ -68,7 +72,7 @@ public function setFilter($filter)
     }
 
     /**
-     * Returns filter name
+     * Returns filter name.
      *
      * @return string
      */
@@ -78,7 +82,7 @@ public function getFilter()
     }
 
     /**
-     * Sets resource url
+     * Sets resource url.
      *
      * @param $url
      */
@@ -88,9 +92,7 @@ public function setUrl($url)
     }
 
     /**
-     * Returns resource url
-     *
-     * @return null
+     * Returns resource url.
      */
     public function getUrl()
     {

diff --git a/Exception/Binary/Loader/NotLoadableException.php b/Exception/Binary/Loader/NotLoadableException.php
@@ -6,5 +6,4 @@
 
 class NotLoadableException extends \RuntimeException implements ExceptionInterface
 {
-
 }
diff --git a/Exception/ExceptionInterface.php b/Exception/ExceptionInterface.php
@@ -4,5 +4,4 @@
 
 interface ExceptionInterface
 {
-
 }
diff --git a/Exception/Imagine/Cache/Resolver/NotResolvableException.php b/Exception/Imagine/Cache/Resolver/NotResolvableException.php
@@ -6,5 +6,4 @@
 
 class NotResolvableException extends \RuntimeException implements ExceptionInterface
 {
-
 }
diff --git a/Exception/Imagine/Cache/Resolver/NotStorableException.php b/Exception/Imagine/Cache/Resolver/NotStorableException.php
@@ -6,5 +6,4 @@
 
 class NotStorableException extends \RuntimeException implements ExceptionInterface
 {
-
 }