Explicit test new ParserFactory methods

nikic · Sep 17, 2023 · 8b9488e · 8b9488e
1 parent 21fa9c9
commit 8b9488e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/test/PhpParser/Node/Scalar/DNumberTest.php b/test/PhpParser/Node/Scalar/DNumberTest.php
@@ -8,7 +8,7 @@
 
 class DNumberTest extends \PHPUnit\Framework\TestCase {
     public function testRawValue() {
-        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $parser = (new ParserFactory())->createForNewestSupportedVersion();
         $nodes = $parser->parse('<?php echo 1_234.56;');
 
         $echo = $nodes[0];

diff --git a/test/PhpParser/Node/Scalar/NumberTest.php b/test/PhpParser/Node/Scalar/NumberTest.php
@@ -7,7 +7,7 @@
 
 class NumberTest extends \PHPUnit\Framework\TestCase {
     public function testRawValue() {
-        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $parser = (new ParserFactory())->createForNewestSupportedVersion();
         $nodes = $parser->parse('<?php echo 1_234;');
 
         $echo = $nodes[0];

diff --git a/test/PhpParser/Node/Scalar/StringTest.php b/test/PhpParser/Node/Scalar/StringTest.php
@@ -7,7 +7,7 @@
 
 class StringTest extends \PHPUnit\Framework\TestCase {
     public function testRawValue() {
-        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $parser = (new ParserFactory())->createForNewestSupportedVersion();
         $nodes = $parser->parse('<?php echo "sequence \x41";');
 
         $echo = $nodes[0];

diff --git a/test/PhpParser/NodeVisitor/NodeConnectingVisitorTest.php b/test/PhpParser/NodeVisitor/NodeConnectingVisitorTest.php
@@ -11,7 +11,7 @@
 
 final class NodeConnectingVisitorTest extends \PHPUnit\Framework\TestCase {
     public function testConnectsNodeToItsParentNodeAndItsSiblingNodes() {
-        $ast = (new ParserFactory())->create(ParserFactory::PREFER_PHP7)->parse(
+        $ast = (new ParserFactory())->createForNewestSupportedVersion()->parse(
             '<?php if (true) {} else {}'
         );
 

diff --git a/test/PhpParser/NodeVisitor/ParentConnectingVisitorTest.php b/test/PhpParser/NodeVisitor/ParentConnectingVisitorTest.php
@@ -9,7 +9,7 @@
 
 final class ParentConnectingVisitorTest extends \PHPUnit\Framework\TestCase {
     public function testConnectsChildNodeToParentNode() {
-        $ast = (new ParserFactory())->create(ParserFactory::PREFER_PHP7)->parse(
+        $ast = (new ParserFactory())->createForNewestSupportedVersion()->parse(
             '<?php class C { public function m() {} }'
         );
 

diff --git a/test/PhpParser/ParserFactoryTest.php b/test/PhpParser/ParserFactoryTest.php
@@ -5,23 +5,20 @@
 /* This test is very weak, because PHPUnit's assertEquals assertion is way too slow dealing with the
  * large objects involved here. So we just do some basic instanceof tests instead. */
 
+use PhpParser\Parser\Php7;
+use PhpParser\Parser\Php8;
+
 class ParserFactoryTest extends \PHPUnit\Framework\TestCase {
-    /** @dataProvider provideTestCreate */
-    public function testCreate($kind, $lexer, $expected) {
-        $this->assertInstanceOf($expected, (new ParserFactory())->create($kind, $lexer));
-    }
+    public function testCreate() {
+        $factory = new ParserFactory();
 
-    public function provideTestCreate() {
         $lexer = new Lexer();
-        return [
-            [
-                ParserFactory::PREFER_PHP7, $lexer,
-                Parser\Php7::class
-            ],
-            [
-                ParserFactory::ONLY_PHP7, null,
-                Parser\Php7::class
-            ],
-        ];
+        $this->assertInstanceOf(Php7::class, $factory->create(ParserFactory::PREFER_PHP7, $lexer));
+        $this->assertInstanceOf(Php7::class, $factory->create(ParserFactory::ONLY_PHP7, $lexer));
+        $this->assertInstanceOf(Php7::class, $factory->create(ParserFactory::PREFER_PHP7));
+        $this->assertInstanceOf(Php7::class, $factory->create(ParserFactory::ONLY_PHP7));
+
+        $this->assertInstanceOf(Php8::class, $factory->createForNewestSupportedVersion());
+        $this->assertInstanceOf(Parser::class, $factory->createForHostVersion());
     }
 }