Skip to content

Commit ce0b94a

Browse files
committed
Merge branch '6.4' into 7.3
* 6.4: Restore Relay 8.5 test account for PHP_ZTS being a boolean value on PHP 8.4+ [Intl] Update data to ICU 78.1 [Console] Fix exception message when abbreviation matches multiple hidden commands [FrameworkBundle] Fix TypeError when traversing scalar values in debug:config [DependencyInjection] Fix loop corruption in CheckTypeDeclarationsPass [DependencyInjection] Fix invalid PHP syntax for nullable TypedReference in PhpDumper Fix typo in comment [Translation][Routing] Fix typos [String] Fix normalization in trimPrefix/trimSuffix
2 parents e9bcfd7 + 441c6b6 commit ce0b94a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/FilesystemTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ protected function markAsSkippedIfSymlinkIsMissing($relative = false)
144144
}
145145

146146
// https://bugs.php.net/69473
147-
if ($relative && '\\' === \DIRECTORY_SEPARATOR && 1 === \PHP_ZTS) {
147+
if ($relative && '\\' === \DIRECTORY_SEPARATOR && \PHP_ZTS) {
148148
$this->markTestSkipped('symlink does not support relative paths on thread safe Windows PHP versions');
149149
}
150150
}

0 commit comments

Comments
 (0)