Upgrade 1-11.38

vendor/symfony/security-bundle/Security/FirewallMap.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Bundle\SecurityBundle\Security;
 
-use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Security\Http\FirewallMapInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * This is a lazy-loading firewall map implementation.
@@ -23,20 +22,100 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class FirewallMap implements FirewallMapInterface
+class FirewallMap extends _FirewallMap implements FirewallMapInterface
 {
-    protected $container;
-    protected $map;
+    /**
+     * @deprecated since version 3.3, to be removed in 4.0 alongside with magic methods below
+     */
+    private $container;
 
-    public function __construct(ContainerInterface $container, array $map)
+    /**
+     * @deprecated since version 3.3, to be removed in 4.0 alongside with magic methods below
+     */
+    private $map;
+
+    public function __construct(ContainerInterface $container, $map)
     {
+        parent::__construct($container, $map);
         $this->container = $container;
         $this->map = $map;
     }
 
     /**
-     * {@inheritdoc}
+     * @internal
      */
+    public function __get($name)
+    {
+        if ('map' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+
+            if ('map' === $name && $this->map instanceof \Traversable) {
+                $this->map = iterator_to_array($this->map);
+            }
+        }
+
+        return $this->$name;
+    }
+
+    /**
+     * @internal
+     */
+    public function __set($name, $value)
+    {
+        if ('map' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+
+            $set = \Closure::bind(function ($name, $value) { $this->$name = $value; }, $this, parent::class);
+            $set($name, $value);
+        }
+
+        $this->$name = $value;
+    }
+
+    /**
+     * @internal
+     */
+    public function __isset($name)
+    {
+        if ('map' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+        }
+
+        return isset($this->$name);
+    }
+
+    /**
+     * @internal
+     */
+    public function __unset($name)
+    {
+        if ('map' === $name || 'container' === $name) {
+            @trigger_error(sprintf('Using the "%s::$%s" property is deprecated since Symfony 3.3 as it will be removed/private in 4.0.', __CLASS__, $name), E_USER_DEPRECATED);
+
+            $unset = \Closure::bind(function ($name) { unset($this->$name); }, $this, parent::class);
+            $unset($name);
+        }
+
+        unset($this->$name);
+    }
+}
+
+/**
+ * @internal to be removed in 4.0
+ */
+class _FirewallMap
+{
+    private $container;
+    private $map;
+    private $contexts;
+
+    public function __construct(ContainerInterface $container, $map)
+    {
+        $this->container = $container;
+        $this->map = $map;
+        $this->contexts = new \SplObjectStorage();
+    }
+
     public function getListeners(Request $request)
     {
         $context = $this->getFirewallContext($request);
@@ -45,7 +124,7 @@ class FirewallMap implements FirewallMapInterface
             return array(array(), null);
         }
 
-        return $context->getContext();
+        return array($context->getListeners(), $context->getExceptionListener());
     }
 
     /**