restore original parser.neon config

rectorphp · Feb 9, 2022 · 963b961 · 963b961
1 parent ec23bb4
commit 963b961
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 75 deletions.
diff --git a/.github/workflows/e2e_php74.yaml → .github/disabled-workflows/e2e_php74.yaml b/.github/workflows/e2e_php74.yaml → .github/disabled-workflows/e2e_php74.yaml
diff --git a/config/phpstan/parser.neon b/config/phpstan/parser.neon
@@ -2,32 +2,39 @@
 # this file overrides definitions from the config above
 services:
     defaultAnalysisParser:
-        factory: @rectorPathRoutingParser
+        factory: @pathRoutingParser
         arguments!: []
 
     cachedRectorParser:
         class: PHPStan\Parser\CachedParser
         arguments:
             originalParser: @rectorParser
             cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
-        autowired: no
+        autowired: false
 
-    rectorSimpleParser:
-        class: PHPStan\Parser\CleaningParser
+    cachedRectorSimpleParser:
+        class: PHPStan\Parser\CachedParser
         arguments:
-            wrappedParser: @currentPhpVersionSimpleDirectParser
-        autowired: no
+            originalParser: @rectorSimpleParser
+            cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
+        autowired: false
 
-    rectorPathRoutingParser:
-        class: Rector\Core\PhpParser\Parser\RectorPathRoutingParser
+    pathRoutingParser:
+        class: PHPStan\Parser\PathRoutingParser
         arguments:
-            phpstanPathRoutingParser: @pathRoutingParser
             currentPhpVersionRichParser: @cachedRectorParser
-        autowired: no
+            currentPhpVersionSimpleParser: @cachedRectorSimpleParser
+            php8Parser: @php8Parser
+        autowired: false
 
     rectorParser:
         class: PHPStan\Parser\RichParser
         arguments:
             parser: @currentPhpVersionPhpParser
             lexer: @currentPhpVersionLexer
         autowired: no
+
+    rectorSimpleParser:
+        class: PHPStan\Parser\SimpleParser
+        arguments:
+            parser: @currentPhpVersionPhpParser
diff --git a/config/services.php b/config/services.php
@@ -70,7 +70,6 @@
             __DIR__ . '/../src/Enum',
             __DIR__ . '/../src/PhpParser/Node/CustomNode',
             __DIR__ . '/../src/PhpParser/ValueObject',
-            __DIR__ . '/../src/PhpParser/Parser/RectorPathRoutingParser.php',
             __DIR__ . '/../src/functions',
             __DIR__ . '/../src/constants.php',
 

diff --git a/e2e/php74-parse-static/composer.json b/e2e/php74-parse-static/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "php": "7.4",
+        "php": "7.4.*",
         "api-platform/core": "^2.6",
         "symfony/framework-bundle": "^5.4",
         "symfony/http-client": "^5.4"

diff --git a/phpstan.neon b/phpstan.neon
@@ -37,7 +37,7 @@ parameters:
     scanDirectories:
         - stubs
 
-    reportUnmatchedIgnoredErrors: false
+#    reportUnmatchedIgnoredErrors: false
     checkGenericClassInNonGenericObjectType: false
 
     excludePaths:
@@ -603,11 +603,3 @@ parameters:
         -
             message: '#Array with keys is not allowed\. Use value object to pass data instead#'
             path: packages/PhpAttribute/Printer/PhpAttributeGroupFactory.php
-
-        # on purpose to fix tests + old PHP version parsing code and keep compatbility
-        - '#Extending PHPStan\\Parser\\PathRoutingParser is not covered by backward compatibility promise\. The class might change in a minor PHPStan version#'
-
-        # false positive
-        -
-            message: '#Dead catch (.*?) ParseError is never thrown in the try block#'
-            path: src/PhpParser/Parser/RectorPathRoutingParser.php
diff --git a/rector.php b/rector.php
@@ -73,9 +73,6 @@
         MyCLabsClassToEnumRector::class,
         SpatieEnumClassToEnumRector::class,
 
-        // code for phpstan with named arguments
-        __DIR__ . '/src/PhpParser/Parser/RectorPathRoutingParser.php',
-
         // test paths
         '*/tests/**/Fixture/*',
         '*/rules-tests/**/Fixture/*',

diff --git a/src/PhpParser/Parser/RectorPathRoutingParser.php b/src/PhpParser/Parser/RectorPathRoutingParser.php