Skip to content

Commit eabaabf

Browse files
Merge branch '5.0' into 5.1
* 5.0: [Mime] Remove unused var [HttpClient] fix monitoring timeouts when other streams are active [PhpUnitBridge] fix syntax on PHP 5.3 [PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed properly cascade validation to child forms [PhpUnitBridge] fix undefined var on version 3.4 Move ajax clear event listener initialization on loadToolbar [HttpClient] Throw JsonException instead of TransportException on empty response in Response::toArray() take into account the context when preserving empty array objects [VarExporter] tfix: s/markAsSkipped/markTestSkipped/ bumped Symfony version to 5.0.10 updated VERSION for 5.0.9 updated CHANGELOG for 5.0.9 bumped Symfony version to 4.4.10 updated VERSION for 4.4.9 updated CHANGELOG for 4.4.9 bumped Symfony version to 3.4.42 updated VERSION for 3.4.41 update CONTRIBUTORS for 3.4.41 updated CHANGELOG for 3.4.41
2 parents 76cf215 + b87e3ae commit eabaabf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/VarExporterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function testExport(string $testName, $value, bool $staticValueExpected =
9292
} elseif (\PHP_VERSION_ID < 70400) {
9393
$fixtureFile = __DIR__.'/Fixtures/'.$testName.'-legacy.php';
9494
} else {
95-
$this->markAsSkipped('PHP >= 7.4.6 required.');
95+
$this->markTestSkipped('PHP >= 7.4.6 required.');
9696
}
9797
$this->assertStringEqualsFile($fixtureFile, $dump);
9898

0 commit comments

Comments
 (0)