Merge pull request #323 from FriendsOfSymfony/cleanup-travisscript

cleanup travis script and naming of varnish config

Author: dbu

.travis.yml

@@ -30,14 +30,15 @@ install:
 before_script:
   # Install Varnish
   - |
+    set -e
     if [ "$VARNISH_VERSION" = "5.0.0" ]; then
       wget https://repo.varnish-cache.org/pkg/${VARNISH_VERSION}/varnish_${VARNISH_VERSION}-1_amd64.deb
       sudo dpkg -i varnish_${VARNISH_VERSION}-1_amd64.deb
       sudo apt-get update -qq
       sudo apt-get -f install
     else
       curl http://repo.varnish-cache.org/debian/GPG-key.txt | sudo apt-key add -
-      echo "deb http://repo.varnish-cache.org/ubuntu/ precise varnish-${VARNISH_VERSION}" | sudo tee -a /etc/apt/sources.list
+      echo "deb https://repo.varnish-cache.org/ubuntu/ trusty varnish-${VARNISH_VERSION}" | sudo tee -a /etc/apt/sources.list
       sudo apt-get update -qq
       sudo apt-get install -qq varnish
     fi

CHANGELOG.md

@@ -16,6 +16,10 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
 * Added support and documentation for setting a custom TTL specifically for the
   caching proxy.
 
+### Logging
+
+* BC BREAK: Renamed the log event listener from Logsubscriber to LogListener.
+
 ### Tagging
 
 * Abstracting tags by adding new `TagsInterface` for ProxyClients, as part of
@@ -29,7 +33,7 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
 
 * Varnish configuration are now files that you can directly include from your
   .vcl and call custom functions to avoid copy-pasting VCL code.
-* Moved Varnish 4 and 5 configuration files from `resources/config/varnish-4/` 
+* Moved Varnish 4 and 5 configuration files from `resources/config/varnish-4/`
   to `resources/config/varnish/`.
 * Changed default Varnish version to 5.
 
@@ -40,7 +44,8 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
 
 ### Symfony HttpCache
 
-* BC BREAK: Constructors for PurgeSubscriber and RefreshSubscriber now use an
+* BC BREAK: Renamed all event listeners to XxListener instead of XxSubscriber.
+* BC BREAK: Constructors for PurgeListener and RefreshListener now use an
   options array for customization.
 
 ### Testing

doc/_static/tabs.css

@@ -25,7 +25,7 @@ div.configuration-block ul.simple li.selected a {
     color: white;
 }
 
-div.highlight-varnish3, div.highlight-varnish4 {
+div.highlight-varnish3, div.highlight-varnish {
     border: none !important;
 }
 
@@ -55,10 +55,10 @@ div.highlight pre {
     color: white !important;
 }
 
-div.highlight pre span.n, 
-div.highlight pre span.na, 
-div.highlight pre span.nb, 
-div.highlight pre span.nc, 
+div.highlight pre span.n,
+div.highlight pre span.na,
+div.highlight pre span.nb,
+div.highlight pre span.nc,
 div.highlight pre span.nf,
 div.highlight pre span.nx,
 div.highlight pre span.kn {
@@ -74,8 +74,8 @@ div.highlight pre span.k, div.highlight pre span.o {
 }
 
 div.highlight pre span.mi,
-div.highlight pre span.s, 
-div.highlight pre span.s1, 
+div.highlight pre span.s,
+div.highlight pre span.s1,
 div.highlight pre span.s2,
 div.highlight pre span.sr {
     color: #56db3a;

doc/cache-invalidator.rst

@@ -224,7 +224,7 @@ So, to catch exceptions::
 Logging errors
 ~~~~~~~~~~~~~~
 
-You can log any exceptions with the help of the ``LogSubscriber`` provided in
+You can log any exceptions with the help of the ``LogListener`` provided in
 this library. First construct a logger that implements
 ``\Psr\Log\LoggerInterface``. For instance, when using Monolog_::
 
@@ -233,12 +233,12 @@ this library. First construct a logger that implements
     $monolog = new Logger(...);
     $monolog->pushHandler(...);
 
-Then add the logger as a subscriber to the cache invalidator::
+Then add the logger as a listener to the cache invalidator::
 
-    use FOS\HttpCache\EventListener\LogSubscriber;
+    use FOS\HttpCache\EventListener\LogListener;
 
-    $subscriber = new LogSubscriber($monolog);
-    $cacheInvalidator->getEventDispatcher()->addSubscriber($subscriber);
+    $logListener = new LogListener($monolog);
+    $cacheInvalidator->getEventDispatcher()->addSubscriber($logListener);
 
 Now, if you flush the invalidator, errors will be logged::
 

doc/conf.py

@@ -9,7 +9,7 @@
 
 lexers['php'] = PhpLexer(startinline=True, linenos=1)
 lexers['varnish3'] = CLexer()
-lexers['varnish4'] = CLexer()
+lexers['varnish'] = CLexer()
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 if not on_rtd:  # only import and set the theme if we're building docs locally
@@ -263,5 +263,5 @@ def setup(app):
 
 config_block = {
     'varnish3': 'Varnish 3',
-    'varnish4': 'Varnish 4 & 5'
+    'varnish': 'Varnish 4 & 5'
 }

doc/symfony-cache-configuration.rst

@@ -40,7 +40,7 @@ trait ``FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache``::
         use EventDispatchingHttpCache;
 
         /**
-         * Made public to allow event subscribers to do refresh operations.
+         * Made public to allow event listeners to do refresh operations.
          *
          * {@inheritDoc}
          */
@@ -86,14 +86,14 @@ the listeners you need there::
 
     use FOS\HttpCache\SymfonyCache\DebugListener();
     use FOS\HttpCache\SymfonyCache\CustomTtlListener();
-    use FOS\HttpCache\SymfonyCache\PurgeSubscriber;
-    use FOS\HttpCache\SymfonyCache\RefreshSubscriber;
-    use FOS\HttpCache\SymfonyCache\UserContextSubscriber;
+    use FOS\HttpCache\SymfonyCache\PurgeListener;
+    use FOS\HttpCache\SymfonyCache\RefreshListener;
+    use FOS\HttpCache\SymfonyCache\UserContextListener;
 
     // ...
 
     /**
-     * Overwrite constructor to register event subscribers for FOSHttpCache.
+     * Overwrite constructor to register event listeners for FOSHttpCache.
      */
     public function __construct(
         HttpKernelInterface $kernel,
@@ -104,9 +104,9 @@ the listeners you need there::
         parent::__construct($kernel, $store, $surrogate, $options);
 
         $this->addSubscriber(new CustomTtlListener());
-        $this->addSubscriber(new PurgeSubscriber());
-        $this->addSubscriber(new RefreshSubscriber());
-        $this->addSubscriber(new UserContextSubscriber());
+        $this->addSubscriber(new PurgeListener());
+        $this->addSubscriber(new RefreshListener());
+        $this->addSubscriber(new UserContextListener());
         if (isset($options['debug']) && $options['debug']) {
             $this->addSubscriber(new DebugListener());
         }
@@ -120,7 +120,7 @@ Purge
 ~~~~~
 
 To support :ref:`cache invalidation <cache invalidate>`, register the
-``PurgeSubscriber``. If the default settings are right for you, you don't
+``PurgeListener``. If the default settings are right for you, you don't
 need to do anything more.
 
 Purging is only allowed from the same machine by default. To purge data from
@@ -146,14 +146,14 @@ Refresh
 ~~~~~~~
 
 To support :ref:`cache refresh <cache refresh>`, register the
-``RefreshSubscriber``. You can pass the constructor an option to specify
+``RefreshListener``. You can pass the constructor an option to specify
 what clients are allowed to refresh cache entries. Refreshing is only allowed
 from the same machine by default. To refresh from other hosts, provide the
 IPs of the machines allowed to refresh, or provide a RequestMatcher that
 checks for an Authorization header or similar. *Only set one of
 ``client_ips`` or ``client_matcher``*.
 
-The refresh subscriber needs to access the ``HttpCache::fetch`` method which
+The refresh listener needs to access the ``HttpCache::fetch`` method which
 is protected on the base HttpCache class. The ``EventDispatchingHttpCache``
 exposes the method as public, but if you implement your own kernel, you need
 to overwrite the method to make it public.
@@ -174,7 +174,7 @@ User Context
 ~~~~~~~~~~~~
 
 To support :doc:`user context hashing <user-context>` you need to register the
-``UserContextSubscriber``. The user context is then automatically recognized
+``UserContextListener``. The user context is then automatically recognized
 based on session cookies or authorization headers. If the default settings are
 right for you, you don't need to do anything more. You can customize a number of
 options through the constructor:
@@ -230,9 +230,9 @@ options through the constructor:
 Cleaning the Cookie Header
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-By default, the UserContextSubscriber only sets the session cookie (according to
+By default, the UserContextListener only sets the session cookie (according to
 the ``session_name_prefix`` option) in the requests to the backend. If you need
-a different behavior, overwrite ``UserContextSubscriber::cleanupHashLookupRequest``
+a different behavior, overwrite ``UserContextListener::cleanupHashLookupRequest``
 with your own logic.
 
 .. _symfonycache_customttl:
@@ -242,11 +242,11 @@ Custom TTL
 
 .. include:: includes/custom-ttl.rst
 
-The ``CustomTtlSubscriber`` looks at a specific header to determine the TTL,
+The ``CustomTtlListener`` looks at a specific header to determine the TTL,
 preferring that over ``s-maxage``. The default header is ``X-Reverse-Proxy-TTL``
-but you can customize that in the subscriber constructor::
+but you can customize that in the listener constructor::
 
-    new CustomTtlSubscriber('My-TTL-Header');
+    new CustomTtlListener('My-TTL-Header');
 
 The custom header is removed before sending the response to the client.
 

doc/varnish-configuration.rst

@@ -16,7 +16,7 @@ which IPs are allowed to issue invalidation requests. To use the provided
 configuration fragments, this ACL has to be named ``invalidators``. The most
 simple ACL, valid for all Varnish versions from 3 onwards, looks as follows:
 
-.. code-block:: varnish4
+.. code-block:: varnish
 
     # /etc/varnish/your_varnish.vcl
 
@@ -59,7 +59,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_purge.vcl";
 
@@ -100,7 +100,7 @@ To enable support, add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_refresh.vcl";
 
@@ -129,7 +129,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_ban.vcl";
 
@@ -186,7 +186,7 @@ VCL will look like this:
 .. configuration-block::
 
     .. literalinclude:: ../resources/config/varnish/fos_ban.vcl
-        :language: varnish4
+        :language: varnish
         :emphasize-lines: 17-22,49-50
         :linenos:
 
@@ -210,7 +210,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_user_context.vcl";
         include "path-to-config/varnish/fos_user_context_url.vcl";
@@ -294,7 +294,7 @@ To make the hash request cacheable, you must extract a stable user session id
 *before* calling ``fos_user_context_recv``. You can do this as
 `explained in the Varnish documentation`_:
 
-.. code-block:: varnish4
+.. code-block:: varnish
     :linenos:
 
     sub vcl_recv {
@@ -329,7 +329,7 @@ inline C enabled: ``-p vcc_allow_inline_c=on``. Then add the following to
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_custom_ttl.vcl";
 
@@ -362,7 +362,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_debug.vcl";
 

src/EventListener/LogSubscriber.php renamed to src/EventListener/LogListener.php

@@ -17,7 +17,10 @@
 use Psr\Log\LogLevel;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class LogSubscriber implements EventSubscriberInterface
+/**
+ * Log when the caching proxy client can't  send requests to the caching server.
+ */
+class LogListener implements EventSubscriberInterface
 {
     /**
      * @var LoggerInterface

src/ProxyClient/Symfony.php

@@ -13,7 +13,7 @@
 
 use FOS\HttpCache\ProxyClient\Invalidation\PurgeInterface;
 use FOS\HttpCache\ProxyClient\Invalidation\RefreshInterface;
-use FOS\HttpCache\SymfonyCache\PurgeSubscriber;
+use FOS\HttpCache\SymfonyCache\PurgeListener;
 
 /**
  * Symfony HttpCache invalidator.
@@ -53,7 +53,7 @@ protected function configureOptions()
     {
         $resolver = parent::configureOptions();
         $resolver->setDefaults([
-            'purge_method' => PurgeSubscriber::DEFAULT_PURGE_METHOD,
+            'purge_method' => PurgeListener::DEFAULT_PURGE_METHOD,
         ]);
 
         return $resolver;

src/SymfonyCache/AccessControlledSubscriber.php renamed to src/SymfonyCache/AccessControlledListener.php

@@ -25,15 +25,15 @@
  *
  * {@inheritdoc}
  */
-abstract class AccessControlledSubscriber implements EventSubscriberInterface
+abstract class AccessControlledListener implements EventSubscriberInterface
 {
     /**
      * @var RequestMatcher
      */
     private $clientMatcher;
 
     /**
-     * When creating this subscriber, you can configure a number of options.
+     * When creating this event listener, you can configure a number of options.
      *
      * - client_matcher: RequestMatcherInterface to identify clients that are allowed to send request.
      * - client_ips:     IP or array of IPs of clients that are allowed to send requests.

src/SymfonyCache/CacheInvalidationInterface.php

@@ -26,7 +26,7 @@ interface CacheInvalidationInterface extends HttpKernelInterface
      *
      * This methods is triggered when the cache missed or a reload is required.
      *
-     * This method is present on HttpCache but must be public to allow event subscribers to do
+     * This method is present on HttpCache but must be public to allow event listeners to do
      * refresh operations.
      *
      * @param Request $request A Request instance

src/SymfonyCache/EventDispatchingHttpCache.php

@@ -26,7 +26,7 @@
  * public does not satisfy the interface for whatever reason. See also
  * http://stackoverflow.com/questions/31877844/php-trait-exposing-a-method-and-interfaces )
  *
- * CacheInvalidator kernels support event subscribers that can act on the
+ * CacheInvalidator kernels support event listeners that can act on the
  * events defined in FOS\HttpCache\SymfonyCache\Events and may alter the
  * request flow.
  *
@@ -62,7 +62,7 @@ public function getEventDispatcher()
     }
 
     /**
-     * Add subscriber.
+     * Add an event subscriber.
      *
      * @param EventSubscriberInterface $subscriber
      */