diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #20275 [HttpFoundation] Avoid implicit null to array conversion in request matcher (ro0NL)

Browse Source 
This PR was squashed before being merged into the 2.7 branch (closes #20275).

Discussion
----------

[HttpFoundation] Avoid implicit null to array conversion in request matcher

| Q | A |
| --- | --- |
| Branch? | 2.7 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any |
| License | MIT |
| Doc PR | reference to the documentation PR, if any |

`null` is allowed _and_ passed as default value from the constructor. Lets be explicit.

Commits
-------

a2c0a78 [HttpFoundation] Avoid implicit null to array conversion in request matcher
This commit is contained in:
Fabien Potencier 2016-11-07 07:11:09 -08:00
commit fd1ee25ebd
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Symfony/Component/HttpFoundation/RequestMatcher.php
View File

@ -19,22 +19,22 @@ namespace Symfony\Component\HttpFoundation;
class RequestMatcher implements RequestMatcherInterface class RequestMatcher implements RequestMatcherInterface
{ {
/** /**
* @var string * @var string|null
*/ */
private $path; private $path;
/** /**
* @var string * @var string|null
*/ */
private $host; private $host;
/** /**
* @var array * @var string[]
*/ */
private $methods = array(); private $methods = array();
/** /**
* @var string * @var string[]
*/ */
private $ips = array(); private $ips = array();
@ -76,13 +76,13 @@ class RequestMatcher implements RequestMatcherInterface
*/ */
public function matchScheme($scheme) public function matchScheme($scheme)
{ {
$this->schemes = array_map('strtolower', (array) $scheme); $this->schemes = null !== $scheme ? array_map('strtolower', (array) $scheme) : array();
} }
/** /**
* Adds a check for the URL host name. * Adds a check for the URL host name.
* *
* @param string $regexp A Regexp * @param string|null $regexp A Regexp
*/ */
public function matchHost($regexp) public function matchHost($regexp)
{ {
@ -92,7 +92,7 @@ class RequestMatcher implements RequestMatcherInterface
/** /**
* Adds a check for the URL path info. * Adds a check for the URL path info.
* *
* @param string $regexp A Regexp * @param string|null $regexp A Regexp
*/ */
public function matchPath($regexp) public function matchPath($regexp)
{ {
@ -112,21 +112,21 @@ class RequestMatcher implements RequestMatcherInterface
/** /**
* Adds a check for the client IP. * Adds a check for the client IP.
* *
* @param string|string[] $ips A specific IP address or a range specified using IP/netmask like 192.168.1.0/24 * @param string|string[]|null $ips A specific IP address or a range specified using IP/netmask like 192.168.1.0/24
*/ */
public function matchIps($ips) public function matchIps($ips)
{ {
$this->ips = (array) $ips; $this->ips = null !== $ips ? (array) $ips : array();
} }
/** /**
* Adds a check for the HTTP method. * Adds a check for the HTTP method.
* *
* @param string|string[] $method An HTTP method or an array of HTTP methods * @param string|string[]|null $method An HTTP method or an array of HTTP methods
*/ */
public function matchMethod($method) public function matchMethod($method)
{ {
$this->methods = array_map('strtoupper', (array) $method); $this->methods = null !== $method ? array_map('strtoupper', (array) $method) : array();
} }
/** /**
@ -145,11 +145,11 @@ class RequestMatcher implements RequestMatcherInterface
*/ */
public function matches(Request $request) public function matches(Request $request)
{ {
if ($this->schemes && !in_array($request->getScheme(), $this->schemes)) { if ($this->schemes && !in_array($request->getScheme(), $this->schemes, true)) {
return false; return false;
} }
if ($this->methods && !in_array($request->getMethod(), $this->methods)) { if ($this->methods && !in_array($request->getMethod(), $this->methods, true)) {
return false; return false;
} }