Merge branch '5.4' into 6.0

* 5.4:
  [Console] Restore psr/log >= 3.0 conflict
  [Security] Make the abstract Voter class implement CacheableVoterInterface
  Add generic types to traversable implementations
  [Security] Fix TypeError message
  [Security] Fix deprecation layer
  [FrameworkBundle] Add completion for workflow:dump
  Fix cancel button
  Fix misleading error on missing provider with authenticator manager
  Don't limit retries of toolbar loading

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(): array;
 }

Adapter/ExtLdap/Collection.php

@@ -84,7 +84,7 @@ public function offsetExists(mixed $offset): bool
         return isset($this->entries[$offset]);
     }
 
-    public function offsetGet(mixed $offset): mixed
+    public function offsetGet(mixed $offset): ?Entry
     {
         $this->toArray();
 

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
      */

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): Collection|array
+    private function executeSearchQuery($expectedResults = 1): CollectionInterface
     {
         $results = $this
             ->adapter