8000 Merge branch '3.3' into 3.4 · symfony/symfony@a0795c7 · GitHub
[go: up one dir, main page]
Skip to content

Commit a0795c7

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.3' into 3.4
* 3.3: [DI] Resolve aliases earlier [DI] Mark Container::$privates as internal [DI] Minor dumping logic simplification bumped Symfony version to 3.3.6 updated VERSION for 3.3.5 updated CHANGELOG for 3.3.5 bumped Symfony version to 3.2.13 updated VERSION for 3.2.12 updated CHANGELOG for 3.2.12 bumped Symfony version to 2.8.26 updated VERSION for 2.8.25 updated CHANGELOG for 2.8.25 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 43eed76 + 72aaecc commit a0795c7

File tree

5 files changed

+81
-28
lines changed

5 files changed

+81
-28
lines changed

‎CHANGELOG-3.2.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ in 3.2 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/v3.2.0...v3.2.1
99

10+
* 3.2.12 (2017-07-17)
11+
12+
* bug #23549 [PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2 (xabbuh)
13+
* security #23507 [Security] validate empty passwords again (xabbuh)
14+
* bug #23526 [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content (jnvsor)
15+
* bug #23540 Disable inlining deprecated services (alekitto)
16+
* bug #23468 [DI] Handle root namespace in service definitions (ro0NL)
17+
* bug #23256 [Security] Fix authentication.failure event not dispatched on AccountStatusException (chalasr)
18+
* bug #23461 Use rawurlencode() to transform the Cookie into a string (javiereguiluz)
19+
* bug #23459 [TwigBundle] allow to configure custom formats in XML configs (xabbuh)
20+
* bug #23460 Don't display the Symfony debug toolbar when printing the page (javiereguiluz)
21+
* bug #23469 [FrameworkBundle] do not wire namespaces for the ArrayAdapter (xabbuh)
22+
* bug #23417 [DI][Security] Prevent unwanted deprecation notices when using Expression Languages (dunglas)
23+
* bug #23261 Fixed absolute url generation for query strings and hash urls (alexander-schranz)
24+
* bug #23398 [Filesystem] Dont copy perms when origin is remote (nicolas-grekas)
25+
1026
* 3.2.11 (2017-07-05)
1127

1228
* bug #23390 [Cache] Handle APCu failures gracefully (nicolas-grekas)

‎CHANGELOG-3.3.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,32 @@ in 3.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/v3.3.0...v3.3.1
99

10+
* 3.3.5 (2017-07-17)
11+
12+
* bug #23549 [PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2 (xabbuh)
13+
* bug #23513 [FrameworkBundle] Set default public directory on install assets (yceruto)
14+
* security #23507 [Security] validate empty passwords again (xabbuh)
15+
* bug #23526 [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content (jnvsor)
16+
* bug #23535 Make server:* commands work out of the box with the public/ root dir (fabpot)
17+
* bug #23540 Disable inlining deprecated services (alekitto)
18+
* bug #23498 [Process] Fixed issue between process builder and exec (lyrixx)
19+
* bug #23490 [DependencyInjection] non-conflicting anonymous service ids across files (xabbuh)
20+
* bug #23468 [DI] Handle root namespace in service definitions (ro0NL)
21+
* bug #23477 [Process] Fix parsing args on Windows (nicolas-grekas)
22+
* bug #23256 [Security] Fix authentication.failure event not dispatched on AccountStatusException (chalasr)
23+
* bug #23461 Use rawurlencode() to transform the Cookie into a string (javiereguiluz)
24+
* bug #23465 [HttpKernel][VarDumper] Truncate profiler data & optim perf (nicolas-grekas)
25+
* bug #23457 [FrameworkBundle] check _controller attribute is a string before parsing it (alekitto)
26+
* bug #23459 [TwigBundle] allow to configure custom formats in XML configs (xabbuh)
27+
* bug #23460 Don't display the Symfony debug toolbar when printing the page (javiereguiluz)
28+
* bug #23469 [FrameworkBundle] do not wire namespaces for the ArrayAdapter (xabbuh)
29+
* bug #23434 [DotEnv] Fix variable substitution (brieucthomas)
30+
* bug #23426 Fixed HttpOnly flag when using Cookie::fromString() (Toflar)
31+
* bug #22439 [DX] [TwigBundle] Enhance the new exception page design (sustmi)
32+
* bug #23417 [DI][Security] Prevent unwanted deprecation notices when using Expression Languages (dunglas)
33+
* bug #23261 Fixed absolute url generation for query strings and hash urls (alexander-schranz)
34+
* bug #23398 [Filesystem] Dont copy perms when origin is remote (nicolas-grekas)
35+
1036
* 3.3.4 (2017-07-05)
1137

1238
* bug #23413 [VarDumper] Reduce size of serialized Data objects (nicolas-grekas)

‎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)
@@ -175,7 +176,6 @@ Symfony is the result of the work of many people who made the code better
175176
- Benjamin Dulau (dbenjamin)
176177
- James Halsall (jaitsu)
177178
- Mathieu Lemoine (lemoinem)
178-
- Chris Wilkinson (thewilkybarkid)
179179
- Andreas Hucks (meandmymonkey)
180180
- Noel Guilbert (noel)
181181
- Stepan Anchugov (kix)
@@ -240,6 +240,7 @@ Symfony is the result of the work of many people who made the code better
240240
- Alif Rachmawadi
241241
- Kristen Gilden (kgilden)
242242
- Pierre-Yves LEBECQ (pylebecq)
243+
- Jordan Samouh (jordansamouh)
243244
- Alex Pott
244245
- Jakub Kucharovic (jkucharovic)
245246
- Uwe Jäger (uwej711)
@@ -250,6 +251,7 @@ Symfony is the result of the work of many people who made the code better
250251
- GordonsLondon
251252
- Jan Sorgalla (jsor)
252253
- Ray
254+
- Nikolay Labinskiy (e-moe)
253255
- Leo Feyer
254256
- Chekote
255257
- Thomas Adam
@@ -276,8 +278,8 @@ Symfony is the result of the work of many people who made the code better
276278
- Marc Weistroff (futurecat)
277279
- Christian Schmidt
278280
- Hidde Wieringa (hiddewie)
281+
- Alessandro Chitolina
279282
- Chad Sikorra (chadsikorra)
280-
- Jordan Samouh (jordansamouh)
281283
- Chris Smith (cs278)
282284
- Florian Klein (docteurklein)
283285
- Manuel Kiessling (manuelkiessling)
@@ -296,7 +298,6 @@ Symfony is the result of the work of many people who made the code better
296298
- Victor Bocharsky (bocharsky_bw)
297299
- Jan Decavele (jandc)
298300
- Gustavo Piltcher
299-
- Nikolay Labinskiy (e-moe)
300301
- Stepan Tanasiychuk (stfalcon)
301302
- Tiago Ribeiro (fixe)
302303
- Hidde Boomsma (hboomsma)
@@ -311,6 +312,7 @@ Symfony is the result of the work of many people who made the code better
311312
- Thomas Schulz (king2500)
312313
- Dariusz Rumiński
313314
- Berny Cantos (xphere81)
315+
- Thierry Thuon (lepiaf)
314316
- Ricard Clau (ricardclau)
315317
- Mark Challoner (markchalloner)
316318
- Gregor Harlan (gharlan)
@@ -329,6 +331,7 @@ Symfony is the result of the work of many people who made the code better
329331
- Inal DJAFAR (inalgnu)
330332
- Christian Gärtner (dagardner)
331333
- Tomasz Kowalczyk (thunderer)
334+
- Michael Babker (mbabker)
332335
- François-Xavier de Guillebon (de-gui_f)
333336
- Damien Alexandre (damienalexandre)
334337
- Felix Labrecque
@@ -337,7 +340,6 @@ Symfony is the result of the work of many people who made the code better
337340
- Robbert Klarenbeek (robbertkl)
338341
- Thomas Calvet (fancyweb)
339342
- Niels Keurentjes (curry684)
340-
- Alessandro Chitolina
341343
- JhonnyL
342344
- hossein zolfi (ocean)
343345
- Clément Gautier (clementgautier)
@@ -403,6 +405,7 @@ Symfony is the result of the work of many people who made the code better
403405
- Olivier Dolbeau (odolbeau)
404406
- Jan Rosier (rosier)
405407
- Thomas Royer (cydonia7)
408+
- Arturs Vonda
406409
- Josip Kruslin
407410
- Asmir Mustafic (goetas)
408411
- vagrant
@@ -430,6 +433,7 @@ Symfony is the result of the work of many people who made the code better
430433
- David Badura (davidbadura)
431434
- Zander Baldwin
432435
- Adam Harvey
436+
- Maxime Veber (nek-)
433437
- Alex Bakhturin
434438
- Alexander Obuhovich (aik099)
435439
- boombatower
@@ -443,6 +447,7 @@ Symfony is the result of the work of many people who made the code better
443447
- Gladhon
444448
- Benoît Burnichon (bburnichon)
445449
- Sebastian Bergmann
450+
- Miroslav Sustek
446451
- Pablo Díez (pablodip)
447452
- Kevin McBride
448453
- Sergio Santoro
@@ -552,7 +557,6 @@ Symfony is the result of the work of many people who made the code better
552557
- Maxime Douailin
553558
- Jean Pasdeloup (pasdeloup)
554559
- Benjamin Cremer (bcremer)
555-
- Thierry Thuon (lepiaf)
556560
- Javier López (loalf)
557561
- Reinier Kip
558562
- Geoffrey Brier (geoffrey-brier)
@@ -574,6 +578,7 @@ Symfony is the result of the work of many people who made the code better
574578
- Alex Bogomazov (alebo)
575579
- maxime.steinhausser
576580
- Stefan Warman
581+
- Thomas Perez (scullwm)
577582
- Tristan Maindron (tmaindron)
578583
- Wesley Lancel
579584
- Ke WANG (yktd26)
@@ -582,7 +587,6 @@ Symfony is the result of the work of many people who made the code better
582587
- Sergey Kolodyazhnyy (skolodyazhnyy)
583588
- umpirski
584589
- Denis Brumann (dbrumann)
585-
- Michael Babker (mbabker)
586590
- Quentin de Longraye (quentinus95)
587591
- Chris Heng (gigablah)
588592
- Richard Bradley
@@ -592,7 +596,6 @@ Symfony is the result of the work of many people who made the code better
592596
- Michael Devery (mickadoo)
593597
- Antoine Corcy
594598
- Artur Eshenbrener
595-
- Arturs Vonda
596599
- Sascha Grossenbacher
597600
- Szijarto Tamas
598601
- Catalin Dan
@@ -622,7 +625,6 @@ Symfony is the result of the work of many people who made the code better
622625
- develop
623626
- ReenExe
624627
- Mark Sonnabaum
625-
- Maxime Veber (nek-)
626628
- Richard Quadling
627629
- jochenvdv
628630
- Arturas Smorgun (asarturas)
@@ -671,7 +673,6 @@ Symfony is the result of the work of many people who made the code better
671673
- Christian Soronellas (theunic)
672674
- Yosmany Garcia (yosmanyga)
673675
- Wouter de Wild
674-
- Miroslav Sustek
675676
- Degory Valentine
676677
- Benoit Lévêque (benoit_leveque)
677678
- Jeroen Fiege (fieg)
@@ -695,6 +696,7 @@ Symfony is the result of the work of many people who made the code better
695696
- Jan Prieser
696697
- Adrien Lucas (adrienlucas)
697698
- Zhuravlev Alexander (scif)
699+
- Yanick Witschi (toflar)
698700
- James Michael DuPont
699701
- Tom Klingenberg
700702
- Christopher Hall (mythmakr)
@@ -836,7 +838,6 @@ Symfony is the result of the work of many people who made the code better
836838
- Danilo Silva
837839
- Zachary Tong (polyfractal)
838840
- Hryhorii Hrebiniuk
839-
- Thomas Perez (scullwm)
840841
- Dennis Fridrich (dfridrich)
841842
- hamza
842843
- dantleech
@@ -865,6 +866,7 @@ Symfony is the result of the work of many people who made the code better
865866
- Goran Juric
866867
- Laurent Ghirardotti (laurentg)
867868
- Nicolas Macherey
869+
- AKeeman (akeeman)
868870
- Lin Clark
869871
- Jeremy David (jeremy.david)
870872
- Robin Lehrmann (robinlehrmann)
@@ -1106,6 +1108,7 @@ Symfony is the result of the work of many people who made the code better
11061108
- Max Romanovsky (maxromanovsky)
11071109
- Mathieu Morlon
11081110
- Daniel Tschinder
1111+
- Alexander Schranz
11091112
- Rafał Muszyński (rafmus90)
11101113
- Timothy Anido (xanido)
11111114
- Rick Prent
@@ -1413,6 +1416,7 @@ Symfony is the result of the work of many people who made the code better
14131416
- Rosio (ben-rosio)
14141417
- Simon Paarlberg (blamh)
14151418
- Jeroen Thora (bolle)
1419+
- Brieuc THOMAS (brieucthomas)
14161420
- Masao Maeda (brtriver)
14171421
- Darius Leskauskas (darles)
14181422
- David Joos (djoos)
@@ -1442,7 +1446,6 @@ Symfony is the result of the work of many people who made the code better
14421446
- Cyrille Jouineau (tuxosaurus)
14431447
- Yorkie Chadwick (yorkie76)
14441448
- GuillaumeVerdon
1445-
- Yanick Witschi
14461449
- Ondrej Mirtes
14471450
- akimsko
14481451
- Youpie

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,14 @@ class Container implements ResettableContainerInterface
5656

5757
protected $services = array();
5858
protected $methodMap = array();
59-
protected $privates = array();
6059
protected $aliases = array();
6160
protected $loading = array();
6261

62+
/**
63+
* @internal
64+
*/
65+
protected $privates = array();
66+
6367
/**
6468
* @internal
6569
*/
@@ -221,15 +225,15 @@ public function has($id)
221225
if (isset($this->privates[$id])) {
222226
@trigger_error(sprintf('Checking for the existence of the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
223227
}
224-
if ('service_container' === $id) {
225-
return true;
226-
}
227228
if (isset($this->aliases[$id])) {
228229
$id = $this->aliases[$id];
229230
}
230231
if (isset($this->services[$id])) {
231232
return true;
232233
}
234+
if ('service_container' === $id) {
235+
return true;
236+
}
233237

234238
if (isset($this->methodMap[$id])) {
235239
return true;
@@ -279,9 +283,6 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
279283
if (isset($this->privates[$id])) {
280284
@trigger_error(sprintf('Requesting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
281285
}
282-
if ('service_container' === $id) {
283-
return $this;
284-
}
285286
if (isset($this->aliases[$id])) {
286287
$id = $this->aliases[$id];
287288
}
@@ -290,6 +291,9 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
290291
if (isset($this->services[$id])) {
291292
return $this->services[$id];
292293
}
294+
if ('service_container' === $id) {
295+
return $this;
296+
}
293297

294298
if (isset($this->loading[$id])) {
295299
throw new ServiceCircularReferenceException($id, array_keys($this->loading));
@@ -352,10 +356,6 @@ public function initialized($id)
352356
{
353357
$id = $this->normalizeId($id);
354358

355-
if ('service_container' === $id) {
356-
return false;
357-
}
358-
359359
if (isset($this->privates[$id])) {
360360
@trigger_error(sprintf('Checking for the initialization of the "%s" private service is deprecated since Symfony 3.4 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
361361
}
@@ -364,6 +364,10 @@ public function initialized($id)
364364
$id = $this->aliases[$id];
365365
}
366366

367+
if ('service_container' === $id) {
368+
return false;
369+
}
370+
367371
return isset($this->services[$id]);
368372
}
369373

0 commit comments

Comments
 (0)
0