Fix merge (phpdoc => typehint)

chalasr · chalasr · commit ba0a917550f3 · 2017-06-13T13:32:22.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -25,12 +25,7 @@ class FirewallContext
     private $exceptionListener;
     private $config;
 
-    /**
-     * @param \Traversable|array     $listeners
-     * @param ExceptionListener|null $exceptionListener
-     * @param FirewallConfig|null    $firewallConfig
-     */
-    public function __construct($listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)
+    public function __construct(iterable $listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)
     {
         $this->listeners = $listeners;
         $this->exceptionListener = $exceptionListener;
@@ -42,10 +37,7 @@ public function getConfig()
         return $this->config;
     }
 
-    /**
-     * @return \Traversable|array
-     */
-    public function getListeners()
+    public function getListeners(): iterable
     {
         return $this->listeners;
     }

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,7 @@ class FirewallContext`
`25`	`25`	`private $exceptionListener;`
`26`	`26`	`private $config;`
`27`	`27`
`28`		`- /**`
`29`		`- * @param \Traversable\|array $listeners`
`30`		`- * @param ExceptionListener\|null $exceptionListener`
`31`		`- * @param FirewallConfig\|null $firewallConfig`
`32`		`- */`
`33`		`- public function __construct($listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)`
	`28`	`+ public function __construct(iterable $listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)`
`34`	`29`	`{`
`35`	`30`	`$this->listeners = $listeners;`
`36`	`31`	`$this->exceptionListener = $exceptionListener;`
`@@ -42,10 +37,7 @@ public function getConfig()`
`42`	`37`	`return $this->config;`
`43`	`38`	`}`
`44`	`39`
`45`		`- /**`
`46`		`- * @return \Traversable\|array`
`47`		`- */`
`48`		`- public function getListeners()`
	`40`	`+ public function getListeners(): iterable`
`49`	`41`	`{`
`50`	`42`	`return $this->listeners;`
`51`	`43`	`}`