Remove deprecations

doc/invalidation-handlers.rst

@@ -9,11 +9,6 @@ to simplify common operations.
 Tag Handler
 -----------
 
-.. versionadded:: 1.3
-    The tag handler was added in FOSHttpCache 1.3. If you are using an older
-    version of the library and can not update, you need to use
-    ``CacheInvalidator::invalidateTags``.
-
 The tag handler helps you to mark responses with tags that you can later use to
 invalidate all cache entries with that tag. Tag invalidation works only with a
 ``CacheInvalidator`` that supports ``CacheInvalidator::INVALIDATE``.

src/CacheInvalidator.php

@@ -20,7 +20,6 @@
 use FOS\HttpCache\ProxyClient\Invalidation\BanInterface;
 use FOS\HttpCache\ProxyClient\Invalidation\PurgeInterface;
 use FOS\HttpCache\ProxyClient\Invalidation\RefreshInterface;
-use FOS\HttpCache\Handler\TagHandler;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -58,18 +57,6 @@ class CacheInvalidator
      */
     private $eventDispatcher;
 
-    /**
-     * @deprecated This reference is only for BC and will be removed in version 2.0.
-     *
-     * @var TagHandler
-     */
-    private $tagHandler;
-
-    /**
-     * @var string
-     */
-    private $tagsHeader = 'X-Cache-Tags';
-
     /**
      * Constructor
      *
@@ -78,9 +65,6 @@ class CacheInvalidator
     public function __construct(ProxyClientInterface $cache)
     {
         $this->cache = $cache;
-        if ($cache instanceof BanInterface) {
-            $this->tagHandler = new TagHandler($this, $this->tagsHeader);
-        }
     }
 
     /**
@@ -144,52 +128,6 @@ public function getEventDispatcher()
         return $this->eventDispatcher;
     }
 
-    /**
-     * Add subscriber
-     *
-     * @param EventSubscriberInterface $subscriber
-     *
-     * @return $this
-     *
-     * @deprecated Use getEventDispatcher()->addSubscriber($subscriber) instead.
-     */
-    public function addSubscriber(EventSubscriberInterface $subscriber)
-    {
-        $this->getEventDispatcher()->addSubscriber($subscriber);
-
-        return $this;
-    }
-
-    /**
-     * Set the HTTP header name that will hold cache tags
-     *
-     * @param string $tagsHeader
-     *
-     * @return $this
-     *
-     * @deprecated Use constructor argument to TagHandler instead.
-     */
-    public function setTagsHeader($tagsHeader)
-    {
-        if ($this->tagHandler && $this->tagHandler->getTagsHeaderName() !== $tagsHeader) {
-            $this->tagHandler = new TagHandler($this, $tagsHeader);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the HTTP header name that will hold cache tags
-     *
-     * @return string
-     *
-     * @deprecated Use TagHandler::getTagsHeaderName instead.
-     */
-    public function getTagsHeader()
-    {
-        return $this->tagHandler ? $this->tagHandler->getTagsHeaderName() : $this->tagsHeader;
-    }
-
     /**
      * Invalidate a path or URL
      *
@@ -200,7 +138,7 @@ public function getTagsHeader()
      *
      * @return $this
      */
-    public function invalidatePath($path, array $headers = array())
+    public function invalidatePath($path, array $headers = [])
     {
         if (!$this->cache instanceof PurgeInterface) {
             throw UnsupportedProxyOperationException::cacheDoesNotImplement('PURGE');
@@ -223,7 +161,7 @@ public function invalidatePath($path, array $headers = array())
      *
      * @return $this
      */
-    public function refreshPath($path, array $headers = array())
+    public function refreshPath($path, array $headers = [])
     {
         if (!$this->cache instanceof RefreshInterface) {
             throw UnsupportedProxyOperationException::cacheDoesNotImplement('REFRESH');
@@ -238,7 +176,7 @@ public function refreshPath($path, array $headers = array())
      * Invalidate all cached objects matching the provided HTTP headers.
      *
      * Each header is a a POSIX regular expression, for example
-     * array('X-Host' => '^(www\.)?(this|that)\.com$')
+     * ['X-Host' => '^(www\.)?(this|that)\.com$']
      *
      * @see BanInterface::ban()
      *
@@ -265,7 +203,7 @@ public function invalidate(array $headers)
      *
      * The hosts parameter can either be a regular expression, e.g.
      * '^(www\.)?(this|that)\.com$' or an array of exact host names, e.g.
-     * array('example.com', 'other.net'). If the parameter is empty, all hosts
+     * ['example.com', 'other.net']. If the parameter is empty, all hosts
      * are matched.
      *
      * @see BanInterface::banPath()
@@ -292,29 +230,6 @@ public function invalidateRegex($path, $contentType = null, $hosts = null)
         return $this;
     }
 
-    /**
-     * Invalidate cache entries that contain any of the specified tags in their
-     * tag header.
-     *
-     * @param array $tags Cache tags
-     *
-     * @throws UnsupportedProxyOperationException If HTTP cache does not support BAN requests
-     *
-     * @return $this
-     *
-     * @deprecated Use TagHandler::invalidateTags instead.
-     */
-    public function invalidateTags(array $tags)
-    {
-        if (!$this->tagHandler) {
-            throw UnsupportedProxyOperationException::cacheDoesNotImplement('BAN');
-        }
-
-        $this->tagHandler->invalidateTags($tags);
-
-        return $this;
-    }
-
     /**
      * Send all pending invalidation requests.
      *

src/Exception/ExceptionCollection.php

@@ -17,9 +17,9 @@
  */
 class ExceptionCollection extends \Exception implements \IteratorAggregate, \Countable, HttpCacheExceptionInterface
 {
-    private $exceptions = array();
-    
-    public function __construct(array $exceptions = array())
+    private $exceptions = [];
+
+    public function __construct(array $exceptions = [])
     {
         foreach ($exceptions as $exception) {
             $this->add($exception);

src/Handler/TagHandler.php

@@ -35,7 +35,7 @@ class TagHandler
     /**
      * @var array
      */
-    private $tags = array();
+    private $tags = [];
 
     /**
      * Constructor
@@ -113,7 +113,7 @@ public function addTags(array $tags)
     public function invalidateTags(array $tags)
     {
         $tagExpression = sprintf('(%s)(,.+)?$', implode('|', array_map('preg_quote', $this->escapeTags($tags))));
-        $headers = array($this->tagsHeader => $tagExpression);
+        $headers = [$this->tagsHeader => $tagExpression];
         $this->invalidator->invalidate($headers);
 
         return $this;
@@ -129,7 +129,7 @@ public function invalidateTags(array $tags)
     protected function escapeTags(array $tags)
     {
         array_walk($tags, function (&$tag) {
-            $tag = str_replace(array(',', "\n"), array('_', '_'), $tag);
+            $tag = str_replace([',', "\n"], ['_', '_'], $tag);
         });
 
         return $tags;

src/ProxyClient/Invalidation/BanInterface.php

@@ -46,7 +46,7 @@ public function ban(array $headers);
      *
      * The hosts parameter can either be a regular expression, e.g.
      * '^(www\.)?(this|that)\.com$' or an array of exact host names, e.g.
-     * array('example.com', 'other.net'). If the parameter is empty, all hosts
+     * ['example.com', 'other.net']. If the parameter is empty, all hosts
      * are matched.
 
      * @param string       $path        Regular expression pattern for URI to

src/ProxyClient/Invalidation/PurgeInterface.php

@@ -36,5 +36,5 @@ interface PurgeInterface extends ProxyClientInterface
      *
      * @return $this
      */
-    public function purge($url, array $headers = array());
+    public function purge($url, array $headers = []);
 }

src/ProxyClient/Invalidation/RefreshInterface.php

@@ -37,5 +37,5 @@ interface RefreshInterface extends ProxyClientInterface
      *
      * @return $this
      */
-    public function refresh($url, array $headers = array());
+    public function refresh($url, array $headers = []);
 }

src/ProxyClient/Symfony.php

@@ -62,7 +62,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function purge($url, array $headers = array())
+    public function purge($url, array $headers = [])
     {
         $this->queueRequest($this->options['purge_method'], $url, $headers);
 
@@ -72,9 +72,9 @@ public function purge($url, array $headers = array())
     /**
      * {@inheritdoc}
      */
-    public function refresh($url, array $headers = array())
+    public function refresh($url, array $headers = [])
     {
-        $headers = array_merge($headers, array('Cache-Control' => 'no-cache'));
+        $headers = array_merge($headers, ['Cache-Control' => 'no-cache']);
         $this->queueRequest(self::HTTP_METHOD_REFRESH, $url, $headers);
 
         return $this;

src/SymfonyCache/CacheEvent.php

@@ -39,17 +39,13 @@ class CacheEvent extends Event
     private $response;
 
     /**
-     * Make sure your $kernel implements CacheInvalidationInterface. Creating the event with other
-     * HttpCache classes is deprecated and will no longer be supported in version 2 of this library.
+     * Make sure your $kernel implements CacheInvalidationInterface
      *
-     * @param CacheInvalidationInterface|HttpCache $kernel  The kernel raising with this event.
+     * @param CacheInvalidationInterface$kernel  The kernel raising with this event.
      * @param Request                              $request The request being processed.
      */
-    public function __construct($kernel, Request $request)
+    public function __construct(CacheInvalidationInterface $kernel, Request $request)
     {
-        if (!($kernel instanceof CacheInvalidationInterface || $kernel instanceof HttpCache)) {
-            throw new \InvalidArgumentException('Expected a CacheInvalidationInterface or HttpCache');
-        }
         $this->kernel = $kernel;
         $this->request = $request;
     }

src/SymfonyCache/PurgeSubscriber.php

@@ -34,7 +34,7 @@ class PurgeSubscriber extends AccessControlledSubscriber
      *
      * @var array
      */
-    private $options = array();
+    private $options = [];
 
     /**
      * When creating this subscriber, you can configure a number of options.
@@ -49,14 +49,14 @@ class PurgeSubscriber extends AccessControlledSubscriber
      *
      * @throws \InvalidArgumentException if unknown keys are found in $options
      */
-    public function __construct(array $options = array())
+    public function __construct(array $options = [])
     {
         $resolver = new OptionsResolver();
         if (method_exists($resolver, 'setDefined')) {
             // this was only added in symfony 2.6
-            $resolver->setDefined(array('purge_client_matcher', 'purge_client_ips', 'purge_method'));
+            $resolver->setDefined(['purge_client_matcher', 'purge_client_ips', 'purge_method']);
         } else {
-            $resolver->setOptional(array('purge_client_matcher', 'purge_client_ips', 'purge_method'));
+            $resolver->setOptional(['purge_client_matcher', 'purge_client_ips', 'purge_method']);
         }
         $resolver->setDefaults(array(
             'purge_client_matcher' => null,

src/SymfonyCache/RefreshSubscriber.php

@@ -42,7 +42,7 @@ class RefreshSubscriber extends AccessControlledSubscriber
      *
      * @throws \InvalidArgumentException if unknown keys are found in $options
      */
-    public function __construct(array $options = array())
+    public function __construct(array $options = [])
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults(array(

src/SymfonyCache/UserContextSubscriber.php

@@ -56,7 +56,7 @@ class UserContextSubscriber implements EventSubscriberInterface
      *
      * @throws \InvalidArgumentException if unknown keys are found in $options
      */
-    public function __construct(array $options = array())
+    public function __construct(array $options = [])
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults(array(
@@ -123,7 +123,7 @@ public function preHandle(CacheEvent $event)
      */
     protected function cleanupHashLookupRequest(Request $hashLookupRequest, Request $originalRequest)
     {
-        $sessionIds = array();
+        $sessionIds = [];
         foreach ($originalRequest->cookies as $name => $value) {
             if ($this->isSessionName($name)) {
                 $sessionIds[$name] = $value;
@@ -223,7 +223,7 @@ private function isSessionName($name)
      */
     private function generateHashLookupRequest(Request $request)
     {
-        $hashLookupRequest = Request::create($this->options['user_hash_uri'], $this->options['user_hash_method'], array(), array(), array(), $request->server->all());
+        $hashLookupRequest = Request::create($this->options['user_hash_uri'], $this->options['user_hash_method'], [], [], [], $request->server->all());
         $hashLookupRequest->attributes->set('internalRequest', true);
         $hashLookupRequest->headers->set('Accept', $this->options['user_hash_accept_header']);
         $this->cleanupHashLookupRequest($hashLookupRequest, $request);

src/Test/NginxTestCase.php

@@ -128,7 +128,7 @@ protected function getProxyClient($purgeLocation = '')
     {
         if (null === $this->proxyClient) {
             $this->proxyClient = new Nginx(
-                array('http://127.0.0.1:' . $this->getCachingProxyPort()),
+                ['http://127.0.0.1:' . $this->getCachingProxyPort()],
                 $this->getHostName()
             );
 

src/Test/Proxy/NginxProxy.php

@@ -52,7 +52,7 @@ public function start()
     public function stop()
     {
         if (file_exists($this->pid)) {
-            $this->runCommand('kill', array(file_get_contents($this->pid)));
+            $this->runCommand('kill', [file_get_contents($this->pid)]);
         }
     }
 
@@ -61,7 +61,7 @@ public function stop()
      */
     public function clear()
     {
-        $this->runCommand('rm', array('-rf', $this->getCacheDir()));
+        $this->runCommand('rm', ['-rf', $this->getCacheDir()]);
         $this->start();
     }
 

src/Test/Proxy/VarnishProxy.php

@@ -62,7 +62,7 @@ public function stop()
     {
         if (file_exists($this->pid)) {
             try {
-                $this->runCommand('kill', array('-9', file_get_contents($this->pid)));
+                $this->runCommand('kill', ['-9', file_get_contents($this->pid)]);
             } catch (\RuntimeException $e) {
                 // Ignore if command fails when Varnish wasn't running
             }

src/Test/SymfonyTestCase.php

@@ -84,10 +84,10 @@ protected function getProxyClient()
     {
         if (null === $this->proxyClient) {
             $this->proxyClient = new Symfony(
-                array('http://127.0.0.1:' . $this->getCachingProxyPort()),
+                ['http://127.0.0.1:' . $this->getCachingProxyPort()],
                 $this->getHostName() . ':' . $this->getCachingProxyPort(),
                 null,
-                array('purge_method' => 'NOTIFY')
+                ['purge_method' => 'NOTIFY']
             );
         }
 

src/Test/VarnishTestCase.php

@@ -152,7 +152,7 @@ protected function getProxyClient()
     {
         if (null === $this->proxyClient) {
             $this->proxyClient = new Varnish(
-                array('http://127.0.0.1:' . $this->getProxy()->getPort()),
+                ['http://127.0.0.1:' . $this->getProxy()->getPort()],
                 $this->getHostName() . ':' . $this->getProxy()->getPort()
             );
         }