use PHPStan 1.7.12, with new phpdoc-parser to fix endline issue

rectorphp · Jun 9, 2022 · 56651d0 · 56651d0
1 parent e7ec08f
commit 56651d0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/build/build-preload.php b/build/build-preload.php
@@ -120,9 +120,6 @@ public function buildPreloadScript(string $buildDirectory): void
         $stmtsAwareInterface = new SplFileInfo(__DIR__ . '/../src/Contract/PhpParser/Node/StmtsAwareInterface.php');
         array_splice($fileInfos, 1, 0, [$stmtsAwareInterface]);
 
-        // hotfix for phpdoc-parser 1.6, possibly waits on phpstan release with this package, see https://github.com/phpstan/phpdoc-parser/issues/132
-        $fileInfos[] = new SmartFileInfo('vendor/phpstan/phpdoc-parser/src/Parser/TokenIterator.php');
-
         // 3. create preload.php from provided files
         $preloadFileContent = $this->createPreloadFileContent($fileInfos);
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "nikic/php-parser": "^4.14.0",
         "ondram/ci-detector": "^4.1",
         "phpstan/phpdoc-parser": "^1.6",
-        "phpstan/phpstan": "^1.7.10",
+        "phpstan/phpstan": "^1.7.12",
         "phpstan/phpstan-phpunit": "^1.1",
         "react/child-process": "^0.6.4",
         "react/event-loop": "^1.3",

diff --git a/preload.php b/preload.php
@@ -252,4 +252,3 @@
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Parser/Tokens.php';
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/ParserFactory.php';
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php';
-require_once __DIR__ . '/vendor/phpstan/phpdoc-parser/src/Parser/TokenIterator.php';