Skip to content
Permalink
Browse files

Merge branch '4.3' into 4.4

* 4.3:
  [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
  #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
  • Loading branch information
nicolas-grekas committed Oct 28, 2019
2 parents d4306da + 5ea9c3e commit 15d87da4a9b0710cca85fdae0d9100bfe0d61f5b
Showing with 3 additions and 3 deletions.
  1. +2 −2 DebugClassLoader.php
  2. +1 −1 Tests/Exception/FlattenExceptionTest.php
@@ -486,7 +486,7 @@ private function darwinRealpath(string $real): string
}
if (isset($dirFiles[$file])) {
return $real .= $dirFiles[$file];
return $real.$dirFiles[$file];
}
$kFile = strtolower($file);
@@ -505,7 +505,7 @@ private function darwinRealpath(string $real): string
self::$darwinCache[$kDir][1] = $dirFiles;
}
return $real .= $dirFiles[$kFile];
return $real.$dirFiles[$kFile];
}
/**
@@ -297,7 +297,7 @@ function () {},
// assertEquals() does not like NAN values.
$this->assertEquals($array[$i][0], 'float');
$this->assertNan($array[$i++][1]);
$this->assertNan($array[$i][1]);
}
public function testRecursionInArguments()

0 comments on commit 15d87da

Please sign in to comment.
You can’t perform that action at this time.