Merge branch '2.7' into 2.8

fabpot · fabpot · commit 1f3aa51b5fee · 2018-05-11T17:48:50.000+02:00
* 2.7:
  fixed CS
  Fixed return type
diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
@@ -42,7 +42,7 @@ public function isHandlerActivated(array $record)
             $isActivated
             && isset($record['context']['exception'])
             && $record['context']['exception'] instanceof HttpException
-            && $record['context']['exception']->getStatusCode() == 404
+            && 404 == $record['context']['exception']->getStatusCode()
             && ($request = $this->requestStack->getMasterRequest())
         ) {
             return !preg_match($this->blacklist, $request->getPathInfo());
diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php
@@ -104,7 +104,7 @@ public function top($bit)
         array_unshift($this->bits, $bit);
 
         foreach ($this->labels as $label => $index) {
-            $this->labels[$label] += 1;
+            ++$this->labels[$label];
         }
 
         return $this;
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1301,7 +1301,7 @@ public function getRealMethod()
      *
      * @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)
     {

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function top($bit)`
`104`	`104`	`array_unshift($this->bits, $bit);`
`105`	`105`
`106`	`106`	`foreach ($this->labels as $label => $index) {`
`107`		`- $this->labels[$label] += 1;`
	`107`	`+ ++$this->labels[$label];`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@ public function getRealMethod()`
`1301`	`1301`	`*`
`1302`	`1302`	`* @param string $format The format`
`1303`	`1303`	`*`
`1304`		`- * @return string The associated mime type (null if not found)`
	`1304`	`+ * @return string\|null The associated mime type (null if not found)`
`1305`	`1305`	`*/`
`1306`	`1306`	`public function getMimeType($format)`
`1307`	`1307`	`{`