Merge branch '4.4' into 5.0

* 4.4:
  fix merge
  Require PHPUnit 9.3 on PHP 8
  [Cache] fix catching auth errors
  Fix CS
  [FrameworkBundle] set default session.handler alias if handler_id is not provided
  Fix CS
  Readability update
  Fix checks for phpunit releases on Composer 2 (resolves #37601)
  [Serializer] Support multiple levels of discriminator mapping
  Use hexadecimal numerals instead of hexadecimals in strings to represent error codes.
  [SCA] Minor fixes on tests
  [WebProfilerBundle] modified url generation to use absolute urls
  [Mailer] Fix reply-to functionality in the SendgridApiTransport
  [Mime] Fix compat with HTTP requests
  ticket_36879 - Fix mandrill raw http request setting from email/name

Author: nicolas-grekas

Adapter/ExtLdap/Connection.php

@@ -25,9 +25,9 @@
  */
 class Connection extends AbstractConnection
 {
-    private const LDAP_INVALID_CREDENTIALS = '0x31';
-    private const LDAP_TIMEOUT = '0x55';
-    private const LDAP_ALREADY_EXISTS = '0x44';
+    private const LDAP_INVALID_CREDENTIALS = 0x31;
+    private const LDAP_TIMEOUT = 0x55;
+    private const LDAP_ALREADY_EXISTS = 0x44;
 
     /** @var bool */
     private $bound = false;

Tests/Adapter/ExtLdap/AdapterTest.php

@@ -94,12 +94,12 @@ public function testLdapQueryScopeBase()
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
 
         $query = $ldap->createQuery('cn=Fabien Potencier,dc=symfony,dc=com', '(objectclass=*)', [
-           'scope' => Query::SCOPE_BASE,
+            'scope' => Query::SCOPE_BASE,
         ]);
         $result = $query->execute();
 
         $entry = $result[0];
-        $this->assertEquals($result->count(), 1);
+        $this->assertEquals(1, $result->count());
         $this->assertEquals(['Fabien Potencier'], $entry->getAttribute('cn'));
     }
 
@@ -116,8 +116,8 @@ public function testLdapQueryScopeOneLevel()
         $subtree_count = $ldap->createQuery('ou=Components,dc=symfony,dc=com', '(objectclass=*)')->execute()->count();
 
         $this->assertNotEquals($one_level_result->count(), $subtree_count);
-        $this->assertEquals($one_level_result->count(), 1);
-        $this->assertEquals($one_level_result[0]->getAttribute('ou'), ['Ldap']);
+        $this->assertEquals(1, $one_level_result->count());
+        $this->assertEquals(['Ldap'], $one_level_result[0]->getAttribute('ou'));
     }
 
     public function testLdapPagination()

Tests/Adapter/ExtLdap/LdapManagerTest.php

@@ -186,7 +186,7 @@ public function testLdapRename()
 
         $result = $this->executeSearchQuery(1);
         $renamedEntry = $result[0];
-        $this->assertEquals($renamedEntry->getAttribute('cn')[0], 'Kevin');
+        $this->assertEquals('Kevin', $renamedEntry->getAttribute('cn')[0]);
 
         $oldRdn = $entry->getAttribute('cn')[0];
         $entryManager->rename($renamedEntry, 'cn='.$oldRdn);