Skip to content

Commit 973a72e

Browse files
Merge branch '4.1'
* 4.1: (21 commits) [php_cs] disable fopen_flags [DI] fix error in dumped container [CS] Remove unused variables passed to closures [DI] fix dumping setters before their inlined instances [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages Don't return early as this bypasses the auto exit feature [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 4.1.6 updated VERSION for 4.1.5 updated CHANGELOG for 4.1.5 bumped Symfony version to 3.4.17 updated VERSION for 3.4.16 updated CHANGELOG for 3.4.16 bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 ...
2 parents 0664b91 + 2474c5d commit 973a72e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ClockMock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static function microtime($asFloat = false)
6767
return self::$now;
6868
}
6969

70-
return sprintf('%0.6f %d', self::$now - (int) self::$now, (int) self::$now);
70+
return sprintf('%0.6f00 %d', self::$now - (int) self::$now, (int) self::$now);
7171
}
7272

7373
public static function date($format, $timestamp = null)

Tests/ClockMockTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testSleep()
4444

4545
public function testMicrotime()
4646
{
47-
$this->assertSame('0.125000 1234567890', microtime());
47+
$this->assertSame('0.12500000 1234567890', microtime());
4848
}
4949

5050
public function testMicrotimeAsFloat()

0 commit comments

Comments
 (0)