diff --git a/lib/Doctrine/Column.php b/lib/Doctrine/Column.php
index 18e081c33..fafb97adb 100644
--- a/lib/Doctrine/Column.php
+++ b/lib/Doctrine/Column.php
@@ -146,6 +146,7 @@ public function enumIndex($field, $value)
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->_definition);
@@ -156,6 +157,7 @@ public function count()
      *
      * @return ArrayIterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator() 
     {
         return new ArrayIterator($this->_definition);
diff --git a/lib/Doctrine/Export/Reporter.php b/lib/Doctrine/Export/Reporter.php
index fb3c43a96..742f39fac 100644
--- a/lib/Doctrine/Export/Reporter.php
+++ b/lib/Doctrine/Export/Reporter.php
@@ -44,6 +44,7 @@ public function pop()
         return array_pop($this->messages);
     }
 
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->messages);
diff --git a/lib/Doctrine/Hydrator/RecordDriver.php b/lib/Doctrine/Hydrator/RecordDriver.php
index b4944428b..a028645d4 100644
--- a/lib/Doctrine/Hydrator/RecordDriver.php
+++ b/lib/Doctrine/Hydrator/RecordDriver.php
@@ -118,7 +118,7 @@ public function flush()
             $coll->takeSnapshot();
         }
         $this->_initializedRelations = null;
-        $this->_collections = null;
+        $this->_collections = array();
         $this->_tables = null;
     }
 }
\ No newline at end of file
diff --git a/lib/Doctrine/Locator.php b/lib/Doctrine/Locator.php
index 70d1998d6..8b4d2817f 100644
--- a/lib/Doctrine/Locator.php
+++ b/lib/Doctrine/Locator.php
@@ -178,6 +178,7 @@ public function locate($name)
      * @see Countable interface
      * @return integer              the number of resources
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->_resources);
@@ -191,6 +192,7 @@ public function count()
      * @return ArrayIterator    an iterator for iterating through
      *                          all bound resources
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->_resources);
diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
index a9cad793f..02659b761 100644
--- a/lib/Doctrine/Table.php
+++ b/lib/Doctrine/Table.php
@@ -1704,7 +1704,7 @@ public function findByDql($dql, $params = array(), $hydrationMode = null)
      * Find records basing on a field.
      *
      * @param string $column            field for the WHERE clause
-     * @param string $value             prepared statement parameter
+     * @param string|array $value       prepared statement parameter
      * @param int $hydrationMode        Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Collection|array
      */
@@ -1719,7 +1719,7 @@ public function findBy($fieldName, $value, $hydrationMode = null)
      * Finds the first record that satisfy the clause.
      *
      * @param string $column            field for the WHERE clause
-     * @param string $value             prepared statement parameter
+     * @param string|array $value       prepared statement parameter
      * @param int $hydrationMode        Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Record
      */
diff --git a/lib/Doctrine/Table/Repository/None.php b/lib/Doctrine/Table/Repository/None.php
index da421ec74..fe651cae6 100644
--- a/lib/Doctrine/Table/Repository/None.php
+++ b/lib/Doctrine/Table/Repository/None.php
@@ -62,6 +62,7 @@ public function get($oid)
      *
      * @return integer                      the number of records this registry has
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 0;