10000 Merge branch '5.4' into 6.0 · symfony/symfony@90f5a98 · GitHub
[go: up one dir, main page]
Skip to content

Commit 90f5a98

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: [HttpFoundation] Fix session tests 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 8f8bb5b + ed7aeba commit 90f5a98

File tree

4 files changed

+31
-13
lines changed

4 files changed

+31
-13
lines changed

‎CONTRIBUTORS.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,21 @@ The Symfony Connect username in parenthesis allows to get more information
9090
- Florin Patan (florinpatan)
9191
- Peter Rehm (rpet)
9292
- Henrik Bjørnskov (henrikbjorn)
93+
- David Buchmann (dbu)
9394
- Konstantin Myakshin (koc)
9495
- Andrej Hudec (pulzarraider)
9596
- Julien Falque (julienfalque)
9697
- Massimiliano Arione (garak)
9798
- Douglas Greenshields (shieldo)
98-
- David Buchmann (dbu)
9999
- Christian Raue
100100
- Jáchym Toušek (enumag)
101+
- Mathias Arlaud (mtarld)
101102
- Graham Campbell (graham)
102103
- Michel Weimerskirch (mweimerskirch)
103104
- Eric Clemmons (ericclemmons)
104105
- Issei Murasawa (issei_m)
105106
- Fran Moreno (franmomu)
106107
- Malte Schlüter (maltemaltesich)
107-
- Mathias Arlaud (mtarld)
108108
- Vasilij Dusko
109109
- Denis (yethee)
110110
- Arnout Boks (aboks)
@@ -122,12 +122,12 @@ The Symfony Connect username in parenthesis allows to get more information
122122
- Lee McDermott
123123
- Brandon Turner
124124
- Luis Cordova (cordoval)
125+
- Antoine Lamirault
125126
- Daniel Holmes (dholmes)
126127
- Toni Uebernickel (havvg)
127128
- Bart van den Burg (burgov)
128129
- Jordan Alliot (jalliot)
129130
- Smaine Milianni (ismail1432)
130-
- Antoine Lamirault
131131
- John Wards (johnwards)
132132
- Dariusz Ruminski
133133
- Lars Strojny (lstrojny)
@@ -210,6 +210,7 @@ The Symfony Connect username in parenthesis allows to get more information
210210
- Martin Hujer (martinhujer)
211211
- Wouter J
212212
- Guilliam Xavier
213+
- Antonio Pauletich (x-coder264)
213214
- Timo Bakx (timobakx)
214215
- Juti Noppornpitak (shiroyuki)
215216
- Joe Bennett (kralos)
@@ -226,7 +227,6 @@ The Symfony Connect username in parenthesis allows to get more information
226227
- Arnaud Kleinpeter (nanocom)
227228
- Guilherme Blanco (guilhermeblanco)
228229
- Chi-teck
229-
- Antonio Pauletich (x-coder264)
230230
- Michael Voříšek
231231
- SpacePossum
232232
- Pablo Godel (pgodel)
@@ -479,6 +479,7 @@ The Symfony Connect username in parenthesis allows to get more information
479479
- Quynh Xuan Nguyen (seriquynh)
480480
- Ray
481481
- Philipp Cordes (corphi)
482+
- Andrii Dembitskyi
482483
- Chekote
483484
- bhavin (bhavin4u)
484485
- Pavel Popov (metaer)
@@ -575,7 +576,6 @@ The Symfony Connect username in parenthesis allows to get more information
575576
- Adrian Rudnik (kreischweide)
576577
- Pavel Batanov (scaytrase)
577578
- Francesc Rosàs (frosas)
578-
- Andrii Dembitskyi
579579
- Bongiraud Dominique
580580
- janschoenherr
581581
- Marko Kaznovac (kaznovac)
@@ -642,6 +642,7 @@ The Symfony Connect username in parenthesis allows to get more information
642642
- Vitaliy Zakharov (zakharovvi)
643643
- Tobias Sjösten (tobiassjosten)
644644
- Gyula Sallai (salla)
645+
- Stefan Gehrig (sgehrig)
645646
- Benjamin Cremer (bcremer)
646647
- rtek
647648
- Inal DJAFAR (inalgnu)
@@ -870,7 +871,6 @@ The Symfony Connect username in parenthesis allows to get more information
870871
- Dirk Pahl (dirkaholic)
871872
- Cédric Lombardot (cedriclombardot)
872873
- Jonas Flodén (flojon)
873-
- Stefan Gehrig (sgehrig)
874874
- Adrien Lucas (adrienlucas)
875875
- Dominik Zogg
876876
- Kai Dederichs
@@ -1037,6 +1037,7 @@ The Symfony Connect username in parenthesis allows to get more information
10371037
- Quentin Dequippe (qdequippe)
10381038
- Yewhen Khoptynskyi (khoptynskyi)
10391039
- Jérôme Nadaud (jnadaud)
1040+
- wuchen90
10401041
- Alexandre Tranchant (alexandre_t)
10411042
- Anthony Moutte
10421043
- shreyadenny
@@ -1050,6 +1051,7 @@ The Symfony Connect username in parenthesis allows to get more information
10501051
- Grégoire Hébert (gregoirehebert)
10511052
- alcaeus
10521053
- Fred Cox
1054+
- Matheo Daninos (mathdns)
10531055
- Iliya Miroslavov Iliev (i.miroslavov)
10541056
- Safonov Nikita (ns3777k)
10551057
- Simon DELICATA
@@ -1975,7 +1977,6 @@ The Symfony Connect username in parenthesis allows to get more information
19751977
- Kirill Nesmeyanov (serafim)
19761978
- Reece Fowell (reecefowell)
19771979
- Guillaume Gammelin
1978-
- wuchen90
19791980
- Valérian Galliat
19801981
- d-ph
19811982
- Renan Taranto (renan-taranto)
@@ -2051,6 +2052,7 @@ The Symfony Connect username in parenthesis allows to get more information
20512052
- boite
20522053
- Silvio Ginter
20532054
- MGDSoft
2055+
- joris
20542056
- Vadim Tyukov (vatson)
20552057
- David Wolter (davewww)
20562058
- Sortex
@@ -2099,6 +2101,7 @@ The Symfony Connect username in parenthesis allows to get more information
20992101
- Thomas
21002102
- Norbert Schultheisz
21012103
- Maximilian Berghoff (electricmaxxx)
2104+
- SOEDJEDE Felix (fsoedjede)
21022105
- Piotr Antosik (antek88)
21032106
- Nacho Martin (nacmartin)
21042107
- Sergey Novikov (s12v)
@@ -2225,6 +2228,7 @@ The Symfony Connect username in parenthesis allows to get more information
22252228
- Nicolas Fabre (nfabre)
22262229
- Raul Rodriguez (raul782)
22272230
- mshavliuk
2231+
- Jesper Skytte
22282232
- MightyBranch
22292233
- Kacper Gunia (cakper)
22302234
- Derek Lambert (dlambert)
@@ -2413,6 +2417,7 @@ The Symfony Connect username in parenthesis allows to get more information
24132417
- Daniel González Zaballos (dem3trio)
24142418
- Emmanuel Vella (emmanuel.vella)
24152419
- Guillaume BRETOU (guiguiboy)
2420+
- Ibon Conesa (ibonkonesa)
24162421
- nuryagdy mustapayev (nueron)
24172422
- Carsten Nielsen (phreaknerd)
24182423
- Jay Severson
@@ -2598,6 +2603,7 @@ The Symfony Connect username in parenthesis allows to get more information
25982603
- Andrew Coulton
25992604
- Ulugbek Miniyarov
26002605
- Jeremy Benoist
2606+
- sdrewergutland
26012607
- Michal Gebauer
26022608
- Phil Davis
26032609
- Gleb Sidora
@@ -2635,6 +2641,7 @@ The Symfony Connect username in parenthesis allows to get more information
26352641
- Mike Francis
26362642
- Nil Borodulia
26372643
- Almog Baku (almogbaku)
2644+
- Benjamin Schultz (bschultz)
26382645
- Gerd Christian Kunze (derdu)
26392646
- Ionel Scutelnicu (ionelscutelnicu)
26402647
- Kamil Madejski (kmadejski)
@@ -2801,6 +2808,7 @@ The Symfony Connect username in parenthesis allows to get more information
28012808
- David Christmann
28022809
- root
28032810
- pf
2811+
- Zoli Konta
28042812
- Vincent Chalnot
28052813
- Patrizio Bekerle
28062814
- Tom Maguire
@@ -2917,7 +2925,6 @@ The Symfony Connect username in parenthesis allows to get more information
29172925
- Kevin Verschaeve (keversc)
29182926
- Kevin Herrera (kherge)
29192927
- Luis Ramón López López (lrlopez)
2920-
- Matheo Daninos (mathdns)
29212928
- Mehdi Mabrouk (mehdidev)
29222929
- Bart Reunes (metalarend)
29232930
- Muriel (metalmumu)
@@ -2936,6 +2943,7 @@ The Symfony Connect username in parenthesis allows to get more information
29362943
- Lajos Veres (vlajos)
29372944
- Vladimir Chernyshev (volch)
29382945
- Yorkie Chadwick (yorkie76)
2946+
- Pavel Barton
29392947
- GuillaumeVerdon
29402948
- ureimers
29412949
- akimsko
@@ -3203,6 +3211,7 @@ The Symfony Connect username in parenthesis allows to get more information
32033211
- emilienbouard (neime)
32043212
- Nicholas Byfleet (nickbyfleet)
32053213
- Nicolas Bondoux (nsbx)
3214+
- Cedric Kastner (nurtext)
32063215
- ollie harridge (ollietb)
32073216
- Pawel Szczepanek (pauluz)
32083217
- Philippe Degeeter (pdegeeter)

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/common.inc

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ ob_start();
5454
class TestSessionHandler extends AbstractSessionHandler
5555
{
5656
private $data;
57+
private $sessionId;
5758

58-
public function __construct($data = '')
59+
public function __construct($data = '', $sessionId = null)
5960
{
6061
$this->data = $data;
62+
$this->sessionId = $sessionId;
6163
}
6264

6365
public function open(string $path, string $name): bool
@@ -130,21 +132,29 @@ class TestSessionHandler extends AbstractSessionHandler
130132

131133
protected function doRead($sessionId): string
132134
{
133-
echo __FUNCTION__.': ', $this->data, "\n";
135+
if (isset($this->sessionId) && $sessionId !== $this->sessionId) {
136+
echo __FUNCTION__ . ": invalid sessionId\n";
137+
138+
return '';
139+
}
140+
echo __FUNCTION__ . ': ', $this->data, "\n";
141+
$this->sessionId = $sessionId;
134142

135143
return $this->data;
136144
}
137145

138146
protected function doWrite($sessionId, $data): bool
139147
{
140148
echo __FUNCTION__.': ', $data, "\n";
149+
$this->sessionId = $sessionId;
141150

142151
return true;
143152
}
144153

145154
protected function doDestroy($sessionId): bool
146155
{
147156
echo __FUNCTION__, "\n";
157+
$this->sessionId = '';
148158

149159
return true;
150160
}

‎src/Symfony/Component/HttpFoundation/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;

‎src/Symfony/Component/HttpFoundation/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)
0