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

Merge branch '2.7' into 2.8

Browse Source 
* 2.7:
  fixed CS
  Fixed return type
This commit is contained in:
Fabien Potencier 2018-05-11 17:48:50 +02:00
commit 1f3aa51b5f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
View File

@ -42,7 +42,7 @@ class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
$isActivated $isActivated
&& isset($record['context']['exception']) && isset($record['context']['exception'])
&& $record['context']['exception'] instanceof HttpException && $record['context']['exception'] instanceof HttpException
&& $record['context']['exception']->getStatusCode() == 404 && 404 == $record['context']['exception']->getStatusCode()
&& ($request = $this->requestStack->getMasterRequest()) && ($request = $this->requestStack->getMasterRequest())
) { ) {
return !preg_match($this->blacklist, $request->getPathInfo()); return !preg_match($this->blacklist, $request->getPathInfo());

2
src/Symfony/Component/Finder/Shell/Command.php
View File

@ -104,7 +104,7 @@ class Command
array_unshift($this->bits, $bit); array_unshift($this->bits, $bit);
foreach ($this->labels as $label => $index) { foreach ($this->labels as $label => $index) {
$this->labels[$label] += 1; ++$this->labels[$label];
} }
return $this; return $this;

2
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -1301,7 +1301,7 @@ class Request
* *
* @param string $format The format * @param string $format The format
* *
* @return string The associated mime type (null if not found) * @return string|null The associated mime type (null if not found)
*/ */
public function getMimeType($format) public function getMimeType($format)
{ {