These patches no longer needed

Author: ondrejmirtes

compiler/build/scoper.inc.php

@@ -45,36 +45,19 @@
 	'exclude-files' => $stubs,
 	'php-version' => '7.4',
 	'patchers' => [
-		function (string $filePath, string $prefix, string $content): string {
-			if ($filePath !== 'bin/phpstan') {
-				return $content;
-			}
-			return str_replace('__DIR__ . \'/..', '\'phar://phpstan.phar', $content);
-		},
-		function (string $filePath, string $prefix, string $content): string {
-			if ($filePath !== 'bin/phpstan') {
-				return $content;
-			}
-			return str_replace(sprintf('%s\\\\__PHPSTAN_RUNNING__', $prefix), '__PHPSTAN_RUNNING__', $content);
-		},
 		function (string $filePath, string $prefix, string $content): string {
 			if ($filePath !== 'vendor/nette/di/src/DI/Compiler.php') {
 				return $content;
 			}
-			return str_replace('|Nette\\\\DI\\\\Statement', sprintf('|\\\\%s\\\\Nette\\\\DI\\\\Statement', $prefix), $content);
+			return str_replace('|Nette\\DI\\Statement', sprintf('|\\%s\\Nette\\DI\\Statement', $prefix), $content);
 		},
 		function (string $filePath, string $prefix, string $content): string {
 			if ($filePath !== 'vendor/nette/di/src/DI/Extensions/DefinitionSchema.php') {
 				return $content;
 			}
 			$content = str_replace(
-				sprintf('\'%s\\\\callable', $prefix),
-				'\'callable',
-				$content
-			);
-			$content = str_replace(
-				'|Nette\\\\DI\\\\Definitions\\\\Statement',
-				sprintf('|%s\\\\Nette\\\\DI\\\\Definitions\\\\Statement', $prefix),
+				'|Nette\\DI\\Definitions\\Statement',
+				sprintf('|%s\\Nette\\DI\\Definitions\\Statement', $prefix),
 				$content
 			);
 
@@ -85,25 +68,10 @@ function (string $filePath, string $prefix, string $content): string {
 				return $content;
 			}
 			$content = str_replace(
-				sprintf('\'%s\\\\string', $prefix),
-				'\'string',
+				'|Nette\\DI\\Definitions\\Statement',
+				sprintf('|%s\\Nette\\DI\\Definitions\\Statement', $prefix),
 				$content
 			);
-			$content = str_replace(
-				'|Nette\\\\DI\\\\Definitions\\\\Statement',
-				sprintf('|%s\\\\Nette\\\\DI\\\\Definitions\\\\Statement', $prefix),
-				$content
-			);
-
-			return $content;
-		},
-		function (string $filePath, string $prefix, string $content): string {
-			if (strpos($filePath, 'src/') !== 0) {
-				return $content;
-			}
-
-			$content = str_replace(sprintf('\'%s\\\\r\\\\n\'', $prefix), '\'\\\\r\\\\n\'', $content);
-			$content = str_replace(sprintf('\'%s\\\\', $prefix), '\'', $content);
 
 			return $content;
 		},
@@ -178,21 +146,12 @@ function (string $filePath, string $prefix, string $content): string {
 
 			return str_replace(sprintf('%s\\Composer\\InstalledVersions', $prefix), 'Composer\\InstalledVersions', $content);
 		},
-		function (string $filePath, string $prefix, string $content): string {
-			if ($filePath !== 'vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php') {
-				return $content;
-			}
-
-			$content = str_replace('\'' . $prefix . '\\\\', '\'', $content);
-
-			return $content;
-		},
 		function (string $filePath, string $prefix, string $content): string {
 			if ($filePath !== 'vendor/phpstan/php-8-stubs/Php8StubsMap.php') {
 				return $content;
 			}
 
-			$content = str_replace('\'' . $prefix . '\\\\', '\'', $content);
+			$content = str_replace('\'' . $prefix . '\\', '\'', $content);
 
 			return $content;
 		},
@@ -208,24 +167,7 @@ function (string $filePath, string $prefix, string $content): string {
 				return $content;
 			}
 
-			return str_replace(sprintf('\'%s\\\\JetBrains\\\\', $prefix), '\'JetBrains\\\\', $content);
-		},
-		function (string $filePath, string $prefix, string $content): string {
-			if (!str_starts_with($filePath, 'vendor/nikic/php-parser/lib')) {
-				return $content;
-			}
-
-			return str_replace(sprintf('use %s\\PhpParser;', $prefix), 'use PhpParser;', $content);
-		},
-		function (string $filePath, string $prefix, string $content): string {
-			if (!str_starts_with($filePath, 'vendor/nikic/php-parser/lib')) {
-				return $content;
-			}
-
-			return str_replace([
-				sprintf('\\%s', $prefix),
-				sprintf('\\\\%s', $prefix),
-			], '', $content);
+			return str_replace(sprintf('\'%s\\JetBrains\\', $prefix), '\'JetBrains\\', $content);
 		},
 		function (string $filePath, string $prefix, string $content): string {
 			if (!str_starts_with($filePath, 'vendor/ondrejmirtes/better-reflection')) {
@@ -244,12 +186,6 @@ function (string $filePath, string $prefix, string $content): string {
 
 			return str_replace('#[Language(\'RegExp\')] ', '', $content);
 		},
-		function (string $filePath, string $prefix, string $content): string {
-			if ($filePath !== 'vendor/fidry/cpu-core-counter/src/Finder/WindowsRegistryLogicalFinder.php') {
-				return $content;
-			}
-			return str_replace(sprintf('%s\\\\reg query', $prefix), 'reg query', $content);
-		},
 	],
 	'exclude-namespaces' => [
 		'PHPStan',