Tweaks

composer · Jul 11, 2024 · 2632168 · 2632168
1 parent 23e29a4
commit 2632168
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/extension.neon b/extension.neon
@@ -13,4 +13,4 @@ services:
     -
         class: Composer\Pcre\PHPStan\PregMatchParameterOutTypeExtension
     -
-        class: Composer\Pcre\PHPStan\PregMatchTypeSpecifyingExtension
+        class: Composer\Pcre\PHPStan\PregMatchTypeSpecifyingExtension
diff --git a/phpstan.neon.dist b/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/*

diff --git a/src/PHPStan/PregMatchFlags.php b/src/PHPStan/PregMatchFlags.php
@@ -32,4 +32,4 @@ static public function getType(?Arg $flagsArg, Scope $scope): ?Type
         }
         return TypeCombinator::union(...$internalFlagsTypes);
     }
-}
+}
diff --git a/src/PHPStan/PregMatchTypeSpecifyingExtension.php b/src/PHPStan/PregMatchTypeSpecifyingExtension.php
@@ -28,7 +28,6 @@ public function __construct(
         $this->regexShapeMatcher = $regexShapeMatcher;
     }
 
-
     public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
     {
         $this->typeSpecifier = $typeSpecifier;
@@ -83,5 +82,4 @@ public function specifyTypes(MethodReflection $methodReflection, StaticCall $nod
             $node,
         );
     }
-
 }
diff --git a/tests/PHPStanTests/TypeInferenceTest.php b/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',
         ];
     }
-}
+}
diff --git a/tests/PHPStanTests/nsrt/preg-match.php b/tests/PHPStanTests/nsrt/preg-match.php
@@ -47,4 +47,4 @@ function equalMatch(string $s): void
         assertType('array{}', $matches);
     }
     assertType('array{}|array{string}', $matches);
-}
+}