Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit f1d5e3ae52ab · 2017-09-15T11:59:38.000+02:00
* 2.7:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction
diff --git a/LdapClient.php b/LdapClient.php
@@ -111,10 +111,10 @@ public function escape($subject, $ignore = '', $flags = 0)
 
         // Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.
         if ((int) $flags & LDAP_ESCAPE_DN) {
-            if (!empty($value) && $value[0] === ' ') {
+            if (!empty($value) && ' ' === $value[0]) {
                 $value = '\\20'.substr($value, 1);
             }
-            if (!empty($value) && $value[strlen($value) - 1] === ' ') {
+            if (!empty($value) && ' ' === $value[strlen($value) - 1]) {
                 $value = substr($value, 0, -1).'\\20';
             }
             $value = str_replace("\r", '\0d', $value);

Original file line number	Diff line number	Diff line change
`@@ -111,10 +111,10 @@ public function escape($subject, $ignore = '', $flags = 0)`
`111`	`111`
`112`	`112`	`// Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.`
`113`	`113`	`if ((int) $flags & LDAP_ESCAPE_DN) {`
`114`		`- if (!empty($value) && $value[0] === ' ') {`
	`114`	`+ if (!empty($value) && ' ' === $value[0]) {`
`115`	`115`	`$value = '\\20'.substr($value, 1);`
`116`	`116`	`}`
`117`		`- if (!empty($value) && $value[strlen($value) - 1] === ' ') {`
	`117`	`+ if (!empty($value) && ' ' === $value[strlen($value) - 1]) {`
`118`	`118`	`$value = substr($value, 0, -1).'\\20';`
`119`	`119`	`}`
`120`	`120`	`$value = str_replace("\r", '\0d', $value);`