From 427d2adfe1503cc636c4df95909006c788e70882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= <theo.fidry@gmail.com>
Date: Fri, 11 Nov 2022 23:48:25 +0100
Subject: [PATCH] Fix define check of class constant

---
 specs/const/const-declaration.php             | 46 +++++++++++++++++++
 .../NodeVisitor/StringScalarPrefixer.php      | 17 ++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/specs/const/const-declaration.php b/specs/const/const-declaration.php
index 08736856..aebf26d6 100644
--- a/specs/const/const-declaration.php
+++ b/specs/const/const-declaration.php
@@ -471,4 +471,50 @@ function isAnotherNewToken(int $token) : bool
         
         PHP,
     ],
+
+    'Define check of a global class constant' => <<<'PHP'
+    <?php
+    
+    if (!defined('Bar::TEST')) {
+    }
+    if (!defined('\Bar::TEST')) {
+    }
+    if (!defined('\\Bar::TEST')) {
+    }
+    ----
+    <?php
+    
+    namespace Humbug;
+    
+    if (!\defined('Humbug\\Bar::TEST')) {
+    }
+    if (!\defined('Humbug\\Bar::TEST')) {
+    }
+    if (!\defined('Humbug\\Bar::TEST')) {
+    }
+    
+    PHP,
+
+    'Define check of a namespaced class constant' => <<<'PHP'
+    <?php
+    
+    if (!defined('Acme\Bar::TEST')) {
+    }
+    if (!defined('\Acme\Bar::TEST')) {
+    }
+    if (!defined('\\Acme\\Bar::TEST')) {
+    }
+    ----
+    <?php
+    
+    namespace Humbug;
+    
+    if (!\defined('Humbug\\Acme\\Bar::TEST')) {
+    }
+    if (!\defined('Humbug\\Acme\\Bar::TEST')) {
+    }
+    if (!\defined('Humbug\\Acme\\Bar::TEST')) {
+    }
+    
+    PHP,
 ];
diff --git a/src/PhpParser/NodeVisitor/StringScalarPrefixer.php b/src/PhpParser/NodeVisitor/StringScalarPrefixer.php
index 0823c299..9f0c66a0 100644
--- a/src/PhpParser/NodeVisitor/StringScalarPrefixer.php
+++ b/src/PhpParser/NodeVisitor/StringScalarPrefixer.php
@@ -98,6 +98,18 @@ final class StringScalarPrefixer extends NodeVisitorAbstract
         $/ux
         REGEX;
 
+    private const CONSTANT_FETCH_PATTERN = <<<'REGEX'
+        /^
+            (\\)?               # leading backslash
+            (
+                [\p{L}_\d]+     # class-like name
+                \\              # separator
+            )*
+            [\p{L}_\d]+         # class-like name
+            ::[\p{L}_\d]+       # constant-like name
+        $/ux
+        REGEX;
+
     public function __construct(
         private readonly string $prefix,
         private readonly EnrichedReflector $enrichedReflector,
@@ -114,7 +126,10 @@ public function enterNode(Node $node): Node
     private function prefixStringScalar(String_ $string): String_
     {
         if (!(ParentNodeAppender::hasParent($string) && is_string($string->value))
-            || 1 !== native_preg_match(self::CLASS_LIKE_PATTERN, $string->value)
+            || (
+                1 !== native_preg_match(self::CLASS_LIKE_PATTERN, $string->value)
+                && 1 !== native_preg_match(self::CONSTANT_FETCH_PATTERN, $string->value)
+            )
         ) {
             return $string;
         }