Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit c7190aeed5cd · 2017-09-15T12:12:22.000+02:00
* 3.3:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction
  [Filesystem] mirror - fix copying content with same name as source/target.
  Removed unnecessary getDefinition() call.
  .php_cs.dist - simplify config
  [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces
diff --git a/Adapter/ExtLdap/Adapter.php b/Adapter/ExtLdap/Adapter.php
@@ -73,10 +73,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
`@@ -73,10 +73,10 @@ public function escape($subject, $ignore = '', $flags = 0)`
`73`	`73`
`74`	`74`	`// Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.`
`75`	`75`	`if ((int) $flags & LDAP_ESCAPE_DN) {`
`76`		`- if (!empty($value) && $value[0] === ' ') {`
	`76`	`+ if (!empty($value) && ' ' === $value[0]) {`
`77`	`77`	`$value = '\\20'.substr($value, 1);`
`78`	`78`	`}`
`79`		`- if (!empty($value) && $value[strlen($value) - 1] === ' ') {`
	`79`	`+ if (!empty($value) && ' ' === $value[strlen($value) - 1]) {`
`80`	`80`	`$value = substr($value, 0, -1).'\\20';`
`81`	`81`	`}`
`82`	`82`	`$value = str_replace("\r", '\0d', $value);`