Merge branch '1.3' into travis

Conflicts:
	.travis.yml
	CHANGELOG.md
	src/EventListener/SessionListener.php

Author: XWB

CHANGELOG.md

@@ -189,6 +189,11 @@ access to other services.)
 * Added an option `always_vary_on_context_hash` to make it possible to disable 
   automatically setting the vary headers for the user hash.
 
+1.3.16
+------
+
+* Adjust session_listener to work with Symfony 3.4.12 (https://github.com/symfony/symfony/pull/27467).
+
 1.3.15
 ------
 

src/EventListener/SessionListener.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\SessionListener as BaseSessionListener;
 
@@ -81,7 +82,13 @@ public function onKernelResponse(FilterResponseEvent $event)
         // noop, see class description
     }
 
-    public static function getSubscribedEvents(): array
+    public function onFinishRequest(FinishRequestEvent $event)
+    {
+        // this hook has been added in symfony 3.4.12 - older versions of the listener do not register for it
+        $this->inner->onFinishRequest($event);
+    }
+
+    public static function getSubscribedEvents()
     {
         return BaseSessionListener::getSubscribedEvents();
     }

tests/Unit/EventListener/SessionListenerTest.php

@@ -38,6 +38,32 @@ public function testOnKernelRequestRemainsUntouched()
         $listener->onKernelRequest($event);
     }
 
+    public function testOnFinishRequestRemainsUntouched()
+    {
+        if (!method_exists('Symfony\Component\HttpKernel\EventListener\SessionListener', 'onFinishRequest')) {
+            $this->markTestSkipped('Method onFinishRequest does not exist on Symfony\Component\HttpKernel\EventListener\SessionListener');
+        }
+
+        $event = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Event\FinishRequestEvent')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $inner = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\EventListener\SessionListener')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $inner
+            ->expects($this->once())
+            ->method('onFinishRequest')
+            ->with($event)
+        ;
+
+        $listener = $this->getListener($inner);
+        $listener->onFinishRequest($event);
+    }
+
     /**
      * @dataProvider onKernelResponseProvider
      */