opis · GrahamCampbell · Oct 5, 2020 · Jul 11, 2020 · Jul 11, 2020 · Jul 11, 2020
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,36 +8,45 @@ on:
       - '**.md'
 jobs:
   tests:
+    name: PHP ${{ matrix.php }}
     runs-on: ubuntu-latest
+
     strategy:
-      fail-fast: true
       matrix:
-        php: [5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-        stability: [prefer-stable]
-
-    name: PHP ${{ matrix.php }}
+        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
 
     steps:
-      - name: Checkout code
+      - name: Checkout Code
         uses: actions/checkout@v2
 
-      - name: Cache dependencies
-        uses: actions/cache@v1
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
+          tools: composer:v2
           coverage: none
 
-      - name: Update composer
-        run: composer self-update
+      - name: Setup Problem Matchers
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install PHP 5/7 Dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --no-interaction --no-progress
+        if: "matrix.php != '8.0'"
 
-      - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+      - name: Install PHP 8 Dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: |
+            composer require "phpunit/phpunit:^9.3" --no-update
+            composer update --no-interaction --no-progress --ignore-platform-req=php
+            php -v
+        if: "matrix.php == '8.0'"
 
-      - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+      - name: Execute PHPUnit
+        run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -15,11 +15,11 @@
         }
     ],
     "require": {
-        "php": "^5.4 || ^7.0"
+        "php": "^5.4 || ^7.0 || ^8.0"
     },
     "require-dev": {
         "jeremeamia/superclosure": "^2.0",
-        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -36,5 +36,9 @@
         "branch-alias": {
             "dev-master": "3.5.x-dev"
         }
+    },
+    "config": {
+        "preferred-install": "dist",
+        "sort-packages": true
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,4 +1,4 @@
-<phpunit bootstrap="./vendor/autoload.php">
+<phpunit bootstrap="./vendor/autoload.php" verbose="true">
     <testsuites>
         <testsuite name="Main">
             <file phpVersion="5.4.0" phpVersionOperator=">=">./tests/ClosureTest.php</file>
@@ -12,6 +12,12 @@
         <testsuite name="Signed">
             <file phpVersion="5.4.0" phpVersionOperator=">=">./tests/SignedClosureTest.php</file>
         </testsuite>
+        <testsuite name="Namespace">
+            <file phpVersion="5.5.0" phpVersionOperator=">=">./tests/NamespaceTest.php</file>
+            <file phpVersion="5.5.0" phpVersionOperator=">=">./tests/NamespaceUnqualifiedTest.php</file>
+            <file phpVersion="5.5.0" phpVersionOperator=">=">./tests/NamespaceFullyQualifiedTest.php</file>
+            <file phpVersion="5.5.0" phpVersionOperator=">=">./tests/NamespacePartiallyQualifiedTest.php</file>
+        </testsuite>
         <testsuite name="ReflectionClosure">
             <file phpVersion="5.4.0" phpVersionOperator=">=">./tests/ReflectionClosureTest.php</file>
         </testsuite>
@@ -25,7 +31,11 @@
             <file phpVersion="7.2.0" phpVersionOperator=">=">./tests/ReflectionClosure4Test.php</file>
         </testsuite>
         <testsuite name="ReflectionClosure5">
-            <file phpVersion="7.4" phpVersionOperator=">=">./tests/ReflectionClosure5Test.php</file>
+            <file phpVersion="7.4.0" phpVersionOperator=">=">./tests/ReflectionClosure5Test.php</file>
+            <file phpVersion="7.4.0" phpVersionOperator=">=">./tests/NamespaceGroupTest.php</file>
+        </testsuite>
+        <testsuite name="ReflectionClosure6">
+            <file phpVersion="8.0.0-dev" phpVersionOperator=">=">./tests/ReflectionClosure6Test.php</file>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>
diff --git a/src/ReflectionClosure.php b/src/ReflectionClosure.php
@@ -7,6 +7,10 @@
 
 namespace Opis\Closure;
 
+defined('T_NAME_QUALIFIED') || define('T_NAME_QUALIFIED', -4);
+defined('T_NAME_FULLY_QUALIFIED') || define('T_NAME_FULLY_QUALIFIED', -5);
+defined('T_FN') || define('T_FN', -6);
+
 use Closure;
 use ReflectionFunction;
 
@@ -84,29 +88,12 @@ public function getCode()
         }
 
         $className = null;
-        $fn = false;
-
 
         if (null !== $className = $this->getClosureScopeClass()) {
             $className = '\\' . trim($className->getName(), '\\');
         }
 
-
-        if($php7 = PHP_MAJOR_VERSION === 7){
-            switch (PHP_MINOR_VERSION){
-                case 0:
-                    $php7_types = array('string', 'int', 'bool', 'float');
-                    break;
-                case 1:
-                    $php7_types = array('string', 'int', 'bool', 'float', 'void');
-                    break;
-                case 2:
-                default:
-                    $php7_types = array('string', 'int', 'bool', 'float', 'void', 'object');
-            }
-            $fn = PHP_MINOR_VERSION === 4;
-        }
-
+        $builtin_types = self::getBuiltinTypes();
         $class_keywords = ['self', 'static', 'parent'];
 
         $ns = $this->getNamespaceName();
@@ -143,7 +130,7 @@ public function getCode()
                     if ($token[0] === T_FUNCTION || $token[0] === T_STATIC) {
                         $code .= $token[1];
                         $state = $token[0] === T_FUNCTION ? 'function' : 'static';
-                    } elseif ($fn && $token[0] === T_FN) {
+                    } elseif ($token[0] === T_FN) {
                         $isShortClosure = true;
                         $code .= $token[1];
                         $state = 'closure_args';
@@ -155,7 +142,7 @@ public function getCode()
                         if ($token[0] === T_FUNCTION) {
                             $state = 'function';
                         }
-                    } elseif ($fn && $token[0] === T_FN) {
+                    } elseif ($token[0] === T_FN) {
                         $isShortClosure = true;
                         $code .= $token[1];
                         $state = 'closure_args';
@@ -182,14 +169,20 @@ public function getCode()
                     if($token[0] === T_FUNCTION || $token[0] === T_STATIC){
                         $code = $token[1];
                         $state = $token[0] === T_FUNCTION ? 'function' : 'static';
-                    } elseif ($fn && $token[0] === T_FN) {
+                    } elseif ($token[0] === T_FN) {
                         $isShortClosure = true;
                         $code .= $token[1];
                         $state = 'closure_args';
                     }
                     break;
                 case 'closure_args':
                     switch ($token[0]){
+                        case T_NAME_QUALIFIED:
+                            list($id_start, $id_start_ci, $id_name) = $this->parseNameQualified($token[1]);
+                            $context = 'args';
+                            $state = 'id_name';
+                            $lastState = 'closure_args';
+                            break;
                         case T_NS_SEPARATOR:
                         case T_STRING:
                             $id_start = $token[1];
@@ -258,6 +251,12 @@ public function getCode()
                             $state = 'id_name';
                             $lastState = 'return';
                             break 2;
+                        case T_NAME_QUALIFIED:
+                            list($id_start, $id_start_ci, $id_name) = $this->parseNameQualified($token[1]);
+                            $context = 'return_type';
+                            $state = 'id_name';
+                            $lastState = 'return';
+                            break 2;
                         case T_DOUBLE_ARROW:
                             $code .= $token[1];
                             if ($isShortClosure) {
@@ -364,6 +363,12 @@ public function getCode()
                             $state = 'id_name';
                             $lastState = 'closure';
                             break 2;
+                        case T_NAME_QUALIFIED:
+                            list($id_start, $id_start_ci, $id_name) = $this->parseNameQualified($token[1]);
+                            $context = 'root';
+                            $state = 'id_name';
+                            $lastState = 'closure';
+                            break 2;
                         case T_NEW:
                             $code .= $token[1];
                             $context = 'new';
@@ -463,13 +468,18 @@ public function getCode()
                             $code .= $token[1];
                             break;
                         case T_NS_SEPARATOR:
+                        case T_NAME_FULLY_QUALIFIED:
                         case T_STRING:
                         case T_STATIC:
                             $id_start = $token[1];
                             $id_start_ci = strtolower($id_start);
                             $id_name = '';
                             $state = 'id_name';
                             break 2;
+                        case T_NAME_QUALIFIED:
+                            list($id_start, $id_start_ci, $id_name) = $this->parseNameQualified($token[1]);
+                            $state = 'id_name';
+                            break 2;
                         case T_VARIABLE:
                             $code .= $token[1];
                             $state = $lastState;
@@ -485,10 +495,9 @@ public function getCode()
                     break;
                 case 'id_name':
                     switch ($token[0]){
+                        case T_NAME_QUALIFIED:
                         case T_NS_SEPARATOR:
                         case T_STRING:
-                            $id_name .= $token[1];
-                            break;
                         case T_WHITESPACE:
                         case T_COMMENT:
                         case T_DOC_COMMENT:
@@ -538,7 +547,7 @@ public function getCode()
                                     if (!$inside_structure) {
                                         $isUsingScope = $token[0] === T_DOUBLE_COLON;
                                     }
-                                } elseif (!($php7 && in_array($id_start_ci, $php7_types))){
+                                } elseif (!(\PHP_MAJOR_VERSION >= 7 && in_array($id_start_ci, $builtin_types))){
                                     if ($classes === null) {
                                         $classes = $this->getClasses();
                                     }
@@ -588,7 +597,7 @@ public function getCode()
                                         if (!$inside_structure && !$id_start_ci === 'static') {
                                             $isUsingScope = true;
                                         }
-                                    } elseif (!($php7 && in_array($id_start_ci, $php7_types))){
+                                    } elseif (!(\PHP_MAJOR_VERSION >= 7 && in_array($id_start_ci, $builtin_types))){
                                         if($classes === null){
                                             $classes = $this->getClasses();
                                         }
@@ -646,6 +655,32 @@ public function getCode()
         return $this->code;
     }
 
+    /**
+     * @return array
+     */
+    private static function getBuiltinTypes()
+    {
+        // PHP 5
+        if (\PHP_MAJOR_VERSION === 5) {
+            return ['array', 'callable'];
+        }
+
+        // PHP 8
+        if (\PHP_MAJOR_VERSION === 8) {
+            return ['array', 'callable', 'string', 'int', 'bool', 'float', 'iterable', 'void', 'object', 'mixed', 'false', 'null'];
+        }
+
+        // PHP 7
+        switch (\PHP_MINOR_VERSION) {
+            case 0:
+                return ['array', 'callable', 'string', 'int', 'bool', 'float'];
+            case 1:
+                return ['array', 'callable', 'string', 'int', 'bool', 'float', 'iterable', 'void'];
+            default:
+                return ['array', 'callable', 'string', 'int', 'bool', 'float', 'iterable', 'void', 'object'];
+        }
+    }
+
     /**
      * @return array
      */
@@ -901,6 +936,11 @@ protected function fetchItems()
                             $name .= $token[1];
                             $alias = $token[1];
                             break;
+                        case T_NAME_QUALIFIED:
+                            $name .= $token[1];
+                            $pieces = explode('\\', $token[1]);
+                            $alias = end($pieces);
+                            break;
                         case T_AS:
                             $lastState = 'use';
                             $state = 'alias';
@@ -935,6 +975,11 @@ protected function fetchItems()
                         case T_NS_SEPARATOR:
                             $name .= $token[1];
                             break;
+                        case T_NAME_QUALIFIED:
+                            $name .= $token[1];
+                            $pieces = explode('\\', $token[1]);
+                            $alias = end($pieces);
+                            break;
                         case T_STRING:
                             $name .= $token[1];
                             $alias = $token[1];
@@ -1035,4 +1080,17 @@ protected function fetchItems()
         static::$constants[$key] = $constants;
         static::$structures[$key] = $structures;
     }
+
+    private function parseNameQualified($token)
+    {
+        $pieces = explode('\\', $token);
+
+        $id_start = array_shift($pieces);
+
+        $id_start_ci = strtolower($id_start);
+
+        $id_name = '\\' . implode('\\', $pieces);
+
+        return [$id_start, $id_start_ci, $id_name];
+    }
 }
diff --git a/tests/ClosureTest.php b/tests/ClosureTest.php
@@ -230,6 +230,7 @@ public function testClosureNested()
             $n = function ($b) {
                 return !$b;
             };
+
             $ns = unserialize(serialize(new SerializableClosure($n)));
 
             return $ns(false);

diff --git a/tests/NamespaceFullyQualifiedTest.php b/tests/NamespaceFullyQualifiedTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Opis\Closure\Test;
+
+use Closure;
+use Opis\Closure\ReflectionClosure;
+
+final class NamespaceGroupTest extends \PHPUnit\Framework\TestCase
+{
+    public function test_namespace_fully_qualified()
+    {
+        $f = function () { new \A; };
+        $e = 'function () { new \A; }';
+        $this->assertEquals($e, $this->c($f));
+    }
+
+    protected function c(Closure $closure)
+    {
+        $r = new ReflectionClosure($closure);
+
+        return $r->getCode();
+    }
+}