Skip to content

Commit

Permalink
minor #20275 [HttpFoundation] Avoid implicit null to array conversion…
Browse files Browse the repository at this point in the history
… in request matcher (ro0NL)

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
  • Loading branch information
fabpot committed Nov 7, 2016
2 parents 2b0c863 + a2c0a78 commit fd1ee25
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/Symfony/Component/HttpFoundation/RequestMatcher.php
Expand Up @@ -19,22 +19,22 @@
class RequestMatcher implements RequestMatcherInterface
{
/**
* @var string
* @var string|null
*/
private $path;

/**
* @var string
* @var string|null
*/
private $host;

/**
* @var array
* @var string[]
*/
private $methods = array();

/**
* @var string
* @var string[]
*/
private $ips = array();

Expand Down Expand Up @@ -76,13 +76,13 @@ public function __construct($path = null, $host = null, $methods = null, $ips =
*/
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.
*
* @param string $regexp A Regexp
* @param string|null $regexp A Regexp
*/
public function matchHost($regexp)
{
Expand All @@ -92,7 +92,7 @@ public function matchHost($regexp)
/**
* Adds a check for the URL path info.
*
* @param string $regexp A Regexp
* @param string|null $regexp A Regexp
*/
public function matchPath($regexp)
{
Expand All @@ -112,21 +112,21 @@ public function matchIp($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)
{
$this->ips = (array) $ips;
$this->ips = null !== $ips ? (array) $ips : array();
}

/**
* 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)
{
$this->methods = array_map('strtoupper', (array) $method);
$this->methods = null !== $method ? array_map('strtoupper', (array) $method) : array();
}

/**
Expand All @@ -145,11 +145,11 @@ public function matchAttribute($key, $regexp)
*/
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;
}

if ($this->methods && !in_array($request->getMethod(), $this->methods)) {
if ($this->methods && !in_array($request->getMethod(), $this->methods, true)) {
return false;
}

Expand Down

0 comments on commit fd1ee25

Please sign in to comment.