From c3cb573c595bf5cc72471fd8d773aa3b0296b035 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Thu, 14 Sep 2023 13:16:24 +0200
Subject: [PATCH] name-collision-detector 2.0

---
 Makefile                      |  2 +-
 build/collision-detector.json | 14 ++++++++++++++
 collision-detector.json       | 14 --------------
 composer.json                 |  2 +-
 composer.lock                 | 15 +++++++--------
 5 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 build/collision-detector.json
 delete mode 100644 collision-detector.json

diff --git a/Makefile b/Makefile
index 2dbc0c16e7..9fa83455bb 100644
--- a/Makefile
+++ b/Makefile
@@ -73,4 +73,4 @@ composer-require-checker:
 	php build/composer-require-checker.phar check --config-file $(CURDIR)/build/composer-require-checker.json
 
 name-collision:
-	php vendor/bin/detect-collisions
+	php vendor/bin/detect-collisions --configuration build/collision-detector.json
diff --git a/build/collision-detector.json b/build/collision-detector.json
new file mode 100644
index 0000000000..f2a690558b
--- /dev/null
+++ b/build/collision-detector.json
@@ -0,0 +1,14 @@
+{
+	"scanPaths": ["../src", "../build", "../tests"],
+	"excludePaths": [
+		"../tests/PHPStan/Analyser/data/parse-error.php",
+		"../tests/PHPStan/Analyser/data/multipleParseErrors.php",
+		"../tests/PHPStan/Parser/data/cleaning-1-before.php",
+		"../tests/PHPStan/Parser/data/cleaning-1-after.php",
+		"../tests/PHPStan/Rules/Functions/data/duplicate-function.php",
+		"../tests/PHPStan/Rules/Classes/data/duplicate-class.php",
+		"../tests/notAutoloaded",
+		"../tests/PHPStan/Rules/Functions/data/define-bug-3349.php",
+		"../tests/PHPStan/Levels/data/stubs/function.php"
+	]
+}
diff --git a/collision-detector.json b/collision-detector.json
deleted file mode 100644
index f76bb1a6fc..0000000000
--- a/collision-detector.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"scanPaths": ["src", "build", "tests"],
-	"excludePaths": [
-		"tests/PHPStan/Analyser/data/parse-error.php",
-		"tests/PHPStan/Analyser/data/multipleParseErrors.php",
-		"tests/PHPStan/Parser/data/cleaning-1-before.php",
-		"tests/PHPStan/Parser/data/cleaning-1-after.php",
-		"tests/PHPStan/Rules/Functions/data/duplicate-function.php",
-		"tests/PHPStan/Rules/Classes/data/duplicate-class.php",
-		"tests/notAutoloaded",
-		"tests/PHPStan/Rules/Functions/data/define-bug-3349.php",
-		"tests/PHPStan/Levels/data/stubs/function.php"
-	]
-}
diff --git a/composer.json b/composer.json
index cf646ad292..abe6415fdf 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,7 @@
 		"phpstan/phpstan-strict-rules": "^1.5.1",
 		"phpunit/phpunit": "^9.5.4",
 		"rector/rector": "^0.17",
-		"shipmonk/name-collision-detector": "dev-master"
+		"shipmonk/name-collision-detector": "^2.0"
 	},
 	"config": {
 		"platform": {
diff --git a/composer.lock b/composer.lock
index 17741ed8a6..4944ba4b8f 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": "66a1ad030befadba6ebd1b506ba58cd2",
+    "content-hash": "2f3c244d8faf175a6c95d841dfd3a8a1",
     "packages": [
         {
             "name": "clue/ndjson-react",
@@ -6563,16 +6563,16 @@
         },
         {
             "name": "shipmonk/name-collision-detector",
-            "version": "dev-master",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/shipmonk-rnd/name-collision-detector.git",
-                "reference": "6c9c6bc0cdd1d56df80ad145147ca22618bf9d77"
+                "reference": "034b32f263edb71d08c15591d35544c2189d9fca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/shipmonk-rnd/name-collision-detector/zipball/6c9c6bc0cdd1d56df80ad145147ca22618bf9d77",
-                "reference": "6c9c6bc0cdd1d56df80ad145147ca22618bf9d77",
+                "url": "https://api.github.com/repos/shipmonk-rnd/name-collision-detector/zipball/034b32f263edb71d08c15591d35544c2189d9fca",
+                "reference": "034b32f263edb71d08c15591d35544c2189d9fca",
                 "shasum": ""
             },
             "require": {
@@ -6589,7 +6589,6 @@
                 "phpunit/phpunit": "^8.5.28 || ^9.5.20",
                 "slevomat/coding-standard": "^8.0.1"
             },
-            "default-branch": true,
             "bin": [
                 "bin/detect-collisions"
             ],
@@ -6614,9 +6613,9 @@
             ],
             "support": {
                 "issues": "https://github.com/shipmonk-rnd/name-collision-detector/issues",
-                "source": "https://github.com/shipmonk-rnd/name-collision-detector/tree/master"
+                "source": "https://github.com/shipmonk-rnd/name-collision-detector/tree/2.0.0"
             },
-            "time": "2023-09-01T13:43:26+00:00"
+            "time": "2023-09-14T09:44:51+00:00"
         },
         {
             "name": "theseer/tokenizer",