Merge pull request #2467 from greg0ire/address-collections-18

Address changes from doctrine/collections 1.8.0

Author: greg0ire

lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php

@@ -359,6 +359,9 @@ public function containsKey($key)
         return $this->coll->containsKey($key);
     }
 
+    /**
+     * @template TMaybeContained
+     */
     public function contains($element)
     {
         $this->initialize();
@@ -373,6 +376,11 @@ public function exists(Closure $p)
         return $this->coll->exists($p);
     }
 
+    /**
+     * @psalm-return (TMaybeContained is T ? TKey|false : false)
+     *
+     * @template TMaybeContained
+     */
     public function indexOf($element)
     {
         $this->initialize();