Cleanup using rector

Author: jaapio

packages/guides-cli/src/DependencyInjection/ContainerFactory.php

@@ -27,8 +27,8 @@
 
 final class ContainerFactory
 {
-    private ContainerBuilder $container;
-    private XmlFileLoader $configLoader;
+    private readonly ContainerBuilder $container;
+    private readonly XmlFileLoader $configLoader;
 
     /** @var array<string, string> */
     private array $registeredExtensions = [];
@@ -42,7 +42,7 @@ public function __construct(array $defaultExtensions = [])
         $this->container = new ContainerBuilder();
         $this->configLoader = new XmlFileLoader(new FileLocator());
 
-        foreach (array_merge([new GuidesExtension(), new ReStructuredTextExtension()], $defaultExtensions) as $extension) {
+        foreach ([new GuidesExtension(), new ReStructuredTextExtension(), ...$defaultExtensions] as $extension) {
             $this->registerExtension($extension);
         }
     }
@@ -54,7 +54,7 @@ public function loadExtensionConfig(string $extension, array $config): void
 
         $extensionAlias = $this->registeredExtensions[$extensionFqcn] ?? false;
         if (!$extensionAlias) {
-            $this->registerExtension(new $extensionFqcn(), $config);
+            $this->registerExtension(new $extensionFqcn());
 
             return;
         }
@@ -72,15 +72,14 @@ public function create(string $vendorDir): Container
         $this->processConfig();
 
         $this->container->setParameter('vendor_dir', $vendorDir);
-        $this->container->setParameter('working_directory', $workingDirectory = rtrim(getcwd(), '/'));
+        $this->container->setParameter('working_directory', rtrim(getcwd(), '/'));
 
         $this->container->compile(true);
 
         return $this->container;
     }
 
-    /** @param array<mixed> $config */
-    private function registerExtension(ExtensionInterface $extension, array $config = []): void
+    private function registerExtension(ExtensionInterface $extension): void
     {
         $this->container->registerExtension($extension);
         $this->container->loadFromExtension($extension->getAlias());

packages/guides-restructured-text/src/RestructuredText/Parser/InlineParser.php

@@ -20,9 +20,7 @@ class InlineParser
     public function __construct(iterable $inlineRules)
     {
         $this->rules = [...$inlineRules];
-        usort($this->rules, static function (InlineRule $a, InlineRule $b): int {
-            return $a->getPriority() > $b->getPriority() ? -1 : 1;
-        });
+        usort($this->rules, static fn(InlineRule $a, InlineRule $b): int => $a->getPriority() > $b->getPriority() ? -1 : 1);
     }
 
     public function parse(string $content, BlockContext $blockContext): InlineCompoundNode

packages/guides/src/Compiler/NodeTransformers/CustomNodeTransformerFactory.php

@@ -29,9 +29,7 @@ public function getPriorities(): array
     {
         $transformers = [...$this->transformers];
         $priorites = array_map(
-            static function (NodeTransformer $transformer) {
-                return $transformer->getPriority();
-            },
+            static fn(NodeTransformer $transformer): int => $transformer->getPriority(),
             $transformers,
         );
         sort($priorites);

packages/guides/src/Compiler/NodeTransformers/DocumentBlockNodeTransformer.php

@@ -31,10 +31,10 @@ public function leaveNode(Node $node, CompilerContext $compilerContext): Node|nu
             $children = [];
             foreach ($node->getValue() as $child) {
                 if ($child instanceof TocNode) {
-                    $child = $child->withOptions(array_merge($child->getOptions(), ['menu' => $node->getIdentifier()]));
+                    $child = $child->withOptions([...$child->getOptions(), 'menu' => $node->getIdentifier()]);
                 }
 
-                $child = $child->withOptions(array_merge($child->getOptions(), ['documentBlock' => $node->getIdentifier()]));
+                $child = $child->withOptions([...$child->getOptions(), 'documentBlock' => $node->getIdentifier()]);
 
                 $children[] = $child;
             }

packages/guides/src/Meta/AnnotationTarget.php

@@ -15,7 +15,7 @@
 
 class AnnotationTarget extends InternalTarget
 {
-    public function __construct(string $documentPath, string $anchorName, private string $name)
+    public function __construct(string $documentPath, string $anchorName, private readonly string $name)
     {
         parent::__construct($documentPath, $anchorName);
     }

packages/guides/src/Nodes/DocumentNode.php

@@ -180,7 +180,7 @@ public function setTitleFound(bool $titleFound): void
     public function getLoggerInformation(): array
     {
         return [
-            'rst-file' => $this->getFilePath() . '.rst',
+            'rst-file' => $this->filePath . '.rst',
         ];
     }
 

packages/guides/src/Nodes/FootnoteNode.php

@@ -43,6 +43,6 @@ public function getNumber(): int
 
     public function getAnchor(): string
     {
-        return 'footnote-' . $this->getNumber();
+        return 'footnote-' . $this->number;
     }
 }

packages/guides/src/Nodes/Inline/AbbreviationInlineNode.php

@@ -4,7 +4,7 @@
 
 namespace phpDocumentor\Guides\Nodes\Inline;
 
-class AbbreviationInlineNode extends GenericTextRoleInlineNode
+final class AbbreviationInlineNode extends GenericTextRoleInlineNode
 {
     public const TYPE = 'abbreviation';
 

packages/guides/src/Nodes/Inline/CitationInlineNode.php

@@ -15,9 +15,9 @@
  */
 class CitationInlineNode extends AnnotationInlineNode
 {
-    public const TYPE = 'citation_inline';
+    final public const TYPE = 'citation_inline';
 
-    public function __construct(string $value, private string $name)
+    public function __construct(string $value, private readonly string $name)
     {
         parent::__construct(self::TYPE, $value);
     }

packages/guides/src/Nodes/Inline/FootnoteInlineNode.php

@@ -22,9 +22,9 @@
  */
 class FootnoteInlineNode extends AnnotationInlineNode
 {
-    public const TYPE = 'footnote';
+    final public const TYPE = 'footnote';
 
-    public function __construct(string $value, private string $name, private int $number)
+    public function __construct(string $value, private readonly string $name, private readonly int $number)
     {
         parent::__construct(self::TYPE, $value);
     }

packages/guides/src/Nodes/Inline/VariableInlineNode.php

@@ -8,7 +8,7 @@
 
 class VariableInlineNode extends InlineNode
 {
-    public const TYPE = 'variable';
+    final public const TYPE = 'variable';
 
     private Node $child;
 

packages/guides/src/ParserContext.php

@@ -105,7 +105,7 @@ public function getCurrentFileName(): string
     public function getLoggerInformation(): array
     {
         return [
-            'rst-file' => $this->getCurrentFileName(),
+            'rst-file' => $this->currentFileName,
         ];
     }
 

packages/guides/src/RenderContext.php

@@ -138,7 +138,7 @@ public function getCurrentFileName(): string
     public function getLoggerInformation(): array
     {
         return [
-            'rst-file' => $this->getCurrentFileName(),
+            'rst-file' => $this->currentFileName,
         ];
     }
 

packages/guides/src/Settings/ProjectSettings.php

@@ -10,9 +10,9 @@
 class ProjectSettings
 {
     /** @var array<string, string> */
-    private array $inventories = [];
-    private string $title = '';
-    private string $version = '';
+    private readonly array $inventories;
+    private readonly string $title;
+    private readonly string $version;
 
     /** @param array<string, string|array<string, string>> $settingsArray */
     public function __construct(array $settingsArray)

packages/guides/src/Twig/Theme/ThemeManager.php

@@ -28,7 +28,7 @@ class ThemeManager
 
     /** @param string[] $defaultPaths */
     public function __construct(
-        private FilesystemLoader $filesystemLoader,
+        private readonly FilesystemLoader $filesystemLoader,
         array $defaultPaths,
     ) {
         $filesystemLoader->setPaths($defaultPaths);

rector.php

@@ -23,7 +23,6 @@
     $rectorConfig->rule(Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector::class);
     $rectorConfig->rule(Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector::class);
-    $rectorConfig->rule(Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector::class);
     $rectorConfig->rule(Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector::class);
     $rectorConfig->rule(Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector::class);
     $rectorConfig->rule(Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector::class);