Skip to content

Commit 6dcc0cb

Browse files
Merge branch '3.3' into 3.4
* 3.3: [travis] fix minor php7.0 version [travis] add ldap.so for php70 [HttpFoundation] Fix logic when JsonSerializable is missing [travis] update to trusty Don't use return on Assert::markTestSkipped. Create directories recursively in the PHPUnit bridge [Dotenv] Add a BC break note Fix ArrayInput::toString() for VALUE_IS_ARRAY options/args [ExpressionLanguage] throws an exception on calling uncallable method
2 parents 4fe9596 + e593f06 commit 6dcc0cb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Loader/IniFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testTypeConversions($key, $value, $supported)
5151
public function testTypeConversionsWithNativePhp($key, $value, $supported)
5252
{
5353
if (defined('HHVM_VERSION_ID')) {
54-
return $this->markTestSkipped();
54+
$this->markTestSkipped();
5555
}
5656

5757
if (!$supported) {

0 commit comments

Comments
 (0)