From a943aacd1085d730e631e28cfce172590e2dd101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Mirtes?= <ondrej@mirtes.cz>
Date: Fri, 21 Jan 2022 10:21:09 +0100
Subject: [PATCH] Update to PHPStan 1.4.1 (#10466)

---
 composer.json         |  2 +-
 composer.lock         | 14 +++++++-------
 phpstan/baseline.neon |  7 ++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 5249c9ebe..713c6cce5 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^6.0",
-        "phpstan/phpstan": "^1.4.0",
+        "phpstan/phpstan": "^1.4.1",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-deprecation-rules": "^1",
         "phpstan/phpstan-strict-rules": "^1"
diff --git a/composer.lock b/composer.lock
index eaf7eec2c..eacfa742a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cb27eeddb876abfa8b15747d9fc568f0",
+    "content-hash": "36248b1f2f20c084208c57c0758261e8",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -1798,16 +1798,16 @@
     "packages-dev": [
         {
             "name": "phpstan/phpstan",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "72b04d97b5e6e60a081f17c416fef35bd521120b"
+                "reference": "5bd02c86beb4c024dd4662b6443f5d5332a0ae12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/72b04d97b5e6e60a081f17c416fef35bd521120b",
-                "reference": "72b04d97b5e6e60a081f17c416fef35bd521120b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5bd02c86beb4c024dd4662b6443f5d5332a0ae12",
+                "reference": "5bd02c86beb4c024dd4662b6443f5d5332a0ae12",
                 "shasum": ""
             },
             "require": {
@@ -1838,7 +1838,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.4.0"
+                "source": "https://github.com/phpstan/phpstan/tree/1.4.1"
             },
             "funding": [
                 {
@@ -1858,7 +1858,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-14T15:58:47+00:00"
+            "time": "2022-01-17T16:35:17+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
diff --git a/phpstan/baseline.neon b/phpstan/baseline.neon
index 2456e9131..4ade76930 100644
--- a/phpstan/baseline.neon
+++ b/phpstan/baseline.neon
@@ -2982,7 +2982,12 @@ parameters:
 
 		-
 			message: "#^Casting to int something that's already int\\.$#"
-			count: 2
+			count: 1
+			path: ../src/Composer/DependencyResolver/Solver.php
+
+		-
+			message: "#^Casting to int\\<min, 0\\>\\|int\\<2, max\\> something that's already int\\<min, 0\\>\\|int\\<2, max\\>\\.$#"
+			count: 1
 			path: ../src/Composer/DependencyResolver/Solver.php
 
 		-