Skip to content

Commit fc4ae91

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: remove an invalid test [Translation] fix support of `TranslatableInterface` in `IdentityTranslator` Fix various bool-type coercions
2 parents a3b4224 + 451a4a1 commit fc4ae91

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/EventListener/SessionListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ public static function provideSessionOptions(): \Generator
104104

105105
yield 'set_cookiesecure_auto_by_symfony_false_by_php' => [
106106
'phpSessionOptions' => ['secure' => false],
107-
'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => 'auto', 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
107+
'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => true, 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
108108
'expectedSessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => false, 'cookie_httponly' => true, 'cookie_samesite' => Cookie::SAMESITE_LAX],
109109
];
110110

111111
yield 'set_cookiesecure_auto_by_symfony_true_by_php' => [
112112
'phpSessionOptions' => ['secure' => true],
113-
'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => 'auto', 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
113+
'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => true, 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
114114
'expectedSessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => true, 'cookie_httponly' => true, 'cookie_samesite' => Cookie::SAMESITE_LAX],
115115
];
116116

0 commit comments

Comments
 (0)