Merge pull request #22 from AlessioGiacobbe/fix/single-segment-imports

fix(resolver): stop corrupting single-segment use const imports

src/Resolver/DeclarationSymbolTrait.php

@@ -80,11 +80,11 @@ trait DeclarationSymbolTrait
             if ($type === Node\Stmt\Use_::TYPE_FUNCTION) {
                 $this->useFunctions[$alias] = $id;
             } elseif ($type === Node\Stmt\Use_::TYPE_CONSTANT) {
-                $lastIndex = strrpos($id, '\\');
+                // $id is already the fully qualified constant name. Splitting
-                $cn = substr($id, $lastIndex + 1);
+                // and re-joining it on `\` corrupted single-segment imports:
-                $ns = substr($id, 0, $lastIndex);
+                // `use const PHP_EOL;` resolved to `\HP_EOL` because
-                $fullName = $ns . '\\' . $cn;
+                // strrpos() returns false when there is no separator.
-                $this->useConstants[$alias] = $fullName;
+                $this->useConstants[$alias] = $id;
             } else {
                 $idLower = strtolower($id);
                 if ($idLower === 'native_types') {

tests/compiler/namespace/use-const-single-segment.phpt

@@ -0,0 +1,28 @@
+--TEST--
+use const with a single-segment (global) constant name
+--FILE--
+<?php
+namespace App {
+    use const PHP_EOL;
+
+    const ANSWER = 42;
+
+    function hello(): string
+    {
+        return "hello" . PHP_EOL;
+    }
+}
+
+namespace {
+    use const App\ANSWER;
+
+    function main(): void
+    {
+        echo \App\hello();
+        echo ANSWER, "\n";
+    }
+}
+?>
+--EXPECT--
+hello
+42