Merge branch '11.4' into 11.5

phpstan.neon

@@ -2,3 +2,19 @@ parameters:
     level: 6
     paths:
         - src
+
+    treatPhpDocTypesAsCertain: false
+
+    ignoreErrors:
+        # ignore errors caused by defensive programming
+        - '#Call to function assert\(\) with true will always evaluate to true.#'
+        - '#Instanceof between .* and .* will always evaluate to true.#'
+        - '#Strict comparison using !== between .*non-empty-string.* and .* will always evaluate to true.#'
+        - '#Strict comparison using !== between .*non-falsy-string.* and .* will always evaluate to true.#'
+        - identifier: argument.named
+
+    excludePaths:
+        - src/Framework/MockObject/Runtime/Api # exclude partial traits, which are only used in runtime generated code
+
+includes:
+	- phar://phpstan.phar/conf/bleedingEdge.neon

src/Framework/Assert.php

@@ -195,7 +195,7 @@ final public static function assertArrayNotHasKey(int|string $key, array|ArrayAc
     }
 
     /**
-     * @phpstan-assert list $array
+     * @phpstan-assert list<mixed> $array
      *
      * @throws ExpectationFailedException
      */
@@ -1198,7 +1198,7 @@ final public static function assertNotInstanceOf(string $expected, mixed $actual
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert array $actual
+     * @phpstan-assert array<mixed> $actual
      */
     final public static function assertIsArray(mixed $actual, string $message = ''): void
     {
@@ -1385,7 +1385,7 @@ final public static function assertIsCallable(mixed $actual, string $message = '
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert iterable $actual
+     * @phpstan-assert iterable<mixed> $actual
      */
     final public static function assertIsIterable(mixed $actual, string $message = ''): void
     {
@@ -1402,7 +1402,7 @@ final public static function assertIsIterable(mixed $actual, string $message = '
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert !array $actual
+     * @phpstan-assert !array<mixed> $actual
      */
     final public static function assertIsNotArray(mixed $actual, string $message = ''): void
     {
@@ -1589,7 +1589,7 @@ final public static function assertIsNotCallable(mixed $actual, string $message
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert !iterable $actual
+     * @phpstan-assert !iterable<mixed> $actual
      */
     final public static function assertIsNotIterable(mixed $actual, string $message = ''): void
     {

src/Framework/Assert/Functions.php

@@ -193,7 +193,7 @@ function assertArrayNotHasKey(int|string $key, array|ArrayAccess $array, string
 
 if (!function_exists('PHPUnit\Framework\assertIsList')) {
     /**
-     * @phpstan-assert list $array
+     * @phpstan-assert list<mixed> $array
      *
      * @throws ExpectationFailedException
      *
@@ -1379,7 +1379,7 @@ function assertNotInstanceOf(string $expected, mixed $actual, string $message =
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert array $actual
+     * @phpstan-assert array<mixed> $actual
      *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *
@@ -1588,7 +1588,7 @@ function assertIsCallable(mixed $actual, string $message = ''): void
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert iterable $actual
+     * @phpstan-assert iterable<mixed> $actual
      *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *
@@ -1607,7 +1607,7 @@ function assertIsIterable(mixed $actual, string $message = ''): void
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert !array $actual
+     * @phpstan-assert !array<mixed> $actual
      *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *
@@ -1816,7 +1816,7 @@ function assertIsNotCallable(mixed $actual, string $message = ''): void
      * @throws Exception
      * @throws ExpectationFailedException
      *
-     * @phpstan-assert !iterable $actual
+     * @phpstan-assert !iterable<mixed> $actual
      *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *

src/Framework/Constraint/Equality/IsEqual.php

@@ -42,7 +42,7 @@ public function __construct(mixed $value)
      *
      * @throws ExpectationFailedException
      */
-    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): ?bool
+    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): bool
     {
         // If $this->value and $other are identical, they are also equal.
         // This is the most common path and will allow us to skip

src/Framework/Constraint/Equality/IsEqualCanonicalizing.php

@@ -42,7 +42,7 @@ public function __construct(mixed $value)
      *
      * @throws ExpectationFailedException
      */
-    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): ?bool
+    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): bool
     {
         // If $this->value and $other are identical, they are also equal.
         // This is the most common path and will allow us to skip

src/Framework/Constraint/Equality/IsEqualIgnoringCase.php

@@ -42,7 +42,7 @@ public function __construct(mixed $value)
      *
      * @throws ExpectationFailedException
      */
-    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): ?bool
+    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): bool
     {
         // If $this->value and $other are identical, they are also equal.
         // This is the most common path and will allow us to skip

src/Framework/Constraint/Equality/IsEqualWithDelta.php

@@ -42,7 +42,7 @@ public function __construct(mixed $value, float $delta)
      *
      * @throws ExpectationFailedException
      */
-    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): ?bool
+    public function evaluate(mixed $other, string $description = '', bool $returnResult = false): bool
     {
         // If $this->value and $other are identical, they are also equal.
         // This is the most common path and will allow us to skip

src/Framework/Constraint/Type/IsType.php

@@ -128,7 +128,6 @@ final class IsType extends Constraint
      */
     public function __construct(string $type)
     {
-        /** @phpstan-ignore isset.offset */
         if (!isset(self::KNOWN_TYPES[$type])) {
             throw new UnknownTypeException($type);
         }

src/Framework/MockObject/Generator/Generator.php

@@ -473,7 +473,7 @@ public function generateClassFromWsdl(string $wsdlFile, string $className, array
 
         try {
             $client   = new SoapClient($wsdlFile, $options);
-            $_methods = array_unique($client->__getFunctions());
+            $_methods = array_unique($client->__getFunctions() ?? []);
 
             unset($client);
         } catch (SoapFault $e) {
@@ -781,7 +781,7 @@ private function generateCodeForTestDoubleClass(string $type, bool $mockObject,
 
         if (is_array($explicitMethods)) {
             foreach ($explicitMethods as $methodName) {
-                if ($class !== null && $class->hasMethod($methodName)) {
+                if ($class->hasMethod($methodName)) {
                     $method = $class->getMethod($methodName);
 
                     if ($this->canMethodBeDoubled($method)) {

src/Framework/MockObject/Generator/MockMethod.php

@@ -226,13 +226,13 @@ public function generateCode(): string
                 'arguments_call'     => $this->argumentsForCall,
                 'return_declaration' => !empty($this->returnType->asString()) ? (': ' . $this->returnType->asString()) : '',
                 'return_type'        => $this->returnType->asString(),
-                'arguments_count'    => $argumentsCount,
+                'arguments_count'    => (string) $argumentsCount,
                 'class_name'         => $this->className,
                 'method_name'        => $this->methodName,
                 'modifier'           => $this->modifier,
                 'reference'          => $this->reference,
                 'clone_arguments'    => $this->cloneArguments ? 'true' : 'false',
-                'deprecation'        => $deprecation,
+                'deprecation'        => $deprecation ?? '',
                 'return_result'      => $returnResult,
             ],
         );

src/Framework/TestCase.php

@@ -2003,7 +2003,6 @@ private function getActiveErrorHandlers(): array
             set_error_handler($handler);
         }
 
-        /** @phpstan-ignore if.alwaysFalse */
         if ($invalidErrorHandlerStack) {
             $message = 'At least one error handler is not callable outside the scope it was registered in';
 

src/Runner/Filter/Factory.php

@@ -12,6 +12,7 @@
 use function assert;
 use FilterIterator;
 use Iterator;
+use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestSuite;
 
 /**
@@ -22,7 +23,7 @@
 final class Factory
 {
     /**
-     * @var list<array{className: class-string, argument: list<non-empty-string>|non-empty-string}>
+     * @var list<array{className: class-string<FilterIterator<int, Test, Iterator<int, Test>>>, argument: list<non-empty-string>|non-empty-string}>
      */
     private array $filters = [];
 
@@ -81,6 +82,11 @@ public function addExcludeNameFilter(string $name): void
         ];
     }
 
+    /**
+     * @param Iterator<int, Test> $iterator
+     *
+     * @return FilterIterator<int, Test, Iterator<int, Test>>
+     */
     public function factory(Iterator $iterator, TestSuite $suite): FilterIterator
     {
         foreach ($this->filters as $filter) {