Use intersection type

phpstan · Sep 27, 2022 · 376449e · 376449e
1 parent 22d7757
commit 376449e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/build/rector-downgrade.php b/build/rector-downgrade.php
@@ -12,6 +12,7 @@
 use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeMixedTypeDeclarationRector;
 use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector;
 use Rector\DowngradePhp80\Rector\Property\DowngradeUnionTypeTypedPropertyRector;
+use Rector\DowngradePhp81\Rector\FunctionLike\DowngradePureIntersectionTypeRector;
 use Rector\DowngradePhp81\Rector\Property\DowngradeReadonlyPropertyRector;
 
 return static function (RectorConfig $config): void {
@@ -30,6 +31,7 @@
 
 	if ($targetPhpVersionId < 80100) {
 		$config->rule(DowngradeReadonlyPropertyRector::class);
+		$config->rule(DowngradePureIntersectionTypeRector::class);
 	}
 
 	if ($targetPhpVersionId < 80000) {

diff --git a/tests/PHPStan/Parser/CachedParserTest.php b/tests/PHPStan/Parser/CachedParserTest.php
@@ -8,6 +8,7 @@
 use PHPStan\File\FileHelper;
 use PHPStan\File\FileReader;
 use PHPStan\Testing\PHPStanTestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class CachedParserTest extends PHPStanTestCase
 {
@@ -61,10 +62,7 @@ public function dataParseFileClearCache(): \Generator
 		];
 	}
 
-	/**
-	 * @return Parser&\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private function getParserMock(): Parser
+	private function getParserMock(): Parser&MockObject
 	{
 		$mock = $this->createMock(Parser::class);
 
@@ -74,10 +72,7 @@ private function getParserMock(): Parser
 		return $mock;
 	}
 
-	/**
-	 * @return \PhpParser\Node&\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private function getPhpParserNodeMock(): \PhpParser\Node
+	private function getPhpParserNodeMock(): \PhpParser\Node&MockObject
 	{
 		return $this->createMock(\PhpParser\Node::class);
 	}