Skip to content

Commit d937d40

Browse files
committed
Merge branch '7.4' into 8.0
* 7.4: (40 commits) [PropertyInfo] treat mixed[] the same as array when getting types from docblocks treat `mixed[]` the same as `array` when getting types from docblocks install ext-zstd on PHP 8.5 as well fix merge [Console] Fix profile invokable command sync ControllerHelper docblock with latest AbstractController changes fix: Typehint for `createForm` in abstractController [Notifier][Mercure] Add support for Mercure 0.7 register attribute loader arguments in a forward-compatible way ensure compatibility with RelayCluster 0.20.0 mark test using a Redis connection as an integration test ensure compatibility with Relay extension 0.20.0 [FrameworkBundle] Allow backed enum to be used in initial_marking workflow configuration [DependencyInjection] Fix `query_string` env processor for URLs without query string [HttpFoundation] Fix Expires response header for EventStream Bump Symfony version to 7.4.1 Update VERSION for 7.4.0 Update CHANGELOG for 7.4.0 - [DependencyInjection] Fix state corruption in PhpFileLoader during recursive imports ...
2 parents 7fc96ae + d551b38 commit d937d40

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)