Automated code improvements

jaapio · jaapio · commit 36f48d586223 · 2023-08-21T21:24:12.000+02:00
diff --git a/Makefile b/Makefile
@@ -71,7 +71,7 @@ vendor: composer.json composer.lock
 
 .PHONY: rector
 rector: ## Refactor code using rector
-	$(PHP_BIN) vendor/bin/rector process packages
+	$(PHP_BIN) vendor/bin/rector process
 
 .PHONY: pre-commit-test
 pre-commit-test: fix-code-style test code-style static-code-analysis
diff --git a/packages/guides-cli/tests/unit/Logger/SpyProcessorTest.php b/packages/guides-cli/tests/unit/Logger/SpyProcessorTest.php
@@ -12,7 +12,7 @@ public function testHasBeenCalledReturnsFalseByDefault(): void
     {
         $spyProcessor = new SpyProcessor();
 
-        $this->assertFalse($spyProcessor->hasBeenCalled());
+        self::assertFalse($spyProcessor->hasBeenCalled());
     }
 
     public function testItKnowsWhenALogIsEmitted(): void
diff --git a/packages/guides-graphs/tests/unit/Nodes/UmlNodeTest.php b/packages/guides-graphs/tests/unit/Nodes/UmlNodeTest.php
@@ -12,7 +12,7 @@ public function test_it_can_be_created_with_a_value(): void
     {
         $node = new UmlNode('value');
 
-        $this->assertSame('value', $node->getValue());
+        self::assertSame('value', $node->getValue());
     }
 
     public function test_you_can_set_a_caption_for_underneath_diagrams(): void
@@ -22,7 +22,7 @@ public function test_you_can_set_a_caption_for_underneath_diagrams(): void
         $node = new UmlNode('value');
         $node->setCaption($caption);
 
-        $this->assertSame($caption, $node->getCaption());
+        self::assertSame($caption, $node->getCaption());
     }
 
     public function test_you_can_pass_classes_for_in_templates(): void
@@ -32,7 +32,7 @@ public function test_you_can_pass_classes_for_in_templates(): void
         $node = new UmlNode('value');
         $node->setClasses($classes);
 
-        $this->assertSame($classes, $node->getClasses());
-        $this->assertSame('float-left my-class', $node->getClassesString());
+        self::assertSame($classes, $node->getClasses());
+        self::assertSame('float-left my-class', $node->getClassesString());
     }
 }
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/BlockContext.php b/packages/guides-restructured-text/src/RestructuredText/Parser/BlockContext.php
@@ -20,7 +20,7 @@
  */
 class BlockContext
 {
-    private LinesIterator $documentIterator;
+    private readonly LinesIterator $documentIterator;
     
     public function __construct(
         private readonly DocumentParserContext $documentParserContext,
@@ -50,6 +50,6 @@ public function getLoggerInformation(): array
             'currentLineNumber' => $this->lineOffset + $this->documentIterator->key(),
         ];
 
-        return array_merge($this->getDocumentParserContext()->getLoggerInformation(), $info);
+        return [...$this->documentParserContext->getLoggerInformation(), ...$info];
     }
 }
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/DocumentParserContext.php b/packages/guides-restructured-text/src/RestructuredText/Parser/DocumentParserContext.php
@@ -31,12 +31,12 @@ class DocumentParserContext
     public bool $nextIndentedBlockShouldBeALiteralBlock = false;
 
     public DocumentNode|null $document = null;
-    
+
     private int $currentTitleLevel;
     /* Each Document has its own text role factory as text roles can be changed on a per document base
         by directives */
-    private TextRoleFactory $textRoleFactoryForDocument;
-    
+    private readonly TextRoleFactory $textRoleFactoryForDocument;
+
     private string $codeBlockDefaultLanguage = '';
 
     /** @var string[] */
@@ -79,7 +79,7 @@ public function setDocument(DocumentNode $document): void
     {
         $this->document = $document;
     }
-    
+
     public function getLevel(string $overlineLetter, string $underlineLetter): int
     {
         $letter = $overlineLetter . ':' . $underlineLetter;
@@ -99,7 +99,7 @@ public function getTextRoleFactoryForDocument(): TextRoleFactory
     {
         return $this->textRoleFactoryForDocument;
     }
-    
+
     public function getCodeBlockDefaultLanguage(): string
     {
         return $this->codeBlockDefaultLanguage;
@@ -109,7 +109,7 @@ public function setCodeBlockDefaultLanguage(string $codeBlockDefaultLanguage): v
     {
         $this->codeBlockDefaultLanguage = $codeBlockDefaultLanguage;
     }
-    
+
     /** @return array<string, string> */
     public function getLoggerInformation(): array
     {
@@ -120,6 +120,6 @@ public function getLoggerInformation(): array
             $info['documentNode'] = 'null';
         }
 
-        return array_merge($this->getContext()->getLoggerInformation(), $info);
+        return [...$this->context->getLoggerInformation(), ...$info];
     }
 }
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/InlineLexer.php b/packages/guides-restructured-text/src/RestructuredText/Parser/InlineLexer.php
@@ -132,48 +132,21 @@ protected function getType(string &$value)
             return self::WHITESPACE;
         }
 
-        switch ($value) {
-            case '`':
-                return self::BACKTICK;
-
-            case '**':
-                return self::STRONG_DELIMITER;
-
-            case '*':
-                return self::EMPHASIS_DELIMITER;
-
-            case '|':
-                return self::VARIABLE_DELIMITER;
-
-            case '<':
-                return self::EMBEDED_URL_START;
-
-            case '>':
-                return self::EMBEDED_URL_END;
-
-            case '_':
-                return self::UNDERSCORE;
-
-            case '__':
-                return self::ANONYMOUS_END;
-
-            case ':':
-                return self::COLON;
-
-            case '#':
-                return self::OCTOTHORPE;
-
-            case '[':
-                return self::ANNOTATION_START;
-
-            case ']':
-                return self::ANNOTATION_END;
-
-            case '~':
-                return self::NBSP;
-
-            default:
-                return self::WORD;
-        }
+        return match ($value) {
+            '`' => self::BACKTICK,
+            '**' => self::STRONG_DELIMITER,
+            '*' => self::EMPHASIS_DELIMITER,
+            '|' => self::VARIABLE_DELIMITER,
+            '<' => self::EMBEDED_URL_START,
+            '>' => self::EMBEDED_URL_END,
+            '_' => self::UNDERSCORE,
+            '__' => self::ANONYMOUS_END,
+            ':' => self::COLON,
+            '#' => self::OCTOTHORPE,
+            '[' => self::ANNOTATION_START,
+            ']' => self::ANNOTATION_END,
+            '~' => self::NBSP,
+            default => self::WORD,
+        };
     }
 }
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/InlineParser.php b/packages/guides-restructured-text/src/RestructuredText/Parser/InlineParser.php
@@ -20,7 +20,7 @@ class InlineParser
     public function __construct(iterable $inlineRules)
     {
         $this->rules = [...$inlineRules];
-        usort($this->rules, static fn(InlineRule $a, InlineRule $b): int => $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
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/LineChecker.php b/packages/guides-restructured-text/src/RestructuredText/Parser/LineChecker.php
@@ -4,13 +4,8 @@
 
 namespace phpDocumentor\Guides\RestructuredText\Parser;
 
-use phpDocumentor\Guides\Nodes\Lists\ListItem;
-
 use function in_array;
 use function mb_strlen;
-use function preg_match;
-use function strlen;
-use function trim;
 
 class LineChecker
 {
@@ -60,6 +55,7 @@ public static function isSpecialLine(string $line, int $minimumLength = 2): stri
         if (!in_array($letter, self::HEADER_LETTERS, true)) {
             return null;
         }
+
         $max = mb_strlen($line);
         for ($i = 1; $i < $max; $i++) {
             if ($line[$i] !== $letter) {
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/BlockQuoteRule.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/BlockQuoteRule.php
@@ -23,8 +23,8 @@
 use function count;
 use function max;
 use function mb_strlen;
-use function mb_strpos;
 use function str_repeat;
+use function str_starts_with;
 use function strlen;
 use function substr;
 use function trim;
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/FieldList/AuthorsFieldListItemRule.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/FieldList/AuthorsFieldListItemRule.php
@@ -13,7 +13,6 @@
 use phpDocumentor\Guides\Nodes\RawNode;
 use phpDocumentor\Guides\RestructuredText\Parser\BlockContext;
 
-use function assert;
 use function count;
 use function explode;
 use function str_contains;
@@ -50,7 +49,6 @@ public function apply(FieldListItemNode $fieldListItemNode, BlockContext $blockC
                 }
             }
 
-
             if ($firstChild instanceof ListNode) {
                 // A bullet list whose elements each contain a single paragraph per author.
                 foreach ($firstChild->getChildren() as $listItemNode) {
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/ParagraphRule.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/ParagraphRule.php
@@ -14,7 +14,6 @@
 namespace phpDocumentor\Guides\RestructuredText\Parser\Productions;
 
 use phpDocumentor\Guides\Nodes\CompoundNode;
-use phpDocumentor\Guides\Nodes\Node;
 use phpDocumentor\Guides\Nodes\ParagraphNode;
 use phpDocumentor\Guides\RestructuredText\Parser\BlockContext;
 use phpDocumentor\Guides\RestructuredText\Parser\Buffer;
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/SectionRule.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/SectionRule.php
@@ -6,7 +6,6 @@
 
 use phpDocumentor\Guides\Nodes\CompoundNode;
 use phpDocumentor\Guides\Nodes\DocumentNode;
-use phpDocumentor\Guides\Nodes\Node;
 use phpDocumentor\Guides\Nodes\SectionNode;
 use phpDocumentor\Guides\Nodes\TitleNode;
 use phpDocumentor\Guides\RestructuredText\Parser\BlockContext;
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php
@@ -18,10 +18,10 @@
 use function array_reverse;
 use function count;
 use function mb_strlen;
-use function mb_strpos;
 use function mb_substr;
 use function preg_match;
 use function sprintf;
+use function str_contains;
 use function str_repeat;
 use function trim;
 
diff --git a/packages/guides-restructured-text/src/RestructuredText/TextRoles/AbstractReferenceTextRole.php b/packages/guides-restructured-text/src/RestructuredText/TextRoles/AbstractReferenceTextRole.php
@@ -15,7 +15,7 @@
 /** @see https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#embedded-uris-and-aliases */
 abstract class AbstractReferenceTextRole implements TextRole
 {
-    private InlineLexer $lexer;
+    private readonly InlineLexer $lexer;
 
     public function __construct(
         private readonly LoggerInterface $logger,
diff --git a/packages/guides-restructured-text/src/RestructuredText/TextRoles/DefaultTextRoleFactory.php b/packages/guides-restructured-text/src/RestructuredText/TextRoles/DefaultTextRoleFactory.php
@@ -19,7 +19,7 @@ public function __construct(
         private readonly TextRole $genericTextRole,
         private TextRole $defaultTextRole,
         iterable $textRoles = [],
-        private array $domains = [],
+        private readonly array $domains = [],
     ) {
         $this->textRoles = [...$textRoles];
     }
@@ -71,7 +71,7 @@ private function findTextRole(array $textRoles, string $name): TextRole
 
         // Textrole name takes precedence over alias
         foreach ($textRoles as $textRole) {
-            if (in_array($name, $textRole->getAliases())) {
+            if (in_array($name, $textRole->getAliases(), true)) {
                 return $textRole;
             }
         }
diff --git a/packages/guides-restructured-text/tests/unit/Parser/Productions/GridTableRuleTest.php b/packages/guides-restructured-text/tests/unit/Parser/Productions/GridTableRuleTest.php
@@ -295,7 +295,7 @@ public function testErrorMultipleHeaderRows(): void
 
     public function testNotEndingWithWhiteLine(): never
     {
-        $this->markTestSkipped('Not correct yet');
+        self::markTestSkipped('Not correct yet');
         $input = <<<'RST'
 +-----------------------------------+---------------+
 | Property                          | Data Type     |
diff --git a/packages/guides-restructured-text/tests/unit/Parser/Productions/InlineRules/TextRoleRuleTest.php b/packages/guides-restructured-text/tests/unit/Parser/Productions/InlineRules/TextRoleRuleTest.php
@@ -80,7 +80,7 @@ public function __construct(
             }
         };
 
-        $textRoleFactory->expects($this->once())
+        $textRoleFactory->expects(self::once())
             ->method('getTextRole')
             ->with('role', $expectedDomain)
             ->willReturn($collectingRole);
@@ -106,16 +106,16 @@ public function __construct(
          * @psalm-suppress UndefinedPropertyFetch
          * @phpstan-ignore-next-line
          */
-        $this->assertSame($expectedRole, $node->role);
+        self::assertSame($expectedRole, $node->role);
         /**
          * @psalm-suppress UndefinedPropertyFetch
          * @phpstan-ignore-next-line
          */
-        $this->assertSame($expectedContent, $node->content);
+        self::assertSame($expectedContent, $node->content);
         /**
          * @psalm-suppress UndefinedPropertyFetch
          * @phpstan-ignore-next-line
          */
-        $this->assertSame($expectedRawContent, $node->rawContent);
+        self::assertSame($expectedRawContent, $node->rawContent);
     }
 }
diff --git a/packages/guides/src/Compiler/CompilerContext.php b/packages/guides/src/Compiler/CompilerContext.php
@@ -75,6 +75,6 @@ public function getShadowTree(): TreeNode
     /** @return array<string, string> */
     public function getLoggerInformation(): array
     {
-        return array_merge($this->getDocumentNode()->getLoggerInformation());
+        return [...$this->getDocumentNode()->getLoggerInformation()];
     }
 }
diff --git a/packages/guides/src/Compiler/NodeTransformers/CustomNodeTransformerFactory.php b/packages/guides/src/Compiler/NodeTransformers/CustomNodeTransformerFactory.php
@@ -29,7 +29,7 @@ public function getPriorities(): array
     {
         $transformers = [...$this->transformers];
         $priorites = array_map(
-            static fn(NodeTransformer $transformer): int => $transformer->getPriority(),
+            static fn (NodeTransformer $transformer): int => $transformer->getPriority(),
             $transformers,
         );
         sort($priorites);
diff --git a/packages/guides/src/Compiler/NodeTransformers/DocumentBlockNodeTransformer.php b/packages/guides/src/Compiler/NodeTransformers/DocumentBlockNodeTransformer.php
@@ -10,8 +10,6 @@
 use phpDocumentor\Guides\Nodes\Menu\TocNode;
 use phpDocumentor\Guides\Nodes\Node;
 
-use function array_merge;
-
 /**
  * @implements NodeTransformer<Node>
  *
diff --git a/packages/guides/src/NodeRenderers/PreRenderers/PreNodeRendererFactory.php b/packages/guides/src/NodeRenderers/PreRenderers/PreNodeRendererFactory.php
@@ -16,9 +16,9 @@
 final class PreNodeRendererFactory implements NodeRendererFactory
 {
     public function __construct(
-        private NodeRendererFactory $innerFactory,
+        private readonly NodeRendererFactory $innerFactory,
         /** @var iterable<PreNodeRenderer> */
-        private iterable $preRenderers,
+        private readonly iterable $preRenderers,
     ) {
     }
 
diff --git a/packages/guides/src/Nodes/Inline/AbstractLinkInlineNode.php b/packages/guides/src/Nodes/Inline/AbstractLinkInlineNode.php
@@ -8,7 +8,7 @@ abstract class AbstractLinkInlineNode extends InlineNode implements LinkInlineNo
 {
     private string $url = '';
 
-    public function __construct(string $type, private string $targetReference, string $value = '')
+    public function __construct(string $type, private readonly string $targetReference, string $value = '')
     {
         parent::__construct($type, $value);
     }
diff --git a/packages/guides/src/Nodes/Inline/DocReferenceNode.php b/packages/guides/src/Nodes/Inline/DocReferenceNode.php
@@ -16,7 +16,7 @@
  */
 class DocReferenceNode extends AbstractLinkInlineNode implements CrossReferenceNode
 {
-    public const TYPE = 'doc';
+    final public const TYPE = 'doc';
 
     public function __construct(
         string $targetDocument,
diff --git a/packages/guides/src/Nodes/Inline/GenericTextRoleInlineNode.php b/packages/guides/src/Nodes/Inline/GenericTextRoleInlineNode.php
@@ -6,8 +6,6 @@
 
 class GenericTextRoleInlineNode extends InlineNode
 {
-    public const TYPE = 'role';
-
     public function __construct(private readonly string $role, private readonly string $content, private readonly string $class = '')
     {
         parent::__construct($role, $content);
diff --git a/packages/guides/src/Nodes/Inline/ReferenceNode.php b/packages/guides/src/Nodes/Inline/ReferenceNode.php
diff --git a/packages/guides/src/Nodes/Menu/MenuEntryNode.php b/packages/guides/src/Nodes/Menu/MenuEntryNode.php
diff --git a/packages/guides/src/ReferenceResolvers/DelegatingReferenceResolver.php b/packages/guides/src/ReferenceResolvers/DelegatingReferenceResolver.php
diff --git a/packages/guides/src/ReferenceResolvers/ExternalReferenceResolver.php b/packages/guides/src/ReferenceResolvers/ExternalReferenceResolver.php
diff --git a/packages/guides/src/ReferenceResolvers/IntersphinxReferenceResolver.php b/packages/guides/src/ReferenceResolvers/IntersphinxReferenceResolver.php
diff --git a/packages/guides/tests/unit/Compiler/NodeTransformers/DocumentEntryRegistrationTransformerTest.php b/packages/guides/tests/unit/Compiler/NodeTransformers/DocumentEntryRegistrationTransformerTest.php
diff --git a/packages/guides/tests/unit/Compiler/ShadowTree/TreeNodeTest.php b/packages/guides/tests/unit/Compiler/ShadowTree/TreeNodeTest.php
diff --git a/packages/guides/tests/unit/InvalidLinkTest.php b/packages/guides/tests/unit/InvalidLinkTest.php
diff --git a/packages/guides/tests/unit/Twig/Theme/ThemeManagerTest.php b/packages/guides/tests/unit/Twig/Theme/ThemeManagerTest.php
diff --git a/phpstan.neon b/phpstan.neon
diff --git a/rector.php b/rector.php

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public function testHasBeenCalledReturnsFalseByDefault(): void`
`12`	`12`	`{`
`13`	`13`	`$spyProcessor = new SpyProcessor();`
`14`	`14`
`15`		`- $this->assertFalse($spyProcessor->hasBeenCalled());`
	`15`	`+ self::assertFalse($spyProcessor->hasBeenCalled());`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public function testItKnowsWhenALogIsEmitted(): void`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public function test_it_can_be_created_with_a_value(): void`
`12`	`12`	`{`
`13`	`13`	`$node = new UmlNode('value');`
`14`	`14`
`15`		`- $this->assertSame('value', $node->getValue());`
	`15`	`+ self::assertSame('value', $node->getValue());`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public function test_you_can_set_a_caption_for_underneath_diagrams(): void`
`@@ -22,7 +22,7 @@ public function test_you_can_set_a_caption_for_underneath_diagrams(): void`
`22`	`22`	`$node = new UmlNode('value');`
`23`	`23`	`$node->setCaption($caption);`
`24`	`24`
`25`		`- $this->assertSame($caption, $node->getCaption());`
	`25`	`+ self::assertSame($caption, $node->getCaption());`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public function test_you_can_pass_classes_for_in_templates(): void`
`@@ -32,7 +32,7 @@ public function test_you_can_pass_classes_for_in_templates(): void`
`32`	`32`	`$node = new UmlNode('value');`
`33`	`33`	`$node->setClasses($classes);`
`34`	`34`
`35`		`- $this->assertSame($classes, $node->getClasses());`
`36`		`- $this->assertSame('float-left my-class', $node->getClassesString());`
	`35`	`+ self::assertSame($classes, $node->getClasses());`
	`36`	`+ self::assertSame('float-left my-class', $node->getClassesString());`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class BlockContext`
`22`	`22`	`{`
`23`		`- private LinesIterator $documentIterator;`
	`23`	`+ private readonly LinesIterator $documentIterator;`
`24`	`24`
`25`	`25`	`public function __construct(`
`26`	`26`	`private readonly DocumentParserContext $documentParserContext,`
`@@ -50,6 +50,6 @@ public function getLoggerInformation(): array`
`50`	`50`	`'currentLineNumber' => $this->lineOffset + $this->documentIterator->key(),`
`51`	`51`	`];`
`52`	`52`
`53`		`- return array_merge($this->getDocumentParserContext()->getLoggerInformation(), $info);`
	`53`	`+ return [...$this->documentParserContext->getLoggerInformation(), ...$info];`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ class DocumentParserContext`
`31`	`31`	`public bool $nextIndentedBlockShouldBeALiteralBlock = false;`
`32`	`32`
`33`	`33`	`public DocumentNode\|null $document = null;`
`34`		`-`
	`34`	`+`
`35`	`35`	`private int $currentTitleLevel;`
`36`	`36`	`/* Each Document has its own text role factory as text roles can be changed on a per document base`
`37`	`37`	`by directives */`
`38`		`- private TextRoleFactory $textRoleFactoryForDocument;`
`39`		`-`
	`38`	`+ private readonly TextRoleFactory $textRoleFactoryForDocument;`
	`39`	`+`
`40`	`40`	`private string $codeBlockDefaultLanguage = '';`
`41`	`41`
`42`	`42`	`/** @var string[] */`
`@@ -79,7 +79,7 @@ public function setDocument(DocumentNode $document): void`
`79`	`79`	`{`
`80`	`80`	`$this->document = $document;`
`81`	`81`	`}`
`82`		`-`
	`82`	`+`
`83`	`83`	`public function getLevel(string $overlineLetter, string $underlineLetter): int`
`84`	`84`	`{`
`85`	`85`	`$letter = $overlineLetter . ':' . $underlineLetter;`
`@@ -99,7 +99,7 @@ public function getTextRoleFactoryForDocument(): TextRoleFactory`
`99`	`99`	`{`
`100`	`100`	`return $this->textRoleFactoryForDocument;`
`101`	`101`	`}`
`102`		`-`
	`102`	`+`
`103`	`103`	`public function getCodeBlockDefaultLanguage(): string`
`104`	`104`	`{`
`105`	`105`	`return $this->codeBlockDefaultLanguage;`
`@@ -109,7 +109,7 @@ public function setCodeBlockDefaultLanguage(string $codeBlockDefaultLanguage): v`
`109`	`109`	`{`
`110`	`110`	`$this->codeBlockDefaultLanguage = $codeBlockDefaultLanguage;`
`111`	`111`	`}`
`112`		`-`
	`112`	`+`
`113`	`113`	`/** @return array<string, string> */`
`114`	`114`	`public function getLoggerInformation(): array`
`115`	`115`	`{`
`@@ -120,6 +120,6 @@ public function getLoggerInformation(): array`
`120`	`120`	`$info['documentNode'] = 'null';`
`121`	`121`	`}`
`122`	`122`
`123`		`- return array_merge($this->getContext()->getLoggerInformation(), $info);`
	`123`	`+ return [...$this->context->getLoggerInformation(), ...$info];`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class InlineParser`
`20`	`20`	`public function __construct(iterable $inlineRules)`
`21`	`21`	`{`
`22`	`22`	`$this->rules = [...$inlineRules];`
`23`		`- usort($this->rules, static fn(InlineRule $a, InlineRule $b): int => $a->getPriority() > $b->getPriority() ? -1 : 1);`
	`23`	`+ usort($this->rules, static fn (InlineRule $a, InlineRule $b): int => $a->getPriority() > $b->getPriority() ? -1 : 1);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function parse(string $content, BlockContext $blockContext): InlineCompoundNode`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`use phpDocumentor\Guides\Nodes\RawNode;`
`14`	`14`	`use phpDocumentor\Guides\RestructuredText\Parser\BlockContext;`
`15`	`15`
`16`		`-use function assert;`
`17`	`16`	`use function count;`
`18`	`17`	`use function explode;`
`19`	`18`	`use function str_contains;`
`@@ -50,7 +49,6 @@ public function apply(FieldListItemNode $fieldListItemNode, BlockContext $blockC`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`
`53`		`-`
`54`	`52`	`if ($firstChild instanceof ListNode) {`
`55`	`53`	`// A bullet list whose elements each contain a single paragraph per author.`
`56`	`54`	`foreach ($firstChild->getChildren() as $listItemNode) {`