typehint the port

roukmoute · roukmoute · commit e923f801efaf · 2018-09-18T14:28:12.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -669,7 +669,7 @@ private function createExpression($container, $expression)
         return $this->expressions[$id] = new Reference($id);
     }
 
-    private function createRequestMatcher($container, $path = null, $host = null, $port = null, $methods = array(), $ip = null, array $attributes = array())
+    private function createRequestMatcher($container, $path = null, $host = null, int $port = null, $methods = array(), $ip = null, array $attributes = array())
     {
         if ($methods) {
             $methods = array_map('strtoupper', (array) $methods);
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\HttpFoundation;
 
-use function is_numeric;
-
 /**
  * RequestMatcher compares a pre-defined set of checks against a Request instance.
  *
@@ -64,7 +62,7 @@ class RequestMatcher implements RequestMatcherInterface
      * @param array                $attributes
      * @param string|string[]|null $schemes
      */
-    public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null, $port = null)
+    public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null, int $port = null)
     {
         $this->matchPath($path);
         $this->matchHost($host);
@@ -103,11 +101,9 @@ public function matchHost($regexp)
      *
      * @param int|null $port The port number to connect to
      */
-    public function matchPort($port)
+    public function matchPort(int $port): void
     {
-        $portInt = (int) $port;
-
-        $this->port = is_numeric($port) || $port == $portInt ? $portInt : null;
+        $this->port = $port;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ private function createExpression($container, $expression)`
`669`	`669`	`return $this->expressions[$id] = new Reference($id);`
`670`	`670`	`}`
`671`	`671`
`672`		`- private function createRequestMatcher($container, $path = null, $host = null, $port = null, $methods = array(), $ip = null, array $attributes = array())`
	`672`	`+ private function createRequestMatcher($container, $path = null, $host = null, int $port = null, $methods = array(), $ip = null, array $attributes = array())`
`673`	`673`	`{`
`674`	`674`	`if ($methods) {`
`675`	`675`	`$methods = array_map('strtoupper', (array) $methods);`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpFoundation;`
`13`	`13`
`14`		`-use function is_numeric;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* RequestMatcher compares a pre-defined set of checks against a Request instance.`
`18`	`16`	`*`
`@@ -64,7 +62,7 @@ class RequestMatcher implements RequestMatcherInterface`
`64`	`62`	`* @param array $attributes`
`65`	`63`	`* @param string\|string[]\|null $schemes`
`66`	`64`	`*/`
`67`		`- public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null, $port = null)`
	`65`	`+ public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null, int $port = null)`
`68`	`66`	`{`
`69`	`67`	`$this->matchPath($path);`
`70`	`68`	`$this->matchHost($host);`
`@@ -103,11 +101,9 @@ public function matchHost($regexp)`
`103`	`101`	`*`
`104`	`102`	`* @param int\|null $port The port number to connect to`
`105`	`103`	`*/`
`106`		`- public function matchPort($port)`
	`104`	`+ public function matchPort(int $port): void`
`107`	`105`	`{`
`108`		`- $portInt = (int) $port;`
`109`		`-`
`110`		`- $this->port = is_numeric($port) \|\| $port == $portInt ? $portInt : null;`
	`106`	`+ $this->port = $port;`
`111`	`107`	`}`
`112`	`108`
`113`	`109`	`/**`