Update LexerFactory to take advantage of the new Emulative lexer capabilities

ondrejmirtes · ondrejmirtes · commit 71013bc41eec · 2020-08-09T16:04:39.000+02:00
diff --git a/src/Parser/LexerFactory.php b/src/Parser/LexerFactory.php
@@ -17,11 +17,13 @@ public function __construct(PhpVersion $phpVersion)
 
 	public function create(): Lexer
 	{
-		if ($this->phpVersion->getVersionId() <= PHP_VERSION_ID) {
+		if ($this->phpVersion->getVersionId() === PHP_VERSION_ID) {
 			return new Lexer();
 		}
 
-		return new Lexer\Emulative();
+		return new Lexer\Emulative([
+			'phpVersion' => $this->phpVersion->getVersionString(),
+		]);
 	}
 
 }
diff --git a/src/Php/PhpVersion.php b/src/Php/PhpVersion.php
@@ -17,6 +17,15 @@ public function getVersionId(): int
 		return $this->versionId;
 	}
 
+	public function getVersionString(): string
+	{
+		$first = (int) floor($this->versionId / 10000);
+		$second = (int) floor(($this->versionId % 10000) / 100);
+		$third = (int) floor($this->versionId % 100);
+
+		return $first . '.' . $second . ($third !== 0 ? '.' . $third : '');
+	}
+
 	public function supportsNullCoalesceAssign(): bool
 	{
 		return $this->versionId >= 70400;
diff --git a/tests/PHPStan/Php/PhpVersionFactoryTest.php b/tests/PHPStan/Php/PhpVersionFactoryTest.php
@@ -14,41 +14,49 @@ public function dataCreate(): array
 				null,
 				null,
 				PHP_VERSION_ID,
+				null,
 			],
 			[
 				70200,
 				null,
 				70200,
+				'7.2',
 			],
 			[
 				70200,
 				'7.4.6',
 				70200,
+				'7.2',
 			],
 			[
 				null,
 				'7.4.6',
 				70406,
+				'7.4.6',
 			],
 			[
 				null,
 				'7.0',
 				70100,
+				'7.1',
 			],
 			[
 				null,
 				'7.1.1',
 				70101,
+				'7.1.1',
 			],
 			[
 				null,
 				'5.4.1',
 				70100,
+				'7.1',
 			],
 			[
 				null,
 				'8.1',
 				80000,
+				'8.0',
 			],
 		];
 	}
@@ -58,16 +66,24 @@ public function dataCreate(): array
 	 * @param int|null $versionId
 	 * @param string|null $composerPhpVersion
 	 * @param int $expectedVersion
+	 * @param string|null $expectedVersionString
 	 */
 	public function testCreate(
 		?int $versionId,
 		?string $composerPhpVersion,
-		int $expectedVersion
+		int $expectedVersion,
+		?string $expectedVersionString
 	): void
 	{
 		$factory = new PhpVersionFactory($versionId, $composerPhpVersion);
 		$phpVersion = $factory->create();
 		$this->assertSame($expectedVersion, $phpVersion->getVersionId());
+
+		if ($expectedVersionString === null) {
+			return;
+		}
+
+		$this->assertSame($expectedVersionString, $phpVersion->getVersionString());
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,13 @@ public function __construct(PhpVersion $phpVersion)`
`17`	`17`
`18`	`18`	`public function create(): Lexer`
`19`	`19`	`{`
`20`		`- if ($this->phpVersion->getVersionId() <= PHP_VERSION_ID) {`
	`20`	`+ if ($this->phpVersion->getVersionId() === PHP_VERSION_ID) {`
`21`	`21`	`return new Lexer();`
`22`	`22`	`}`
`23`	`23`
`24`		`- return new Lexer\Emulative();`
	`24`	`+ return new Lexer\Emulative([`
	`25`	`+ 'phpVersion' => $this->phpVersion->getVersionString(),`
	`26`	`+ ]);`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`}`