[SecurityBundle] Rename FirewallContext#getContext()

chalasr · chalasr · commit 033da86d4c6c · 2016-11-05T14:34:59.000+01:00
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.2, will be removed in 4.0. Use {@link getListeners()} instead.
+     */
     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 $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
@@ -39,7 +39,7 @@ 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());
     }
 }

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.2, 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.2 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`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function testGetters()`
`39`	`39`
`40`	`40`	`$context = new FirewallContext($listeners, $exceptionListener, $config);`
`41`	`41`
`42`		`- $this->assertEquals(array($listeners, $exceptionListener), $context->getContext());`
	`42`	`+ $this->assertEquals(array($listeners, $exceptionListener), $context->getListeners());`
`43`	`43`	`$this->assertEquals($config, $context->getConfig());`
`44`	`44`	`}`
`45`	`45`	`}`