From 5539f9d6c815d4bc1ec7f8191af37f2c8bf0cfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20Lepp=C3=A4nen?= <tarmo.leppanen@protacon.com>
Date: Mon, 7 May 2018 19:50:17 +0300
Subject: [PATCH 1/2] Fixed return type

---
 src/Symfony/Component/HttpFoundation/Request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index e1309d477b..7e8e075a83 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1322,7 +1322,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)
     {

From 8072eed4bf6237df15f74647c793cf2e951b6ab8 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 11 May 2018 17:48:19 +0200
Subject: [PATCH 2/2] fixed CS

---
 .../Handler/FingersCrossed/NotFoundActivationStrategy.php       | 2 +-
 src/Symfony/Component/Finder/Shell/Command.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
index 413b476f29..596fcdd84d 100644
--- a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
+++ b/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());
diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php
index 47f4b42221..43114dbcc0 100644
--- a/src/Symfony/Component/Finder/Shell/Command.php
+++ b/src/Symfony/Component/Finder/Shell/Command.php
@@ -100,7 +100,7 @@ class Command
         array_unshift($this->bits, $bit);
 
         foreach ($this->labels as $label => $index) {
-            $this->labels[$label] += 1;
+            ++$this->labels[$label];
         }
 
         return $this;