Merge pull request #1164 from phpDocumentor/bump/phpstan

jaapio · web-flow · commit 8fb464e09622 · 2024-10-25T23:06:41.000+02:00
Bump phpstan
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
         "league/flysystem-memory": "^1.0",
         "phpbench/phpbench": "^1.3",
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan": "^1.12",
         "phpstan/phpstan-strict-rules": "^1.6",
         "phpstan/phpstan-webmozart-assert": "^1.2",
         "phpunit/phpunit": "^10.5",
diff --git a/composer.lock b/composer.lock
diff --git a/packages/guides-restructured-text/src/RestructuredText/Directives/RoleDirective.php b/packages/guides-restructured-text/src/RestructuredText/Directives/RoleDirective.php
@@ -47,7 +47,7 @@ public function processAction(
     ): void {
         $name = $directive->getData();
         $role = 'span';
-        if (preg_match('/^([A-Za-z-]*)\(([A-Za-z-]*)\)$/', trim($name), $match) > 0) {
+        if (preg_match('/^([A-Za-z-]*)\(([A-Za-z-]*)\)$/', trim($name), $match) === 1) {
             $name = $match[1];
             $role = $match[2];
         }
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Interlink/DefaultInterlinkParser.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Interlink/DefaultInterlinkParser.php
@@ -26,6 +26,6 @@ public function extractInterlink(string $fullReference): InterlinkData
             return new InterlinkData($fullReference, '');
         }
 
-        return new InterlinkData($matches[2], $matches[1] ?? '');
+        return new InterlinkData($matches[2], $matches[1]);
     }
 }
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/DirectiveRule.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/DirectiveRule.php
@@ -256,11 +256,11 @@ private function isDirectiveOption(string|null $line): bool
      */
     private function parseDirectiveOption(string $line): DirectiveOption
     {
-        if (preg_match('/^(\s+):(.+): (.*)$/mUsi', $line, $match) > 0) {
+        if (preg_match('/^(\s+):(.+): (.*)$/mUsi', $line, $match) === 1) {
             return new DirectiveOption($match[2], trim($match[3]));
         }
 
-        if (preg_match('/^(\s+):(.+):(\s*)$/mUsi', $line, $match) > 0) {
+        if (preg_match('/^(\s+):(.+):(\s*)$/mUsi', $line, $match) === 1) {
             return new DirectiveOption($match[2], true);
         }
 
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/LinkRule.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/LinkRule.php
@@ -61,30 +61,30 @@ public function apply(BlockContext $blockContext, CompoundNode|null $on = null):
     private function parseLink(string $line): LinkParser|null
     {
         // Links
-        if (preg_match('/^\.\.\s+_`(.+)`: (.+)$/mUsi', $line, $match) > 0) {
+        if (preg_match('/^\.\.\s+_`(.+)`: (.+)$/mUsi', $line, $match) === 1) {
             return $this->createLink($match[1], $match[2], LinkParser::TYPE_LINK);
         }
 
         // anonymous links
-        if (preg_match('/^\.\.\s+_(.+): (.+)$/mUsi', $line, $match) > 0) {
+        if (preg_match('/^\.\.\s+_(.+): (.+)$/mUsi', $line, $match) === 1) {
             return $this->createLink($match[1], $match[2], LinkParser::TYPE_LINK);
         }
 
         // Short anonymous links
-        if (preg_match('/^__\s+(.+)$/mUsi', trim($line), $match) > 0) {
+        if (preg_match('/^__\s+(.+)$/mUsi', trim($line), $match) === 1) {
             $url = $match[1];
 
             return $this->createLink('_', $url, LinkParser::TYPE_LINK);
         }
 
         // Anchor links - ".. _`anchor-link`:"
-        if (preg_match('/^\.\.\s+_`(.+)`:$/mUsi', trim($line), $match) > 0) {
+        if (preg_match('/^\.\.\s+_`(.+)`:$/mUsi', trim($line), $match) === 1) {
             $anchor = $match[1];
 
             return new LinkParser($anchor, '#' . $anchor, LinkParser::TYPE_ANCHOR);
         }
 
-        if (preg_match('/^\.\.\s+_(.+):$/mUsi', trim($line), $match) > 0) {
+        if (preg_match('/^\.\.\s+_(.+):$/mUsi', trim($line), $match) === 1) {
             $anchor = $match[1];
 
             return $this->createLink($anchor, '#' . $anchor, LinkParser::TYPE_ANCHOR);
diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/ListRule.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/ListRule.php
@@ -127,7 +127,7 @@ private function isListLine(string|null $line): bool
     /** @return array{marker: string, indenting: int} */
     public function getItemConfig(string $line): array
     {
-        $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) > 0;
+        $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) === 1;
         if (!$isList) {
             throw new InvalidArgumentException('Line is not a valid item line');
         }
@@ -144,7 +144,7 @@ private function isListItemStart(string|null $line, string|null $listMarker = nu
             return false;
         }
 
-        $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) > 0;
+        $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) === 1;
         if (!$isList) {
             return false;
         }
diff --git a/packages/guides-restructured-text/src/RestructuredText/TextRoles/AbbreviationTextRole.php b/packages/guides-restructured-text/src/RestructuredText/TextRoles/AbbreviationTextRole.php
@@ -52,7 +52,7 @@ public function processNode(
         string $content,
         string $rawContent,
     ): InlineNode {
-        if (preg_match('/([^\(]+)\(([^\)]+)\)$/', $content, $matches) !== 0) {
+        if (preg_match('/([^\(]+)\(([^\)]+)\)$/', $content, $matches) === 1) {
             return new AbbreviationInlineNode(trim($matches[1]), trim($matches[2]));
         }
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -85,11 +85,6 @@ parameters:
 			count: 1
 			path: packages/guides-graphs/src/Graphs/DependencyInjection/GraphsExtension.php
 
-		-
-			message: "#^Parameter \\#1 \\$filename of function file_put_contents expects string, string\\|false given\\.$#"
-			count: 1
-			path: packages/guides-graphs/src/Graphs/Renderer/PlantumlRenderer.php
-
 		-
 			message: "#^Method phpDocumentor\\\\Guides\\\\Markdown\\\\Parsers\\\\InlineParsers\\\\AbstractInlineTextDecoratorParser\\<TValue of phpDocumentor\\\\Guides\\\\Nodes\\\\Inline\\\\InlineNodeInterface\\>\\:\\:createInlineNode\\(\\) invoked with 3 parameters, 2 required\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -23,11 +23,6 @@
       <code><![CDATA[scalarNode]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="packages/guides-restructured-text/src/RestructuredText/Parser/Productions/InlineMarkupRule.php">
-    <MoreSpecificImplementedParamType>
-      <code><![CDATA[$on]]></code>
-    </MoreSpecificImplementedParamType>
-  </file>
   <file src="packages/guides/src/Compiler/NodeTransformers/CustomNodeTransformerFactory.php">
     <ReservedWord>
       <code><![CDATA[NodeTransformer]]></code>
diff --git a/tests/Functional/FunctionalTest.php b/tests/Functional/FunctionalTest.php
@@ -160,6 +160,7 @@ public function testFunctional(
             $logHandler = $this->getContainer()->get(TestHandler::class);
             assert($logHandler instanceof TestHandler);
 
+            /** @var list<string> $logRecords */
             $logRecords = array_map(
                 static fn (array|LogRecord $log) => $log['level_name'] . ': ' . $log['message'],
                 array_filter($logHandler->getRecords(), static fn (array|LogRecord $log) => $log['level'] >= Logger::WARNING &&

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function processAction(`
`47`	`47`	`): void {`
`48`	`48`	`$name = $directive->getData();`
`49`	`49`	`$role = 'span';`
`50`		`- if (preg_match('/^([A-Za-z-])\(([A-Za-z-])\)$/', trim($name), $match) > 0) {`
	`50`	`+ if (preg_match('/^([A-Za-z-])\(([A-Za-z-])\)$/', trim($name), $match) === 1) {`
`51`	`51`	`$name = $match[1];`
`52`	`52`	`$role = $match[2];`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ public function extractInterlink(string $fullReference): InterlinkData`
`26`	`26`	`return new InterlinkData($fullReference, '');`
`27`	`27`	`}`
`28`	`28`
`29`		`- return new InterlinkData($matches[2], $matches[1] ?? '');`
	`29`	`+ return new InterlinkData($matches[2], $matches[1]);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,11 @@ private function isDirectiveOption(string\|null $line): bool`
`256`	`256`	`*/`
`257`	`257`	`private function parseDirectiveOption(string $line): DirectiveOption`
`258`	`258`	`{`
`259`		`- if (preg_match('/^(\s+):(.+): (.*)$/mUsi', $line, $match) > 0) {`
	`259`	`+ if (preg_match('/^(\s+):(.+): (.*)$/mUsi', $line, $match) === 1) {`
`260`	`260`	`return new DirectiveOption($match[2], trim($match[3]));`
`261`	`261`	`}`
`262`	`262`
`263`		`- if (preg_match('/^(\s+):(.+):(\s*)$/mUsi', $line, $match) > 0) {`
	`263`	`+ if (preg_match('/^(\s+):(.+):(\s*)$/mUsi', $line, $match) === 1) {`
`264`	`264`	`return new DirectiveOption($match[2], true);`
`265`	`265`	`}`
`266`	`266`
Original file line number	Diff line number	Diff line change
`@@ -61,30 +61,30 @@ public function apply(BlockContext $blockContext, CompoundNode\|null $on = null):`
`61`	`61`	`private function parseLink(string $line): LinkParser\|null`
`62`	`62`	`{`
`63`	`63`	`// Links`
`64`		- if (preg_match('/^\.\.\s+_`(.+)`: (.+)$/mUsi', $line, $match) > 0) {
	`64`	+ if (preg_match('/^\.\.\s+_`(.+)`: (.+)$/mUsi', $line, $match) === 1) {
`65`	`65`	`return $this->createLink($match[1], $match[2], LinkParser::TYPE_LINK);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`// anonymous links`
`69`		`- if (preg_match('/^\.\.\s+_(.+): (.+)$/mUsi', $line, $match) > 0) {`
	`69`	`+ if (preg_match('/^\.\.\s+_(.+): (.+)$/mUsi', $line, $match) === 1) {`
`70`	`70`	`return $this->createLink($match[1], $match[2], LinkParser::TYPE_LINK);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Short anonymous links`
`74`		`- if (preg_match('/^__\s+(.+)$/mUsi', trim($line), $match) > 0) {`
	`74`	`+ if (preg_match('/^__\s+(.+)$/mUsi', trim($line), $match) === 1) {`
`75`	`75`	`$url = $match[1];`
`76`	`76`
`77`	`77`	`return $this->createLink('_', $url, LinkParser::TYPE_LINK);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	// Anchor links - ".. _`anchor-link`:"
`81`		- if (preg_match('/^\.\.\s+_`(.+)`:$/mUsi', trim($line), $match) > 0) {
	`81`	+ if (preg_match('/^\.\.\s+_`(.+)`:$/mUsi', trim($line), $match) === 1) {
`82`	`82`	`$anchor = $match[1];`
`83`	`83`
`84`	`84`	`return new LinkParser($anchor, '#' . $anchor, LinkParser::TYPE_ANCHOR);`
`85`	`85`	`}`
`86`	`86`
`87`		`- if (preg_match('/^\.\.\s+_(.+):$/mUsi', trim($line), $match) > 0) {`
	`87`	`+ if (preg_match('/^\.\.\s+_(.+):$/mUsi', trim($line), $match) === 1) {`
`88`	`88`	`$anchor = $match[1];`
`89`	`89`
`90`	`90`	`return $this->createLink($anchor, '#' . $anchor, LinkParser::TYPE_ANCHOR);`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ private function isListLine(string\|null $line): bool`
`127`	`127`	`/** @return array{marker: string, indenting: int} */`
`128`	`128`	`public function getItemConfig(string $line): array`
`129`	`129`	`{`
`130`		`- $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) > 0;`
	`130`	`+ $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) === 1;`
`131`	`131`	`if (!$isList) {`
`132`	`132`	`throw new InvalidArgumentException('Line is not a valid item line');`
`133`	`133`	`}`
`@@ -144,7 +144,7 @@ private function isListItemStart(string\|null $line, string\|null $listMarker = nu`
`144`	`144`	`return false;`
`145`	`145`	`}`
`146`	`146`
`147`		`- $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) > 0;`
	`147`	`+ $isList = preg_match(self::LIST_MARKER_REGEX, $line, $m) === 1;`
`148`	`148`	`if (!$isList) {`
`149`	`149`	`return false;`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function processNode(`
`52`	`52`	`string $content,`
`53`	`53`	`string $rawContent,`
`54`	`54`	`): InlineNode {`
`55`		`- if (preg_match('/([^\(]+)\(([^\)]+)\)$/', $content, $matches) !== 0) {`
	`55`	`+ if (preg_match('/([^\(]+)\(([^\)]+)\)$/', $content, $matches) === 1) {`
`56`	`56`	`return new AbbreviationInlineNode(trim($matches[1]), trim($matches[2]));`
`57`	`57`	`}`
`58`	`58`