Issue #3314873 by Spokje, mondrake: Remove PHPStan conflict section in composer.json, bump to ^1.8.10

(cherry picked from commit 26a407568b)

composer.json

@@ -26,7 +26,7 @@
         "phpunit/phpunit": "^9.5",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.8.5",
+        "phpstan/phpstan": "^1.8.10",
         "symfony/css-selector": "^6.1",
         "symfony/phpunit-bridge": "^6.1.2",
         "symfony/var-dumper": "^6.1",
@@ -38,9 +38,6 @@
         "symfony/browser-kit": "^6.1",
         "symfony/dom-crawler": "^6.1"
     },
-    "conflict": {
-        "phpstan/phpstan": ">=1.8.7"
-    },
     "replace": {
         "symfony/polyfill-php72": "*",
         "symfony/polyfill-php73": "*",

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": "2e6f827c2b25211481ca277eda3177bc",
+    "content-hash": "90f666c1a627d276ba8d260270e65912",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -5771,16 +5771,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.5",
+            "version": "1.8.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20"
+                "reference": "0c4459dc42c568b818b3f25186589f3acddc1823"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
-                "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0c4459dc42c568b818b3f25186589f3acddc1823",
+                "reference": "0c4459dc42c568b818b3f25186589f3acddc1823",
                 "shasum": ""
             },
             "require": {
@@ -5810,7 +5810,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.5"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.10"
             },
             "funding": [
                 {
@@ -5826,7 +5826,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-07T16:05:32+00:00"
+            "time": "2022-10-17T14:23:35+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

composer/Metapackage/DevDependencies/composer.json

@@ -18,7 +18,7 @@
         "mikey179/vfsstream": "^1.6.11",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.8.5",
+        "phpstan/phpstan": "^1.8.10",
         "phpunit/phpunit": "^9.5",
         "symfony/browser-kit": "^6.1",
         "symfony/css-selector": "^6.1",

composer/Metapackage/PinnedDevDependencies/composer.json

@@ -36,7 +36,7 @@
         "phpspec/prophecy-phpunit": "v2.0.1",
         "phpstan/extension-installer": "1.1.0",
         "phpstan/phpdoc-parser": "1.7.0",
-        "phpstan/phpstan": "1.8.5",
+        "phpstan/phpstan": "1.8.10",
         "phpunit/php-code-coverage": "9.2.17",
         "phpunit/php-file-iterator": "3.0.6",
         "phpunit/php-invoker": "3.1.1",