fixup! try to remove breaking service from container

Author: TomasVotruba

rules/CodingStyle/Rector/Enum_/EnumCaseToPascalCaseRector.php

@@ -208,9 +208,9 @@ private function convertToPascalCase(string $name): string
                 fn ($part): string =>
                 // If part is all uppercase, convert to ucfirst(strtolower())
                 // If part is already mixed or PascalCase, keep as is except ucfirst
-                ctype_upper($part)
-                    ? ucfirst(strtolower($part))
-                    : ucfirst($part),
+                ctype_upper((string) $part)
+                    ? ucfirst(strtolower((string) $part))
+                    : ucfirst((string) $part),
                 $parts
             )
         );

src/DependencyInjection/PHPStan/PHPStanContainerMemento.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\DependencyInjection\PHPStan;
+
+use PHPStan\DependencyInjection\MemoizingContainer;
+use PHPStan\DependencyInjection\Nette\NetteContainer;
+use PHPStan\Parser\AnonymousClassVisitor;
+use PHPStan\Parser\RichParser;
+use Rector\Util\Reflection\PrivatesAccessor;
+
+/**
+ * Helper service to modify PHPStan container
+ */
+final class PHPStanContainerMemento
+{
+    public static function removeRichVisitors(RichParser $richParser): void
+    {
+        // the only way now seems to access container early and remove unwanted services
+        // here https://github.com/phpstan/phpstan-src/blob/522421b007cbfc674bebb93e823c774167ac78cd/src/Parser/RichParser.php#L90-L92
+        $privatesAccessor = new PrivatesAccessor();
+
+        /** @var MemoizingContainer $container */
+        $container = $privatesAccessor->getPrivateProperty($richParser, 'container');
+
+        /** @var NetteContainer $originalContainer */
+        $originalContainer = $privatesAccessor->getPrivateProperty($container, 'originalContainer');
+
+        /** @var NetteContainer $originalContainer */
+        $deeperContainer = $privatesAccessor->getPrivateProperty($originalContainer, 'container');
+
+        // get tags property
+        $tags = $privatesAccessor->getPrivateProperty($deeperContainer, 'tags');
+
+        // keep only the anonymous class visitor
+        // remove all the rest, https://github.com/phpstan/phpstan-src/tree/1d86de8bb9371534983a8dbcd879e057d2ff028f/src/Parser
+        $tags[RichParser::VISITOR_SERVICE_TAG] = [
+            $container->findServiceNamesByType(AnonymousClassVisitor::class)[0] => true,
+        ];
+
+        $privatesAccessor->setPrivateProperty($deeperContainer, 'tags', $tags);
+    }
+}

src/PhpParser/Parser/RectorParser.php

@@ -8,6 +8,7 @@
 use PhpParser\ParserFactory;
 use PhpParser\PhpVersion;
 use PHPStan\Parser\Parser;
+use Rector\DependencyInjection\PHPStan\PHPStanContainerMemento;
 use Rector\PhpParser\ValueObject\StmtsAndTokens;
 use Rector\Util\Reflection\PrivatesAccessor;
 
@@ -17,6 +18,7 @@ public function __construct(
         private Parser $parser,
         private PrivatesAccessor $privatesAccessor
     ) {
+        PHPStanContainerMemento::removeRichVisitors($parser);
     }
 
     /**

tests/PhpParser/Printer/PHPStanPrinterTest.php

@@ -5,14 +5,10 @@
 namespace Rector\Tests\PhpParser\Printer;
 
 use PhpParser\PrettyPrinter\Standard;
-use PHPStan\DependencyInjection\MemoizingContainer;
-use PHPStan\DependencyInjection\Nette\NetteContainer;
-use PHPStan\Parser\AnonymousClassVisitor;
-use PHPStan\Parser\ArrayMapArgVisitor;
 use PHPStan\Parser\Parser;
 use PHPStan\Parser\RichParser;
+use Rector\DependencyInjection\PHPStan\PHPStanContainerMemento;
 use Rector\Testing\PHPUnit\AbstractLazyTestCase;
-use Rector\Util\Reflection\PrivatesAccessor;
 use ReflectionProperty;
 
 /**
@@ -28,7 +24,7 @@ public function testAddingCommentOnSomeNodesFail(): void
         /** @var RichParser $phpstanParser */
         $phpstanParser = $this->make(Parser::class);
 
-        $this->removeNodeVisitorFromPHPStanParser($phpstanParser, [ArrayMapArgVisitor::class]);
+        PHPStanContainerMemento::removeRichVisitors($phpstanParser);
 
         $stmts = $phpstanParser->parseFile(__DIR__ . '/Fixture/some_array_map.php');
 
@@ -46,34 +42,4 @@ public function testAddingCommentOnSomeNodesFail(): void
 
         $this->assertStringEqualsFile(__DIR__ . '/Fixture/some_array_map.php', $newlineNormalizedContents);
     }
-
-    /**
-     * @param class-string[] $nodeVisitorsToRemove
-     */
-    private function removeNodeVisitorFromPHPStanParser(RichParser $phpstanParser, array $nodeVisitorsToRemove): void
-    {
-        // the only way now seems to access container early and remove unwanted services
-        // here https://github.com/phpstan/phpstan-src/blob/522421b007cbfc674bebb93e823c774167ac78cd/src/Parser/RichParser.php#L90-L92
-        $privatesAccessor = new PrivatesAccessor();
-
-        /** @var MemoizingContainer $container */
-        $container = $privatesAccessor->getPrivateProperty($phpstanParser, 'container');
-
-        /** @var NetteContainer $originalContainer */
-        $originalContainer = $privatesAccessor->getPrivateProperty($container, 'originalContainer');
-
-        /** @var NetteContainer $originalContainer */
-        $deeperContainer = $privatesAccessor->getPrivateProperty($originalContainer, 'container');
-
-        // get tags property
-        $tags = $privatesAccessor->getPrivateProperty($deeperContainer, 'tags');
-
-        // keep only the anonymous class visitor
-        // remove all the rest, https://github.com/phpstan/phpstan-src/tree/1d86de8bb9371534983a8dbcd879e057d2ff028f/src/Parser
-        $tags[RichParser::VISITOR_SERVICE_TAG] = [
-            $container->findServiceNamesByType(AnonymousClassVisitor::class)[0] => true,
-        ];
-
-        $privatesAccessor->setPrivateProperty($deeperContainer, 'tags', $tags);
-    }
 }