Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f7ade17

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.0
* 2.8: [PhpUnitBridge] Revert 7f62133 bumped Symfony version to 2.3.40 set s-maxage only if all responses are cacheable updated VERSION for 2.3.39 update CONTRIBUTORS for 2.3.39 updated CHANGELOG for 2.3.39 Improved the "branch" row of the PR table [Debug] Replaced logic for detecting filesystem case sensitivity [Process] Wait a bit less on Windows Use debug member variable Autowiring the concrete class too - consistent with behavior of other services Fix typos #18090 1. PHPs session design to PHP's session design 2. Symfony HttpKernel offers to Symfony's HttpKernel offers 3. in which case it it should to in which case it should Fix for Isssue #18091 replace perfom by perform minor #18088 Fix typo for profiler [Validator] Fixing inaccurate typehint in docblock [ci] remove token for composer now that rate limiting is off Conflicts: CHANGELOG-2.3.md src/Symfony/Bridge/PhpUnit/composer.json
2 parents b120697 + 314ccdf commit f7ade17

File tree

15 files changed

+151
-45
lines changed

15 files changed

+151
-45
lines changed

‎.composer/auth.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch | master for features and deprecations / lowest applicable and maintained version otherwise
3+
| Branch? | "master" for new features / 2.3, 2.7, 2.8 or 3.0 for fixes
44
| Bug fix? | yes/no
55
| New feature? | yes/no
66
| BC breaks? | yes/no

‎CONTRIBUTORS.md

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Symfony is the result of the work of many people who made the code better
1616
- Kris Wallsmith (kriswallsmith)
1717
- Jakub Zalas (jakubzalas)
1818
- Ryan Weaver (weaverryan)
19-
- Hugo Hamon (hhamon)
2019
- Javier Eguiluz (javier.eguiluz)
20+
- Hugo Hamon (hhamon)
2121
- Abdellatif Ait boudad (aitboudad)
2222
- Pascal Borreli (pborreli)
2323
- Kévin Dunglas (dunglas)
@@ -35,8 +35,8 @@ Symfony is the result of the work of many people who made the code better
3535
- Eriksen Costa (eriksencosta)
3636
- Sarah Khalil (saro0h)
3737
- Jonathan Wage (jwage)
38-
- Maxime Steinhausser (ogizanagi)
3938
- Diego Saint Esteben (dosten)
39+
- Maxime Steinhausser (ogizanagi)
4040
- Alexandre Salomé (alexandresalome)
4141
- William Durand (couac)
4242
- ornicar
@@ -56,12 +56,12 @@ Symfony is the result of the work of many people who made the code better
5656
- Michel Weimerskirch (mweimerskirch)
5757
- Eric Clemmons (ericclemmons)
5858
- Andrej Hudec (pulzarraider)
59+
- Christian Raue
5960
- Matthias Pigulla (mpdude)
6061
- Peter Rehm (rpet)
6162
- Deni
6263
- Henrik Westphal (snc)
6364
- Dariusz Górecki (canni)
64-
- Christian Raue
6565
- Arnout Boks (aboks)
6666
- Douglas Greenshields (shieldo)
6767
- Lee McDermott
@@ -79,16 +79,18 @@ Symfony is the result of the work of many people who made the code better
7979
- Iltar van der Berg (kjarli)
8080
- Arnaud Le Blanc (arnaud-lb)
8181
- Jérôme Tamarelle (gromnan)
82+
- Jules Pietri (heah)
8283
- Michal Piotrowski (eventhorizon)
8384
- Tim Nagel (merk)
85+
- Paráda József (paradajozsef)
8486
- Brice BERNARD (brikou)
87+
- Ener-Getick (energetick)
8588
- Charles Sarrazin (csarrazi)
8689
- Alexander M. Turek (derrabus)
8790
- Dariusz Ruminski
8891
- marc.weistroff
8992
- lenar
9093
- Włodzimierz Gajda (gajdaw)
91-
- Paráda József (paradajozsef)
9294
- Alexander Schwenn (xelaris)
9395
- Florian Voutzinos (florianv)
9496
- Colin Frei
@@ -98,13 +100,12 @@ Symfony is the result of the work of many people who made the code better
98100
- Peter Kokot (maastermedia)
99101
- excelwebzone
100102
- Jacob Dreesen (jdreesen)
103+
- Konstantin Myakshin (koc)
101104
- Jérémy DERUSSÉ (jderusse)
102105
- Vladimir Reznichenko (kalessil)
103106
- Baptiste Clavié (talus)
104-
- Ener-Getick (energetick)
105107
- Fabien Pennequin (fabienpennequin)
106108
- Gordon Franke (gimler)
107-
- Konstantin Myakshin (koc)
108109
- Tomáš Votruba (tomas_votruba)
109110
- Jáchym Toušek
110111
- Robert Schönthal (digitalkaoz)
@@ -117,7 +118,6 @@ Symfony is the result of the work of many people who made the code better
117118
- Sebastian Hörl (blogsh)
118119
- Daniel Gomes (danielcsgomes)
119120
- Hidenori Goto (hidenorigoto)
120-
- Jules Pietri (heah)
121121
- Evgeniy (ewgraf)
122122
- Guilherme Blanco (guilhermeblanco)
123123
- Pablo Godel (pgodel)
@@ -146,6 +146,8 @@ Symfony is the result of the work of many people who made the code better
146146
- Dmitrii Chekaliuk (lazyhammer)
147147
- Clément JOBEILI (dator)
148148
- Daniel Wehner
149+
- Richard van Laak (rvanlaak)
150+
- Possum
149151
- Dorian Villet (gnutix)
150152
- Javier Spagnoletti (phansys)
151153
- Richard Miller (mr_r_miller)
@@ -154,11 +156,10 @@ Symfony is the result of the work of many people who made the code better
154156
- Benjamin Dulau (dbenjamin)
155157
- Andreas Hucks (meandmymonkey)
156158
- Noel Guilbert (noel)
157-
- Richard van Laak (rvanlaak)
159+
- Stepan Anchugov (kix)
158160
- bronze1man
159161
- sun (sun)
160162
- Larry Garfield (crell)
161-
- Possum
162163
- Martin Schuhfuß (usefulthink)
163164
- Matthieu Bontemps (mbontemps)
164165
- Pierre Minnieur (pminnieur)
@@ -177,7 +178,6 @@ Symfony is the result of the work of many people who made the code better
177178
- Sven Paulus (subsven)
178179
- Lars Strojny (lstrojny)
179180
- Rui Marinho (ruimarinho)
180-
- Stepan Anchugov (kix)
181181
- Eugene Wissner
182182
- Julien Brochet (mewt)
183183
- Sergey Linnik (linniksa)
@@ -186,6 +186,7 @@ Symfony is the result of the work of many people who made the code better
186186
- Titouan Galopin (tgalopin)
187187
- Loïc Faugeron
188188
- Jannik Zschiesche (apfelbox)
189+
- Marco Pivetta (ocramius)
189190
- julien pauli (jpauli)
190191
- Michael Lee (zerustech)
191192
- Lorenz Schori
@@ -265,11 +266,11 @@ Symfony is the result of the work of many people who made the code better
265266
- Bob den Otter (bopp)
266267
- Adrian Rudnik (kreischweide)
267268
- Francesc Rosàs (frosas)
269+
- Massimiliano Arione (garak)
268270
- Julien Galenski (ruian)
269271
- Bongiraud Dominique
270272
- janschoenherr
271273
- Thomas Schulz (king2500)
272-
- Marco Pivetta (ocramius)
273274
- Berny Cantos (xphere81)
274275
- Ricard Clau (ricardclau)
275276
- Mark Challoner (markchalloner)
@@ -314,6 +315,7 @@ Symfony is the result of the work of many people who made the code better
314315
- Endre Fejes
315316
- Tobias Naumann (tna)
316317
- Shein Alexey
318+
- Baptiste Lafontaine
317319
- Joe Lencioni
318320
- Daniel Tschinder
319321
- Kai
@@ -336,7 +338,6 @@ Symfony is the result of the work of many people who made the code better
336338
- Oscar Cubo Medina (ocubom)
337339
- Karel Souffriau
338340
- Christophe L. (christophelau)
339-
- Massimiliano Arione (garak)
340341
- Anthon Pang (robocoder)
341342
- Emanuele Gaspari (inmarelibero)
342343
- Dariusz Rumiński
@@ -388,6 +389,7 @@ Symfony is the result of the work of many people who made the code better
388389
- Roman Lapin (memphys)
389390
- Yoshio HANAWA
390391
- Gladhon
392+
- Benoît Burnichon (bburnichon)
391393
- Sebastian Bergmann
392394
- Pablo Díez (pablodip)
393395
- Kevin McBride
@@ -397,6 +399,7 @@ Symfony is the result of the work of many people who made the code better
397399
- Ilya Antipenko (aivus)
398400
- Iker Ibarguren (ikerib)
399401
- Ricardo Oliveira (ricardolotr)
402+
- Roy Van Ginneken (rvanginneken)
400403
- ondrowan
401404
- Barry vd. Heuvel (barryvdh)
402405
- Jerzy Zawadzki (jzawadzki)
@@ -458,7 +461,6 @@ Symfony is the result of the work of many people who made the code better
458461
- Johnny Robeson (johnny)
459462
- Disquedur
460463
- Michiel Boeckaert (milio)
461-
- Baptiste Lafontaine
462464
- Geoffrey Tran (geoff)
463465
- Jan Behrens
464466
- Mantas Var (mvar)
@@ -514,6 +516,7 @@ Symfony is the result of the work of many people who made the code better
514516
- Luc Vieillescazes (iamluc)
515517
- Johann Saunier (prophet777)
516518
- Antoine Corcy
519+
- Rob Bast
517520
- Artur Eshenbrener
518521
- Arturs Vonda
519522
- Sascha Grossenbacher
@@ -522,6 +525,7 @@ Symfony is the result of the work of many people who made the code better
522525
- Benjamin Zikarsky (bzikarsky)
523526
- Simon Schick (simonsimcity)
524527
- redstar504
528+
- Tristan Roussel
525529
- Hossein Bukhamsin
526530
- Disparity
527531
- origaminal
@@ -615,7 +619,6 @@ Symfony is the result of the work of many people who made the code better
615619
- Emanuele Iannone
616620
- Tony Malzhacker
617621
- Mathieu MARCHOIS
618-
- Benoît Burnichon (bburnichon)
619622
- Cyril Quintin (cyqui)
620623
- Gerard van Helden (drm)
621624
- Johnny Peck (johnnypeck)
@@ -719,17 +722,20 @@ Symfony is the result of the work of many people who made the code better
719722
- Danilo Silva
720723
- Zachary Tong (polyfractal)
721724
- Hryhorii Hrebiniuk
725+
- mcfedr (mcfedr)
722726
- dantleech
723727
- Xavier Leune
724728
- Tero Alén (tero)
725729
- DerManoMann
726730
- Guillaume Royer
727731
- Artem (digi)
732+
- boite
728733
- dantleech
729734
- Vadim Tyukov (vatson)
730735
- Sortex
731736
- chispita
732737
- Wojciech Sznapka
738+
- Arjan Keeman
733739
- Máximo Cuadros (mcuadros)
734740
- tamirvs
735741
- julien.galenski
@@ -807,7 +813,6 @@ Symfony is the result of the work of many people who made the code better
807813
- spdionis
808814
- Eduardo García Sanz (coma)
809815
- James Gilliland
810-
- Roy Van Ginneken
811816
- David de Boer (ddeboer)
812817
- Gilles Doge (gido)
813818
- abulford
@@ -869,6 +874,7 @@ Symfony is the result of the work of many people who made the code better
869874
- Ludek Stepan
870875
- Geoffrey Brier
871876
- Aaron Stephens (astephens)
877+
- Craig Menning (cmenning)
872878
- Balázs Benyó (duplabe)
873879
- Erika Heidi Reinaldo (erikaheidi)
874880
- Pierre Tachoire (krichprollsch)
@@ -881,6 +887,7 @@ Symfony is the result of the work of many people who made the code better
881887
- Karol Sójko (karolsojko)
882888
- sl_toto (sl_toto)
883889
- Walter Dal Mut (wdalmut)
890+
- Albin Kerouaton
884891
- Sébastien HOUZÉ
885892
- Jingyu Wang
886893
- Daniel Espendiller
@@ -900,6 +907,7 @@ Symfony is the result of the work of many people who made the code better
900907
- Daniel Richter (richtermeister)
901908
- ChrisC
902909
- Ilya Biryukov
910+
- Kim Laï Trinh
903911
- Jason Desrosiers
904912
- m.chwedziak
905913
- Philip Frank
@@ -958,7 +966,6 @@ Symfony is the result of the work of many people who made the code better
958966
- Jānis Lukss
959967
- rkerner
960968
- Alex Silcock
961-
- Rob Bast
962969
- Matthew J Mucklo
963970
- fdgdfg (psampaz)
964971
- Stéphane Seng
@@ -1024,6 +1031,7 @@ Symfony is the result of the work of many people who made the code better
10241031
- Alexandre Segura
10251032
- Josef Cech
10261033
- Arnau González (arnaugm)
1034+
- Simon Bouland (bouland)
10271035
- Nate (frickenate)
10281036
- Matthew Foster (mfoster)
10291037
- Paul Seiffert (seiffert)
@@ -1087,16 +1095,20 @@ Symfony is the result of the work of many people who made the code better
10871095
- Jordi Llonch (jordillonch)
10881096
- Cédric Dugat (ph3nol)
10891097
- Philip Dahlstrøm (phidah)
1098+
- Alex Rock Ancelet (pierstoval)
10901099
- Milos Colakovic (project2481)
10911100
- Rénald Casagraude (rcasagraude)
10921101
- Robin Duval (robin-duval)
10931102
- Grinbergs Reinis (shima5)
10941103
- Artem Lopata (bumz)
1104+
- Nicole Cordes
10951105
- Alexey Popkov
10961106
- Artyom Protaskin
10971107
- Nathanael d. Noblet
10981108
- helmer
1109+
- ged15
10991110
- Daan van Renterghem
1111+
- Nicole Cordes
11001112
- Bram Van der Sype (brammm)
11011113
- Julien Moulin (lizjulien)
11021114
- Nikita Nefedov (nikita2206)
@@ -1316,7 +1328,6 @@ Symfony is the result of the work of many people who made the code better
13161328
- Sema
13171329
- Elan Ruusamäe
13181330
- Thorsten Hallwas
1319-
- Tristan Roussel
13201331
- Michael Squires
13211332
- Norman Soetbeer
13221333
- zorn
@@ -1399,6 +1410,7 @@ Symfony is the result of the work of many people who made the code better
13991410
- Ala Eddine Khefifi (nayzo)
14001411
- emilienbouard (neime)
14011412
- Nicholas Byfleet (nickbyfleet)
1413+
- Tomas Norkūnas (norkunas)
14021414
- ollie harridge (ollietb)
14031415
- Paul Andrieux (paulandrieux)
14041416
- Paweł Szczepanek (pauluz)

‎src/Symfony/Bridge/PhpUnit/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.5.9"
19+
"php": ">=5.3.3 EVEN ON LATEST SYMFONY VERSIONS TO ALLOW USING",
20+
"php": "THIS BRIDGE WHEN TESTING LOWEST SYMFONY VERSIONS.",
21+
"php": ">=5.3.3"
2022
},
2123
"suggest": {
2224
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode)
482482
->children()
483483
->scalarNode('cache')->defaultValue('file')->end()
484484
->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
485-
->booleanNode('debug')->defaultValue('%kernel.debug%')->end()
485+
->booleanNode('debug')->defaultValue($this->debug)->end()
486486
->end()
487487
->end()
488488
->end()

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
<service id="service_container" synthetic="true">
3333
<autowiring-type>Symfony\Component\DependencyInjection\ContainerInterface</autowiring-type>
34+
<autowiring-type>Symfony\Component\DependencyInjection\Container</autowiring-type>
3435
</service>
3536

3637
<service id="kernel" synthetic="true" />

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ protected static function getBundleDefaultConfig()
163163
'annotations' => array(
164164
'cache' => 'file',
165165
'file_cache_dir' => '%kernel.cache_dir%/annotations',
166-
'debug' => '%kernel.debug%',
166+
'debug' => true,
167167
),
168168
'serializer' => array(
169169
'enabled' => false,

‎src/Symfony/Component/Debug/DebugClassLoader.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,16 @@ public function __construct(callable $classLoader)
4242
$this->isFinder = is_array($classLoader) && method_exists($classLoader[0], 'findFile');
4343

4444
if (!isset(self::$caseCheck)) {
45-
self::$caseCheck = false !== stripos(PHP_OS, 'win') ? (false !== stripos(PHP_OS, 'darwin') ? 2 : 1) : 0;
45+
if(!file_exists(strtolower(__FILE__))) {
46+
// filesystem is case sensitive
47+
self::$caseCheck = 0;
48+
} elseif(realpath(strtolower(__FILE__)) === __FILE__) {
49+
// filesystem is not case sensitive
50+
self::$caseCheck = 1;
51+
} else {
52+
// filesystem is not case sensitive AND realpath() fails to normalize case
53+
self::$caseCheck = 2;
54+
}
4655
}
4756
}
4857

‎src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ public function setName($name);
7676
* Note regenerate+destroy should not clear the session data in memory
7777
* only delete the session data from persistent storage.
7878
*
79-
* Care: When regenerating the session ID no locking is involved in PHPs
79+
* Care: When regenerating the session ID no locking is involved in PHP's
8080
* session design. See https://bugs.php.net/bug.php?id=61470 for a discussion.
8181
* So you must make sure the regenerated session is saved BEFORE sending the
82-
* headers with the new ID. Symfonys HttpKernel offers a listener for this.
82+
* headers with the new ID. Symfony's HttpKernel offers a listener for this.
8383
* See Symfony\Component\HttpKernel\EventListener\SaveSessionListener.
8484
* Otherwise session data could get lost again for concurrent requests with the
8585
* new ID. One result could be that you get logged out after just logging in.
@@ -101,7 +101,7 @@ public function regenerate($destroy = false, $lifetime = null);
101101
*
102102
* This method must invoke session_write_close() unless this interface is
103103
* used for a storage object design for unit or functional testing where
104-
* a real PHP session would interfere with testing, in which case it
104+
* a real PHP session would interfere with testing, in which case
105105
* it should actually persist the session data if required.
106106
*
107107
* @throws \RuntimeException If the session is saved without being started, or if the session

0 commit comments

Comments
 (0)