Patch vendor with Composer patches

Author: ondrejmirtes

compiler/build/scoper.inc.php

@@ -195,19 +195,7 @@ function (string $filePath, string $prefix, string $content): string {
 			}
 
 			return str_replace(sprintf('%s\\Attribute', $prefix), 'Attribute', $content);
-		},
-		function (string $filePath, string $prefix, string $content): string {
-			return str_replace('private static final', 'private static', $content);
-		},
-		function (string $filePath, string $prefix, string $content): string {
-			if ($filePath !== 'vendor/hoa/stream/Stream.php') {
-				return $content;
-			}
-
-			$content = str_replace('\Hoa\Consistency::registerShutdownFunction(xcallable(\'Hoa\\\\Stream\\\\Stream::_Hoa_Stream\'));', '', $content);
-
-			return $content;
-		},
+		}
 	],
 	'whitelist' => [
 		'PHPStan\*',

compiler/src/Console/CompileCommand.php

@@ -50,16 +50,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$this->buildPreloadScript();
 		$this->deleteUnnecessaryVendorCode();
-		$this->patchFile(
-			$output,
-			'vendor/hoa/consistency/Consistency.php',
-			'compiler/patches/Consistency.diff'
-		);
-		$this->patchFile(
-			$output,
-			'vendor/hoa/protocol/Wrapper.php',
-			'compiler/patches/Wrapper.diff'
-		);
 		$this->fixComposerJson($this->buildDir);
 		$this->renamePhpStormStubs();
 		$this->patchPhpStormStubs($output);

composer.json

@@ -47,7 +47,8 @@
 		"phpstan/phpstan-php-parser": "^0.12",
 		"phpstan/phpstan-phpunit": "^0.12",
 		"phpstan/phpstan-strict-rules": "^0.12",
-		"phpunit/phpunit": "^9.5.4"
+		"phpunit/phpunit": "^9.5.4",
+		"vaimo/composer-patches": "^4.22"
 	},
 	"config": {
 		"platform": {
@@ -59,6 +60,9 @@
 	"extra": {
 		"branch-alias": {
 			"dev-master": "0.12-dev"
+		},
+		"patcher": {
+			"search": "patches"
 		}
 	},
 	"autoload": {