applied codestyle fixer to remove unused imports and align phpdoc

FriendsOfSymfony · Aug 5, 2014 · 34b6d11 · 34b6d11
1 parent c41edd6
commit 34b6d11
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 27 deletions.
diff --git a/DependencyInjection/FOSHttpCacheExtension.php b/DependencyInjection/FOSHttpCacheExtension.php
@@ -61,7 +61,6 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('cache_manager.xml');
         }
 
-
         if ($config['tags']['enabled']) {
             // true or auto
             $loader->load('tag_listener.xml');

diff --git a/EventListener/InvalidationSubscriber.php b/EventListener/InvalidationSubscriber.php
@@ -19,7 +19,6 @@
 use Symfony\Component\Console\Event\ConsoleEvent;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\ExpressionLanguage\SyntaxError;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/Security/Http/Logout/ContextInvalidationLogoutHandler.php b/Security/Http/Logout/ContextInvalidationLogoutHandler.php
@@ -50,8 +50,8 @@ public function __construct(BanInterface $banner, $userIdentifierHeaders, $accep
     /**
      * Invalidate the user context hash
      *
-     * @param Request $request
-     * @param Response $response
+     * @param Request        $request
+     * @param Response       $response
      * @param TokenInterface $token
      */
     public function logout(Request $request, Response $response, TokenInterface $token)

diff --git a/Tests/Functional/Fixtures/Session/TestSessionStorage.php b/Tests/Functional/Fixtures/Session/TestSessionStorage.php
@@ -18,7 +18,7 @@ class TestSessionStorage implements SessionStorageInterface
      *
      * @throws \RuntimeException If something goes wrong starting the session.
      *
-     * @return bool    True if started.
+     * @return bool True if started.
      *
      * @api
      */
@@ -30,7 +30,7 @@ public function start()
     /**
      * Checks if the session is started.
      *
-     * @return bool    True if started, false otherwise.
+     * @return bool True if started, false otherwise.
      */
     public function isStarted()
     {
@@ -94,13 +94,13 @@ public function setName($name)
      * Note regenerate+destroy should not clear the session data in memory
      * only delete the session data from persistent storage.
      *
-     * @param bool $destroy Destroy session when regenerating?
-     * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                          will leave the system settings unchanged, 0 sets the cookie
-     *                          to expire with browser session. Time is in seconds, and is
-     *                          not a Unix timestamp.
+     * @param bool $destroy  Destroy session when regenerating?
+     * @param int  $lifetime Sets the cookie lifetime for the session cookie. A null value
+     *                       will leave the system settings unchanged, 0 sets the cookie
+     *                       to expire with browser session. Time is in seconds, and is
+     *                       not a Unix timestamp.
      *
-     * @return bool    True if session regenerated, false if error
+     * @return bool True if session regenerated, false if error
      *
      * @throws \RuntimeException If an error occurs while regenerating this storage
      *
@@ -168,4 +168,4 @@ public function getMetadataBag()
     {
         return null;
     }
-}
+}
diff --git a/Tests/Functional/Security/Http/Logout/ContextInvalidationLogoutHandlerTest.php b/Tests/Functional/Security/Http/Logout/ContextInvalidationLogoutHandlerTest.php
@@ -22,4 +22,4 @@ public function testLogout()
         $client->getCookieJar()->set(new Cookie('TESTSESSID', 'test'));
         $client->request('GET', '/secured_area/logout');
     }
-} 
+}
diff --git a/Tests/Resources/Fixtures/config/nginx.yml b/Tests/Resources/Fixtures/config/nginx.yml
@@ -6,4 +6,3 @@ fos_http_cache:
             base_url: /test
             purge_location: /purge
             guzzle_client: acme.guzzle.nginx
-
diff --git a/Tests/Unit/Configuration/InvalidateRouteTest.php b/Tests/Unit/Configuration/InvalidateRouteTest.php
@@ -11,10 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Unit\Configuration;
 
-use FOS\HttpCacheBundle\Command\InvalidatePathCommand;
 use FOS\HttpCacheBundle\Configuration\InvalidateRoute;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * Test the @InvalidateRoute annotation.

diff --git a/Tests/Unit/DependencyInjection/Compiler/HashGeneratorPassTest.php b/Tests/Unit/DependencyInjection/Compiler/HashGeneratorPassTest.php
@@ -14,7 +14,6 @@
 use FOS\HttpCacheBundle\DependencyInjection\Compiler\HashGeneratorPass;
 use FOS\HttpCacheBundle\DependencyInjection\FOSHttpCacheExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 class HashGeneratorPassTest extends \PHPUnit_Framework_TestCase

diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -268,7 +268,7 @@ public function testCacheManagerNoClient()
             try {
                 $this->assertProcessedConfigurationEquals(array(), array($format));
                 $this->fail('No exception thrown on invalid configuration');
-            } catch(InvalidConfigurationException $e) {
+            } catch (InvalidConfigurationException $e) {
                 $this->assertContains('need to configure a proxy_client', $e->getMessage());
             }
         }
@@ -288,7 +288,7 @@ public function testTagsNoCacheManager()
             try {
                 $this->assertProcessedConfigurationEquals(array(), array($format));
                 $this->fail('No exception thrown on invalid configuration');
-            } catch(InvalidConfigurationException $e) {
+            } catch (InvalidConfigurationException $e) {
                 $this->assertContains('cache_manager needed for tag handling', $e->getMessage());
             }
         }
@@ -308,7 +308,7 @@ public function testInvalidationNoCacheManager()
             try {
                 $this->assertProcessedConfigurationEquals(array(), array($format));
                 $this->fail('No exception thrown on invalid configuration');
-            } catch(InvalidConfigurationException $e) {
+            } catch (InvalidConfigurationException $e) {
                 $this->assertContains('cache_manager needed for invalidation handling', $e->getMessage());
             }
         }
@@ -329,7 +329,7 @@ public function testTagRulesNotEnabled()
             try {
                 $this->assertProcessedConfigurationEquals(array(), array($format));
                 $this->fail('No exception thrown on invalid configuration');
-            } catch(InvalidConfigurationException $e) {
+            } catch (InvalidConfigurationException $e) {
                 $this->assertContains('need to enable the cache_manager and tags to use rules', $e->getMessage());
             }
         }
@@ -350,7 +350,7 @@ public function testInvalidationRulesNotEnabled()
             try {
                 $this->assertProcessedConfigurationEquals(array(), array($format));
                 $this->fail('No exception thrown on invalid configuration');
-            } catch(InvalidConfigurationException $e) {
+            } catch (InvalidConfigurationException $e) {
                 $this->assertContains('need to enable the cache_manager and invalidation to use rules', $e->getMessage());
             }
         }
@@ -370,7 +370,7 @@ public function testInvalidDate()
             try {
                 $this->assertProcessedConfigurationEquals(array(), array($format));
                 $this->fail('No exception thrown on invalid configuration');
-            } catch(InvalidConfigurationException $e) {
+            } catch (InvalidConfigurationException $e) {
                 $this->assertContains('Failed to parse time string', $e->getMessage());
             }
         }
@@ -393,7 +393,7 @@ public function testRulesBothStatusAndExpression()
             try {
                 $this->assertProcessedConfigurationEquals(array(), array($format));
                 $this->fail('No exception thrown on invalid configuration');
-            } catch(InvalidConfigurationException $e) {
+            } catch (InvalidConfigurationException $e) {
                 $this->assertContains('may not set both additional_cacheable_status and match_response', $e->getMessage());
             }
         }

diff --git a/Tests/Unit/DependencyInjection/FOSHttpCacheExtensionTest.php b/Tests/Unit/DependencyInjection/FOSHttpCacheExtensionTest.php
@@ -344,7 +344,7 @@ private function assertMatcherCreated(ContainerBuilder $container, array $attrib
         // first argument should be the reference to the matcher
         $reference = $ruleDefinition->getArgument(0);
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $reference);
-        $this->assertEquals($matcherId, (string)$reference);
+        $this->assertEquals($matcherId, (string) $reference);
 
         return $matcherDefinition;
     }