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
This commit is contained in:
commit
f8f5c028d1
@ -7,6 +7,17 @@ in 2.7 minor versions.
|
|||||||
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
|
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
|
||||||
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.7.0...v2.7.1
|
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.7.0...v2.7.1
|
||||||
|
|
||||||
|
* 2.7.32 (2017-07-17)
|
||||||
|
|
||||||
|
* security #23507 [Security] validate empty passwords again (xabbuh)
|
||||||
|
* bug #23526 [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content (jnvsor)
|
||||||
|
* bug #23468 [DI] Handle root namespace in service definitions (ro0NL)
|
||||||
|
* bug #23256 [Security] Fix authentication.failure event not dispatched on AccountStatusException (chalasr)
|
||||||
|
* bug #23461 Use rawurlencode() to transform the Cookie into a string (javiereguiluz)
|
||||||
|
* bug #23459 [TwigBundle] allow to configure custom formats in XML configs (xabbuh)
|
||||||
|
* bug #23261 Fixed absolute url generation for query strings and hash urls (alexander-schranz)
|
||||||
|
* bug #23398 [Filesystem] Dont copy perms when origin is remote (nicolas-grekas)
|
||||||
|
|
||||||
* 2.7.31 (2017-07-05)
|
* 2.7.31 (2017-07-05)
|
||||||
|
|
||||||
* bug #23378 [FrameworkBundle] Do not remove files from assets dir (1ed)
|
* bug #23378 [FrameworkBundle] Do not remove files from assets dir (1ed)
|
||||||
|
@ -19,13 +19,13 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Ryan Weaver (weaverryan)
|
- Ryan Weaver (weaverryan)
|
||||||
- Javier Eguiluz (javier.eguiluz)
|
- Javier Eguiluz (javier.eguiluz)
|
||||||
- Hugo Hamon (hhamon)
|
- Hugo Hamon (hhamon)
|
||||||
- Abdellatif Ait boudad (aitboudad)
|
|
||||||
- Maxime Steinhausser (ogizanagi)
|
- Maxime Steinhausser (ogizanagi)
|
||||||
|
- Abdellatif Ait boudad (aitboudad)
|
||||||
- Robin Chalas (chalas_r)
|
- Robin Chalas (chalas_r)
|
||||||
- Romain Neutron (romain)
|
- Romain Neutron (romain)
|
||||||
- Pascal Borreli (pborreli)
|
- Pascal Borreli (pborreli)
|
||||||
- Wouter De Jong (wouterj)
|
|
||||||
- Grégoire Pineau (lyrixx)
|
- Grégoire Pineau (lyrixx)
|
||||||
|
- Wouter De Jong (wouterj)
|
||||||
- Joseph Bielawski (stloyd)
|
- Joseph Bielawski (stloyd)
|
||||||
- Karma Dordrak (drak)
|
- Karma Dordrak (drak)
|
||||||
- Lukas Kahwe Smith (lsmith)
|
- Lukas Kahwe Smith (lsmith)
|
||||||
@ -35,8 +35,8 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Benjamin Eberlei (beberlei)
|
- Benjamin Eberlei (beberlei)
|
||||||
- Igor Wiedler (igorw)
|
- Igor Wiedler (igorw)
|
||||||
- Eriksen Costa (eriksencosta)
|
- Eriksen Costa (eriksencosta)
|
||||||
- Jules Pietri (heah)
|
|
||||||
- Roland Franssen (ro0)
|
- Roland Franssen (ro0)
|
||||||
|
- Jules Pietri (heah)
|
||||||
- Sarah Khalil (saro0h)
|
- Sarah Khalil (saro0h)
|
||||||
- Guilhem Niot (energetick)
|
- Guilhem Niot (energetick)
|
||||||
- Jonathan Wage (jwage)
|
- Jonathan Wage (jwage)
|
||||||
@ -93,6 +93,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Maxime STEINHAUSSER
|
- Maxime STEINHAUSSER
|
||||||
- Alexander M. Turek (derrabus)
|
- Alexander M. Turek (derrabus)
|
||||||
- Michal Piotrowski (eventhorizon)
|
- Michal Piotrowski (eventhorizon)
|
||||||
|
- Dany Maillard (maidmaid)
|
||||||
- Issei Murasawa (issei_m)
|
- Issei Murasawa (issei_m)
|
||||||
- Tim Nagel (merk)
|
- Tim Nagel (merk)
|
||||||
- Brice BERNARD (brikou)
|
- Brice BERNARD (brikou)
|
||||||
@ -133,7 +134,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Guilherme Blanco (guilhermeblanco)
|
- Guilherme Blanco (guilhermeblanco)
|
||||||
- Pablo Godel (pgodel)
|
- Pablo Godel (pgodel)
|
||||||
- Jérémie Augustin (jaugustin)
|
- Jérémie Augustin (jaugustin)
|
||||||
- Dany Maillard (maidmaid)
|
|
||||||
- Andréia Bohner (andreia)
|
- Andréia Bohner (andreia)
|
||||||
- Rafael Dohms (rdohms)
|
- Rafael Dohms (rdohms)
|
||||||
- Arnaud Kleinpeter (nanocom)
|
- Arnaud Kleinpeter (nanocom)
|
||||||
@ -141,6 +141,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- David Maicher (dmaicher)
|
- David Maicher (dmaicher)
|
||||||
- Mikael Pajunen
|
- Mikael Pajunen
|
||||||
- Joel Wurtz (brouznouf)
|
- Joel Wurtz (brouznouf)
|
||||||
|
- Jérôme Vasseur (jvasseur)
|
||||||
- Grégoire Paris (greg0ire)
|
- Grégoire Paris (greg0ire)
|
||||||
- Philipp Wahala (hifi)
|
- Philipp Wahala (hifi)
|
||||||
- Vyacheslav Pavlov
|
- Vyacheslav Pavlov
|
||||||
@ -150,7 +151,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Thomas Rabaix (rande)
|
- Thomas Rabaix (rande)
|
||||||
- Rouven Weßling (realityking)
|
- Rouven Weßling (realityking)
|
||||||
- Teoh Han Hui (teohhanhui)
|
- Teoh Han Hui (teohhanhui)
|
||||||
- Jérôme Vasseur (jvasseur)
|
|
||||||
- Clemens Tolboom
|
- Clemens Tolboom
|
||||||
- Helmer Aaviksoo
|
- Helmer Aaviksoo
|
||||||
- Hiromi Hishida (77web)
|
- Hiromi Hishida (77web)
|
||||||
@ -162,6 +162,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Artur Kotyrba
|
- Artur Kotyrba
|
||||||
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
|
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
|
||||||
- James Halsall (jaitsu)
|
- James Halsall (jaitsu)
|
||||||
|
- Chris Wilkinson (thewilkybarkid)
|
||||||
- Warnar Boekkooi (boekkooi)
|
- Warnar Boekkooi (boekkooi)
|
||||||
- Dmitrii Chekaliuk (lazyhammer)
|
- Dmitrii Chekaliuk (lazyhammer)
|
||||||
- Clément JOBEILI (dator)
|
- Clément JOBEILI (dator)
|
||||||
@ -174,7 +175,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Dennis Benkert (denderello)
|
- Dennis Benkert (denderello)
|
||||||
- Benjamin Dulau (dbenjamin)
|
- Benjamin Dulau (dbenjamin)
|
||||||
- Mathieu Lemoine (lemoinem)
|
- Mathieu Lemoine (lemoinem)
|
||||||
- Chris Wilkinson (thewilkybarkid)
|
|
||||||
- Andreas Hucks (meandmymonkey)
|
- Andreas Hucks (meandmymonkey)
|
||||||
- Noel Guilbert (noel)
|
- Noel Guilbert (noel)
|
||||||
- Stepan Anchugov (kix)
|
- Stepan Anchugov (kix)
|
||||||
@ -238,6 +238,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Alif Rachmawadi
|
- Alif Rachmawadi
|
||||||
- Kristen Gilden (kgilden)
|
- Kristen Gilden (kgilden)
|
||||||
- Pierre-Yves LEBECQ (pylebecq)
|
- Pierre-Yves LEBECQ (pylebecq)
|
||||||
|
- Jordan Samouh (jordansamouh)
|
||||||
- Alex Pott
|
- Alex Pott
|
||||||
- Jakub Kucharovic (jkucharovic)
|
- Jakub Kucharovic (jkucharovic)
|
||||||
- Uwe Jäger (uwej711)
|
- Uwe Jäger (uwej711)
|
||||||
@ -248,6 +249,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- GordonsLondon
|
- GordonsLondon
|
||||||
- Jan Sorgalla (jsor)
|
- Jan Sorgalla (jsor)
|
||||||
- Ray
|
- Ray
|
||||||
|
- Nikolay Labinskiy (e-moe)
|
||||||
- Leo Feyer
|
- Leo Feyer
|
||||||
- Chekote
|
- Chekote
|
||||||
- Thomas Adam
|
- Thomas Adam
|
||||||
@ -274,8 +276,8 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Marc Weistroff (futurecat)
|
- Marc Weistroff (futurecat)
|
||||||
- Christian Schmidt
|
- Christian Schmidt
|
||||||
- Hidde Wieringa (hiddewie)
|
- Hidde Wieringa (hiddewie)
|
||||||
|
- Alessandro Chitolina
|
||||||
- Chad Sikorra (chadsikorra)
|
- Chad Sikorra (chadsikorra)
|
||||||
- Jordan Samouh (jordansamouh)
|
|
||||||
- Chris Smith (cs278)
|
- Chris Smith (cs278)
|
||||||
- Florian Klein (docteurklein)
|
- Florian Klein (docteurklein)
|
||||||
- Manuel Kiessling (manuelkiessling)
|
- Manuel Kiessling (manuelkiessling)
|
||||||
@ -294,7 +296,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Victor Bocharsky (bocharsky_bw)
|
- Victor Bocharsky (bocharsky_bw)
|
||||||
- Jan Decavele (jandc)
|
- Jan Decavele (jandc)
|
||||||
- Gustavo Piltcher
|
- Gustavo Piltcher
|
||||||
- Nikolay Labinskiy (e-moe)
|
|
||||||
- Stepan Tanasiychuk (stfalcon)
|
- Stepan Tanasiychuk (stfalcon)
|
||||||
- Tiago Ribeiro (fixe)
|
- Tiago Ribeiro (fixe)
|
||||||
- Hidde Boomsma (hboomsma)
|
- Hidde Boomsma (hboomsma)
|
||||||
@ -309,6 +310,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Thomas Schulz (king2500)
|
- Thomas Schulz (king2500)
|
||||||
- Dariusz Rumiński
|
- Dariusz Rumiński
|
||||||
- Berny Cantos (xphere81)
|
- Berny Cantos (xphere81)
|
||||||
|
- Thierry Thuon (lepiaf)
|
||||||
- Ricard Clau (ricardclau)
|
- Ricard Clau (ricardclau)
|
||||||
- Mark Challoner (markchalloner)
|
- Mark Challoner (markchalloner)
|
||||||
- Gregor Harlan (gharlan)
|
- Gregor Harlan (gharlan)
|
||||||
@ -327,6 +329,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Inal DJAFAR (inalgnu)
|
- Inal DJAFAR (inalgnu)
|
||||||
- Christian Gärtner (dagardner)
|
- Christian Gärtner (dagardner)
|
||||||
- Tomasz Kowalczyk (thunderer)
|
- Tomasz Kowalczyk (thunderer)
|
||||||
|
- Michael Babker (mbabker)
|
||||||
- François-Xavier de Guillebon (de-gui_f)
|
- François-Xavier de Guillebon (de-gui_f)
|
||||||
- Damien Alexandre (damienalexandre)
|
- Damien Alexandre (damienalexandre)
|
||||||
- Felix Labrecque
|
- Felix Labrecque
|
||||||
@ -335,7 +338,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Robbert Klarenbeek (robbertkl)
|
- Robbert Klarenbeek (robbertkl)
|
||||||
- Thomas Calvet (fancyweb)
|
- Thomas Calvet (fancyweb)
|
||||||
- Niels Keurentjes (curry684)
|
- Niels Keurentjes (curry684)
|
||||||
- Alessandro Chitolina
|
|
||||||
- JhonnyL
|
- JhonnyL
|
||||||
- hossein zolfi (ocean)
|
- hossein zolfi (ocean)
|
||||||
- Clément Gautier (clementgautier)
|
- Clément Gautier (clementgautier)
|
||||||
@ -401,6 +403,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Olivier Dolbeau (odolbeau)
|
- Olivier Dolbeau (odolbeau)
|
||||||
- Jan Rosier (rosier)
|
- Jan Rosier (rosier)
|
||||||
- Thomas Royer (cydonia7)
|
- Thomas Royer (cydonia7)
|
||||||
|
- Arturs Vonda
|
||||||
- Josip Kruslin
|
- Josip Kruslin
|
||||||
- Asmir Mustafic (goetas)
|
- Asmir Mustafic (goetas)
|
||||||
- vagrant
|
- vagrant
|
||||||
@ -428,6 +431,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- David Badura (davidbadura)
|
- David Badura (davidbadura)
|
||||||
- Zander Baldwin
|
- Zander Baldwin
|
||||||
- Adam Harvey
|
- Adam Harvey
|
||||||
|
- Maxime Veber (nek-)
|
||||||
- Alex Bakhturin
|
- Alex Bakhturin
|
||||||
- Alexander Obuhovich (aik099)
|
- Alexander Obuhovich (aik099)
|
||||||
- boombatower
|
- boombatower
|
||||||
@ -441,6 +445,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Gladhon
|
- Gladhon
|
||||||
- Benoît Burnichon (bburnichon)
|
- Benoît Burnichon (bburnichon)
|
||||||
- Sebastian Bergmann
|
- Sebastian Bergmann
|
||||||
|
- Miroslav Sustek
|
||||||
- Pablo Díez (pablodip)
|
- Pablo Díez (pablodip)
|
||||||
- Kevin McBride
|
- Kevin McBride
|
||||||
- Sergio Santoro
|
- Sergio Santoro
|
||||||
@ -550,7 +555,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Maxime Douailin
|
- Maxime Douailin
|
||||||
- Jean Pasdeloup (pasdeloup)
|
- Jean Pasdeloup (pasdeloup)
|
||||||
- Benjamin Cremer (bcremer)
|
- Benjamin Cremer (bcremer)
|
||||||
- Thierry Thuon (lepiaf)
|
|
||||||
- Javier López (loalf)
|
- Javier López (loalf)
|
||||||
- Reinier Kip
|
- Reinier Kip
|
||||||
- Geoffrey Brier (geoffrey-brier)
|
- Geoffrey Brier (geoffrey-brier)
|
||||||
@ -572,6 +576,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Alex Bogomazov (alebo)
|
- Alex Bogomazov (alebo)
|
||||||
- maxime.steinhausser
|
- maxime.steinhausser
|
||||||
- Stefan Warman
|
- Stefan Warman
|
||||||
|
- Thomas Perez (scullwm)
|
||||||
- Tristan Maindron (tmaindron)
|
- Tristan Maindron (tmaindron)
|
||||||
- Wesley Lancel
|
- Wesley Lancel
|
||||||
- Ke WANG (yktd26)
|
- Ke WANG (yktd26)
|
||||||
@ -580,7 +585,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Sergey Kolodyazhnyy (skolodyazhnyy)
|
- Sergey Kolodyazhnyy (skolodyazhnyy)
|
||||||
- umpirski
|
- umpirski
|
||||||
- Denis Brumann (dbrumann)
|
- Denis Brumann (dbrumann)
|
||||||
- Michael Babker (mbabker)
|
|
||||||
- Quentin de Longraye (quentinus95)
|
- Quentin de Longraye (quentinus95)
|
||||||
- Chris Heng (gigablah)
|
- Chris Heng (gigablah)
|
||||||
- Richard Bradley
|
- Richard Bradley
|
||||||
@ -590,7 +594,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Michael Devery (mickadoo)
|
- Michael Devery (mickadoo)
|
||||||
- Antoine Corcy
|
- Antoine Corcy
|
||||||
- Artur Eshenbrener
|
- Artur Eshenbrener
|
||||||
- Arturs Vonda
|
|
||||||
- Sascha Grossenbacher
|
- Sascha Grossenbacher
|
||||||
- Szijarto Tamas
|
- Szijarto Tamas
|
||||||
- Catalin Dan
|
- Catalin Dan
|
||||||
@ -620,7 +623,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- develop
|
- develop
|
||||||
- ReenExe
|
- ReenExe
|
||||||
- Mark Sonnabaum
|
- Mark Sonnabaum
|
||||||
- Maxime Veber (nek-)
|
|
||||||
- Richard Quadling
|
- Richard Quadling
|
||||||
- jochenvdv
|
- jochenvdv
|
||||||
- Arturas Smorgun (asarturas)
|
- Arturas Smorgun (asarturas)
|
||||||
@ -669,7 +671,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Christian Soronellas (theunic)
|
- Christian Soronellas (theunic)
|
||||||
- Yosmany Garcia (yosmanyga)
|
- Yosmany Garcia (yosmanyga)
|
||||||
- Wouter de Wild
|
- Wouter de Wild
|
||||||
- Miroslav Sustek
|
|
||||||
- Degory Valentine
|
- Degory Valentine
|
||||||
- Benoit Lévêque (benoit_leveque)
|
- Benoit Lévêque (benoit_leveque)
|
||||||
- Jeroen Fiege (fieg)
|
- Jeroen Fiege (fieg)
|
||||||
@ -693,6 +694,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Jan Prieser
|
- Jan Prieser
|
||||||
- Adrien Lucas (adrienlucas)
|
- Adrien Lucas (adrienlucas)
|
||||||
- Zhuravlev Alexander (scif)
|
- Zhuravlev Alexander (scif)
|
||||||
|
- Yanick Witschi (toflar)
|
||||||
- James Michael DuPont
|
- James Michael DuPont
|
||||||
- Tom Klingenberg
|
- Tom Klingenberg
|
||||||
- Christopher Hall (mythmakr)
|
- Christopher Hall (mythmakr)
|
||||||
@ -834,7 +836,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Danilo Silva
|
- Danilo Silva
|
||||||
- Zachary Tong (polyfractal)
|
- Zachary Tong (polyfractal)
|
||||||
- Hryhorii Hrebiniuk
|
- Hryhorii Hrebiniuk
|
||||||
- Thomas Perez (scullwm)
|
|
||||||
- Dennis Fridrich (dfridrich)
|
- Dennis Fridrich (dfridrich)
|
||||||
- hamza
|
- hamza
|
||||||
- dantleech
|
- dantleech
|
||||||
@ -863,6 +864,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Goran Juric
|
- Goran Juric
|
||||||
- Laurent Ghirardotti (laurentg)
|
- Laurent Ghirardotti (laurentg)
|
||||||
- Nicolas Macherey
|
- Nicolas Macherey
|
||||||
|
- AKeeman (akeeman)
|
||||||
- Lin Clark
|
- Lin Clark
|
||||||
- Jeremy David (jeremy.david)
|
- Jeremy David (jeremy.david)
|
||||||
- Robin Lehrmann (robinlehrmann)
|
- Robin Lehrmann (robinlehrmann)
|
||||||
@ -1104,6 +1106,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Max Romanovsky (maxromanovsky)
|
- Max Romanovsky (maxromanovsky)
|
||||||
- Mathieu Morlon
|
- Mathieu Morlon
|
||||||
- Daniel Tschinder
|
- Daniel Tschinder
|
||||||
|
- Alexander Schranz
|
||||||
- Rafał Muszyński (rafmus90)
|
- Rafał Muszyński (rafmus90)
|
||||||
- Timothy Anido (xanido)
|
- Timothy Anido (xanido)
|
||||||
- Rick Prent
|
- Rick Prent
|
||||||
@ -1411,6 +1414,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Rosio (ben-rosio)
|
- Rosio (ben-rosio)
|
||||||
- Simon Paarlberg (blamh)
|
- Simon Paarlberg (blamh)
|
||||||
- Jeroen Thora (bolle)
|
- Jeroen Thora (bolle)
|
||||||
|
- Brieuc THOMAS (brieucthomas)
|
||||||
- Masao Maeda (brtriver)
|
- Masao Maeda (brtriver)
|
||||||
- Darius Leskauskas (darles)
|
- Darius Leskauskas (darles)
|
||||||
- David Joos (djoos)
|
- David Joos (djoos)
|
||||||
@ -1440,7 +1444,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Cyrille Jouineau (tuxosaurus)
|
- Cyrille Jouineau (tuxosaurus)
|
||||||
- Yorkie Chadwick (yorkie76)
|
- Yorkie Chadwick (yorkie76)
|
||||||
- GuillaumeVerdon
|
- GuillaumeVerdon
|
||||||
- Yanick Witschi
|
|
||||||
- Ondrej Mirtes
|
- Ondrej Mirtes
|
||||||
- akimsko
|
- akimsko
|
||||||
- Youpie
|
- Youpie
|
||||||
|
@ -256,9 +256,6 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
|
|||||||
// this method can be called thousands of times during a request, avoid
|
// this method can be called thousands of times during a request, avoid
|
||||||
// calling strtolower() unless necessary.
|
// calling strtolower() unless necessary.
|
||||||
for ($i = 2;;) {
|
for ($i = 2;;) {
|
||||||
if ('service_container' === $id) {
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
if (isset($this->aliases[$id])) {
|
if (isset($this->aliases[$id])) {
|
||||||
$id = $this->aliases[$id];
|
$id = $this->aliases[$id];
|
||||||
}
|
}
|
||||||
@ -266,6 +263,9 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
|
|||||||
if (isset($this->services[$id]) || array_key_exists($id, $this->services)) {
|
if (isset($this->services[$id]) || array_key_exists($id, $this->services)) {
|
||||||
return $this->services[$id];
|
return $this->services[$id];
|
||||||
}
|
}
|
||||||
|
if ('service_container' === $id) {
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
if (isset($this->loading[$id])) {
|
if (isset($this->loading[$id])) {
|
||||||
throw new ServiceCircularReferenceException($id, array_keys($this->loading));
|
throw new ServiceCircularReferenceException($id, array_keys($this->loading));
|
||||||
@ -335,16 +335,16 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
|
|||||||
{
|
{
|
||||||
$id = strtolower($id);
|
$id = strtolower($id);
|
||||||
|
|
||||||
|
if (isset($this->aliases[$id])) {
|
||||||
|
$id = $this->aliases[$id];
|
||||||
|
}
|
||||||
|
|
||||||
if ('service_container' === $id) {
|
if ('service_container' === $id) {
|
||||||
// BC: 'service_container' was a synthetic service previously.
|
// BC: 'service_container' was a synthetic service previously.
|
||||||
// @todo Change to false in next major release.
|
// @todo Change to false in next major release.
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($this->aliases[$id])) {
|
|
||||||
$id = $this->aliases[$id];
|
|
||||||
}
|
|
||||||
|
|
||||||
return isset($this->services[$id]) || array_key_exists($id, $this->services);
|
return isset($this->services[$id]) || array_key_exists($id, $this->services);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1502,6 +1502,10 @@ EOF;
|
|||||||
*/
|
*/
|
||||||
private function getServiceCall($id, Reference $reference = null)
|
private function getServiceCall($id, Reference $reference = null)
|
||||||
{
|
{
|
||||||
|
while ($this->container->hasAlias($id)) {
|
||||||
|
$id = (string) $this->container->getAlias($id);
|
||||||
|
}
|
||||||
|
|
||||||
if ('service_container' === $id) {
|
if ('service_container' === $id) {
|
||||||
return '$this';
|
return '$this';
|
||||||
}
|
}
|
||||||
@ -1510,10 +1514,6 @@ EOF;
|
|||||||
return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
|
return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->container->hasAlias($id)) {
|
|
||||||
$id = (string) $this->container->getAlias($id);
|
|
||||||
}
|
|
||||||
|
|
||||||
return sprintf('$this->get(\'%s\')', $id);
|
return sprintf('$this->get(\'%s\')', $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user