Merge pull request #370 from FriendsOfSymfony/update-master

Update master from 1.4 branch

.travis.yml

@@ -63,7 +63,7 @@ script:
   - if [[ "$DOCCHECK" = true ]]; then make -C doc spelling; fi
 
 after_script:
-  # avoid uploading the code coverage for HHVM as it cannot generate it (PHPUnit dropped the old HHVM driver and the 
+  # avoid uploading the code coverage for HHVM as it cannot generate it (PHPUnit dropped the old HHVM driver and the
   # XDebug API is not implemented in HHVM 3.5) and we don't want to cancel the Scrutinizer analysis by notifying
   # it than no coverage data is available
   - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

CHANGELOG.md

@@ -94,6 +94,11 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
   tags are formatted, use the new `header_formatter` option with a
   `TagHeaderFormatter`.
 
+1.4.3
+-----
+
+* Avoid warning about `count(null)` in PHP 7.2.
+
 1.4.2
 -----
 

src/CacheInvalidator.php

@@ -110,7 +110,7 @@ public function supports($operation)
      *
      * @return $this
      *
-     * @throws \Exception When trying to override the event dispatcher
+     * @throws \Exception when trying to override the event dispatcher
      */
     public function setEventDispatcher(EventDispatcherInterface $eventDispatcher)
     {
@@ -262,9 +262,9 @@ public function invalidateRegex($path, $contentType = null, $hosts = null)
     /**
      * Send all pending invalidation requests.
      *
-     * @return int The number of cache invalidations performed per caching server
+     * @return int the number of cache invalidations performed per caching server
      *
-     * @throws ExceptionCollection If any errors occurred during flush
+     * @throws ExceptionCollection if any errors occurred during flush
      */
     public function flush()
     {

src/Exception/InvalidUrlException.php

@@ -17,7 +17,7 @@
 class InvalidUrlException extends InvalidArgumentException implements HttpCacheException
 {
     /**
-     * @param string $url    The invalid URL
+     * @param string $url    the invalid URL
      * @param string $reason Further explanation why the URL was invalid (optional)
      *
      * @return self

src/Exception/MissingHostException.php

@@ -18,7 +18,7 @@
 class MissingHostException extends \RuntimeException implements HttpCacheException
 {
     /**
-     * @param string $path The path that was asked to be invalidated
+     * @param string $path the path that was asked to be invalidated
      *
      * @return MissingHostException
      */

src/Exception/UnsupportedProxyOperationException.php

@@ -18,7 +18,7 @@
 class UnsupportedProxyOperationException extends \RuntimeException implements HttpCacheException
 {
     /**
-     * @param string $method Name of the HTTP method that would be required
+     * @param string $method name of the HTTP method that would be required
      *
      * @return UnsupportedProxyOperationException
      */

src/ProxyClient/Invalidation/BanCapable.php

@@ -64,11 +64,11 @@ public function ban(array $headers);
      *
      *    $client->banPath('*.png$', null, '^www.example.com$');
      *
-     * @param string       $path        Regular expression pattern for URI to
+     * @param string       $path        regular expression pattern for URI to
      *                                  invalidate
-     * @param string       $contentType Regular expression pattern for the content
+     * @param string       $contentType regular expression pattern for the content
      *                                  type to limit banning, for instance 'text'
-     * @param array|string $hosts       Regular expression of a host name or list
+     * @param array|string $hosts       regular expression of a host name or list
      *                                  of exact host names to limit banning
      *
      * @return $this

src/ProxyClient/ProxyClient.php

@@ -23,9 +23,9 @@ interface ProxyClient
     /**
      * Send all pending invalidation requests.
      *
-     * @return int The number of cache invalidations performed per caching server
+     * @return int the number of cache invalidations performed per caching server
      *
-     * @throws ExceptionCollection If any errors occurred during flush
+     * @throws ExceptionCollection if any errors occurred during flush
      */
     public function flush();
 }

src/SymfonyCache/CacheEvent.php

@@ -41,9 +41,9 @@ class CacheEvent extends Event
     /**
      * Make sure your $kernel implements CacheInvalidationInterface.
      *
-     * @param CacheInvalidation $kernel   The kernel raising with this event
-     * @param Request           $request  The request being processed
-     * @param Response          $response The response, if available
+     * @param CacheInvalidation $kernel   the kernel raising with this event
+     * @param Request           $request  the request being processed
+     * @param Response          $response the response, if available
      */
     public function __construct(CacheInvalidation $kernel, Request $request, Response $response = null)
     {
@@ -76,7 +76,7 @@ public function getRequest()
      * Events that occur after the response is created provide the default response.
      * Event listeners can also set the response to make it available here.
      *
-     * @return Response|null The response if one was set
+     * @return Response|null the response if one was set
      */
     public function getResponse()
     {

src/SymfonyCache/UserContextListener.php

@@ -220,7 +220,7 @@ private function isSessionName($name)
      *
      * @param Request $request
      *
-     * @return Request The request that will return the user context hash value
+     * @return Request the request that will return the user context hash value
      */
     private function generateHashLookupRequest(Request $request)
     {

tests/Functional/Varnish/UserContextTestCase.php

@@ -24,7 +24,7 @@ abstract class UserContextTestCase extends VarnishTestCase
     /**
      * Assert that the context cache status is as expected.
      *
-     * @param string $hashCache The cache status of the context request
+     * @param string $hashCache the cache status of the context request
      */
     abstract protected function assertContextCache($hashCache);