Fix scoping of namespaces which have a dash in their namespace for st…

…ring literals (#211) Closes #210
humbug · May 29, 2018 · 83b9abb · 83b9abb
1 parent 91fae9c
commit 83b9abb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/specs/string-literal/array-var.php b/specs/string-literal/array-var.php
@@ -24,18 +24,18 @@
 <?php
 
 $x = [
-    'Symfony\\Component\\Yaml\\Yaml' => 'Symfony\\Component\\Yaml\\Yaml',
-    '\\Symfony\\Component\\Yaml\\Yaml' => '\\Symfony\\Component\\Yaml\\Yaml',
-    'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\Yaml',
-    '\\Humbug\\Symfony\\Component\\Yaml\\Yaml' => '\\Humbug\\Symfony\\Component\\Yaml\\Yaml',
+    'Symfony\\Component\\Yaml\\Yaml' => 'Symfony\\Component\\Yaml\\_Yaml',
+    '\\Symfony\\Component\\Yaml\\Yaml' => '\\Symfony\\Component\\Yaml\\_Yaml',
+    'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\_Yaml',
+    '\\Humbug\\Symfony\\Component\\Yaml\\Yaml' => '\\Humbug\\Symfony\\Component\\Yaml\\_Yaml',
 ];
 
 ----
 <?php
 
 namespace Humbug;
 
-$x = ['Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\Yaml', 'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\Yaml', 'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\Yaml', 'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\Yaml'];
+$x = ['Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\_Yaml', 'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\_Yaml', 'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\_Yaml', 'Humbug\\Symfony\\Component\\Yaml\\Yaml' => 'Humbug\\Symfony\\Component\\Yaml\\_Yaml'];
 
 PHP
     ,

diff --git a/specs/string-literal/class-const.php b/specs/string-literal/class-const.php
@@ -24,10 +24,10 @@
 <?php
 
 class Foo {
-    const X = 'Symfony\\Component\\Yaml\\Yaml';
-    const X = '\\Symfony\\Component\\Yaml\\Yaml';
-    const X = 'Humbug\\Symfony\\Component\\Yaml\\Yaml';
-    const X = '\\Humbug\\Symfony\\Component\\Yaml\\Yaml';
+    const X = 'Symfony\\Component\\Yaml\\Ya_ml';
+    const X = '\\Symfony\\Component\\Yaml\\Ya_ml';
+    const X = 'Humbug\\Symfony\\Component\\Yaml\\Ya_ml';
+    const X = '\\Humbug\\Symfony\\Component\\Yaml\\Ya_ml';
     
     const X = 'HelloWorld';
 }
@@ -39,10 +39,10 @@ class Foo {
 
 class Foo
 {
-    const X = 'Humbug\\Symfony\\Component\\Yaml\\Yaml';
-    const X = 'Humbug\\Symfony\\Component\\Yaml\\Yaml';
-    const X = 'Humbug\\Symfony\\Component\\Yaml\\Yaml';
-    const X = 'Humbug\\Symfony\\Component\\Yaml\\Yaml';
+    const X = 'Humbug\\Symfony\\Component\\Yaml\\Ya_ml';
+    const X = 'Humbug\\Symfony\\Component\\Yaml\\Ya_ml';
+    const X = 'Humbug\\Symfony\\Component\\Yaml\\Ya_ml';
+    const X = 'Humbug\\Symfony\\Component\\Yaml\\Ya_ml';
     const X = 'HelloWorld';
 }
 

diff --git a/src/PhpParser/NodeVisitor/StringScalarPrefixer.php b/src/PhpParser/NodeVisitor/StringScalarPrefixer.php
@@ -72,7 +72,7 @@ public function enterNode(Node $node): Node
     private function shouldPrefixScalar(Node $node): bool
     {
         if (false === ($node instanceof String_ && AppendParentNode::hasParent($node) && is_string($node->value))
-            || 1 !== preg_match('/^\\\\*(?:\p{L}+\\\\+)++\p{L}+$/u', $node->value)
+            || 1 !== preg_match('/^\\\\*(?:[\p{L}_]+\\\\+)++[\p{L}_]+$/u', $node->value)
         ) {
             return false;
         }