Merge pull request #313 from VincentLanglet/lazyCollection

Update phpdoc of the AbstractLazyCollection
doctrine · Aug 15, 2022 · 1269d42 · 1269d42
2 parents ff49ca8 + e732b16
commit 1269d42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/Doctrine/Common/Collections/AbstractLazyCollection.php b/lib/Doctrine/Common/Collections/AbstractLazyCollection.php
@@ -3,6 +3,7 @@
 namespace Doctrine\Common\Collections;
 
 use Closure;
+use LogicException;
 use ReturnTypeWillChange;
 use Traversable;
 
@@ -18,8 +19,8 @@ abstract class AbstractLazyCollection implements Collection
  /**
  * The backed collection to use
  *
- * @psalm-var Collection<TKey,T>
- * @var Collection<mixed>
+ * @psalm-var Collection<TKey,T>|null
+ * @var Collection<mixed>|null
  */
  protected $collection;
 
@@ -356,6 +357,8 @@ public function isInitialized()
  * Initialize the collection
  *
  * @return void
+ *
+ * @psalm-assert Collection<TKey,T> $this->collection
  */
  protected function initialize()
  {
@@ -365,6 +368,10 @@ protected function initialize()
 
  $this->doInitialize();
  $this->initialized = true;
+
+ if ($this->collection === null) {
+ throw new LogicException('You must initialize the collection property in the doInitialize() method.');
+ }
  }
 
  /**

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,3 +6,6 @@ parameters:
  -
  message: '~Parameter #1 \$key of method Doctrine\\Common\\Collections\\ArrayCollection<TKey of \(int\|string\),T>::set\(\) expects TKey of \(int\|string\), int\|string given\.~'
  path: 'lib/Doctrine/Common/Collections/ArrayCollection.php'
+ -
+ message: '~Cannot call method .* on Doctrine\\Common\\Collections\\Collection<TKey of \(int\|string\), T>\|null\.~'
+ path: 'lib/Doctrine/Common/Collections/AbstractLazyCollection.php'