8000 Merge branch '4.1' · symfony/symfony@a1aee05 · GitHub
[go: up one dir, main page]
Skip to content

Commit a1aee05

Browse files
fabpotfabpot
committed
Merge branch '4.1'
* 4.1: bumped Symfony version to 2.8.46 updated VERSION for 2.8.45 update CONTRIBUTORS for 2.8.45 updated CHANGELOG for 2.8.45 [PhpUnitBridge] keep compat with composer 1.0 Instantiate $offset and $maxlen at definition [Cache] minor code update to leverage PHP 7.1
2 parents da0ef24 + 2c3c5c2 commit a1aee05

File tree

6 files changed

+49
-21
lines changed

6 files changed

+49
-21
lines changed

‎CONTRIBUTORS.md‎

Lines changed: 29 additions & 16 deletions
D306
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Symfony is the result of the work of many people who made the code better
2424
- Hugo Hamon (hhamon)
2525
- Abdellatif Ait boudad (aitboudad)
2626
- Romain Neutron (romain)
27-
- Pascal Borreli (pborreli)
2827
- Roland Franssen (ro0)
28+
- Pascal Borreli (pborreli)
2929
- Wouter De Jong (wouterj)
3030
- Joseph Bielawski (stloyd)
3131
- Karma Dordrak (drak)
@@ -52,9 +52,9 @@ Symfony is the result of the work of many people who made the code better
5252
- stealth35 ‏ (stealth35)
5353
- Alexander Mols (asm89)
5454
- Bulat Shakirzyanov (avalanche123)
55+
- Dany Maillard (maidmaid)
5556
- Peter Rehm (rpet)
5657
- Matthias Pigulla (mpdude)
57-
- Dany Maillard (maidmaid)
5858
- Saša Stamenković (umpirsky)
5959
- Kevin Bond (kbond)
6060
- Tobias Nyholm (tobias)
@@ -63,9 +63,9 @@ Symfony is the result of the work of many people who made the code better
6363
- Miha Vrhovnik
6464
- Diego Saint Esteben (dii3g0)
6565
- Alexander M. Turek (derrabus)
66+
- Jérémy DERUSSÉ (jderusse)
6667
- Konstantin Kudryashov (everzet)
6768
- Bilal Amarni (bamarni)
68-
- Jérémy DERUSSÉ (jderusse)
6969
- Florin Patan (florinpatan)
7070
- Gábor Egyed (1ed)
7171
- Mathieu Piot (mpiot)
@@ -75,9 +75,9 @@ Symfony is the result of the work of many people who made the code better
7575
- Eric Clemmons (ericclemmons)
7676
- Jáchym Toušek (enumag)
7777
- Charles Sarrazin (csarrazi)
78+
- David Maicher (dmaicher)
7879
- Konstantin Myakshin (koc)
7980
- Christian Raue
80-
- David Maicher (dmaicher)
8181
- Arnout Boks (aboks)
8282
- Deni
8383
- Henrik Westphal (snc)
@@ -99,9 +99,9 @@ Symfony is the result of the work of many people who made the code better
9999
- Fran Moreno (franmomu)
100100
- Antoine Hérault (herzult)
101101
- Paráda József (paradajozsef)
102+
- Grégoire Paris (greg0ire)
102103
- Arnaud Le Blanc (arnaud-lb)
103104
- Maxime STEINHAUSSER
104-
- Grégoire Paris (greg0ire)
105105
- Michal Piotrowski (eventhorizon)
106106
- Tim Nagel (merk)
107107
- Brice BERNARD (brikou)
@@ -124,14 +124,14 @@ Symfony is the result of the work of many people who made the code better
124124
- Fabien Pennequin (fabienpennequin)
125125
- Gordon Franke (gimler)
126126
- Eric GELOEN (gelo)
127+
- Sebastiaan Stok (sstok)
127128
- Lars Strojny (lstrojny)
128129
- Daniel Wehner (dawehner)
129130
- Tugdual Saunier (tucksaun)
130131
- Javier Spagnoletti (phansys)
131132
- Théo FIDRY (theofidry)
132133
- Robert Schönthal (digitalkaoz)
133134
- Florian Lonqueu-Brochard (florianlb)
134-
- Sebastiaan Stok (sstok)
135135
- Stefano Sala (stefano.sala)
136136
- Jérôme Vasseur (jvasseur)
137137
- Evgeniy (ewgraf)
@@ -144,6 +144,7 @@ Symfony is the result of the work of many people who made the code better
144144
- Hidenori Goto (hidenorigoto)
145145
- Chris Wilkinson (thewilkybarkid)
146146
- Arnaud Kleinpeter (nanocom)
147+
- Jannik Zschiesche (apfelbox)
147148
- Guilherme Blanco (guilhermeblanco)
148149
- Pablo Godel (pgodel)
149150
- Jérémie Augustin (jaugustin)
@@ -159,7 +160,6 @@ Symfony is the result of the work of many people who made the code better
159160
- Vyacheslav Pavlov
160161
- Richard van Laak (rvanlaak)
161162
- Richard Shank (iampersistent)
162-
- Jannik Zschiesche (apfelbox)
163163
- Thomas Rabaix (rande)
164164
- Rouven Weßling (realityking)
165165
- Clemens Tolboom
@@ -192,6 +192,7 @@ Symfony is the result of the work of many people who made the code better
192192
- SpacePossum
193193
- Benjamin Dulau (dbenjamin)
194194
- Mathieu Lemoine (lemoinem)
195+
- Thomas Calvet (fancyweb)
195196
- Christian Schmidt
196197
- Andreas Hucks (meandmymonkey)
197198
- Noel Guilbert (noel)
@@ -200,6 +201,7 @@ Symfony is the result of the work of many people who made the code better
200201
- bronze1man
201202
- sun (sun)
202203
- Larry Garfield (crell)
204+
- Michaël Perrin (michael.perrin)
203205
- Martin Schuhfuß (usefulthink)
204206
- apetitpa
205207
- Matthieu Bontemps (mbontemps)
@@ -221,7 +223,6 @@ Symfony is the result of the work of many people who made the code better
221223
- Tom Van Looy (tvlooy)
222224
- Sven Paulus (subsven)
223225
- Yanick Witschi (toflar)
224-
- Thomas Calvet (fancyweb)
225226
- Rui Marinho (ruimarinho)
226227
- Alessandro Chitolina
227228
- Eugene Wissner
@@ -230,7 +231,6 @@ Symfony is the result of the work of many people who made the code better
230231
- Leo Feyer
231232
- Tristan Darricau (nicofuma)
232233
- Nikolay Labinskiy (e-moe)
233-
- Michaël Perrin (michael.perrin)
234234
- Marcel Beerta (mazen)
235235
- Albert Casademont (acasademont)
236236
- Loïc Faugeron
@@ -253,6 +253,7 @@ Symfony is the result of the work of many people who made the code better
253253
- Ruben Gonzalez (rubenrua)
254254
- Adam Prager (padam87)
255255
- Benoît Burnichon (bburnichon)
256+
- Florent Mata (fmata)
256257
- Roman Marintšenko (inori)
257258
- Xavier Montaña Carreras (xmontana)
258259
- Mickaël Andrieu (mickaelandrieu)
@@ -297,7 +298,6 @@ Symfony is the result of the work of many people who made the code better
297298
- Roumen Damianoff (roumen)
298299
- Antonio J. García Lagar (ajgarlag)
299300
- Kim Hemsø Rasmussen (kimhemsoe)
300-
- Florent Mata (fmata)
301301
- Wouter Van Hecke
302302
- Jérôme Parmentier (lctrs)
303303
- Michael Babker (mbabker)
@@ -310,6 +310,7 @@ Symfony is the result of the work of many people who made the code better
310310
- Chad Sikorra (chadsikorra)
311311
- Chris Smith (cs278)
312312
- Florian Klein (docteurklein)
313+
- Gary PEGEOT (gary-p)
313314
- Manuel Kiessling (manuelkiessling)
314315
- Atsuhiro KUBO (iteman)
315316
- Andrew Moore (finewolf)
@@ -343,6 +344,7 @@ Symfony is the result of the work of many people who made the code better
343344
- Thierry Thuon (lepiaf)
344345
- Ricard Clau (ricardclau)
345346
- Mark Challoner (markchalloner)
347+
- Colin O'Dell (colinodell)
346348
- Gennady Telegin (gtelegin)
347349
- Ben Davies (bendavies)
348350
- Erin Millard
@@ -380,7 +382,7 @@ Symfony is the result of the work of many people who made the code better
380382
- Grzegorz (Greg) Zdanowski (kiler129)
381383
- Kirill chEbba Chebunin (chebba)
382384
- Greg Thornton (xdissent)
383-
- Gary PEGEOT (gary-p)
385+
- Sullivan SENECHAL (soullivaneuh)
384386
- Costin Bereveanu (schniper)
385387
- Loïc Chardonnet (gnusat)
386388
- Marek Kalnik (marekkalnik)
@@ -432,7 +434,6 @@ Symfony is the result of the work of many people who made the code better
432434
- Christopher Davis (chrisguitarguy)
433435
- Jan Schumann
434436
- Niklas Fiekas
435-
- Colin O'Dell (colinodell)
436437
- Markus Bachmann (baachi)
437438
- lancergr
438439
- Zan Baldwin
@@ -486,7 +487,6 @@ Symfony is the result of the work of many people who made the code better
486487
- Haralan Dobrev (hkdobrev)
487488
- Sebastian Bergmann
488489
- Miroslav Sustek
489-
- Sullivan SENECHAL (soullivaneuh)
490490
- Pablo Díez (pablodip)
491491
- Martin Hujer (martinhujer)
492492
- Kevin McBride
@@ -510,6 +510,7 @@ Symfony is the result of the work of many people who made the code better
510510
- Markus Lanthaler (lanthaler)
511511
- Remi Collet
512512
- Vicent Soria Durá (vicentgodella)
513+
- Michael Moravec
513514
- Anthony Ferrara
514515
- Ioan Negulescu
515516
- Jakub Škvára (jskvara)
@@ -652,6 +653,7 @@ Symfony is the result of the work of many people who made the code better
652653
- Szijarto Tamas
653654
- Robin Lehrmann (robinlehrmann)
654655
- Catalin Dan
656+
- Jaroslav Kuba
655657
- Stephan Vock
656658
- Benjamin Zikarsky (bzikarsky)
657659
- Simon Schick (simonsimcity)
@@ -738,7 +740,6 @@ Symfony is the result of the work of many people who made the code better
738740
- Marc Morera (mmoreram)
739741
- Saif Eddin Gmati (azjezz)
740742
- Smaine Milianni (ismail1432)
741-
- Michael Moravec
742743
- Andrew Hilobok (hilobok)
743744
- Noah Heck (myesain)
744745
- Christian Soronellas (theunic)
@@ -788,6 +789,7 @@ Symfony is the result of the work of many people who made the code better
788789
- Sofiane HADDAG (sofhad)
789790
- frost-nzcr4
790791
- Bozhidar Hristov
792+
- Ivan Nikolaev (destillat)
791793
- andrey1s
792794
- Abhoryo
793795
- Fabian Vogler (fabian)
@@ -913,6 +915,7 @@ Symfony is the result of the work of many people who made the code better
913915
- Michael Tibben
914916
- Billie Thompson
915917
- Sander Marechal
918+
- ProgMiner
916919
- Oleg Golovakhin (doc_tr)
917920
- Icode4Food (icode4food)
918921
- Radosław Benkel
@@ -1001,6 +1004,7 @@ Symfony is the result of the work of many people who made the code better
10011004
- Denis Kop
10021005
- Jean-Guilhem Rouel (jean-gui)
10031006
- jfcixmedia
1007+
- Dominic Tubach
10041008
- Nikita Konstantinov
10051009
- Martijn Evers
10061010
- Benjamin Paap (benjaminpaap)
@@ -1043,6 +1047,7 @@ Symfony is the result of the work of many people who made the code better
10431047
- Alexander Cheprasov
10441048
- Rodrigo Díez Villamuera (rodrigodiez)
10451049
- e-ivanov
1050+
- Einenlum
10461051
- Jochen Bayer (jocl)
10471052
- Alex Bowers
10481053
- Jeremy Bush
@@ -1062,7 +1067,6 @@ Symfony is the result of the work of many people who made the code better
10621067
- David Otton
10631068
- Will Donohoe
10641069
- peter
1065-
- Jaroslav Kuba
10661070
- Jérémy Jourdin (jjk801)
10671071
- BRAMILLE Sébastien (oktapodia)
10681072
- Artem Kolesnikov (tyomo4ka)
@@ -1168,6 +1172,7 @@ Symfony is the result of the work of many people who made the code better
11681172
- Saem Ghani
11691173
- Clément LEFEBVRE
11701174
- Conrad Kleinespel
1175+
- Zacharias Luiten
11711176
- Sebastian Utz
11721177
- Adrien Gallou (agallou)
11731178
- Maks Rafalko (bornfree)
@@ -1233,6 +1238,7 @@ Symfony is the result of the work of many people who made the code better
12331238
- WedgeSama
12341239
- Felds Liscia
12351240
- Chihiro Adachi (chihiro-adachi)
1241+
- Emanuele Panzeri (thepanz)
12361242
- Tadcka
12371243
- Beth Binkovitz
12381244
- Gonzalo Míguez
@@ -1305,6 +1311,7 @@ Symfony is the result of the work of many people who made the code better
13051311
- Benjamin Bender
13061312
- Jared Farrish
13071313
- karl.rixon
1314+
- raplider
13081315
- Konrad Mohrfeldt
13091316
- Lance Chen
13101317
- Ciaran McNulty (ciaranmcnulty)
@@ -1373,19 +1380,20 @@ Symfony is the result of the work of many people who made the code better
13731380
- Harold Iedema
13741381
- Arnau González (arnaugm)
13751382
- Simon Bouland (bouland)
1376-
- Ivan Nikolaev (destillat)
13771383
- Matthew Foster (mfoster)
13781384
- Paul Seiffert (seiffert)
13791385
- Vasily Khayrulin (sirian)
13801386
- Stefan Koopmanschap (skoop)
13811387
- Stefan Hüsges (tronsha)
1388+
- Vlad Gregurco (vgregurco)
13821389
- Jake Bishop (yakobeyak)
13831390
- Dan Blows
13841391
- Matt Wells
13851392
- Nicolas Appriou
13861393
- stloyd
13871394
- Andreas
13881395
- Chris Tickner
1396+
- BoShurik
13891397
- Andrew Coulton
13901398
- Jeremy Benoist
13911399
- Michal Gebauer
@@ -1399,14 +1407,17 @@ Symfony is the result of the work of many people who made the code better
13991407
- Luis Muñoz
14001408
- Matthew Donadio
14011409
- Houziaux mike
1410+
- Phobetor
14021411
- Andreas
1412+
- Markus
14031413
- Thomas Chmielowiec
14041414
- shdev
14051415
- Andrey Ryaguzov
14061416
- Stefan
14071417
- Peter Bex
14081418
- Manatsawin Hanmongkolchai
14091419
- Gunther Konig
1420+
- Mickael GOETZ
14101421
- Maciej Schmidt
14111422
- Greg ORIOL
14121423
- Dennis Væversted
@@ -1418,6 +1429,7 @@ Symfony is the result of the work of many people who made the code better
14181429
- Mike Francis
14191430
- Christoph Nissle (derstoffel)
14201431
- Ionel Scutelnicu (ionelscutelnicu)
1432+
- Grenier Kévin (mcsky_biig)
14211433
- Nicolas Tallefourtané (nicolab)
14221434
- Botond Dani (picur)
14231435
- Thierry Marianne (thierrymarianne)
@@ -1815,6 +1827,7 @@ Symfony is the result of the work of many people who made the code better
18151827
- jspee
18161828
- David Soria Parra
18171829
- Sergiy Sokolenko
1830+
- Ahmed Abdulrahman
18181831
- dinitrol
18191832
- Penny Leach
18201833
- Yurii K

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
130130
}
131131
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
132132
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
133-
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-suggest --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
133+
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
134+
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
134135
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
135136
if ($exit) {
136137
exit($exit);

‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,15 @@ function ($key, $value, $isHit) use ($defaultLifetime) {
6464
null,
6565
CacheItem::class
6666
);
67-
$getId = function ($key) { return $this->getId((string) $key); };
67+
$getId = \Closure::fromCallable(array($this, 'getId'));
6868
$this->mergeByLifetime = \Closure::bind(
6969
function ($deferred, $namespace, &$expiredIds) use ($getId) {
7070
$byLifetime = array();
7171
$now = microtime(true);
7272
$expiredIds = array();
7373

7474
foreach ($deferred as $key => $item) {
75+
$key = (string) $key;
7576
if (null === $item->expiry) {
7677
$ttl = 0 < $item->defaultLifetime ? $item->defaultLifetime : 0;
7778
} elseif (0 >= $ttl = (int) ($item->expiry - $now)) {

‎src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class TagAwareAdapter implements CacheInterface, TagAwareAdapterInterface, Prune
3939
private $knownTagVersions = array();
4040
private $knownTagVersionsTtl;
4141

42-
public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, $knownTagVersionsTtl = 0.15)
42+
public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15)
4343
{
4444
$this->pool = $itemsPool;
4545
$this->tags = $tagsPool ?: $itemsPool;

‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class BinaryFileResponse extends Response
3131
* @var File
3232
*/
3333
protected $file;
34-
protected $offset;
35-
protected $maxlen;
34+
protected $offset = 0;
35+
protected $maxlen = -1;
3636
protected $deleteFileAfterSend = false;
3737

3838
/**

‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,19 @@ public function provideFullFileRanges()
208208
);
209209
}
210210

211+
public function testUnpreparedResponseSendsFullFile()
212+
{
213+
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200);
214+
215+
$data = file_get_contents(__DIR__.'/File/Fixtures/test.gif');
216+
217+
$this->expectOutputString($data);
218+
$response = clone $response;
219+
$response->sendContent();
220+
221+
$this->assertEquals(200, $response->getStatusCode());
222+
}
223+
211224
/**
212225
* @dataProvider provideInvalidRanges
213226
*/

0 commit comments

Comments
 (0)
163F
0