Adopt Microsoft/tolerant-php-parser

.gitignore

@@ -5,3 +5,4 @@ vendor/
 .phpls/
 composer.lock
 stubs
+*.ast

.gitmodules

@@ -0,0 +1,27 @@
+[submodule "validation/frameworks/php-language-server"]
+	path = validation/frameworks/php-language-server
+	url = https://github.com/felixfbecker/php-language-server
+[submodule "validation/frameworks/wordpress"]
+	path = validation/frameworks/wordpress
+	url = https://github.com/wordpress/wordpress
+[submodule "validation/frameworks/drupal"]
+	path = validation/frameworks/drupal
+	url = https://github.com/drupal/drupal
+[submodule "validation/frameworks/tolerant-php-parser"]
+	path = validation/frameworks/tolerant-php-parser
+	url = https://github.com/microsoft/tolerant-php-parser
+[submodule "validation/frameworks/symfony"]
+	path = validation/frameworks/symfony
+	url = https://github.com/symfony/symfony
+[submodule "validation/frameworks/math-php"]
+	path = validation/frameworks/math-php
+	url = https://github.com/markrogoyski/math-php
+[submodule "validation/frameworks/codeigniter"]
+	path = validation/frameworks/codeigniter
+	url = https://github.com/bcit-ci/codeigniter
+[submodule "validation/frameworks/cakephp"]
+	path = validation/frameworks/cakephp
+	url = https://github.com/cakephp/cakephp
+[submodule "validation/frameworks/phpunit"]
+	path = validation/frameworks/phpunit
+	url = https://github.com/sebastianbergmann/phpunit

Performance.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace LanguageServer\Tests;
+require __DIR__ . '/vendor/autoload.php';
+
+use Exception;
+use LanguageServer\Index\Index;
+use LanguageServer\ParserKind;
+use LanguageServer\PhpDocument;
+use LanguageServer\DefinitionResolver;
+use Microsoft\PhpParser;
+use phpDocumentor\Reflection\DocBlockFactory;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+$totalSize = 0;
+
+$frameworks = ["drupal", "wordpress", "php-language-server", "tolerant-php-parser", "math-php", "symfony", "CodeIgniter", "cakephp"];
+
+foreach($frameworks as $framework) {
+    $iterator = new RecursiveDirectoryIterator(__DIR__ . "/validation/frameworks/$framework");
+    $testProviderArray = array();
+
+    foreach (new RecursiveIteratorIterator($iterator) as $file) {
+        if (strpos((string)$file, ".php") !== false) {
+            $totalSize += $file->getSize();
+            $testProviderArray[] = $file->getPathname();
+        }
+    }
+
+    if (count($testProviderArray) === 0) {
+        throw new Exception("ERROR: Validation testsuite frameworks not found - run `git submodule update --init --recursive` to download.");
+    }
+
+
+    $parserKinds = [ParserKind::PHP_PARSER, ParserKind::TOLERANT_PHP_PARSER];
+    foreach ($parserKinds as $kind) {
+        $start = microtime(true);
+
+        foreach ($testProviderArray as $idx => $testCaseFile) {
+            if (filesize($testCaseFile) > 10000) {
+                continue;
+            }
+            if ($idx % 1000 === 0) {
+                echo "$idx\n";
+            }
+
+            $fileContents = file_get_contents($testCaseFile);
+
+            $docBlockFactory = DocBlockFactory::createInstance();
+            $index = new Index;
+            $maxRecursion = [];
+            $definitions = [];
+
+            $definitionResolver = new DefinitionResolver($index);
+            $parser = new PhpParser\Parser();
+
+            try {
+                $document = new PhpDocument($testCaseFile, $fileContents, $index, $parser, $docBlockFactory, $definitionResolver);
+            } catch (\Throwable $e) {
+                continue;
+            }
+        }
+
+        echo "------------------------------\n";
+
+        echo "Time [$framework, $kind]: " . (microtime(true) - $start) . PHP_EOL;
+
+    }
+}
+

composer.json

@@ -28,7 +28,6 @@
     },
     "require": {
         "php": ">=7.0",
-        "nikic/php-parser": "^3.0.5",
         "phpdocumentor/reflection-docblock": "^3.0",
         "sabre/event": "^5.0",
         "felixfbecker/advanced-json-rpc": "^2.0",
@@ -38,7 +37,8 @@
         "webmozart/glob": "^4.1",
         "sabre/uri": "^2.0",
         "jetbrains/phpstorm-stubs": "dev-master",
-        "composer/composer": "^1.3"
+        "composer/composer": "^1.3",
+        "Microsoft/tolerant-php-parser": "^0.0.2"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -47,7 +47,9 @@
             "LanguageServer\\": "src/"
         },
         "files" : [
-            "src/utils.php"
+            "src/utils.php",
+            "src/FqnUtilities.php",
+            "src/ParserHelpers.php"
         ]
     },
     "autoload-dev": {

phpcs.xml.dist

@@ -2,6 +2,7 @@
 <ruleset name="PHP Language Server">
     <file>src</file>
     <file>tests</file>
+    <exclude-pattern>tests/Validation/cases</exclude-pattern>
     <rule ref="PSR2">
         <exclude name="PSR2.Namespaces.UseDeclaration.MultipleDeclarations"/>
         <exclude name="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed"/>

phpunit.xml.dist

@@ -12,6 +12,6 @@
         </whitelist>
     </filter>
     <php>
-        <ini name="memory_limit" value="256M"/>
+        <ini name="memory_limit" value="1024M"/>
     </php>
 </phpunit>