phpstan / fix tests

Author: gherkins

src/RegExp.php

@@ -57,18 +57,19 @@ public function matches(string $string): bool
     }
 
     /**
-     * @return mixed[]
+     * @return array<int|string, string|array<int,mixed>>|array<int,mixed>
      */
     public function exec(string $haystack): array
     {
         return $this->findIn($haystack);
     }
 
     /**
-     * @return string[]
+     * @return array<int|string, string|array<int,mixed>>|array<int,mixed>
      */
     public function findIn(string $haystack): array
     {
+        /** @var array<int|string, string|array<int,mixed>> $matches */
         $matches = [];
         call_user_func_array(
             $this->_method, /* @phpstan-ignore-line */
@@ -80,7 +81,6 @@ public function findIn(string $haystack): array
             ]
         );
 
-        /* @phpstan-ignore-next-line */
         if (!isset($matches[1]) && isset($matches[0]) && is_array($matches[0])) {
             return $matches[0];
         }
@@ -89,12 +89,17 @@ public function findIn(string $haystack): array
     }
 
 
-    public function replace(string $string, callable $callback): mixed
+    /**
+     * @param callable(string): string $callback
+     * @return string|null
+     */
+    public function replace(string $string, callable $callback): ?string
     {
         return preg_replace_callback(
             sprintf("/%s/%s", $this->_expr, $this->_flags),
-            function ($hit) use ($callback) {
-                return call_user_func($callback, $hit[0]);
+            function (array $hit) use ($callback): string {
+                $res = call_user_func($callback, $hit[0]);
+                return (string) $res;
             },
             $string
         );

src/RegExpBuilder.php

@@ -414,7 +414,7 @@ public function notAhead(RegExpBuilder $r): RegExpBuilder
         return $this;
     }
 
-    public function asGroup(string $name = null): RegExpBuilder
+    public function asGroup(?string $name = null): RegExpBuilder
     {
         $this->_capture = true;
         $this->_captureName = $name;

tests/RegExpBuilderTest.php

@@ -25,11 +25,7 @@ public function testRegExp(): void
             ->getRegExp();
 
 
-        $this->assertTrue(is_string($regEx->getFlags()));
-        $this->assertTrue($regEx->getFlags() === "m");
-
-        $this->assertTrue(is_string($regEx->__toString()));
-        $this->assertTrue(is_string($regEx->getExpression()));
+        $this->assertSame("m", $regEx->getFlags());
     }
 
     public function testMoney(): void
@@ -749,6 +745,7 @@ public function testNamedGroup(): void
             ->exactly(3)->digits()->asGroup("numbers")
             ->getRegExp();
 
+        /** @var array<string, mixed> $res */
         $res = $regEx->findIn("hello-123-abc");
 
         $this->assertTrue(array_key_exists("numbers", $res));

tests/UsageExamplesTest.php

@@ -92,9 +92,9 @@ public function testUsageExample3(): void
 
         $matches = $regExp->exec($text);
 
-        $this->assertTrue($matches[0] === "SomeFile.pdf");
-        $this->assertTrue($matches[1] === "doc_04.pdf");
-        $this->assertTrue($matches[2] === "File.doc");
+        $this->assertSame("SomeFile.pdf", $matches[0]);
+        $this->assertSame("doc_04.pdf", $matches[1]);
+        $this->assertSame("File.doc", $matches[2]);
     }
 
     public function testReplace(): void
@@ -111,12 +111,13 @@ public function testReplace(): void
 
         $text = $regExp->replace(
             $text,
-            function ($match) {
-                return (int)$match + 1;
+            function (string $match): string {
+                // convert to int, increment and cast back to string
+                return (string)(((int)$match) + 1);
             }
         );
 
-        $this->assertTrue("99 bottles of beer on the wall" === $text);
+        $this->assertSame("99 bottles of beer on the wall", $text);
     }
 
     public function testPregMatchFlags(): void
@@ -144,16 +145,16 @@ public function testPregMatchFlags(): void
 
         $matches = $regExp->exec($text);
 
-        $this->assertTrue(is_array($matches[0]));
-        $this->assertTrue($matches[0][0] === "SomeFile.pdf");
-        $this->assertTrue($matches[0][1] === 73);
+        $this->assertIsArray($matches[0]);
+        $this->assertSame("SomeFile.pdf", $matches[0][0]);
+        $this->assertSame(73, $matches[0][1]);
 
-        $this->assertTrue(is_array($matches[1]));
-        $this->assertTrue($matches[1][0] === "doc_04.pdf");
-        $this->assertTrue($matches[1][1] === 226);
+        $this->assertIsArray($matches[1]);
+        $this->assertSame("doc_04.pdf", $matches[1][0]);
+        $this->assertSame(226, $matches[1][1]);
 
-        $this->assertTrue(is_array($matches[2]));
-        $this->assertTrue($matches[2][0] === "File.doc");
-        $this->assertTrue($matches[2][1] === 419);
+        $this->assertIsArray($matches[2]);
+        $this->assertSame("File.doc", $matches[2][0]);
+        $this->assertSame(419, $matches[2][1]);
     }
 }