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

Commit f8f5c02

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: [DI] Resolve aliases earlier bumped Symfony version to 2.7.33 updated VERSION for 2.7.32 update CONTRIBUTORS for 2.7.32 updated CHANGELOG for 2.7.32
2 parents 53b8579 + 910a8de commit f8f5c02

File tree

4 files changed

+41
-27
lines changed

4 files changed

+41
-27
lines changed

‎CHANGELOG-2.7.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ in 2.7 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.7.0...v2.7.1
99

10+
* 2.7.32 (2017-07-17)
11+
12+
* security #23507 [Security] validate empty passwords again (xabbuh)
13+
* bug #23526 [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content (jnvsor)
14+
* bug #23468 [DI] Handle root namespace in service definitions (ro0NL)
15+
* bug #23256 [Security] Fix authentication.failure event not dispatched on AccountStatusException (chalasr)
16+
* bug #23461 Use rawurlencode() to transform the Cookie into a string (javiereguiluz)
17+
* bug #23459 [TwigBundle] allow to configure custom formats in XML configs (xabbuh)
18+
* bug #23261 Fixed absolute url generation for query strings and hash urls (alexander-schranz)
19+
* bug #23398 [Filesystem] Dont copy perms when origin is remote (nicolas-grekas)
20+
1021
* 2.7.31 (2017-07-05)
1122

1223
* bug #23378 [FrameworkBundle] Do not remove files from assets dir (1ed)

‎CONTRIBUTORS.md

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Symfony is the result of the work of many people who made the code better
1919
- Ryan Weaver (weaverryan)
2020
- Javier Eguiluz (javier.eguiluz)
2121
- Hugo Hamon (hhamon)
22-
- Abdellatif Ait boudad (aitboudad)
2322
- Maxime Steinhausser (ogizanagi)
23+
- Abdellatif Ait boudad (aitboudad)
2424
- Robin Chalas (chalas_r)
2525
- Romain Neutron (romain)
2626
- Pascal Borreli (pborreli)
27-
- Wouter De Jong (wouterj)
2827
- Grégoire Pineau (lyrixx)
28+
- Wouter De Jong (wouterj)
2929
- Joseph Bielawski (stloyd)
3030
- Karma Dordrak (drak)
3131
- Lukas Kahwe Smith (lsmith)
@@ -35,8 +35,8 @@ Symfony is the result of the work of many people who made the code better
3535
- Benjamin Eberlei (beberlei)
3636
- Igor Wiedler (igorw)
3737
- Eriksen Costa (eriksencosta)
38-
- Jules Pietri (heah)
3938
- Roland Franssen (ro0)
39+
- Jules Pietri (heah)
4040
- Sarah Khalil (saro0h)
4141
- Guilhem Niot (energetick)
4242
- Jonathan Wage (jwage)
@@ -93,6 +93,7 @@ Symfony is the result of the work of many people who made the code better
9393
- Maxime STEINHAUSSER
9494
- Alexander M. Turek (derrabus)
9595
- Michal Piotrowski (eventhorizon)
96+
- Dany Maillard (maidmaid)
9697
- Issei Murasawa (issei_m)
9798
- Tim Nagel (merk)
9899
- Brice BERNARD (brikou)
@@ -133,14 +134,14 @@ Symfony is the result of the work of many people who made the code better
133134
- Guilherme Blanco (guilhermeblanco)
134135
- Pablo Godel (pgodel)
135136
- Jérémie Augustin (jaugustin)
136-
- Dany Maillard (maidmaid)
137137
- Andréia Bohner (andreia)
138138
- Rafael Dohms (rdohms)
139139
- Arnaud Kleinpeter (nanocom)
140140
- jwdeitch
141141
- David Maicher (dmaicher)
142142
- Mikael Pajunen
143143
- Joel Wurtz (brouznouf)
144+
- Jérôme Vasseur (jvasseur)
144145
- Grégoire Paris (greg0ire)
145146
- Philipp Wahala (hifi)
146147
- Vyacheslav Pavlov
@@ -150,7 +151,6 @@ Symfony is the result of the work of many people who made the code better
150151
- Thomas Rabaix (rande)
151152
- Rouven Weßling (realityking)
152153
- Teoh Han Hui (teohhanhui)
153-
- Jérôme Vasseur (jvasseur)
154154
- Clemens Tolboom
155155
- Helmer Aaviksoo
156156
- Hiromi Hishida (77web)
@@ -162,6 +162,7 @@ Symfony is the result of the work of many people who made the code better
162162
- Artur Kotyrba
163163
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
164164
- James Halsall (jaitsu)
165+
- Chris Wilkinson (thewilkybarkid)
165166
- Warnar Boekkooi (boekkooi)
166167
- Dmitrii Chekaliuk (lazyhammer)
167168
- Clément JOBEILI (dator)
@@ -174,7 +175,6 @@ Symfony is the result of the work of many people who made the code better
174175
- Dennis Benkert (denderello)
175176
- Benjamin Dulau (dbenjamin)
176177
- Mathieu Lemoine (lemoinem)
177-
- Chris Wilkinson (thewilkybarkid)
178178
- Andreas Hucks (meandmymonkey)
179179
- Noel Guilbert (noel)
180180
- Stepan Anchugov (kix)
@@ -238,6 +238,7 @@ Symfony is the result of the work of many people who made the code better
238238
- Alif Rachmawadi
239239
- Kristen Gilden (kgilden)
240240
- Pierre-Yves LEBECQ (pylebecq)
241+
- Jordan Samouh (jordansamouh)
241242
- Alex Pott
242243
- Jakub Kucharovic (jkucharovic)
243244
- Uwe Jäger (uwej711)
@@ -248,6 +249,7 @@ Symfony is the result of the work of many people who made the code better
248249
- GordonsLondon
249250
- Jan Sorgalla (jsor)
250251
- Ray
252+
- Nikolay Labinskiy (e-moe)
251253
- Leo Feyer
252254
- Chekote
253255
- Thomas Adam
@@ -274,8 +276,8 @@ Symfony is the result of the work of many people who made the code better
274276
- Marc Weistroff (futurecat)
275277
- Christian Schmidt
276278
- Hidde Wieringa (hiddewie)
279+
- Alessandro Chitolina
277280
- Chad Sikorra (chadsikorra)
278-
- Jordan Samouh (jordansamouh)
279281
- Chris Smith (cs278)
280282
- Florian Klein (docteurklein)
281283
- Manuel Kiessling (manuelkiessling)
@@ -294,7 +296,6 @@ Symfony is the result of the work of many people who made the code better
294296
- Victor Bocharsky (bocharsky_bw)
295297
- Jan Decavele (jandc)
296298
- Gustavo Piltcher
297-
- Nikolay Labinskiy (e-moe)
298299
- Stepan Tanasiychuk (stfalcon)
299300
- Tiago Ribeiro (fixe)
300301
- Hidde Boomsma (hboomsma)
@@ -309,6 +310,7 @@ Symfony is the result of the work of many people who made the code better
309310
- Thomas Schulz (king2500)
310311
- Dariusz Rumiński
311312
- Berny Cantos (xphere81)
313+
- Thierry Thuon (lepiaf)
312314
- Ricard Clau (ricardclau)
313315
- Mark Challoner (markchalloner)
314316
- Gregor Harlan (gharlan)
@@ -327,6 +329,7 @@ Symfony is the result of the work of many people who made the code better
327329
- Inal DJAFAR (inalgnu)
328330
- Christian Gärtner (dagardner)
329331
- Tomasz Kowalczyk (thunderer)
332+
- Michael Babker (mbabker)
330333
- François-Xavier de Guillebon (de-gui_f)
331334
- Damien Alexandre (damienalexandre)
332335
- Felix Labrecque
@@ -335,7 +338,6 @@ Symfony is the result of the work of many people who made the code better
335338
- Robbert Klarenbeek (robbertkl)
336339
- Thomas Calvet (fancyweb)
337340
- Niels Keurentjes (curry684)
338-
- Alessandro Chitolina
339341
- JhonnyL
340342
- hossein zolfi (ocean)
341343
- Clément Gautier (clementgautier)
@@ -401,6 +403,7 @@ Symfony is the result of the work of many people who made the code better
401403
- Olivier Dolbeau (odolbeau)
402404
- Jan Rosier (rosier)
403405
- Thomas Royer (cydonia7)
406+
- Arturs Vonda
404407
- Josip Kruslin
405408
- Asmir Mustafic (goetas)
406409
- vagrant
@@ -428,6 +431,7 @@ Symfony is the result of the work of many people who made the code better
428431
- David Badura (davidbadura)
429432
- Zander Baldwin
430433
- Adam Harvey
434+
- Maxime Veber (nek-)
431435
- Alex Bakhturin
432436
- Alexander Obuhovich (aik099)
433437
- boombatower
@@ -441,6 +445,7 @@ Symfony is the result of the work of many people who made the code better
441445
- Gladhon
442446
- Benoît Burnichon (bburnichon)
443447
- Sebastian Bergmann
448+
- Miroslav Sustek
444449
- Pablo Díez (pablodip)
445450
- Kevin McBride
446451
- Sergio Santoro
@@ -550,7 +555,6 @@ Symfony is the result of the work of many people who made the code better
550555
- Maxime Douailin
551556
- Jean Pasdeloup (pasdeloup)
552557
- Benjamin Cremer (bcremer)
553-
- Thierry Thuon (lepiaf)
554558
- Javier López (loalf)
555559
- Reinier Kip
556560
- Geoffrey Brier (geoffrey-brier)
@@ -572,6 +576,7 @@ Symfony is the result of the work of many people who made the code better
572576
- Alex Bogomazov (alebo)
573577
- maxime.steinhausser
574578
- Stefan Warman
579+
- Thomas Perez (scullwm)
575580
- Tristan Maindron (tmaindron)
576581
- Wesley Lancel
577582
- Ke WANG (yktd26)
@@ -580,7 +585,6 @@ Symfony is the result of the work of many people who made the code better
580585
- Sergey Kolodyazhnyy (skolodyazhnyy)
581586
- umpirski
582587
- Denis Brumann (dbrumann)
583-
- Michael Babker (mbabker)
584588
- Quentin de Longraye (quentinus95)
585589
- Chris Heng (gigablah)
586590
- Richard Bradley
@@ -590,7 +594,6 @@ Symfony is the result of the work of many people who made the code better
590594
- Michael Devery (mickadoo)
591595
- Antoine Corcy
592596
- Artur Eshenbrener
593-
- Arturs Vonda
594597
- Sascha Grossenbacher
595598
- Szijarto Tamas
596599
- Catalin Dan
@@ -620,7 +623,6 @@ Symfony is the result of the work of many people who made the code better
620623
- develop
621624
- ReenExe
622625
- Mark Sonnabaum
623-
- Maxime Veber (nek-)
624626
- Richard Quadling
625627
- jochenvdv
626628
- Arturas Smorgun (asarturas)
@@ -669,7 +671,6 @@ Symfony is the result of the work of many people who made the code better
669671
- Christian Soronellas (theunic)
670672
- Yosmany Garcia (yosmanyga)
671673
- Wouter de Wild
672-
- Miroslav Sustek
673674
- Degory Valentine
674675
- Benoit Lévêque (benoit_leveque)
675676
- Jeroen Fiege (fieg)
@@ -693,6 +694,7 @@ Symfony is the result of the work of many people who made the code better
693694
- Jan Prieser
694695
- Adrien Lucas (adrienlucas)
695696
- Zhuravlev Alexander (scif)
697+
- Yanick Witschi (toflar)
696698
- James Michael DuPont
697699
- Tom Klingenberg
698700
- Christopher Hall (mythmakr)
@@ -834,7 +836,6 @@ Symfony is the result of the work of many people who made the code better
834836
- Danilo Silva
835837
- Zachary Tong (polyfractal)
836838
- Hryhorii Hrebiniuk
837-
- Thomas Perez (scullwm)
838839
- Dennis Fridrich (dfridrich)
839840
- hamza
840841
- dantleech
@@ -863,6 +864,7 @@ Symfony is the result of the work of many people who made the code better
863864
- Goran Juric
864865
- Laurent Ghirardotti (laurentg)
865866
- Nicolas Macherey
867+
- AKeeman (akeeman)
866868
- Lin Clark
867869
- Jeremy David (jeremy.david)
868870
- Robin Lehrmann (robinlehrmann)
@@ -1104,6 +1106,7 @@ Symfony is the result of the work of many people who made the code better
11041106
- Max Romanovsky (maxromanovsky)
11051107
- Mathieu Morlon
11061108
- Daniel Tschinder
1109+
- Alexander Schranz
11071110
- Rafał Muszyński (rafmus90)
11081111
- Timothy Anido (xanido)
11091112
- Rick Prent
@@ -1411,6 +1414,7 @@ Symfony is the result of the work of many people who made the code better
14111414
- Rosio (ben-rosio)
14121415
- Simon Paarlberg (blamh)
14131416
- Jeroen Thora (bolle)
1417+
- Brieuc THOMAS (brieucthomas)
14141418
- Masao Maeda (brtriver)
14151419
- Darius Leskauskas (darles)
14161420
- David Joos (djoos)
@@ -1440,7 +1444,6 @@ Symfony is the result of the work of many people who made the code better
14401444
- Cyrille Jouineau (tuxosaurus)
14411445
- Yorkie Chadwick (yorkie76)
14421446
- GuillaumeVerdon
1443-
- Yanick Witschi
14441447
- Ondrej Mirtes
14451448
- akimsko
14461449
- Youpie

‎src/Symfony/Component/DependencyInjection/Container.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,16 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
256256
// this method can be called thousands of times during a request, avoid
257257
// calling strtolower() unless necessary.
258258
for ($i = 2;;) {
259-
if ('service_container' === $id) {
260-
return $this;
261-
}
262259
if (isset($this->aliases[$id])) {
263260
$id = $this->aliases[$id];
264261
}
265262
// Re-use shared service instance if it exists.
266263
if (isset($this->services[$id]) || array_key_exists($id, $this->services)) {
267264
return $this->services[$id];
268265
}
266+
if ('service_container' === $id) {
267+
return $this;
268+
}
269269

270270
if (isset($this->loading[$id])) {
271271
throw new ServiceCircularReferenceException($id, array_keys($this->loading));
@@ -335,16 +335,16 @@ public function initialized($id)
335335
{
336336
$id = strtolower($id);
337337

338+
if (isset($this->aliases[$id])) {
339+
$id = $this->aliases[$id];
340+
}
341+
338342
if ('service_container' === $id) {
339343
// BC: 'service_container' was a synthetic service previously.
340344
// @todo Change to false in next major release.
341345
return true;
342346
}
343347

344-
if (isset($this->aliases[$id])) {
345-
$id = $this->aliases[$id];
346-
}
347-
348348
return isset($this->services[$id]) || array_key_exists($id, $this->services);
349349
}
350350

‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,10 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac
15021502
*/
15031503
private function getServiceCall($id, Reference $reference = null)
15041504
{
1505+
while ($this->container->hasAlias($id)) {
1506+
$id = (string) $this->container->getAlias($id);
1507+
}
1508+
15051509
if ('service_container' === $id) {
15061510
return '$this';
15071511
}
@@ -1510,10 +1514,6 @@ private function getServiceCall($id, Reference $reference = null)
15101514
return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
15111515
}
15121516

1513-
if ($this->container->hasAlias($id)) {
1514-
$id = (string) $this->container->getAlias($id);
1515-
}
1516-
15171517
return sprintf('$this->get(\'%s\')', $id);
15181518
}
15191519

0 commit comments

Comments
 (0)
0