Tighten PHPStan ignore handling and replace broad suppressions with targeted fixes

phpstan.neon

@@ -1,31 +1,13 @@
 parameters:
     level: 8
-    reportUnmatchedIgnoredErrors: false
+    reportUnmatchedIgnoredErrors: true
     paths:
         - %currentWorkingDirectory%/src/
         - %currentWorkingDirectory%/tests/
     ignoreErrors:
         -
-            message: ~has no return type specified~
+            identifier: missingType.return
             path: %currentWorkingDirectory%/tests/*
         -
             message: '#assertContains|assertInternalType|assertStringContainsString|assertIsArray|expectExceptionMessage#'
             path: %currentWorkingDirectory%/tests/*
-        -
-            message: ~Call to an undefined static method~
-            path: %currentWorkingDirectory%/tests/StaticArrayyTest.php
-        # false-positive?
-        - '/function call_user_func expects callable.*array\{.*\} given/'
-        - '/function call_user_func_array expects callable.*array\{.*\} given/'
-        - '/\(array<TKey of \(int\|string\), T>\) does not accept array<TKey of \(int\|string\)/'
-        - '/\(array<TKey of \(int\|string\), T>\) does not accept array<int, T>/'
-        - '/\(array<TKey of \(int\|string\), T>\) does not accept array<int\|string, T>/'
-        - '/array_map expects \(callable\(mixed\):/'
-        # ignore gernal errors
-        - '/Unsafe usage of new static/'
-        - '/should be compatible with return type \(bool\) of method ArrayObject/'
-        # ignore Iterator stuff
-        - '/__construct\(\) has parameter \$iteratorClass with generic/'
-        - '/create\(\) has parameter \$iteratorClass with generic/'
-        - '/parameter \$iteratorClass with generic class Arrayy\\ArrayyIterator/'
-        - '/generic class Arrayy\\ArrayyIterator does not specify its types/'

src/Arrayy.php

@@ -59,7 +59,7 @@
     /**
      * @var string
      *
-     * @phpstan-var class-string<\Arrayy\ArrayyIterator>
+     * @phpstan-var class-string<\Arrayy\ArrayyIterator<TKey,T>>
      */
     protected $iteratorClass = ArrayyIterator::class;
 
@@ -111,7 +111,7 @@
      *                                             true, otherwise this option didn't not work anyway.
      *                                             </p>
      *
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>> $iteratorClass
      */
     public function __construct(
         $data = [],
@@ -274,9 +274,9 @@
                 );
             }
 
             $this->internalSet($key, $value);
 
             return $this;
         }
 
         return $this->append($value);
@@ -314,7 +314,7 @@
                 &&
                 \is_array($this->array[$key])
             ) {
-                $this->array[$key][] = $value;
+                $this->array[$key][] = $value; // @phpstan-ignore assign.propertyType
             } else {
                 $this->array[$key] = $value;
             }
@@ -322,7 +322,7 @@
             $this->array[] = $value;
         }
 
         return $this;
     }
 
     /**
@@ -392,7 +392,7 @@
 
         \asort($this->array, $sort_flags);
 
         return $this;
     }
 
     /**
@@ -419,7 +419,7 @@
          */
         $that->asort($sort_flags);
 
         return $that;
     }
 
     /**
@@ -473,7 +473,7 @@
             return \iterator_count($this->generator);
         }
 
         return \count($this->toArray(), $mode);
     }
 
     /**
@@ -594,7 +594,7 @@
 
         \ksort($this->array, $sort_flags);
 
         return $this;
     }
 
     /**
@@ -620,7 +620,7 @@
          */
         $that->ksort($sort_flags);
 
         return $that;
     }
 
     /**
@@ -638,7 +638,7 @@
 
         \natcasesort($this->array);
 
         return $this;
     }
 
     /**
@@ -659,7 +659,7 @@
          */
         $that->natcasesort();
 
         return $that;
     }
 
     /**
@@ -738,7 +738,7 @@
             \strpos($offset, $this->pathSeparator) !== false
         ) {
             $explodedPath = \explode($this->pathSeparator, (string) $offset);
             if ($explodedPath !== false) {
                 /** @var string $lastOffset - helper for phpstan */
                 $lastOffset = \array_pop($explodedPath);
                 $containerPath = \implode($this->pathSeparator, $explodedPath);
@@ -848,7 +848,7 @@
         ) {
             $path = \explode($this->pathSeparator, (string) $offset);
 
             if ($path !== false) {
                 $pathToUnset = \array_pop($path);
 
                 /**
@@ -884,7 +884,7 @@
     {
         $this->generatorToArray();
 
         if (\PHP_VERSION_ID < 70400) {
             return parent::serialize();
         }
 
@@ -900,7 +900,7 @@
      *
      * @return void
      *
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>> $iteratorClass
      */
     #[\ReturnTypeWillChange]
     public function setIteratorClass($iteratorClass)
@@ -943,7 +943,7 @@
     #[\ReturnTypeWillChange]
     public function uasort($callable): self
     {
         if (!\is_callable($callable)) {
             throw new \InvalidArgumentException('Passed function must be callable');
         }
 
@@ -1035,7 +1035,7 @@
     #[\ReturnTypeWillChange]
     public function unserialize($string): self
     {
         if (\PHP_VERSION_ID < 70400) {
             parent::unserialize($string);
 
             return $this;
@@ -1734,7 +1734,7 @@
      * @return static
      *                <p>(Immutable) Returns an new instance of the Arrayy object.</p>
      *
-     * @phpstan-param  class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param  class-string<\Arrayy\ArrayyIterator<TKey,T>> $iteratorClass
      * @phpstan-return static<TKey,T>
      * @psalm-mutation-free
      */
@@ -1743,7 +1743,7 @@
         string $iteratorClass = ArrayyIterator::class,
         bool $checkPropertiesInConstructor = true
     ) {
-        return new static(
+        return new static( // @phpstan-ignore new.static
             $data,
             $iteratorClass,
             $checkPropertiesInConstructor
@@ -1766,7 +1766,7 @@
      *
      * @return array
      */
     public function flatten($delimiter = '.', $prepend = '', $items = null)
     {
         // init
         $flatten = [];
@@ -1799,7 +1799,7 @@
      *               <p>(Mutable) Return this Arrayy object.</p>
      *
      * @phpstan-param  array<TKey,T> $array
      * @phpstan-return $this<TKey,T>
      *
      * @internal this will not check any types because it's set directly as reference
      */
@@ -1893,7 +1893,7 @@
     public static function createFromObject(\Traversable $object): self
     {
         // init
-        $arrayy = new static();
+        $arrayy = static::create();
 
         if ($object instanceof self) {
             $objectArray = $object->getGenerator();
@@ -5050,7 +5050,7 @@
         if ($key === null) {
             \array_unshift($this->array, $value);
         } else {
-            $this->array = [$key => $value] + $this->array;
+            $this->array = [$key => $value] + $this->array; // @phpstan-ignore assign.propertyType
         }
 
         return $this;
@@ -5241,7 +5241,7 @@
             }
         }
 
-        \array_push($this->array, ...$args);
+        \array_push($this->array, ...$args); // @phpstan-ignore assign.propertyType
 
         return $this;
     }
@@ -5391,7 +5391,7 @@
 
         if ($number === null) {
             $arrayRandValue = [$this->array[\array_rand($this->array)]];
-            $this->array = $arrayRandValue;
+            $this->array = $arrayRandValue; // @phpstan-ignore assign.propertyType
 
             return $this;
         }
@@ -5535,15 +5535,15 @@
 
         foreach ($this->getGenerator() as $val) {
             if (\is_array($val)) {
-                $result[] = (new static($val))->reduce_dimension($unique)->toArray();
+                $result[] = static::create($val)->reduce_dimension($unique)->toArray();
             } else {
                 $result[] = [$val];
             }
         }
 
         $result = $result === [] ? [] : \array_merge(...$result);
 
-        $resultArrayy = new static($result);
+        $resultArrayy = static::create($result);
 
         /**
          * @psalm-suppress ImpureMethodCall - object is already re-created
@@ -7157,7 +7157,7 @@
             }
         }
 
-        \array_unshift($this->array, ...$args);
+        \array_unshift($this->array, ...$args); // @phpstan-ignore assign.propertyType
 
         return $this;
     }

src/ArrayyIterator.php

@@ -41,7 +41,8 @@ public function current()
         $value = parent::current();
 
         if (\is_array($value)) {
-            $value = \call_user_func([$this->class, 'create'], $value, static::class, false);
+            $class = $this->class;
+            $value = $class::create($value, static::class, false);
         }
 
         return $value;
@@ -62,7 +63,8 @@ public function offsetGet($offset)
         $value = parent::offsetGet($offset);
 
         if (\is_array($value)) {
-            $value = \call_user_func([$this->class, 'create'], $value, static::class, false);
+            $class = $this->class;
+            $value = $class::create($value, static::class, false);
         }
 
         return $value;

src/ArrayyRewindableExtendedGenerator.php

@@ -41,7 +41,8 @@ public function current()
         $value = $this->generator->current();
 
         if (\is_array($value)) {
-            $value = \call_user_func([$this->class, 'create'], $value, static::class, false);
+            $class = $this->class;
+            $value = $class::create($value, static::class, false);
         }
 
         return $value;

src/Collection/AbstractCollection.php

@@ -63,7 +63,7 @@ abstract class AbstractCollection extends Arrayy implements CollectionInterface
      *                                             </p>
      *
      * @phpstan-param array<TKey,T>|\Arrayy\Arrayy<TKey,T>|\Closure():array<TKey,T>|mixed $data
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>> $iteratorClass
      */
     public function __construct(
         $data = [],
@@ -263,7 +263,7 @@ public function merge(CollectionInterface ...$collections): self
      * @template TKeyCreate as TKey
      * @template TCreate as T
      * @phpstan-param array<TKeyCreate,TCreate> $data
-     * @phpstan-param  class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param  class-string<\Arrayy\ArrayyIterator<TKeyCreate,TCreate>> $iteratorClass
      * @phpstan-return static<TKeyCreate,TCreate>
      *
      * @psalm-mutation-free
@@ -273,7 +273,7 @@ public static function create(
         string $iteratorClass = ArrayyIterator::class,
         bool $checkPropertiesInConstructor = true
     ) {
-        return new static(
+        return new static( // @phpstan-ignore new.static
             $data,
             $iteratorClass,
             $checkPropertiesInConstructor

src/Collection/Collection.php

@@ -98,7 +98,7 @@ class Collection extends AbstractCollection
      * @param TypeInterface|null $type
      *
      * @phpstan-param array<array-key,T>|array<TKey,T>|\Arrayy\Arrayy<TKey,T> $data
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>> $iteratorClass
      */
     public function __construct(
         $data = [],
@@ -145,7 +145,7 @@ public static function construct(
     ): self {
         $type = self::convertIntoTypeCheckArray($type);
 
-        return new static(
+        return new static( // @phpstan-ignore new.static
             $data,
             ArrayyIterator::class,
             $checkPropertiesInConstructorAndType,

src/Collection/CollectionInterface.php

@@ -163,7 +163,7 @@ public function containsValueRecursive($value): bool;
      * @template TKeyCreate as TKey
      * @template TCreate as T
      * @phpstan-param array<TKeyCreate,TCreate> $data
-     * @phpstan-param  class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param  class-string<\Arrayy\ArrayyIterator<TKeyCreate,TCreate>> $iteratorClass
      * @phpstan-return static<TKeyCreate,TCreate>
      *
      * @psalm-mutation-free

src/StaticArrayy.php

@@ -56,7 +56,7 @@ public static function __callStatic(string $name, $arguments)
 
         $arrayy = Arrayy::create($array);
 
-        return \call_user_func_array([$arrayy, $name], $args);
+        return $arrayy->{$name}(...$args);
     }
 
     ////////////////////////////////////////////////////////////////////

src/Type/DetectFirstValueTypeCollection.php

@@ -27,7 +27,7 @@ final class DetectFirstValueTypeCollection extends Collection implements TypeInt
      * @param bool               $checkPropertiesInConstructor
      *
      * @phpstan-param array<TKey,T>|Arrayy<TKey,T> $data
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>> $iteratorClass
      */
     public function __construct(
         $data = [],

src/Type/InstanceCollection.php

@@ -21,7 +21,7 @@ final class InstanceCollection extends Collection implements TypeInterface
      * @param string|null   $className
      *
      * @phpstan-param array<TKey,T> $data
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator>|null $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>>|null $iteratorClass
      * @phpstan-param class-string<T>|null $className
      */
     public function __construct(

src/Type/InstancesCollection.php

@@ -21,7 +21,7 @@ final class InstancesCollection extends Collection implements TypeInterface
      * @param string[]|null $classNames
      *
      * @phpstan-param array<TKey,T> $data
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator>|null $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>>|null $iteratorClass
      * @phpstan-param array<class-string<T>>|null $classNames
      */
     public function __construct(

src/TypeCheck/TypeCheckArray.php

@@ -30,7 +30,7 @@ class TypeCheckArray extends \Arrayy\ArrayyStrict
      *                                             true, otherwise this option didn't not work anyway.
      *                                             </p>
      *
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<TKey,T>> $iteratorClass
      */
     public function __construct(
         $data = [],

tests/ModelA.php

@@ -15,7 +15,7 @@ class ModelA extends \Arrayy\Arrayy implements ModelInterface
      * @param array  $array
      * @param string $iteratorClass
      *
-     * @phpstan-param class-string<\Arrayy\ArrayyIterator> $iteratorClass
+     * @phpstan-param class-string<\Arrayy\ArrayyIterator<array-key,mixed>> $iteratorClass
      */
     public function __construct($array = [], $iteratorClass = ArrayyIterator::class)
     {

tests/StaticArrayyTest.php

@@ -16,34 +16,34 @@ public function testBadMethodCall()
 
         /** @noinspection PhpUndefinedMethodInspection */
         /** @noinspection PhpUnusedLocalVariableInspection */
-        $result = A::invalidMethod('foo');
+        $result = A::invalidMethod('foo'); // @phpstan-ignore staticMethod.notFound
     }
 
     public function testEmptyArgsInvocation()
     {
         /** @noinspection PhpUndefinedMethodInspection */
-        $result = A::first();
+        $result = A::first(); // @phpstan-ignore staticMethod.notFound
         static::assertNull($result);
     }
 
     public function testInvocation()
     {
         /** @noinspection PhpUndefinedMethodInspection */
-        $result = A::first(['lall', 'FOOBAR'], 1);
+        $result = A::first(['lall', 'FOOBAR'], 1); // @phpstan-ignore staticMethod.notFound
         static::assertSame('lall', $result);
     }
 
     public function testPartialArgsInvocation()
     {
         /** @noinspection PhpUndefinedMethodInspection */
-        $result = A::replaceOneValue(['foo', 'bar'], 'foo');
+        $result = A::replaceOneValue(['foo', 'bar'], 'foo'); // @phpstan-ignore staticMethod.notFound
         static::assertSame(['', 'bar'], $result->getArray());
     }
 
     public function testFullArgsInvocation()
     {
         /** @noinspection PhpUndefinedMethodInspection */
-        $result = A::replaceOneValue(['foo', 'bar'], 'foo', 'test');
+        $result = A::replaceOneValue(['foo', 'bar'], 'foo', 'test'); // @phpstan-ignore staticMethod.notFound
         static::assertSame(['test', 'bar'], $result->getArray());
     }