Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 5384ecdbd96b · 2021-11-29T16:30:56.000+01:00
* 5.3:
  [Security] Do not overwrite already stored tokens for REMOTE_USER authentication
  [Validator] Fix validation for single level domains
  Fix redundant type casts
  Increased the reserved memory from 10k to 32k
  [DoctrineBridge] Add DbalLoggerTest to group legacy
  Leverage DBAL's getNativeConnection() method
  Fix idempotency of LocoProvider write method
diff --git a/Adapter/ExtLdap/Adapter.php b/Adapter/ExtLdap/Adapter.php
@@ -72,7 +72,7 @@ public function escape(string $subject, string $ignore = '', int $flags = 0)
         $value = ldap_escape($subject, $ignore, $flags);
 
         // Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.
-        if ((int) $flags & \LDAP_ESCAPE_DN) {
+        if ($flags & \LDAP_ESCAPE_DN) {
             if (!empty($value) && ' ' === $value[0]) {
                 $value = '\\20'.substr($value, 1);
             }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function escape(string $subject, string $ignore = '', int $flags = 0)`
`72`	`72`	`$value = ldap_escape($subject, $ignore, $flags);`
`73`	`73`
`74`	`74`	`// Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.`
`75`		`- if ((int) $flags & \LDAP_ESCAPE_DN) {`
	`75`	`+ if ($flags & \LDAP_ESCAPE_DN) {`
`76`	`76`	`if (!empty($value) && ' ' === $value[0]) {`
`77`	`77`	`$value = '\\20'.substr($value, 1);`
`78`	`78`	`}`