Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit debf92a601c4 · 2019-10-28T22:51:41.000+01:00
* 4.4: [OptionsResolve] Revert change in tests for a not-merged change in code [HttpClient] fix handling of 3xx with no Location header - ignore Content-Length when no body is expected [Workflow] Made the configuration more robust for the 'property' key [Security/Core] make NativePasswordEncoder use sodium to validate passwords when possible [FrameworkBundle] make SodiumVault report bad decryption key accurately cs fix [Security] Allow to set a fixed algorithm [Security/Core] make encodedLength computation more generic [Security/Core] add fast path when encoded password cannot match anything symfony#30432 fix an error message fix paths to detect code owners [HttpClient] ignore the body of responses to HEAD requests [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 [SecurityBundle] Fix wrong assertion Remove unused local variables in tests [Yaml][Parser] Remove the getLastLineNumberBeforeDeprecation() internal unused method Make sure to collect child forms created on *_SET_DATA events [WebProfilerBundle] Improve display in Email panel for dark theme do not render errors for checkboxes twice
diff --git a/DebugClassLoader.php b/DebugClassLoader.php
@@ -751,7 +751,7 @@ private function darwinRealpath(string $real): string
         }
 
         if (isset($dirFiles[$file])) {
-            return $real .= $dirFiles[$file];
+            return $real.$dirFiles[$file];
         }
 
         $kFile = strtolower($file);
@@ -770,7 +770,7 @@ private function darwinRealpath(string $real): string
             self::$darwinCache[$kDir][1] = $dirFiles;
         }
 
-        return $real .= $dirFiles[$kFile];
+        return $real.$dirFiles[$kFile];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -751,7 +751,7 @@ private function darwinRealpath(string $real): string`
`751`	`751`	`}`
`752`	`752`
`753`	`753`	`if (isset($dirFiles[$file])) {`
`754`		`- return $real .= $dirFiles[$file];`
	`754`	`+ return $real.$dirFiles[$file];`
`755`	`755`	`}`
`756`	`756`
`757`	`757`	`$kFile = strtolower($file);`
`@@ -770,7 +770,7 @@ private function darwinRealpath(string $real): string`
`770`	`770`	`self::$darwinCache[$kDir][1] = $dirFiles;`
`771`	`771`	`}`
`772`	`772`
`773`		`- return $real .= $dirFiles[$kFile];`
	`773`	`+ return $real.$dirFiles[$kFile];`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`/**`