Merge branch '3.4'

* 3.4:
  fix
This commit is contained in:
Nicolas Grekas 2017-10-10 19:20:12 +02:00
commit 773be7fff6

View File

@ -94,8 +94,8 @@ EODUMP;
*/ */
public function testDumpInterval($intervalSpec, $ms, $invert, $expected) public function testDumpInterval($intervalSpec, $ms, $invert, $expected)
{ {
if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc2', '<=')) { if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
$this->markTestSkipped('Skipped on 7.2 before rc3 because of php bug #75354.'); $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
} }
$interval = $this->createInterval($intervalSpec, $ms, $invert); $interval = $this->createInterval($intervalSpec, $ms, $invert);
@ -114,8 +114,8 @@ EODUMP;
*/ */
public function testDumpIntervalExcludingVerbosity($intervalSpec, $ms, $invert, $expected) public function testDumpIntervalExcludingVerbosity($intervalSpec, $ms, $invert, $expected)
{ {
if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc2', '<=')) { if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
$this->markTestSkipped('Skipped on 7.2 before rc3 because of php bug #75354.'); $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
} }
$interval = $this->createInterval($intervalSpec, $ms, $invert); $interval = $this->createInterval($intervalSpec, $ms, $invert);