symfony
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
Lines changed: 0 additions & 12 deletions b/‎src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
Lines changed: 0 additions & 12 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallConfigTest.php
Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallConfigTest.php
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php
Lines changed: 15 additions & 26 deletions b/‎src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php
Lines changed: 15 additions & 26 deletions
@@ -32,25 +32,13 @@ public function __construct(array $listeners, ExceptionListener $exceptionListen
         $this->config = $config;
     }
 
-    public function getListeners()
-    {
-        return array($this->listeners, $this->exceptionListener);
-    }
-
     public function getConfig()
     {
         return $this->config;
     }
 
-    /**
-     * @deprecated since 3.2. Use {@see getListeners()} instead.
-     *
-     * @return array
-     */
     public function getContext()
     {
-        @trigger_error(sprintf('Method %s() is deprecated since version 3.2 and will be removed in 4.0. Use %s::getListeners() instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
-
         return array($this->listeners, $this->exceptionListener);
     }
 }
@@ -41,15 +41,15 @@ public function getListeners(Request $request)
             return array(array(), null);
         }
 
-        return $context->getListeners();
+        return $context->getContext();
     }
 
     /**
      * Gets the firewall for a given Request.
      *
      * @param Request $request
      *
-     * @return Firewall|null The matching firewall
+     * @return FirewallContext|null The matching context
      */
     public function getContext(Request $request)
     {
 
@@ -48,7 +48,12 @@ public function testGetters()
         $this->assertSame($options['user_checker'], $config->getUserChecker());
 
         // Listener configs
-        $expectedConfigs = array('logout' => $options['logout'], 'remember_me' => $options['remember_me'], 'anonymous' => $options['anonymous']);
+        $expectedConfigs = array(
+            'logout' => $options['logout'],
+            'remember_me' => $options['remember_me'],
+            'anonymous' => $options['anonymous'],
+        );
+
         $this->assertSame($expectedConfigs, $config->getListenerConfigs());
     }
 }
@@ -20,37 +20,26 @@ class FirewallContextTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetConfig()
     {
-        $config = $this->getFirewallConfigMock();
-        $exceptionListener = $this->getExceptionListenerMock();
-        $listeners = array($this->getListenerMock());
-
-        $context = new FirewallContext($listeners, $exceptionListener, $config);
-
-        $this->assertEquals(array($listeners, $exceptionListener), $context->getListeners());
-        $this->assertEquals($config, $context->getConfig());
-    }
-
-    private function getExceptionListenerMock()
-    {
-        return $this
-            ->getMockBuilder(ExceptionListener::class)
+        $config = $this
+            ->getMockBuilder(FirewallConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
-    }
 
-    private function getListenerMock()
-    {
-        return $this
-            ->getMockBuilder(ListenerInterface::class)
+        $exceptionListener = $this
+            ->getMockBuilder(ExceptionListener::class)
             ->disableOriginalConstructor()
             ->getMock();
-    }
 
-    private function getFirewallConfigMock()
-    {
-        return $this
-            ->getMockBuilder(FirewallConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $listeners = array(
+            $this
+                ->getMockBuilder(ListenerInterface::class)
+                ->disableOriginalConstructor()
+                ->getMock(),
+        );
+
+        $context = new FirewallContext($listeners, $exceptionListener, $config);
+
+        $this->assertEquals(array($listeners, $exceptionListener), $context->getContext());
+        $this->assertEquals($config, $context->getConfig());
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -32,25 +32,13 @@ public function __construct(array $listeners, ExceptionListener $exceptionListen`
`32`	`32`	`$this->config = $config;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function getListeners()`
`36`		`- {`
`37`		`- return array($this->listeners, $this->exceptionListener);`
`38`		`- }`
`39`		`-`
`40`	`35`	`public function getConfig()`
`41`	`36`	`{`
`42`	`37`	`return $this->config;`
`43`	`38`	`}`
`44`	`39`
`45`		`- /**`
`46`		`- * @deprecated since 3.2. Use {@see getListeners()} instead.`
`47`		`- *`
`48`		`- * @return array`
`49`		`- */`
`50`	`40`	`public function getContext()`
`51`	`41`	`{`
`52`		`- @trigger_error(sprintf('Method %s() is deprecated since version 3.2 and will be removed in 4.0. Use %s::getListeners() instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);`
`53`		`-`
`54`	`42`	`return array($this->listeners, $this->exceptionListener);`
`55`	`43`	`}`
`56`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ public function getListeners(Request $request)`
`41`	`41`	`return array(array(), null);`
`42`	`42`	`}`
`43`	`43`
`44`		`- return $context->getListeners();`
	`44`	`+ return $context->getContext();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`48`	`48`	`* Gets the firewall for a given Request.`
`49`	`49`	`*`
`50`	`50`	`* @param Request $request`
`51`	`51`	`*`
`52`		`- * @return Firewall\|null The matching firewall`
	`52`	`+ * @return FirewallContext\|null The matching context`
`53`	`53`	`*/`
`54`	`54`	`public function getContext(Request $request)`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,12 @@ public function testGetters()`
`48`	`48`	`$this->assertSame($options['user_checker'], $config->getUserChecker());`
`49`	`49`
`50`	`50`	`// Listener configs`
`51`		`- $expectedConfigs = array('logout' => $options['logout'], 'remember_me' => $options['remember_me'], 'anonymous' => $options['anonymous']);`
	`51`	`+ $expectedConfigs = array(`
	`52`	`+ 'logout' => $options['logout'],`
	`53`	`+ 'remember_me' => $options['remember_me'],`
	`54`	`+ 'anonymous' => $options['anonymous'],`
	`55`	`+ );`
	`56`	`+`
`52`	`57`	`$this->assertSame($expectedConfigs, $config->getListenerConfigs());`
`53`	`58`	`}`
`54`	`59`	`}`