[SecurityBundle] Rename FirewallContext#getContext()

chalasr · chalasr · commit 03b330cc6254 · 2016-11-20T11:18:12.000+01:00
diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md
@@ -28,6 +28,12 @@ FrameworkBundle
  * The `Resources/public/css/*.css` files have been removed (they are now inlined
    in TwigBundle).
 
+SecurityBundle
+--------------
+
+ * The `FirewallContext::getContext()` method has been deprecated and will be removed in 4.0.
+   Use the `getListeners()` method instead.
+
 Console
 -------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -131,6 +131,11 @@ FrameworkBundle
    `serializer.mapping.cache.apc` and `serializer.mapping.cache.doctrine.apc`
    have been removed. APCu should now be automatically used when available.
 
+SecurityBundle
+--------------
+
+ * The `FirewallContext::getContext()` method has been removed, use the `getListeners()` method instead.
+
 HttpFoundation
 ---------------
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -41,7 +41,17 @@ public function getConfig()
         return $this->config;
     }
 
+    /**
+     * @deprecated since version 3.3, will be removed in 4.0. Use {@link getListeners()} instead.
+     */
     public function getContext()
+    {
+        @trigger_error(sprintf('Method %s() is deprecated since version 3.3 and will be removed in 4.0. Use %s::getListeners() instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+
+        return $this->getListeners();
+    }
+
+    public function getListeners()
     {
         return array($this->listeners, $this->exceptionListener);
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -46,7 +46,7 @@ public function getListeners(Request $request)
             return array(array(), null);
         }
 
-        return $context->getContext();
+        return $context->getListeners();
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php
@@ -21,12 +21,7 @@ class FirewallContextTest extends \PHPUnit_Framework_TestCase
     public function testGetters()
     {
         $config = new FirewallConfig('main', 'request_matcher', 'user_checker');
-
-        $exceptionListener = $this
-            ->getMockBuilder(ExceptionListener::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
+        $exceptionListener = $this->getExceptionListenerMock();
         $listeners = array(
             $this
                 ->getMockBuilder(ListenerInterface::class)
@@ -36,7 +31,25 @@ public function testGetters()
 
         $context = new FirewallContext($listeners, $exceptionListener, $config);
 
-        $this->assertEquals(array($listeners, $exceptionListener), $context->getContext());
+        $this->assertEquals(array($listeners, $exceptionListener), $context->getListeners());
         $this->assertEquals($config, $context->getConfig());
     }
+
+    /**
+     * @expectedDeprecation Method Symfony\Bundle\SecurityBundle\Security\FirewallContext::getContext() is deprecated since version 3.2 and will be removed in 4.0. Use Symfony\Bundle\SecurityBundle\Security\FirewallContext::getListeners() instead.
+     * @group legacy
+     */
+    public function testGetContextTriggersDeprecation()
+    {
+        (new FirewallContext(array(), $this->getExceptionListenerMock(), new FirewallConfig('main', 'request_matcher', 'user_checker')))
+            ->getContext();
+    }
+
+    private function getExceptionListenerMock()
+    {
+        return $this
+            ->getMockBuilder(ExceptionListener::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,17 @@ public function getConfig()`
`41`	`41`	`return $this->config;`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ /**`
	`45`	`+ * @deprecated since version 3.3, will be removed in 4.0. Use {@link getListeners()} instead.`
	`46`	`+ */`
`44`	`47`	`public function getContext()`
	`48`	`+ {`
	`49`	`+ @trigger_error(sprintf('Method %s() is deprecated since version 3.3 and will be removed in 4.0. Use %s::getListeners() instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);`
	`50`	`+`
	`51`	`+ return $this->getListeners();`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ public function getListeners()`
`45`	`55`	`{`
`46`	`56`	`return array($this->listeners, $this->exceptionListener);`
`47`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function getListeners(Request $request)`
`46`	`46`	`return array(array(), null);`
`47`	`47`	`}`
`48`	`48`
`49`		`- return $context->getContext();`
	`49`	`+ return $context->getListeners();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`