fixed parser [Closes #28]

nette · Sep 26, 2023 · 236ecdc · 236ecdc
1 parent abc683f
commit 236ecdc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/RobotLoader/RobotLoader.php b/src/RobotLoader/RobotLoader.php
@@ -373,9 +373,9 @@ private function scanPhp(string $file): array
 				$expected = null;
 			}
 
-			if ($token->text === '{') {
+			if ($token->id === ord('{')) {
 				$level++;
-			} elseif ($token->text === '}') {
+			} elseif ($token->id === ord('}')) {
 				$level--;
 			}
 		}

diff --git a/tests/Loaders/RobotLoader.phpt b/tests/Loaders/RobotLoader.phpt
@@ -20,13 +20,15 @@ $loader->addDirectory(__DIR__ . '/files/'); // purposely doubled
 $loader->addDirectory(__DIR__ . '/file/interface.php'); // as file
 $loader->addDirectory(__DIR__ . '/file/class.const.php');
 $loader->addDirectory(__DIR__ . '/file/trait.php');
+$loader->addDirectory(__DIR__ . '/file/bug-28.php');
 $loader->excludeDirectory(__DIR__ . '/files/exclude');
 $loader->excludeDirectory(__DIR__ . '/files/exclude2/excluded.php');
 $loader->register();
 
 Assert::false(class_exists('ConditionalClass'));   // files/conditional.class.php
 Assert::true(interface_exists('TestInterface'));   // file/interface.php
 Assert::true(trait_exists('TestTrait')); // file/trait.php
+Assert::true(class_exists('Bug28')); // file/bug-28.php
 
 Assert::true(class_exists('TestClass'));           // files/namespaces1.php
 Assert::true(class_exists('MySpace1\TestClass1')); // files/namespaces1.php

diff --git a/tests/Loaders/file/bug-28.php b/tests/Loaders/file/bug-28.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = '';
+$foo = "Hello {$foo}!";
+
+class Bug28
+{
+	public function fn()
+	{
+	}
+}