Skip to content

Commit e550bdd

Browse files
Merge branch '6.1' into 6.2
* 6.1: [HttpFoundation] Fix session tests Bump Symfony version to 6.1.7 Update VERSION for 6.1.6 Update CHANGELOG for 6.1.6 Bump Symfony version to 6.0.15 Update VERSION for 6.0.14 Update CHANGELOG for 6.0.14 Bump Symfony version to 5.4.15 Update VERSION for 5.4.14 Update CHANGELOG for 5.4.14 Bump Symfony version to 4.4.48 Update VERSION for 4.4.47 Update CONTRIBUTORS for 4.4.47 Update CHANGELOG for 4.4.47
2 parents 6d0b296 + 792a185 commit e550bdd

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Tests/Session/Storage/Handler/Fixtures/common.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,23 @@ class TestSessionHandler extends AbstractSessionHandler
126126
return '';
127127
}
128128
echo __FUNCTION__ . ': ', $this->data, "\n";
129+
$this->sessionId = $sessionId;
129130

130131
return $this->data;
131132
}
132133

133134
protected function doWrite($sessionId, $data): bool
134135
{
135136
echo __FUNCTION__.': ', $data, "\n";
137+
$this->sessionId = $sessionId;
136138

137139
return true;
138140
}
139141

140142
protected function doDestroy($sessionId): bool
141143
{
142144
echo __FUNCTION__, "\n";
145+
$this->sessionId = '';
143146

144147
return true;
145148
}

Tests/Session/Storage/Handler/Fixtures/regenerate.expected

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ close
99
open
1010
validateId
1111
read
12-
doRead: abc|i:123;
12+
doRead: invalid sessionId
1313
read
14-
doRead: abc|i:123;
1514

1615
write
1716
doWrite: abc|i:123;

Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ close
88
open
99
validateId
1010
read
11-
doRead:
11+
doRead: invalid sessionId
1212
read
1313

1414
write

0 commit comments

Comments
 (0)