Merge pull request #511 from mglaman/gh509

Author: mglaman

stubs/Drupal/Core/Field/FieldItemList.stub

@@ -4,12 +4,17 @@ namespace Drupal\Core\Field;
 
 use Drupal\Core\TypedData\Plugin\DataType\ItemList;
 
+/**
+ * @template T of \Drupal\Core\Field\FieldItemInterface
+ * @extends ItemList<T>
+ * @implements FieldItemListInterface<T>
+ */
 class FieldItemList extends ItemList implements FieldItemListInterface {
 
   /**
    * @return \Drupal\Core\Field\FieldItemInterface
    */
-  protected function createItem($offset = 0, $value = NULL): \Drupal\Core\Field\FieldItemInterface {
+  protected function createItem(int $offset = 0, ?mixed $value = NULL): \Drupal\Core\Field\FieldItemInterface {
   }
 
 }

stubs/Drupal/Core/TypedData/Plugin/DataType/ItemList.stub

@@ -0,0 +1,16 @@
+<?php
+
+namespace Drupal\Core\TypedData\Plugin\DataType;
+
+use Drupal\Core\TypedData\ComplexDataInterface;
+use Drupal\Core\TypedData\ListInterface;
+use Drupal\Core\TypedData\TypedData;
+use Drupal\Core\TypedData\TypedDataInterface;
+
+/**
+ * @template T of TypedDataInterface
+ * @implements \IteratorAggregate<int, T>
+ * @implements ListInterface<T>
+ */
+class ItemList extends TypedData implements \IteratorAggregate, ListInterface {
+}

tests/src/StubTest.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace mglaman\PHPStanDrupal\Tests;
+
+use PHPStan\Analyser\Error;
+use PHPStan\PhpDoc\StubFilesProvider;
+use PHPStan\PhpDoc\StubValidator;
+use PHPStan\Testing\PHPStanTestCase;
+
+final class StubTest extends PHPStanTestCase
+{
+    use AdditionalConfigFilesTrait;
+
+    public function testValid(): void {
+        $stubFilesProvider = self::getContainer()
+            ->getByType(StubFilesProvider::class);
+        // @phpstan-ignore-next-line
+        $projectStubFiles = $stubFilesProvider->getProjectStubFiles();
+
+        $stubValidators = self::getContainer()
+            ->getByType(StubValidator::class);
+        // @phpstan-ignore-next-line
+        $stubErrors = $stubValidators->validate($projectStubFiles, true);
+        $errorsAsArrays = array_map(
+            static fn (Error $error) => $error->jsonSerialize(),
+            $stubErrors
+        );
+        self::assertEquals(
+            [],
+            $errorsAsArrays,
+            var_export($errorsAsArrays, true)
+        );
+    }
+
+}