Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  [FrameworkBundle] fix merge
  [FrameworkBundle] Filter out trans paths that are covered by a parent folder path
  [Form] fix tests
  [Serializer] Fixed framework.serializer.default_context is not working for JsonEncoder
  [Ldap] Do not run ldap_set_option on failed connection
  Correct compare float data
  Fix AbstractFormLoginAuthenticator return types (fixes #47571).
  Run composer with --ignore-platform-req=php+
  [FrameworkBundle] Fix a phpdoc in mailer assertions
  • Loading branch information
nicolas-grekas committed Sep 28, 2022
2 parents f2c1780 + 6df7a3e commit 7554fde
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Tests/StopwatchPeriodTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function testGetEndTime($end, $useMorePrecision, $expected)
public function testGetDuration($start, $end, $useMorePrecision, $duration)
{
$period = new StopwatchPeriod($start, $end, $useMorePrecision);
$this->assertSame($duration, $period->getDuration());
$this->assertEqualsWithDelta($duration, $period->getDuration(), \PHP_FLOAT_EPSILON);
}

public function provideTimeValues()
Expand Down

0 comments on commit 7554fde

Please sign in to comment.