Add generic types to traversable implementations

Author: derrabus

Adapter/CollectionInterface.php

@@ -15,11 +15,14 @@
 
 /**
  * @author Charles Sarrazin <charles@sarraz.in>
+ *
+ * @extends \ArrayAccess<int, Entry>
+ * @extends \IteratorAggregate<int, Entry>
  */
 interface CollectionInterface extends \Countable, \IteratorAggregate, \ArrayAccess
 {
     /**
-     * @return Entry[]
+     * @return array<int, Entry>
      */
     public function toArray();
 }

Adapter/ExtLdap/Collection.php

@@ -63,7 +63,7 @@ public function count()
     }
 
     /**
-     * @return \Traversable
+     * @return \Traversable<int, Entry>
      */
     #[\ReturnTypeWillChange]
     public function getIterator()
@@ -101,7 +101,7 @@ public function offsetExists($offset)
     }
 
     /**
-     * @return mixed
+     * @return Entry|null
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)

Adapter/ExtLdap/EntryManager.php

@@ -140,7 +140,7 @@ private function getConnectionResource()
     }
 
     /**
-     * @param iterable|UpdateOperation[] $operations An array or iterable of UpdateOperation instances
+     * @param iterable<int, UpdateOperation> $operations An array or iterable of UpdateOperation instances
      *
      * @throws UpdateOperationException in case of an error
      */

Adapter/QueryInterface.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Ldap\Adapter;
 
-use Symfony\Component\Ldap\Entry;
 use Symfony\Component\Ldap\Exception\LdapException;
 use Symfony\Component\Ldap\Exception\NotBoundException;
 
@@ -33,7 +32,7 @@ interface QueryInterface
     /**
      * Executes a query and returns the list of Ldap entries.
      *
-     * @return CollectionInterface|Entry[]
+     * @return CollectionInterface
      *
      * @throws NotBoundException
      * @throws LdapException

Tests/Adapter/ExtLdap/LdapManagerTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Ldap\Tests\Adapter\ExtLdap;
 
+use Symfony\Component\Ldap\Adapter\CollectionInterface;
 use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter;
 use Symfony\Component\Ldap\Adapter\ExtLdap\Collection;
 use Symfony\Component\Ldap\Adapter\ExtLdap\UpdateOperation;
@@ -160,10 +161,7 @@ public function testLdapUnboundUpdate()
         $em->update(new Entry(''));
     }
 
-    /**
-     * @return Collection|Entry[]
-     */
-    private function executeSearchQuery($expectedResults = 1)
+    private function executeSearchQuery($expectedResults = 1): CollectionInterface
     {
         $results = $this
             ->adapter