[!]: PHP 7.2 as minimal requirement

[+]: update vendor libs + add more tests
[-]: remove custom PseudoTypes for phpDocumentor (PseudoTypes are now build in into phpDocumentor itself)

Author: voku

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.15.3 (2020-10-06)
+
+- update vendor libs
+- PHP 7.2 as minimal requirement
+- remove custom PseudoTypes for phpDocumentor (PseudoTypes are now build in into phpDocumentor itself)
+- add more tests for "PhpCodeParser->getFunctionsInfo()"
+
 ### 0.15.2 (2020-09-04)
 
 - save special phpdoc @tags and the content of these tags

composer.json

@@ -16,12 +16,11 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
-        "ext-simplexml": "*",
+        "php": ">=7.2",
         "amphp/parallel": "~1.4",
-        "phpdocumentor/type-resolver": "~1.0 || ~1.3",
-        "phpdocumentor/reflection-docblock": "~4.3 || ~5.1 || 5.x-dev",
-        "phpdocumentor/reflection-common": "~2.1 || ~2.2",
+        "phpdocumentor/type-resolver": "~1.3",
+        "phpdocumentor/reflection-docblock": "~5.1",
+        "phpdocumentor/reflection-common": "~2.2",
         "phpstan/phpdoc-parser": "~0.4",
         "voku/simple-cache": "~4.0",
         "nikic/php-parser": "~4.10",
@@ -33,15 +32,7 @@
     "autoload": {
         "psr-4": {
             "voku\\": "src/voku/"
-        },
-        "files": [
-            "src/voku/SimplePhpParser/Model/types/ArrayArray.php",
-            "src/voku/SimplePhpParser/Model/types/ArrayFloat.php",
-            "src/voku/SimplePhpParser/Model/types/ArrayInt.php",
-            "src/voku/SimplePhpParser/Model/types/ArrayString.php",
-            "src/voku/SimplePhpParser/Model/types/BooleanFalse.php",
-            "src/voku/SimplePhpParser/Model/types/BooleanTrue.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {

src/voku/SimplePhpParser/Model/types/ArrayArray.php

@@ -279,11 +279,11 @@ public static function parseDocTypeObject($type): string
             return 'string|int|float|bool';
         }
 
-        if ($type instanceof \phpDocumentor\Reflection\Types\BooleanTrue) {
+        if ($type instanceof \phpDocumentor\Reflection\PseudoTypes\True_) {
             return 'true';
         }
 
-        if ($type instanceof \phpDocumentor\Reflection\Types\BooleanFalse) {
+        if ($type instanceof \phpDocumentor\Reflection\PseudoTypes\False_) {
             return 'false';
         }
 
@@ -376,13 +376,6 @@ public static function createDocBlockInstance(array $additionalTags = []): \phpD
         $descriptionFactory = new \phpDocumentor\Reflection\DocBlock\DescriptionFactory($tagFactory);
         $typeResolver = new \phpDocumentor\Reflection\TypeResolver($fqsenResolver);
 
-        $typeResolver->addKeyword('array[]', \phpDocumentor\Reflection\Types\ArrayArray::class);
-        $typeResolver->addKeyword('float[]', \phpDocumentor\Reflection\Types\ArrayFloat::class);
-        $typeResolver->addKeyword('int[]', \phpDocumentor\Reflection\Types\ArrayInt::class);
-        $typeResolver->addKeyword('string[]', \phpDocumentor\Reflection\Types\ArrayString::class);
-        $typeResolver->addKeyword('false', \phpDocumentor\Reflection\Types\BooleanFalse::class);
-        $typeResolver->addKeyword('true', \phpDocumentor\Reflection\Types\BooleanTrue::class);
-
         /**
          * @noinspection   PhpParamsInspection
          * @psalm-suppress InvalidArgument - false-positive from "ReflectionDocBlock" + PHP >= 7.2

src/voku/SimplePhpParser/Model/types/ArrayFloat.php

@@ -231,6 +231,8 @@ public function testSpecialPhpDocComment(): void
         * Add a route like `$router->route(\'/blog/\', function(){...});` where function returns html.
         *
         * @export(Router.route)
+        *
+        * @return mixed[][][]|false
         */
         function route($pattern, $callback){}
         ';
@@ -239,7 +241,52 @@ function route($pattern, $callback){}
         $phpFunctions = $phpCode->getFunctions();
 
         static::assertSame('route', $phpFunctions['route']->name);
-        static::assertSame(['export' => '@export (Router.route)'], $phpFunctions['route']->tagNames);
+        static::assertSame(['export' => '@export (Router.route)', 'return' => '@return array[][]|false'], $phpFunctions['route']->tagNames);
+    }
+
+    public function testGetFunctionsInfo(): void
+    {
+        $phpCode = PhpCodeParser::getPhpFiles(
+            __DIR__ . '/Dummy.php'
+        );
+        $phpFunctionsInfo = $phpCode->getFunctionsInfo();
+
+        $result = $phpFunctionsInfo;
+
+        $result = self::removeLocalPathForTheTest($result);
+
+        // DEBUG
+        //\var_export($result);
+
+        static::assertSame([
+            'voku\\tests\\foo' => [
+                'fullDescription' => '',
+                'paramsTypes'     => [
+                    'foo' => [
+                        'type'                           => 'int',
+                        'typeFromPhpDocMaybeWithComment' => null,
+                        'typeFromPhpDoc'                 => null,
+                        'typeFromPhpDocSimple'           => null,
+                        'typeFromPhpDocExtended'         => null,
+                        'typeFromDefaultValue'           => 'int',
+                    ],
+                ],
+                'returnTypes' => [
+                    'type'                           => null,
+                    'typeFromPhpDocMaybeWithComment' => '\\Dummy',
+                    'typeFromPhpDoc'                 => 'Dummy',
+                    'typeFromPhpDocSimple'           => '\\Dummy',
+                    'typeFromPhpDocExtended'         => 'Dummy',
+                ],
+                'line'          => 10,
+                'file'          => 'Simple-PHP-Code-Parser/tests/Dummy.php',
+                'error'         => '',
+                'is_deprecated' => false,
+                'is_meta'       => false,
+                'is_internal'   => false,
+                'is_removed'    => false,
+            ],
+        ], $result);
     }
 
     public function testGetMethodsInfoFromExtendedClass(): void