8000 Merge branch '2.4' into 2.5 · symfony/symfony@a9af6be · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit a9af6be

Browse files
fabpotfabpot
committed
Merge branch '2.4' into 2.5
* 2.4: [Process] Adjust PR #11264, make it Windows compatible and fix CS [Process] Fix unit tests on Windows platform bumped Symfony version to 2.4.9 bumped Symfony version to 2.3.19 updated VERSION for 2.4.8 updated CHANGELOG for 2.4.8 updated VERSION for 2.3.18 update CONTRIBUTORS for 2.3.18 updated CHANGELOG for 2.3.18 [Process] Use correct test for empty string in UnixPipes Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents 28defa8 + 2797df8 commit a9af6be

File tree

6 files changed

+70
-19
lines changed

6 files changed

+70
-19
lines changed

‎CHANGELOG-2.3.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ in 2.3 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
99

10+
* 2.3.18 (2014-07-15)
11+
12+
* [Security] Forced validate of locales passed to the translator
13+
* feature #11367 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671) (Andrew Moore)
14+
* bug #11386 Remove Spaceless Blocks from Twig Form Templates (chrisguitarguy)
15+
* bug #9719 [TwigBundle] fix configuration tree for paths (mdavis1982, cordoval)
16+
* bug #11244 [HttpFoundation] Remove body-related headers when sending the response, if body is empty (SimonSimCity)
17+
1018
* 2.3.17 (2014-07-07)
1119

1220
* bug #11238 [Translation] Added unescaping of ids in PoFileLoader (JustBlackBird)

‎CHANGELOG-2.4.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ in 2.4 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.4.0...v2.4.1
99

10+
* 2.4.8 (2014-07-15)
11+
12+
* [Security] Forced validate of locales passed to the translator
13+
* bug #11278 Remove Spaceless Blocks From Twig Templates (chrisguitarguy)
14+
* feature #11367 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671) (Andrew Moore)
15+
* bug #11386 Remove Spaceless Blocks from Twig Form Templates (chrisguitarguy)
16+
* bug #9719 [TwigBundle] fix configuration tree for paths (mdavis1982, cordoval)
17+
* bug #11244 [HttpFoundation] Remove body-related headers when sending the response, if body is empty (SimonSimCity)
18+
1019
* 2.4.7 (2014-07-08)
1120

1221
* bug #11283 [SecurityBundle] Remove Expression Language services when the component is unavailable (thewilkybarkid)

‎CONTRIBUTORS.md

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Symfony2 is the result of the work of many people who made the code better
1919
- Ryan Weaver (weaverryan)
2020
- Lukas Kahwe Smith (lsmith)
2121
- Jeremy Mikola (jmikola)
22-
- Jean-François Simon (jfsimon)
2322
- Romain Neutron (romain)
23+
- Jean-François Simon (jfsimon)
2424
- Benjamin Eberlei (beberlei)
2525
- Igor Wiedler (igorw)
2626
- Hugo Hamon (hhamon)
@@ -44,18 +44,18 @@ Symfony2 is the result of the work of many people who made the code better
4444
- Wouter De Jong (wouterj)
4545
- Eric Clemmons (ericclemmons)
4646
- Nicolas Grekas (nicolas-grekas)
47+
- Andrej Hudec (pulzarraider)
4748
- Deni
4849
- Henrik Westphal (snc)
4950
- Dariusz Górecki (canni)
50-
- Andrej Hudec (pulzarraider)
5151
- Arnout Boks (aboks)
52+
- Christian Raue
5253
- Michel Weimerskirch (mweimerskirch)
5354
- Lee McDermott
5455
- Brandon Turner
5556
- Douglas Greenshields (shieldo)
5657
- Daniel Holmes (dholmes)
5758
- Jordan Alliot (jalliot)
58-
- Christian Raue
5959
- John Wards (johnwards)
6060
- Fran Moreno (franmomu)
6161
- Bart van den Burg (burgov)
@@ -75,21 +75,21 @@ Symfony2 is the result of the work of many people who made the code better
7575
- Fabien Pennequin (fabienpennequin)
7676
- Jacob Dreesen (jdreesen)
7777
- Gábor Egyed (1ed)
78+
- Ait Boudad Abdellatif (aitboudad)
7879
- Adrien Brault (adrienbrault)
7980
- Michal Piotrowski (eventhorizon)
80-
- Ait Boudad Abdellatif (aitboudad)
8181
- Robert Schönthal (digitalkaoz)
8282
- Juti Noppornpitak (shiroyuki)
8383
- Sebastian Hörl (blogsh)
8484
- Daniel Gomes (danielcsgomes)
8585
- Hidenori Goto (hidenorigoto)
8686
- Peter Kokot (maastermedia)
87+
- Christian Flothmann (xabbuh)
8788
- Jérémie Augustin (jaugustin)
8889
- David Buchmann (dbu)
8990
- Jérôme Tamarelle (gromnan)
9091
- Tigran Azatyan (tigranazatyan)
9192
- Javier Eguiluz (javier.eguiluz)
92-
- Christian Flothmann (xabbuh)
9393
- Rafael Dohms (rdohms)
9494
- Richard Shank (iampersistent)
9595
- Gordon Franke (gimler)
@@ -146,6 +146,7 @@ Symfony2 is the result of the work of many people who made the code better
146146
- Manuel Reinhard (sprain)
147147
- Danny Berger (dpb587)
148148
- Xavier Montaña Carreras (xmontana)
149+
- Michele Orselli (orso)
149150
- Xavier Perez
150151
- Arjen Brouwer (arjenjb)
151152
- Katsuhiro OGAWA
@@ -168,7 +169,6 @@ Symfony2 is the result of the work of many people who made the code better
168169
- Robert Kiss (kepten)
169170
- Kim Hemsø Rasmussen (kimhemsoe)
170171
- Wouter Van Hecke
171-
- Michele Orselli (orso)
172172
- Michael Holm (hollo)
173173
- Marc Weistroff (futurecat)
174174
- Pierre-Yves LEBECQ (pylebecq)
@@ -231,6 +231,7 @@ Symfony2 is the result of the work of many people who made the code better
231231
- Ismael Ambrosi (iambrosi)
232232
- Shein Alexey
233233
- Issei Murasawa (issei_m)
234+
- hacfi (hifi)
234235
- Joe Lencioni
235236
- Kai
236237
- Xavier HAUSHERR
@@ -274,6 +275,7 @@ Symfony2 is the result of the work of many people who made the code better
274275
- François-Xavier de Guillebon (de-gui_f)
275276
- boombatower
276277
- Fabrice Bernhard (fabriceb)
278+
- Clément Gautier (clementgautier)
277279
- Fabian Lange (codingfabian)
278280
- Yoshio HANAWA
279281
- Baptiste Clavié (talus)
@@ -294,11 +296,11 @@ Symfony2 is the result of the work of many people who made the code better
294296
- Maks Slesarenko
295297
- Markus Lanthaler (lanthaler)
296298
- Vicent Soria Durá (vicentgodella)
299+
- Chris Wilkinson (thewilkybarkid)
297300
- Ioan Negulescu
298301
- Andrew Udvare (audvare)
299302
- alexpods
300303
- Erik Trapman (eriktrapman)
301-
- hacfi (hifi)
302304
- De Cock Xavier (xdecock)
303305
- Alex Pott
304306
- Norbert Orzechowicz (norzechowicz)
@@ -365,13 +367,15 @@ Symfony2 is the result of the work of many people who made the code better
365367
- Arturs Vonda
366368
- Sascha Grossenbacher
367369
- Ben Davies (bendavies)
370+
- Simon Schick (simonsimcity)
368371
- Hossein Bukhamsin
369372
- Paweł Wacławczyk (pwc)
370373
- Oleg Zinchenko (cystbear)
371374
- Diego Saint Esteben (dii3g0)
372375
- Johannes Klauss (cloppy)
373376
- Evan Villemez
374377
- fzerorubigd
378+
- Benjamin Grandfond (benjamin)
375379
- Tiago Brito (blackmx)
376380
- Richard van den Brand (ricbra)
377381
- develop
@@ -403,7 +407,6 @@ Symfony2 is the result of the work of many people who made the code better
403407
- Marek Štípek (maryo)
404408
- John Bohn (jbohn)
405409
- Jakub Škvára (jskvara)
406-
- Chris Wilkinson (thewilkybarkid)
407410
- Andrew Hilobok (hilobok)
408411
- Christian Soronellas (theunic)
409412
- Jérôme Vieilledent (lolautruche)
@@ -532,7 +535,6 @@ Symfony2 is the result of the work of many people who made the code better
532535
- jfcixmedia
533536
- Martijn Evers
534537
- Benjamin Paap (benjaminpaap)
535-
- Simon Schick (simonsimcity)
536538
- Christian
537539
- Sergii Smertin (nfx)
538540
- Eddie Jaoude
@@ -550,6 +552,7 @@ Symfony2 is the result of the work of many people who made the code better
550552
- Benoit Garret
551553
- DerManoMann
552554
- Asmir Mustafic (goetas)
555+
- Julien Bianchi (jubianchi)
553556
- Marcin Chwedziak
554557
- Roland Franssen (ro0)
555558
- Maciej Malarz
@@ -562,20 +565,22 @@ Symfony2 is the result of the work of many people who made the code better
562565
- kaiwa
563566
- Albert Ganiev (helios-ag)
564567
- Neil Katin
568+
- David Otton
565569
- peter
566570
- Artem Kolesnikov (tyomo4ka)
567571
- Gustavo Adrian
568-
- Clément Gautier (clementgautier)
569572
- Yannick
570573
- Luc Vieillescazes (iamluc)
571574
- Eduardo García Sanz (coma)
572575
- David de Boer (ddeboer)
573576
- Brooks Boyd
574577
- Roger Webb
578+
- Dmitriy Simushev
575579
- Max Voloshin (maxvoloshin)
576580
- Nicolas Fabre (nfabre)
577581
- Raul Rodriguez (raul782)
578582
- Patrick Landolt (scube)
583+
- WybrenKoelmans
579584
- Derek Lambert
580585
- Felicitus
581586
- Krzysztof Przybyszewski
@@ -730,6 +735,7 @@ Symfony2 is the result of the work of many people who made the code better
730735
- catch
731736
- Alexandre Segura
732737
- Josef Cech
738+
- Nate (frickenate)
733739
- Matthew Foster (mfoster)
734740
- Maximilian Reichel (phramz)
735741
- Paul Seiffert (seiffert)
@@ -750,7 +756,6 @@ Symfony2 is the result of the work of many people who made the code better
750756
- Andrey Ryaguzov
751757
- Gunther Konig
752758
- František Bereň
753-
- Benjamin Grandfond (benjamin)
754759
- Christoph Nissle (derstoffel)
755760
- Ionel Scutelnicu (ionelscutelnicu)
756761
- Johnny Peck (johnnypeck)
@@ -875,6 +880,7 @@ Symfony2 is the result of the work of many people who made the code better
875880
- Yorkie Chadwick (yorkie76)
876881
- Yanick Witschi
877882
- Ondrej Mirtes
883+
- akimsko
878884
- Youpie
879885
- srsbiz
880886
- Nicolas A. Bérard-Nault
@@ -1010,6 +1016,7 @@ Symfony2 is the result of the work of many people who made the code better
10101016
- Adam Monsen (meonkeys)
10111017
- ollie harridge (ollietb)
10121018
- Paweł Szczepanek (pauluz)
1019+
- Christian López Espínola (penyaskito)
10131020
- Petr Jaroš (petajaros)
10141021
- Philipp Hoffmann (philipphoffmann)
10151022
- Alex Carol (picard89)

‎src/Symfony/Component/Process/ProcessPipes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,11 @@ private function readStreams($blocking, $close = false)
335335
$type = array_search($pipe, $this->pipes);
336336

337337
$data = '';
338-
while ($dataread = fread($pipe, self::CHUNK_SIZE)) {
338+
while ('' !== $dataread = (string) fread($pipe, self::CHUNK_SIZE)) {
339339
$data .= $dataread;
340340
}
341341

342-
if ($data) {
342+
if ('' !== $data) {
343343
$read[$type] = $data;
344344
}
345345

‎src/Symfony/Component/Process/Tests/AbstractProcessTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,19 @@ public function testFlushOutput()
306306
$this->assertEmpty($p->getOutput());
307307
}
308308

309+
public function testZeroAsOutput()
310+
{
311+
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
312+
// see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line
313+
$p = $this->getProcess('echo | set /p dummyName=0');
314+
} else {
315+
$p = $this->getProcess('printf 0');
316+
}
317+
318+
$p->run();
319+
$this->assertSame('0', $p->getOutput());
320+
}
321+
309322
public function testExitCodeCommandFailed()
310323
{
311324
if (defined('PHP_WINDOWS_VERSION_BUILD')) {

‎src/Symfony/Component/Process/Tests/ExecutableFinderTest.php

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public function testFind()
4747
$this->setPath(dirname(PHP_BINARY));
4848

4949
$finder = new ExecutableFinder;
50-
$result = $finder->find(basename(PHP_BINARY));
50+
$result = $finder->find($this->getPhpBinaryName());
5151

52-
$this->assertEquals($result, PHP_BINARY);
52+
$this->assertSamePath(PHP_BINARY, $result);
5353
}
5454

5555
public function testFindWithDefault()
@@ -83,9 +83,9 @@ public function testFindWithExtraDirs()
8383
$extraDirs = array(dirname(PHP_BINARY));
8484

8585
$finder = new ExecutableFinder;
86-
$result = $finder->find(basename(PHP_BINARY), null, $extraDirs);
86+
$result = $finder->find($this->getPhpBinaryName(), null, $extraDirs);
8787

88-
$this->assertEquals(PHP_BINARY, $result);
88+
$this->assertSamePath(PHP_BINARY, $result);
8989
}
9090

9191
public function testFindWithOpenBaseDir()
@@ -105,8 +105,22 @@ public function testFindWithOpenBaseDir()
105105
ini_set('open_basedir', dirname(PHP_BINARY).PATH_SEPARATOR.'/');
106106

107107
$finder = new ExecutableFinder;
108-
$result = $finder->find(basename(PHP_BINARY));
108+
$result = $finder->find($this->getPhpBinaryName());
109109

110-
$this->assertEquals(PHP_BINARY, $result);
110+
$this->assertSamePath(PHP_BINARY, $result);
111+
}
112+
113+
private function assertSamePath($expected, $tested)
114+
{
115+
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
116+
$this->assertEquals(strtolower($expected), strtolower($tested));
117+
} else {
118+
$this->assertEquals($expected, $tested);
119+
}
120+
}
121+
122+
private function getPhpBinaryName()
123+
{
124+
return basename(PHP_BINARY, defined('PHP_WINDOWS_VERSION_BUILD') ? '.exe' : '');
111125
}
112126
}

0 commit comments

Comments
 (0)
0