Merge pull request #81 from mmoreram/feature/php-cs-fixer

Applied Fabpot php-cs-fixer to all code
FriendsOfSymfony · Jun 16, 2014 · e96f1d5 · e96f1d5
2 parents 9693d74 + a05d345
commit e96f1d5
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 37 deletions.
diff --git a/CacheManager.php b/CacheManager.php
@@ -87,8 +87,8 @@ public function invalidateRoute($name, array $parameters = array())
     /**
      * Refresh a route
      *
-     * @param string $route     Route name
-     * @param array $parameters Route parameters (optional)
+     * @param string $route      Route name
+     * @param array  $parameters Route parameters (optional)
      *
      * @return $this
      */

diff --git a/Command/BaseInvalidateCommand.php b/Command/BaseInvalidateCommand.php
@@ -12,9 +12,6 @@
 namespace FOS\HttpCacheBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 use FOS\HttpCacheBundle\CacheManager;
 

diff --git a/Command/InvalidatePathCommand.php b/Command/InvalidatePathCommand.php
@@ -11,7 +11,6 @@
 
 namespace FOS\HttpCacheBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Command/InvalidateRegexCommand.php b/Command/InvalidateRegexCommand.php
@@ -11,7 +11,6 @@
 
 namespace FOS\HttpCacheBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Command/InvalidateTagCommand.php b/Command/InvalidateTagCommand.php
@@ -11,7 +11,6 @@
 
 namespace FOS\HttpCacheBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Command/RefreshPathCommand.php b/Command/RefreshPathCommand.php
@@ -11,7 +11,6 @@
 
 namespace FOS\HttpCacheBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Configuration/InvalidatePath.php b/Configuration/InvalidatePath.php
@@ -59,4 +59,4 @@ public function allowArray()
     {
         return true;
     }
-}
+}
diff --git a/Configuration/InvalidateRoute.php b/Configuration/InvalidateRoute.php
@@ -80,4 +80,4 @@ public function allowArray()
     {
         return true;
     }
-}
+}
diff --git a/Configuration/Tag.php b/Configuration/Tag.php
@@ -74,4 +74,4 @@ public function allowArray()
     {
         return true;
     }
-}
+}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -168,13 +168,13 @@ private function addMatchSection(NodeBuilder $rules)
                         ->info('Request host name.')
                     ->end()
                     ->arrayNode('methods')
-                        ->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                        ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
                         ->useAttributeAsKey('name')
                         ->prototype('scalar')->end()
                         ->info('Request HTTP methods.')
                     ->end()
                     ->arrayNode('ips')
-                        ->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                        ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
                         ->useAttributeAsKey('name')
                         ->prototype('scalar')->end()
                         ->info('List of client IPs.')
@@ -220,7 +220,7 @@ private function addHeaderSection(NodeBuilder $rules)
                         ->info('Specify an X-Reverse-Proxy-TTL header with a time in seconds for a caching proxy under your control.')
                     ->end()
                     ->arrayNode('vary')
-                        ->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                        ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
                         ->prototype('scalar')->end()
                         ->info('Define a list of additional headers on which the response varies.')
                     ->end()
@@ -242,7 +242,7 @@ private function addProxyClientSection(ArrayNodeDefinition $rootNode)
                         ->arrayNode('varnish')
                             ->children()
                                 ->arrayNode('servers')
-                                    ->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                                    ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
                                     ->useAttributeAsKey('name')
                                     ->isRequired()
                                     ->requiresAtLeastOneElement()

diff --git a/EventListener/AbstractRuleSubscriber.php b/EventListener/AbstractRuleSubscriber.php
@@ -27,7 +27,7 @@ class AbstractRuleSubscriber
      * request and response are matched.
      *
      * @param RuleMatcherInterface $ruleMatcher The headers apply to responses matched by this matcher.
-     * @param array                $settings     An array of header configuration.
+     * @param array                $settings    An array of header configuration.
      * @param int                  $priority    Optional priority of this matcher. Higher priority is applied first.
      */
     public function addRule(

diff --git a/EventListener/FlashMessageSubscriber.php b/EventListener/FlashMessageSubscriber.php
@@ -39,8 +39,8 @@ class FlashMessageSubscriber implements EventSubscriberInterface
     /**
      * Set a serializer instance
      *
-     * @param   Session     $session A session instance
-     * @param   array       $options
+     * @param Session $session A session instance
+     * @param array   $options
      */
     public function __construct($session, array $options = array())
     {

diff --git a/EventListener/TagSubscriber.php b/EventListener/TagSubscriber.php
@@ -13,7 +13,6 @@
 
 use FOS\HttpCacheBundle\CacheManager;
 use FOS\HttpCacheBundle\Configuration\Tag;
-use FOS\HttpCacheBundle\Http\RuleMatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/Exception/InvalidTagException.php b/Exception/InvalidTagException.php
@@ -17,4 +17,4 @@ public function __construct($tag, $char)
     {
         parent:__construct(sprintf('Tag %s is invalid because it contains %s'));
     }
-}
+}
diff --git a/Invalidator/Invalidator.php b/Invalidator/Invalidator.php
@@ -69,4 +69,4 @@ public function addInvalidatedRoute($route, array $config = array())
 
         return $this;
     }
-}
+}
diff --git a/Invalidator/InvalidatorCollection.php b/Invalidator/InvalidatorCollection.php
@@ -78,4 +78,4 @@ public function getInvalidatedRoutes($route)
 
         return $routes;
     }
-}
+}
diff --git a/Invalidator/InvalidatorCollectionFactory.php b/Invalidator/InvalidatorCollectionFactory.php
@@ -33,4 +33,4 @@ public static function getInvalidatorCollection(array $configs)
 
         return $collection;
     }
-}
+}
diff --git a/Invalidator/InvalidatorInterface.php b/Invalidator/InvalidatorInterface.php
@@ -54,4 +54,4 @@ public function addInvalidatedRoute($route, array $config);
      * @return array
      */
     public function getInvalidatedRoutes();
-}
+}
diff --git a/Tests/Functional/Command/InvalidatePathCommandTest.php b/Tests/Functional/Command/InvalidatePathCommandTest.php
@@ -11,9 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
-use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 
 class InvalidatePathCommandTest extends CommandTestCase
 {

diff --git a/Tests/Functional/Command/InvalidateRegexCommandTest.php b/Tests/Functional/Command/InvalidateRegexCommandTest.php
@@ -11,9 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
-use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 
 class InvalidateRegexCommandTest extends CommandTestCase
 {

diff --git a/Tests/Functional/Command/InvalidateTagCommandTest.php b/Tests/Functional/Command/InvalidateTagCommandTest.php
@@ -11,9 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
-use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 
 class InvalidateTagCommandTest extends CommandTestCase
 {

diff --git a/Tests/Functional/Command/RefreshPathCommandTest.php b/Tests/Functional/Command/RefreshPathCommandTest.php
@@ -11,9 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
-use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 
 class RefreshPathCommandTest extends CommandTestCase
 {

diff --git a/Tests/Unit/DependencyInjection/FOSHttpCacheExtensionTest.php b/Tests/Unit/DependencyInjection/FOSHttpCacheExtensionTest.php
@@ -13,7 +13,6 @@
 
 use FOS\HttpCacheBundle\DependencyInjection\FOSHttpCacheExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use \Mockery;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
 class FOSHttpCacheExtensionTest extends \PHPUnit_Framework_TestCase

diff --git a/Tests/Unit/EventListener/TagSubscriberTest.php b/Tests/Unit/EventListener/TagSubscriberTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace FOS\HttpCacheBundle\Test\Unit\EventListener;
+namespace FOS\HttpCacheBundle\Tests\Unit\EventListener;
 
 use FOS\HttpCacheBundle\CacheManager;
 use FOS\HttpCacheBundle\Configuration\Tag;

diff --git a/Tests/Unit/EventListener/UserContextSubscriberTest.php b/Tests/Unit/EventListener/UserContextSubscriberTest.php
@@ -38,7 +38,6 @@ public function testOnKernelRequest()
 
         $response = $event->getResponse();
 
-
         $this->assertNotNull($response);
         $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
         $this->assertEquals('hash', $response->headers->get('X-Hash'));

diff --git a/Tests/Unit/UserContext/RequestMatcherTest.php b/Tests/Unit/UserContext/RequestMatcherTest.php
@@ -48,4 +48,4 @@ public function testNoMatch()
 
         $this->assertFalse($requestMatcher->matches($request));
     }
-}
+}