From 344c78513095107903bcc868521a194e9b30d4a1 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@elao.com>
Date: Wed, 16 May 2018 10:02:29 +0200
Subject: [PATCH] [SecurityBundle] Fix FirewallContext constructor 3.4
 compatibility

---
 .../Bundle/SecurityBundle/Resources/config/security.xml      | 1 +
 .../Bundle/SecurityBundle/Security/FirewallContext.php       | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index b044ccba98e74..f8016b7176631 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -150,6 +150,7 @@
         <service id="security.firewall.context" class="%security.firewall.context.class%" abstract="true">
             <argument type="collection" />
             <argument type="service" id="security.exception_listener" />
+            <argument>null</argument>  <!-- FC Symfony >3.4 -->
             <argument />  <!-- LogoutListener -->
         </service>
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
index e9f8fe66d6395..ef6b810919dfb 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -26,7 +26,10 @@ class FirewallContext
     private $exceptionListener;
     private $logoutListener;
 
-    public function __construct(array $listeners, ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)
+    /**
+     * @param null $config Dummy argument for forward compatibility with Symfony 3.4
+     */
+    public function __construct(array $listeners, ExceptionListener $exceptionListener = null, $config = null, LogoutListener $logoutListener = null)
     {
         $this->listeners = $listeners;
         $this->exceptionListener = $exceptionListener;