Tweaks

Author: Seldaek

extension.neon

@@ -13,4 +13,4 @@ services:
     -
         class: Composer\Pcre\PHPStan\PregMatchParameterOutTypeExtension
     -
-        class: Composer\Pcre\PHPStan\PregMatchTypeSpecifyingExtension
+        class: Composer\Pcre\PHPStan\PregMatchTypeSpecifyingExtension

phpstan.neon.dist

@@ -7,8 +7,8 @@ parameters:
     reportUnmatchedIgnoredErrors: false
     treatPhpDocTypesAsCertain: false
 
-    ignoreErrors:
-        - '#Test::data[a-zA-Z0-9_]+\(\) return type has no value type specified in iterable type#'
+    bootstrapFiles:
+        - tests/phpstan-locate-phpunit-autoloader.php
 
     excludePaths:
         - tests/PHPStanTests/nsrt/*

src/PHPStan/PregMatchFlags.php

@@ -32,4 +32,4 @@ static public function getType(?Arg $flagsArg, Scope $scope): ?Type
         }
         return TypeCombinator::union(...$internalFlagsTypes);
     }
-}
+}

src/PHPStan/PregMatchParameterOutTypeExtension.php

@@ -14,8 +14,10 @@
 
 final class PregMatchParameterOutTypeExtension implements StaticMethodParameterOutTypeExtension
 {
-
-    private RegexArrayShapeMatcher $regexShapeMatcher;
+    /**
+     * @var RegexArrayShapeMatcher
+     */
+    private $regexShapeMatcher;
 
     public function __construct(
         RegexArrayShapeMatcher $regexShapeMatcher

src/PHPStan/PregMatchTypeSpecifyingExtension.php

@@ -16,19 +16,21 @@
 
 final class PregMatchTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
+    /**
+     * @var TypeSpecifier
+     */
+    private $typeSpecifier;
 
-    private TypeSpecifier $typeSpecifier;
+    /**
+     * @var RegexArrayShapeMatcher
+     */
+    private $regexShapeMatcher;
 
-    private RegexArrayShapeMatcher $regexShapeMatcher;
-
-    public function __construct(
-        RegexArrayShapeMatcher $regexShapeMatcher
-    )
+    public function __construct(RegexArrayShapeMatcher $regexShapeMatcher)
     {
         $this->regexShapeMatcher = $regexShapeMatcher;
     }
 
-
     public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
     {
         $this->typeSpecifier = $typeSpecifier;
@@ -83,5 +85,4 @@ public function specifyTypes(MethodReflection $methodReflection, StaticCall $nod
             $node,
         );
     }
-
 }

tests/PHPStanTests/TypeInferenceTest.php

@@ -15,10 +15,12 @@
 
 class TypeInferenceTest extends TypeInferenceTestCase
 {
+    /**
+     * @return mixed
+     */
     public function dataFileAsserts(): iterable
     {
         yield from $this->gatherAssertTypesFromDirectory(__DIR__ . '/nsrt');
-
     }
 
     /**
@@ -28,9 +30,9 @@ public function dataFileAsserts(): iterable
     public function testFileAsserts(
         string $assertType,
         string $file,
-               ...$args
-	): void
-	{
+        ...$args
+    ): void
+    {
         $this->assertFileAsserts($assertType, $file, ...$args);
     }
 
@@ -41,4 +43,4 @@ public static function getAdditionalConfigFiles(): array
             __DIR__ . '/../../extension.neon',
         ];
     }
-}
+}

tests/PHPStanTests/nsrt/preg-match.php

@@ -47,4 +47,4 @@ function equalMatch(string $s): void
         assertType('array{}', $matches);
     }
     assertType('array{}|array{string}', $matches);
-}
+}