Synchronize Collection::add with doctrine/collections

extension.neon

@@ -38,7 +38,6 @@ parameters:
 		- stubs/Persistence/ObjectRepository.stub
 		- stubs/RepositoryFactory.stub
 		- stubs/Collections/ArrayCollection.stub
-		- stubs/Collections/Collection.stub
 		- stubs/Collections/ReadableCollection.stub
 		- stubs/Collections/Selectable.stub
 		- stubs/ORM/AbstractQuery.stub

src/Stubs/Doctrine/StubFilesExtensionLoader.php

@@ -2,10 +2,14 @@
 
 namespace PHPStan\Stubs\Doctrine;
 
+use Composer\InstalledVersions;
+use OutOfBoundsException;
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 use PHPStan\BetterReflection\Reflector\Reflector;
 use PHPStan\PhpDoc\StubFilesExtension;
+use function class_exists;
 use function dirname;
+use function strpos;
 
 class StubFilesExtensionLoader implements StubFilesExtension
 {
@@ -59,6 +63,19 @@ public function getFiles(): array
 			$files[] = $stubsDir . '/ServiceEntityRepository.stub';
 		}
 
+		try {
+			$collectionVersion = class_exists(InstalledVersions::class)
+				? InstalledVersions::getVersion('doctrine/collections')
+				: null;
+		} catch (OutOfBoundsException $e) {
+			$collectionVersion = null;
+		}
+		if ($collectionVersion !== null && strpos($collectionVersion, '1.') === 0) {
+			$files[] = $stubsDir . '/Collections/Collection1.stub';
+		} else {
+			$files[] = $stubsDir . '/Collections/Collection.stub';
+		}
+
 		return $files;
 	}
 

stubs/Collections/Collection.stub

@@ -21,7 +21,7 @@ interface Collection extends Countable, IteratorAggregate, ArrayAccess, Readable
      *
      * @param T $element
      *
-     * @return true
+     * @return void
      */
     public function add($element) {}
 

stubs/Collections/Collection1.stub

@@ -0,0 +1,46 @@
+<?php
+
+namespace Doctrine\Common\Collections;
+
+use ArrayAccess;
+use Countable;
+use IteratorAggregate;
+
+/**
+ * @template TKey of array-key
+ * @template T
+ * @extends IteratorAggregate<TKey, T>
+ * @extends ArrayAccess<TKey, T>
+ * @extends ReadableCollection<TKey, T>
+ */
+interface Collection extends Countable, IteratorAggregate, ArrayAccess, ReadableCollection
+{
+
+    /**
+     * @phpstan-impure
+     *
+     * @param T $element
+     *
+     * @return true
+     */
+    public function add($element) {}
+
+    /**
+     * @phpstan-impure
+     *
+     * @param TKey $key
+     *
+     * @return T|null
+     */
+    public function remove($key) {}
+
+    /**
+     * @phpstan-impure
+     *
+     * @param T $element
+     *
+     * @return bool
+     */
+    public function removeElement($element) {}
+
+}