8000 Merge branch '2.8' into 3.1 · symfony/symfony@c5aa4f0 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit c5aa4f0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.1
* 2.8: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
2 parents 260702b + ccf63e6 commit c5aa4f0

File tree

43 files changed

+125
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+125
-88
lines changed

‎CONTRIBUTORS.md

Lines changed: 37 additions & 26 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-
- Javier Eguiluz (javier.eguiluz)
2019
- Kévin Dunglas (dunglas)
20+
- Javier Eguiluz (javier.eguiluz)
2121
- Hugo Hamon (hhamon)
2222
- Abdellatif Ait boudad (aitboudad)
2323
- Pascal Borreli (pborreli)
@@ -56,17 +56,18 @@ Symfony is the result of the work of many people who made the code better
5656
- Ener-Getick (energetick)
5757
- Iltar van der Berg (kjarli)
5858
- Kevin Bond (kbond)
59+
- Andrej Hudec (pulzarraider)
5960
- Gábor Egyed (1ed)
6061
- Michel Weimerskirch (mweimerskirch)
6162
- Eric Clemmons (ericclemmons)
6263
- Matthias Pigulla (mpdude)
63-
- Andrej Hudec (pulzarraider)
6464
- Christian Raue
65+
- Arnout Boks (aboks)
6566
- Charles Sarrazin (csarrazi)
67+
- Robin Chalas (chalas_r)
6668
- Deni
6769
- Henrik Westphal (snc)
6870
- Dariusz Górecki (canni)
69-
- Arnout Boks (aboks)
7071
- Douglas Greenshields (shieldo)
7172
- Lee McDermott
7273
- Brandon Turner
@@ -80,14 +81,14 @@ Symfony is the result of the work of many people who made the code better
8081
- Toni Uebernickel (havvg)
8182
- Fran Moreno (franmomu)
8283
- Antoine Hérault (herzult)
83-
- Robin Chalas (chalas_r)
8484
- Arnaud Le Blanc (arnaud-lb)
8585
- Jérôme Tamarelle (gromnan)
8686
- Paráda József (paradajozsef)
87+
- Titouan Galopin (tgalopin)
8788
- Michal Piotrowski (eventhorizon)
8889
- Tim Nagel (merk)
89-
- Brice BERNARD (brikou)
9090
- Konstantin Myakshin (koc)
91+
- Brice BERNARD (brikou)
9192
- Alexander M. Turek (derrabus)
9293
- Dariusz Ruminski
9394
- marc.weistroff
@@ -114,15 +115,14 @@ Symfony is the result of the work of many people who made the code better
114115
- Théo FIDRY (theofidry)
115116
- Robert Schönthal (digitalkaoz)
116117
- Florian Lonqueu-Brochard (florianlb)
117-
- Titouan Galopin (tgalopin)
118118
- Stefano Sala (stefano.sala)
119+
- Evgeniy (ewgraf)
119120
- Juti Noppornpitak (shiroyuki)
120121
- Tigran Azatyan (tigranazatyan)
121122
- Sebastian Hörl (blogsh)
122123
- Daniel Gomes (danielcsgomes)
123124
- Hidenori Goto (hidenorigoto)
124125
- Sebastiaan Stok (sstok)
125-
- Evgeniy (ewgraf)
126126
- Tugdual Saunier (tucksaun)
127127
- Guilherme Blanco (guilhermeblanco)
128128
- Pablo Godel (pgodel)
@@ -132,6 +132,7 @@ Symfony is the result of the work of many people who made the code better
132132
- Arnaud Kleinpeter (nanocom)
133133
- Joel Wurtz (brouznouf)
134134
- Philipp Wahala (hifi)
135+
- Vyacheslav Pavlov
135136
- Richard Shank (iampersistent)
136137
- Thomas Rabaix (rande)
137138
- Vincent AUBERT (vincent)
@@ -161,9 +162,9 @@ Symfony is the result of the work of many people who made the code better
161162
- Noel Guilbert (noel)
162163
- Stepan Anchugov (kix)
163164
- bronze1man
165+
- Roland Franssen (ro0)
164166
- sun (sun)
165167
- Larry Garfield (crell)
166-
- Vyacheslav Pavlov
167168
- Martin Schuhfuß (usefulthink)
168169
- Matthieu Bontemps (mbontemps)
169170
- Pierre Minnieur (pminnieur)
@@ -179,12 +180,15 @@ Symfony is the result of the work of many people who made the code better
179180
- Justin Hileman (bobthecow)
180181
- Blanchon Vincent (blanchonvincent)
181182
- Michele Orselli (orso)
183+
- Tom Van Looy (tvlooy)
182184
- Sven Paulus (subsven)
183185
- Lars Strojny (lstrojny)
184186
- Rui Marinho (ruimarinho)
185187
- Daniel Espendiller
188+
- Dawid Nowak
186189
- Eugene Wissner
187190
- Julien Brochet (mewt)
191+
- Yonel Ceruto González (yonelceruto)
188192
- Sergey Linnik (linniksa)
189193
- Michaël Perrin (michael.perrin)
190194
- Marcel Beerta (mazen)
@@ -205,17 +209,17 @@ Symfony is the result of the work of many people who made the code better
205209
- Danny Berger (dpb587)
206210
- Jérôme Vasseur
207211
- Roman Marintšenko (inori)
212+
- Christian Schmidt
208213
- Xavier Montaña Carreras (xmontana)
209-
- Tom Van Looy (tvlooy)
210214
- Chris Wilkinson (thewilkybarkid)
211215
- Mickaël Andrieu (mickaelandrieu)
212216
- Xavier Perez
213217
- Arjen Brouwer (arjenjb)
214218
- Katsuhiro OGAWA
215219
- Alif Rachmawadi
216220
- Kristen Gilden (kgilden)
217-
- Dawid Nowak
218221
- Pierre-Yves LEBECQ (pylebecq)
222+
- Alex Pott
219223
- Jakub Kucharovic (jkucharovic)
220224
- Eugene Leonovich (rybakit)
221225
- Filippo Tessarotto
@@ -227,8 +231,10 @@ Symfony is the result of the work of many people who made the code better
227231
- Ray
228232
- Grégoire Paris (greg0ire)
229233
- Chekote
234+
- Tobias Nyholm (tobias)
230235
- Thomas Adam
231236
- Albert Casademont (acasademont)
237+
- Jhonny Lidfors (jhonne)
232238
- Diego Agulló (aeoris)
233239
- jdhoek
234240
- Nikita Konstantinov
@@ -242,7 +248,6 @@ Symfony is the result of the work of many people who made the code better
242248
- Roumen Damianoff (roumen)
243249
- Antonio J. García Lagar (ajgarlag)
244250
- Kim Hemsø Rasmussen (kimhemsoe)
245-
- Christian Schmidt
246251
- Wouter Van Hecke
247252
- Peter Kruithof (pkruithof)
248253
- Michael Holm (hollo)
@@ -257,17 +262,15 @@ Symfony is the result of the work of many people who made the code better
257262
- Andrew Moore (finewolf)
258263
- Bertrand Zuchuat (garfield-fr)
259264
- Gabor Toth (tgabi333)
260-
- Alex Pott
261265
- realmfoo
262266
- Thomas Tourlourat (armetiz)
263267
- Andrey Esaulov (andremaha)
264-
- Tobias Nyholm (tobias)
265268
- Grégoire Passault (gregwar)
269+
- Leo Feyer
266270
- Ismael Ambrosi (iambrosi)
267271
- Uwe Jäger (uwej711)
268272
- Aurelijus Valeiša (aurelijus)
269273
- Jan Decavele (jandc)
270-
- Yonel Ceruto González (yonelceruto)
271274
- Gustavo Piltcher
272275
- Stepan Tanasiychuk (stfalcon)
273276
- Tiago Ribeiro (fixe)
@@ -306,8 +309,8 @@ Symfony is the result of the work of many people who made the code better
306309
- Felix Labrecque
307310
- Yaroslav Kiliba
308311
- Terje Bråten
309-
- Roland Franssen (ro0)
310312
- Robbert Klarenbeek (robbertkl)
313+
- Marek Štípek (maryo)
311314
- Alessandro Chitolina
312315
- JhonnyL
313316
- hossein zolfi (ocean)
@@ -317,6 +320,8 @@ Symfony is the result of the work of many people who made the code better
317320
- Stéphane PY (steph_py)
318321
- Philipp Kräutli (pkraeutli)
319322
- Kirill chEbba Chebunin (chebba)
323+
- Tristan Darricau (nicofuma)
324+
- SpacePossum
320325
- Greg Thornton (xdissent)
321326
- Costin Bereveanu (schniper)
322327
- Loïc Chardonnet (gnusat)
@@ -328,7 +333,6 @@ Symfony is the result of the work of many people who made the code better
328333
- Endre Fejes
329334
- Tobias Naumann (tna)
330335
- Daniel Beyer
331-
- Jhonny Lidfors (jhonne)
332336
- Shein Alexey
333337
- Baptiste Lafontaine
334338
- Joe Lencioni
@@ -383,7 +387,6 @@ Symfony is the result of the work of many people who made the code better
383387
- cedric lombardot (cedriclombardot)
384388
- Jonas Flodén (flojon)
385389
- Christian Schmidt
386-
- Marek Štípek (maryo)
387390
- Marcin Sikoń (marphi)
388391
- Dominik Zogg (dominik.zogg)
389392
- Marek Pietrzak
@@ -393,6 +396,7 @@ Symfony is the result of the work of many people who made the code better
393396
- Christian Wahler
394397
- Mathieu Lemoine
395398
- Gintautas Miselis
399+
- James Halsall (jaitsu)
396400
- David Badura (davidbadura)
397401
- Zander Baldwin
398402
- Adam Harvey
@@ -409,7 +413,6 @@ Symfony is the result of the work of many people who made the code better
409413
- Benoît Burnichon (bburnichon)
410414
- Sebastian Bergmann
411415
- Pablo Díez (pablodip)
412-
- SpacePossum
413416
- Kevin McBride
414417
- Philipp Rieber (bicpi)
415418
- Manuel de Ruiter (manuel)
@@ -428,14 +431,15 @@ Symfony is the result of the work of many people who made the code better
428431
- Filip Procházka (fprochazka)
429432
- mmoreram
430433
- Markus Lanthaler (lanthaler)
434+
- Remi Collet
431435
- Vicent Soria Durá (vicentgodella)
432436
- Nicolas Dewez (nicolas_dewez)
433437
- Anthony Ferrara
434438
- Ioan Negulescu
435439
- Jakub Škvára (jskvara)
436440
- Andrew Udvare (audvare)
437441
- alexpods
438-
- Tristan Darricau (nicofuma)
442+
- Michele Locati
439443
- Erik Trapman (eriktrapman)
440444
- De Cock Xavier (xdecock)
441445
- Almog Baku (almogbaku)
@@ -449,13 +453,13 @@ Symfony is the result of the work of many people who made the code better
449453
- DUPUCH (bdupuch)
450454
- Benjamin Leveque (benji07)
451455
- Nate (frickenate)
456+
- Timothée Barray (tyx)
452457
- jhonnyL
453458
- sasezaki
454459
- Dawid Pakuła (zulusx)
455460
- Florian Rey (nervo)
456461
- Oskar Stark (oskarstark)
457462
- Rodrigo Borrego Bernabé (rodrigobb)
458-
- Leo Feyer
459463
- MatTheCat
460464
- Denis Gorbachev (starfall)
461465
- Peter van Dommelen
@@ -557,6 +561,7 @@ Symfony is the result of the work of many people who made the code better
557561
- Hossein Bukhamsin
558562
- Disparity
559563
- origaminal
564+
- Maxime STEINHAUSSER
560565
- Paweł Wacławczyk (pwc)
561566
- Oleg Zinchenko (cystbear)
562567
- Johannes Klauss (cloppy)
@@ -567,6 +572,7 @@ Symfony is the result of the work of many people who made the code better
567572
- Tiago Brito (blackmx)
568573
- Richard van den Brand (ricbra)
569574
- develop
575+
- ReenExe
570576
- Mark Sonnabaum
571577
- Richard Quadling
572578
- jochenvdv
@@ -596,7 +602,6 @@ Symfony is the result of the work of many people who made the code better
596602
- Lars Vierbergen
597603
- Dennis Hotson
598604
- Andrew Tchircoff (andrewtch)
599-
- Remi Collet
600605
- michaelwilliams
601606
- 1emming
602607
- Leevi Graham (leevigraham)
@@ -619,7 +624,6 @@ Symfony is the result of the work of many people who made the code better
619624
- possum
620625
- Denis Zunke (donalberto)
621626
- Olivier Maisonneuve (olineuve)
622-
- Michele Locati
623627
- Masterklavi
624628
- Francis Turmel (fturmel)
625629
- cgonzalez
@@ -630,6 +634,7 @@ Symfony is the result of the work of many people who made the code better
630634
- Harm van Tilborg
631635
- Jan Prieser
632636
- Adrien Lucas (adrienlucas)
637+
- Zhuravlev Alexander (scif)
633638
- James Michael DuPont
634639
- Tom Klingenberg
635640
- Christopher Hall (mythmakr)
@@ -681,7 +686,6 @@ Symfony is the result of the work of many people who made the code better
681686
- abdul malik ikhsan (samsonasik)
682687
- Henry Snoek (snoek09)
683688
- Simone Di Maulo (toretto460)
684-
- Timothée Barray (tyx)
685689
- Sander Toonen (xatoo)
686690
- Christian Morgan
687691
- Alexander Miehe (engerim)
@@ -801,7 +805,6 @@ Symfony is the result of the work of many people who made the code better
801805
- Ken Marfilla (marfillaster)
802806
- benatespina (benatespina)
803807
- Denis Kop
804-
- Maxime STEINHAUSSER
805808
- jfcixmedia
806809
- Martijn Evers
807810
- Benjamin Paap (benjaminpaap)
@@ -834,6 +837,7 @@ Symfony is the result of the work of many people who made the code better
834837
- Rodrigo Díez Villamuera (rodrigodiez)
835838
- e-ivanov
836839
- Jochen Bayer (jocl)
840+
- Matteo Beccati (matteobeccati)
837841
- Jeremy Bush
838842
- wizhippo
839843
- Viacheslav Sychov
@@ -855,6 +859,7 @@ Symfony is the result of the work of many people who made the code better
855859
- Gustavo Adrian
856860
- Yannick
857861
- spdionis
862+
- Taras Girnyk
858863
- Eduardo García Sanz (coma)
859864
- James Gilliland
860865
- Rhodri Pugh (rodnaph)
@@ -882,6 +887,7 @@ Symfony is the result of the work of many people who made the code better
882887
- Christian Sciberras
883888
- Clement Herreman (clemherreman)
884889
- Dan Ionut Dumitriu (danionut90)
890+
- David Maicher (dmaicher)
885891
- Nyro (nyro)
886892
- Marco
887893
- Marc Torres
@@ -946,6 +952,7 @@ Symfony is the result of the work of many people who made the code better
946952
- ShiraNai7
947953
- Vašek Purchart (vasek-purchart)
948954
- Janusz Jabłoński (yanoosh)
955+
- Sandro Hopf
949956
- Łukasz Makuch
950957
- George Giannoulopoulos
951958
- Daniel Richter (richtermeister)
@@ -971,7 +978,6 @@ Symfony is the result of the work of many people who made the code better
971978
- WedgeSama
972979
- Felds Liscia
973980
- Ahmed TAILOULOUTE (ahmedtai)
974-
- James Halsall (jaitsu)
975981
- Maxime Veber (nek-)
976982
- Sullivan SENECHAL
977983
- Tadcka
@@ -1026,6 +1032,7 @@ Symfony is the result of the work of many people who made the code better
10261032
- Valentin VALCIU
10271033
- Kevin Dew
10281034
- James Cowgill
1035+
- 1ma (jautenim)
10291036
- Nicolas Schwartz (nicoschwartz)
10301037
- Patrik Gmitter (patie)
10311038
- Jonathan Gough
@@ -1102,8 +1109,8 @@ Symfony is the result of the work of many people who made the code better
11021109
- David Stone
11031110
- Jovan Perovic (jperovic)
11041111
- Pablo Maria Martelletti (pmartelletti)
1105-
- Zhuravlev Alexander (scif)
11061112
- Yassine Guedidi (yguedidi)
1113+
- Waqas Ahmed
11071114
- Luis Muñoz
11081115
- Andreas
11091116
- Thomas Chmielowiec
@@ -1185,6 +1192,7 @@ Symfony is the result of the work of many people who made the code better
11851192
- Adam
11861193
- devel
11871194
- taiiiraaa
1195+
- Johann Pardanaud
11881196
- Trevor Suarez
11891197
- gedrox
11901198
- dropfen
@@ -1313,6 +1321,7 @@ Symfony is the result of the work of many people who made the code better
13131321
- Joseph Deray
13141322
- Damian Sromek
13151323
- Ben
1324+
- Evgeniy Tetenchuk
13161325
- dasmfm
13171326
- Arnaud Buathier (arnapou)
13181327
- chesteroni (chesteroni)
@@ -1403,6 +1412,7 @@ Symfony is the result of the work of many people who made the code better
14031412
- Benjamin Long
14041413
- Matt Janssen
14051414
- Peter Gribanov
1415+
- Ben Johnson
14061416
- kwiateusz
14071417
- David Soria Parra
14081418
- Sergiy Sokolenko
@@ -1526,6 +1536,7 @@ Symfony is the result of the work of many people who made the code better
15261536
- smokeybear87
15271537
- Gustavo Adrian
15281538
- Kevin Weber
1539+
- Dionysis Arvanitis
15291540
- Sergey Fedotov
15301541
- Michael
15311542
- fh-github@fholzhauer.de

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
336336
$memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcache.class').'%';
337337
$memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.memcache_instance.class').'%';
338338
$memcacheHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.memcache_host').'%';
339-
$memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
339+
$memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
340340
$cacheDef = new Definition($memcacheClass);
341341
$memcacheInstance = new Definition($memcacheInstanceClass);
342342
$memcacheInstance->addMethodCall('connect', array(

0 commit comments

Comments
 (0)
0