Fix some issues

Author: ddeboer

EventListener/FlashMessageSubscriber.php

@@ -58,11 +58,11 @@ public static function getSubscribedEvents()
         );
     }
 
-   /**
-    * Moves flash messages from the session to a cookie inside a Response Kernel listener
-    *
-    * @param FilterResponseEvent $event
-    */
+    /**
+     * Moves flash messages from the session to a cookie inside a Response Kernel listener
+     *
+     * @param FilterResponseEvent $event
+     */
     public function onKernelResponse(FilterResponseEvent $event)
     {
         if ($event->getRequestType() !== HttpKernel::MASTER_REQUEST) {

EventListener/InvalidationSubscriber.php

@@ -58,9 +58,9 @@ class InvalidationSubscriber extends AbstractRuleSubscriber implements EventSubs
     /**
      * Constructor
      *
-     * @param CacheManager          $cacheManager
-     * @param UrlGeneratorInterface $urlGenerator
-     * @param ExpressionLanguage    $expressionLanguage
+     * @param CacheManager            $cacheManager
+     * @param UrlGeneratorInterface   $urlGenerator
+     * @param ExpressionLanguage|null $expressionLanguage
      */
     public function __construct(
         CacheManager $cacheManager,
@@ -82,8 +82,6 @@ public function __construct(
      *   HTTP cache.
      *
      * @param PostResponseEvent $event
-     *
-     * @return array Paths that were flushed from the invalidation queue
      */
     public function onKernelTerminate(PostResponseEvent $event)
     {

EventListener/TagSubscriber.php

@@ -39,8 +39,8 @@ class TagSubscriber extends AbstractRuleSubscriber implements EventSubscriberInt
     /**
      * Constructor
      *
-     * @param CacheManager       $cacheManager
-     * @param ExpressionLanguage $expressionLanguage
+     * @param CacheManager            $cacheManager
+     * @param ExpressionLanguage|null $expressionLanguage
      */
     public function __construct(
         CacheManager $cacheManager,

Test/ProxyTestCase.php

@@ -19,8 +19,8 @@ abstract class ProxyTestCase extends WebTestCase
     /**
      * Assert cache hit
      *
-     * @param Response $response
-     * @param string   $message
+     * @param Response    $response
+     * @param string|null $message
      */
     public function assertHit(Response $response, $message = null)
     {
@@ -30,8 +30,8 @@ public function assertHit(Response $response, $message = null)
     /**
      * Assert cache miss
      *
-     * @param Response $response
-     * @param string   $message
+     * @param Response    $response
+     * @param string|null $message
      */
     public function assertMiss(Response $response, $message = null)
     {

Tests/Functional/Fixtures/Session/TestSessionStorage.php

@@ -3,166 +3,109 @@
 namespace FOS\HttpCacheBundle\Tests\Functional\Fixtures\Session;
 
 use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
 use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
+/**
+ * {@inheritdoc}
+ */
 class TestSessionStorage implements SessionStorageInterface
 {
     private $started = false;
 
     private $bags = array();
 
     /**
-     * Starts the session.
-     *
-     * @throws \RuntimeException If something goes wrong starting the session.
-     *
-     * @return bool True if started.
-     *
-     * @api
+     * {@inheritdoc}
      */
     public function start()
     {
-        $this->started = true;
+        return $this->started = true;
     }
 
     /**
-     * Checks if the session is started.
-     *
-     * @return bool True if started, false otherwise.
+     * {@inheritdoc}
      */
     public function isStarted()
     {
         return $this->started;
     }
 
     /**
-     * Returns the session ID
-     *
-     * @return string The session ID or empty.
-     *
-     * @api
+     * {@inheritdoc}
      */
     public function getId()
     {
         return 'test';
     }
 
     /**
-     * Sets the session ID
-     *
-     * @param string $id
-     *
-     * @api
+     * {@inheritdoc}
      */
     public function setId($id)
     {
     }
 
     /**
-     * Returns the session name
-     *
-     * @return mixed The session name.
-     *
-     * @api
+     * {@inheritdoc}
      */
     public function getName()
     {
         return 'TESTSESSID';
     }
 
     /**
-     * Sets the session name
-     *
-     * @param string $name
-     *
-     * @api
+     * {@inheritdoc}
      */
+
     public function setName($name)
     {
     }
 
     /**
-     * Regenerates id that represents this storage.
-     *
-     * This method must invoke session_regenerate_id($destroy) unless
-     * this interface is used for a storage object designed for unit
-     * or functional testing where a real PHP session would interfere
-     * with testing.
-     *
-     * 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.
-     *
-     * @return bool True if session regenerated, false if error
-     *
-     * @throws \RuntimeException If an error occurs while regenerating this storage
-     *
-     * @api
+     * {@inheritdoc}
      */
     public function regenerate($destroy = false, $lifetime = null)
     {
         return true;
     }
 
     /**
-     * Force the session to be saved and closed.
-     *
-     * This method must invoke session_write_close() unless this interface is
-     * used for a storage object design for unit or functional testing where
-     * a real PHP session would interfere with testing, in which case it
-     * it should actually persist the session data if required.
-     *
-     * @throws \RuntimeException If the session is saved without being started, or if the session
-     *                           is already closed.
+     * {@inheritdoc}
      */
     public function save()
     {
     }
 
     /**
-     * Clear all session data in memory.
+     * {@inheritdoc}
      */
     public function clear()
     {
     }
 
     /**
-     * Gets a SessionBagInterface by name.
-     *
-     * @param string $name
-     *
-     * @return SessionBagInterface
-     *
-     * @throws \InvalidArgumentException If the bag does not exist
+     * {@inheritdoc}
      */
     public function getBag($name)
     {
         return $this->bags[$name];
     }
 
     /**
-     * Registers a SessionBagInterface for use.
-     *
-     * @param SessionBagInterface $bag
+     * {@inheritdoc}
      */
     public function registerBag(SessionBagInterface $bag)
     {
-        if ($bag->getName() == "attributes") {
+        if ($bag->getName() == 'attributes') {
             $bag->set('_security_secured_area', serialize(new UsernamePasswordToken('user', 'user', 'in_memory', array('ROLE_USER'))));
         }
 
         $this->bags[$bag->getName()] = $bag;
     }
 
     /**
-     * @return MetadataBag
+     * {@inheritdoc}
      */
     public function getMetadataBag()
     {