Merge branch '2.7' into 2.8

* 2.7:
  fixed CS
  Fixed return type

src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php

@@ -42,7 +42,7 @@ class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
             $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());

src/Symfony/Component/Finder/Shell/Command.php

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

src/Symfony/Component/HttpFoundation/Request.php

@@ -1301,7 +1301,7 @@ class Request
      *
      * @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)
     {