Fix opis#70

and1truong · Jul 24, 2020 · 9fee604 · 9fee604
1 parent dec9fc5
commit 9fee604
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/ReflectionClosure.php b/src/ReflectionClosure.php
@@ -469,6 +469,22 @@ public function getCode()
                             $id_start_ci = strtolower($id_start);
                             $id_name = '';
                             $state = 'id_name';
+
+                            if ($context === 'new') {
+                                if ($id_start !== '\\' && !in_array($id_start_ci, $class_keywords)) {
+                                    if ($classes === null) {
+                                        $classes = $this->getClasses();
+                                    }
+
+                                    if (isset($classes[$id_start_ci])) {
+                                        $id_start = $classes[$id_start_ci];
+                                    }
+                                    if ($id_start[0] !== '\\') {
+                                        $id_start = $nsf . '\\' . $id_start;
+                                    }
+                                }
+                            }
+
                             break 2;
                         case T_VARIABLE:
                             $code .= $token[1];

diff --git a/tests/ClosureTest.php b/tests/ClosureTest.php
@@ -10,11 +10,24 @@
 use Closure;
 use stdClass;
 use Serializable;
+use Opis\Closure\ClosureContext;
 use Opis\Closure\ReflectionClosure;
 use Opis\Closure\SerializableClosure;
 
 class ClosureTest extends \PHPUnit\Framework\TestCase
 {
+    public function testClassNameWithUse()
+    {
+        $wrapper = new SerializableClosure(
+            function () {
+                return new ClosureContext; // new object without `()`
+            }
+        );
+
+        $code = $wrapper->getReflector()->getCode();
+        $this->assertStringContainsString('Opis\Closure\ClosureContext', $code);
+    }
+
     protected function s($closure)
     {
         if($closure instanceof Closure)