diff --git a/.travis.yml b/.travis.yml
index b279eac0215a8..19bcdeac8ef54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -159,7 +159,7 @@ before_install:
tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI
- tfold ext.zookeeper tpecl zookeeper-0.6.0 zookeeper.so $INI
+ tfold ext.zookeeper tpecl zookeeper-0.7.1 zookeeper.so $INI
tfold ext.amqp tpecl amqp-1.9.4 amqp.so $INI
done
diff --git a/CHANGELOG-4.2.md b/CHANGELOG-4.2.md
index bf1520b310051..6af197319cde7 100644
--- a/CHANGELOG-4.2.md
+++ b/CHANGELOG-4.2.md
@@ -7,6 +7,52 @@ in 4.2 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 between two versions, go to https://github.com/symfony/symfony/compare/v4.2.0...v4.2.1
+* 4.2.5 (2019-04-02)
+
+ * bug #30660 [Bridge][Twig] DebugCommand - fix escaping and filter (SpacePossum)
+ * bug #30784 [Translator] Add resource path to exception message for schema valida… (jschaedl)
+ * bug #30720 Fix getSetMethodNormalizer to correctly ignore the attributes specified in "ignored_attributes" (Emmanuel BORGES)
+ * bug #30749 [Serializer] Added check of constuctor modifiers to AbstractNormalizer (NekaKawaii)
+ * bug #30776 [Routing] Fix routes annotation loading with glob pattern (snoob)
+ * bug #30773 [DependencyInjection] Fix hardcoded hotPathTagName (jderusse)
+ * bug #30737 [Validator] Improve constraint default option check (vudaltsov)
+ * bug #30736 [Validator] Fix annotation default for @Count and @Length (vudaltsov)
+ * bug #30621 [Cache] Ensure key exists before checking array value (jrjohnson)
+ * bug #30711 [Serializer] Use object class resolver when extracting attributes (joelwurtz)
+ * bug #30641 [FrameworkBundle] properly describe service definitions without class (xabbuh)
+ * bug #30620 [FrameworkBundle][HttpFoundation] make session service resettable (dmaicher)
+ * bug #30648 Debug finalized config in debug:config (ro0NL)
+ * bug #30640 [Phpunit] fixed support for PHP 5.3 (fabpot)
+ * bug #30616 Fix case when multiple loaders are providing paths for the same namespace (yceruto)
+ * bug #30595 Do not validate child constraints if form has no validation groups (maryo)
+ * bug #30440 [TwigBridge] Fix DebugCommand when chain loader is involved (yceruto)
+ * bug #30479 Check if Client exists when test.client does not exist, to provide clearer exception message (SerkanYildiz)
+ * bug #30597 [Form] Added ResetInterface to CachingFactoryDecorator (HeahDude)
+ * bug #30593 Fixed usage of TranslatorInterface in form extension (fixes #30591) (althaus)
+ * feature #30584 [Intl] Add compile binary (ro0NL)
+ * bug #30487 Fix Cache error while using anonymous class (Emmanuel BORGES)
+ * bug #30576 [Cache] fix LockRegistry (nicolas-grekas)
+ * bug #30548 Correct language code for ukrainian language (stanleyk)
+ * bug #30518 [Cache] Fix perf when using RedisCluster by reducing roundtrips to the servers (nicolas-grekas)
+ * bug #30515 [Cache] Only delete one key at a time when on Predis + Cluster (andrerom)
+ * bug #30511 [Process] fix using argument $php of new PhpProcess() (nicolas-grekas)
+ * bug #30507 [Routing] Fixed XML options resolution (Jules Pietri)
+ * bug #30506 [TwigBridge] remove deprecation triggered when using Twig 2.7 (nicolas-grekas)
+ * bug #30496 [PHPUnit-Bridge] override some Composer environment variables (nicoweb)
+ * bug #30505 [TwigBridge] Remove usages of the spaceless tag (nicolas-grekas)
+ * bug #30466 [Messenger] Make 'headers' key optional for encoded messages (yceruto)
+ * bug #30474 compatibility with phpunit8 (garak)
+ * bug #30497 [HttpKernel] Change default log level for output streams (yceruto)
+ * bug #30498 [translation] Update defaut format from yml to yaml (GaryPEGEOT)
+ * bug #30490 Don't resolve the Deprecation error handler mode until a deprecation is triggered (Emmanuel BORGES)
+ * bug #30396 [Form] Avoid a form type extension appears many times in debug:form (markitosgv)
+ * bug #30361 [PropertyInfo] Fix undefined variable fromConstructor when passing context to getTypes (mantis)
+ * bug #30361 [PropertyInfo] Fix undefined variable fromConstructor when passing context to getTypes (mantis, OskarStark)
+ * bug #30410 [Monolog] Really reset logger when calling logger::reset() (lyrixx)
+ * bug #30437 [Debug] detect annotations before blank docblock lines (xabbuh)
+ * bug #30417 Autoconfig: don't automatically tag decorators (dunglas)
+ * bug #30392 [PropertyAccess] Fixed PropertyPathBuilder remove that fails to reset internal indexes (GregOriol)
+
* 4.2.4 (2019-03-03)
* bug #30383 [WebProfilerBundle] toolbar: invisible route name in Firefox (inmarelibero)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b6b40057db1df..bc64e2f7979e5 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -17,9 +17,9 @@ Symfony is the result of the work of many people who made the code better
- Maxime Steinhausser (ogizanagi)
- Jakub Zalas (jakubzalas)
- Johannes S (johannes)
+ - Javier Eguiluz (javier.eguiluz)
- Ryan Weaver (weaverryan)
- Kris Wallsmith (kriswallsmith)
- - Javier Eguiluz (javier.eguiluz)
- Roland Franssen (ro0)
- Grégoire Pineau (lyrixx)
- Hugo Hamon (hhamon)
@@ -36,8 +36,8 @@ Symfony is the result of the work of many people who made the code better
- Jean-François Simon (jfsimon)
- Benjamin Eberlei (beberlei)
- Igor Wiedler (igorw)
- - Jules Pietri (heah)
- Yonel Ceruto (yonelceruto)
+ - Jules Pietri (heah)
- Eriksen Costa (eriksencosta)
- Guilhem Niot (energetick)
- Sarah Khalil (saro0h)
@@ -56,8 +56,8 @@ Symfony is the result of the work of many people who made the code better
- Bulat Shakirzyanov (avalanche123)
- Matthias Pigulla (mpdude)
- Jérémy DERUSSÉ (jderusse)
- - Peter Rehm (rpet)
- Saša Stamenković (umpirsky)
+ - Peter Rehm (rpet)
- Kevin Bond (kbond)
- Pierre du Plessis (pierredup)
- Henrik Bjørnskov (henrikbjorn)
@@ -71,11 +71,11 @@ Symfony is the result of the work of many people who made the code better
- Gábor Egyed (1ed)
- Titouan Galopin (tgalopin)
- Vladimir Reznichenko (kalessil)
+ - Jáchym Toušek (enumag)
- Michel Weimerskirch (mweimerskirch)
- Andrej Hudec (pulzarraider)
- Konstantin Myakshin (koc)
- Eric Clemmons (ericclemmons)
- - Jáchym Toušek (enumag)
- Charles Sarrazin (csarrazi)
- David Maicher (dmaicher)
- Christian Raue
@@ -125,6 +125,7 @@ Symfony is the result of the work of many people who made the code better
- Daniel Wehner (dawehner)
- excelwebzone
- Gordon Franke (gimler)
+ - Thomas Calvet (fancyweb)
- Javier Spagnoletti (phansys)
- Fabien Pennequin (fabienpennequin)
- Eric GELOEN (gelo)
@@ -144,7 +145,6 @@ Symfony is the result of the work of many people who made the code better
- Daniel Gomes (danielcsgomes)
- Gabriel Caruso
- Hidenori Goto (hidenorigoto)
- - Thomas Calvet (fancyweb)
- Arnaud Kleinpeter (nanocom)
- Jannik Zschiesche (apfelbox)
- Guilherme Blanco (guilhermeblanco)
@@ -181,6 +181,7 @@ Symfony is the result of the work of many people who made the code better
- SpacePossum
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
- James Halsall (jaitsu)
+ - Anthony MARTIN (xurudragon)
- Matthieu Napoli (mnapoli)
- Florent Mata (fmata)
- Warnar Boekkooi (boekkooi)
@@ -195,7 +196,9 @@ Symfony is the result of the work of many people who made the code better
- Mario A. Alvarez Garcia (nomack84)
- Dennis Benkert (denderello)
- DQNEO
+ - Oskar Stark (oskarstark)
- Benjamin Dulau (dbenjamin)
+ - François-Xavier de Guillebon (de-gui_f)
- Mathieu Lemoine (lemoinem)
- Christian Schmidt
- Andreas Hucks (meandmymonkey)
@@ -214,13 +217,13 @@ Symfony is the result of the work of many people who made the code better
- apetitpa
- Matthieu Bontemps (mbontemps)
- apetitpa
+ - Samuel NELA (snela)
- Pierre Minnieur (pminnieur)
- fivestar
- Dominique Bongiraud
- Jeremy Livingston (jeremylivingston)
- Michael Lee (zerustech)
- Matthieu Auger (matthieuauger)
- - Oskar Stark (oskarstark)
- Leszek Prabucki (l3l0)
- Fabien Bourigault (fbourigault)
- François Zaninotto (fzaninotto)
@@ -239,7 +242,6 @@ Symfony is the result of the work of many people who made the code better
- Tristan Darricau (nicofuma)
- Marcel Beerta (mazen)
- Pavel Batanov (scaytrase)
- - Samuel NELA (snela)
- Loïc Faugeron
- Hidde Wieringa (hiddewie)
- Marco Pivetta (ocramius)
@@ -262,7 +264,6 @@ Symfony is the result of the work of many people who made the code better
- Benoît Burnichon (bburnichon)
- Roman Marintšenko (inori)
- Xavier Montaña Carreras (xmontana)
- - François-Xavier de Guillebon (de-gui_f)
- Mickaël Andrieu (mickaelandrieu)
- Maxime Veber (nek-)
- Xavier Perez
@@ -318,6 +319,7 @@ Symfony is the result of the work of many people who made the code better
- Marc Weistroff (futurecat)
- Christian Schmidt
- MatTheCat
+ - Alexander Schranz (alexander-schranz)
- Chad Sikorra (chadsikorra)
- Chris Smith (cs278)
- Florian Klein (docteurklein)
@@ -366,6 +368,7 @@ Symfony is the result of the work of many people who made the code better
- Thomas Royer (cydonia7)
- alquerci
- Francesco Levorato
+ - Pascal Luna (skalpa)
- Dmitrii Poddubnyi (karser)
- Vitaliy Zakharov (zakharovvi)
- Tobias Sjösten (tobiassjosten)
@@ -384,7 +387,6 @@ Symfony is the result of the work of many people who made the code better
- JhonnyL
- David Badura (davidbadura)
- hossein zolfi (ocean)
- - Alexander Schranz (alexander-schranz)
- Clément Gautier (clementgautier)
- Sanpi
- Eduardo Gulias (egulias)
@@ -393,6 +395,7 @@ Symfony is the result of the work of many people who made the code better
- Stéphane PY (steph_py)
- Philipp Kräutli (pkraeutli)
- Grzegorz (Greg) Zdanowski (kiler129)
+ - Iker Ibarguren (ikerib)
- Kirill chEbba Chebunin (chebba)
- Greg Thornton (xdissent)
- Martin Hujer (martinhujer)
@@ -447,8 +450,10 @@ Symfony is the result of the work of many people who made the code better
- Valentin Jonovs (valentins-jonovs)
- Jeanmonod David (jeanmonod)
- Christopher Davis (chrisguitarguy)
+ - Webnet team (webnet)
- Jan Schumann
- Niklas Fiekas
+ - renanbr
- Markus Bachmann (baachi)
- lancergr
- Mihai Stancu
@@ -456,7 +461,7 @@ Symfony is the result of the work of many people who made the code better
- Olivier Dolbeau (odolbeau)
- Jan Rosier (rosier)
- Alessandro Lai (jean85)
- - Pascal Luna (skalpa)
+ - Andre Rømcke (andrerom)
- Arturs Vonda
- Josip Kruslin
- Asmir Mustafic (goetas)
@@ -480,6 +485,7 @@ Symfony is the result of the work of many people who made the code better
- Jonas Flodén (flojon)
- Gonzalo Vilaseca (gonzalovilaseca)
- Marcin Sikoń (marphi)
+ - Przemysław Bogusz (przemyslaw-bogusz)
- Dominik Zogg (dominik.zogg)
- Marek Pietrzak
- Luc Vieillescazes (iamluc)
@@ -492,6 +498,7 @@ Symfony is the result of the work of many people who made the code better
- Adam Harvey
- Anton Bakai
- Rhodri Pugh (rodnaph)
+ - Sam Fleming (sam_fleming)
- Alex Bakhturin
- insekticid
- Alexander Obuhovich (aik099)
@@ -516,7 +523,6 @@ Symfony is the result of the work of many people who made the code better
- Manuel de Ruiter (manuel)
- Eduardo Oliveira (entering)
- Ilya Antipenko (aivus)
- - Iker Ibarguren (ikerib)
- Ricardo Oliveira (ricardolotr)
- Roy Van Ginneken (rvanginneken)
- ondrowan
@@ -546,6 +552,7 @@ Symfony is the result of the work of many people who made the code better
- Almog Baku (almogbaku)
- Scott Arciszewski
- Xavier HAUSHERR
+ - Philipp Cordes
- Norbert Orzechowicz (norzechowicz)
- Denis Charrier (brucewouaigne)
- Matthijs van den Bos (matthijs)
@@ -596,6 +603,7 @@ Symfony is the result of the work of many people who made the code better
- Jan Behrens
- Mantas Var (mvar)
- Sebastian Krebs
+ - Baptiste Leduc (bleduc)
- Laurent VOULLEMIER (lvo)
- Jean-Christophe Cuvelier [Artack]
- Simon DELICATA
@@ -617,7 +625,6 @@ Symfony is the result of the work of many people who made the code better
- Sinan Eldem
- Alexandre Dupuy (satchette)
- Malte Blättermann
- - Andre Rømcke (andrerom)
- Nahuel Cuesta (ncuesta)
- Chris Boden (cboden)
- Christophe Villeger (seragan)
@@ -626,7 +633,6 @@ Symfony is the result of the work of many people who made the code better
- Stefan Gehrig (sgehrig)
- Hany el-Kerdany
- Wang Jingyu
- - Webnet team (webnet)
- Åsmund Garfors
- Gunnstein Lye (glye)
- Maxime Douailin
@@ -641,6 +647,7 @@ Symfony is the result of the work of many people who made the code better
- dantleech
- Anne-Sophie Bachelard (annesophie)
- Sebastian Marek (proofek)
+ - Guilhem N (guilhemn)
- Erkhembayar Gantulga (erheme318)
- Michal Trojanowski
- David Fuhr
@@ -656,6 +663,7 @@ Symfony is the result of the work of many people who made the code better
- Stefan Warman
- Arkadius Stefanski (arkadius)
- Tristan Maindron (tmaindron)
+ - Behnoush Norouzali (behnoush)
- Wesley Lancel
- Ke WANG (yktd26)
- Ivo Bathke (ivoba)
@@ -678,6 +686,7 @@ Symfony is the result of the work of many people who made the code better
- Sascha Grossenbacher
- Emanuele Panzeri (thepanz)
- Szijarto Tamas
+ - Gocha Ossinkine (ossinkine)
- Robin Lehrmann (robinlehrmann)
- Catalin Dan
- Jaroslav Kuba
@@ -734,10 +743,10 @@ Symfony is the result of the work of many people who made the code better
- Pascal Helfenstein
- Anthony GRASSIOT (antograssiot)
- Baldur Rensch (brensch)
- - Anthony MARTIN (xurudragon)
- Pierre Rineau
- Vladyslav Petrovych
- Alex Xandra Albert Sim
+ - Patrick Landolt (scube)
- Carson Full
- Sergey Yastrebov
- Trent Steel (trsteel88)
@@ -774,6 +783,7 @@ Symfony is the result of the work of many people who made the code better
- Noah Heck (myesain)
- Christian Soronellas (theunic)
- Johann Pardanaud
+ - fedor.f
- Yosmany Garcia (yosmanyga)
- Wouter de Wild
- Antoine M (amakdessi)
@@ -786,9 +796,9 @@ Symfony is the result of the work of many people who made the code better
- possum
- Denis Zunke (donalberto)
- Ahmadou Waly Ndiaye (waly)
- - Philipp Cordes
- Ahmed TAILOULOUTE (ahmedtai)
- Olivier Maisonneuve (olineuve)
+ - Pedro Miguel Maymone de Resende (pedroresende)
- Masterklavi
- Francis Turmel (fturmel)
- Nikita Nefedov (nikita2206)
@@ -803,6 +813,7 @@ Symfony is the result of the work of many people who made the code better
- Harm van Tilborg
- Jan Prieser
- GDIBass
+ - Antoine Lamirault
- Adrien Lucas (adrienlucas)
- Zhuravlev Alexander (scif)
- James Michael DuPont
@@ -899,7 +910,6 @@ Symfony is the result of the work of many people who made the code better
- Adán Lobato (adanlobato)
- Ian Jenkins (jenkoian)
- Matthew Davis (mdavis1982)
- - Sam Fleming (sam_fleming)
- Maks
- Antoine LA
- den
@@ -907,6 +917,7 @@ Symfony is the result of the work of many people who made the code better
- omerida
- Gábor Tóth
- Daniel Cestari
+ - Matt Janssen
- David Lima
- Stéphane Delprat
- Brian Freytag (brianfreytag)
@@ -926,7 +937,6 @@ Symfony is the result of the work of many people who made the code better
- Kyle
- Daniel Alejandro Castro Arellano (lexcast)
- sensio
- - Baptiste Leduc (bleduc)
- Sebastien Morel (plopix)
- Patrick Kaufmann
- Piotr Stankowski
@@ -974,10 +984,10 @@ Symfony is the result of the work of many people who made the code better
- Sander Coolen (scoolen)
- Nicolas Le Goff (nlegoff)
- Ben Oman
- - Guilhem N (guilhemn)
- Chris de Kok
- Andreas Kleemann
- Manuele Menozzi
+ - zairig imad (zairigimad)
- Anton Babenko (antonbabenko)
- Irmantas Šiupšinskas (irmantas)
- Danilo Silva
@@ -1013,23 +1023,25 @@ Symfony is the result of the work of many people who made the code better
- tamirvs
- julien.galenski
- Christian Neff
+ - Chris Tiearney
- Oliver Hoff
- Ole Rößner (basster)
+ - Faton (notaf)
+ - Tom Houdmont
- Per Sandström (per)
- Goran Juric
- Laurent Ghirardotti (laurentg)
- Nicolas Macherey
- Guido Donnari
- AKeeman (akeeman)
+ - Mert Simsek (mrtsmsk0)
- Lin Clark
- Jeremy David (jeremy.david)
- - Gocha Ossinkine (ossinkine)
- Troy McCabe
- Ville Mattila
- ilyes kooli
- gr1ev0us
- mlazovla
- - Behnoush norouzali (behnoush)
- Max Beutel
- Antanas Arvasevicius
- Pierre Dudoret
@@ -1038,6 +1050,7 @@ Symfony is the result of the work of many people who made the code better
- nacho
- Piotr Antosik (antek88)
- Artem Lopata
+ - Patrick Reimers (preimers)
- Sergey Novikov (s12v)
- Marcos Quesada (marcos_quesada)
- Matthew Vickery (mattvick)
@@ -1052,6 +1065,7 @@ Symfony is the result of the work of many people who made the code better
- Jean-Guilhem Rouel (jean-gui)
- jfcixmedia
- Dominic Tubach
+ - Tales Santos (tsantos84)
- Nikita Konstantinov
- Martijn Evers
- Vitaliy Ryaboy (vitaliy)
@@ -1060,6 +1074,7 @@ Symfony is the result of the work of many people who made the code better
- Denis Golubovskiy (bukashk0zzz)
- Sergii Smertin (nfx)
- Michał Strzelecki
+ - Soner Sayakci
- hugofonseca (fonsecas72)
- Martynas Narbutas
- Toon Verwerft (veewee)
@@ -1133,10 +1148,13 @@ Symfony is the result of the work of many people who made the code better
- rchoquet
- gitlost
- Taras Girnyk
+ - nikos.sotiropoulos
- Eduardo García Sanz (coma)
+ - Sergio (deverad)
- James Gilliland
- fduch (fduch)
- David de Boer (ddeboer)
+ - Eno Mullaraj (emullaraj)
- Ryan Rogers
- Klaus Purer
- arnaud (arnooo999)
@@ -1155,7 +1173,6 @@ Symfony is the result of the work of many people who made the code better
- Max Voloshin (maxvoloshin)
- Nicolas Fabre (nfabre)
- Raul Rodriguez (raul782)
- - Patrick Landolt (scube)
- WybrenKoelmans
- Derek Lambert
- MightyBranch
@@ -1183,6 +1200,7 @@ Symfony is the result of the work of many people who made the code better
- Dmitri Petmanson
- heccjj
- Alexandre Melard
+ - Jonathan (jls-esokia)
- Jay Klehr
- Sergey Yuferev
- Tobias Stöckler
@@ -1244,6 +1262,7 @@ Symfony is the result of the work of many people who made the code better
- Sébastien HOUZÉ
- Jingyu Wang
- steveYeah
+ - BENOIT POLASZEK (bpolaszek)
- Samy Dindane (dinduks)
- Keri Henare (kerihenare)
- Cédric Lahouste (rapotor)
@@ -1252,7 +1271,6 @@ Symfony is the result of the work of many people who made the code better
- Berat Doğan
- Guillaume LECERF
- Juanmi Rodriguez Cerón
- - renanbr
- Andy Raines
- Anthony Ferrara
- Geoffrey Pécro (gpekz)
@@ -1277,6 +1295,7 @@ Symfony is the result of the work of many people who made the code better
- Luis Ramirez (luisdeimos)
- Daniel Richter (richtermeister)
- ChrisC
+ - JL
- Ilya Biryukov
- Kim Laï Trinh
- Jason Desrosiers
@@ -1311,11 +1330,14 @@ Symfony is the result of the work of many people who made the code better
- Adrien Moiruad
- Tomaz Ahlin
- Philip Ardery
+ - Nasim
- Marcus Stöhr (dafish)
- Daniel González Zaballos (dem3trio)
- Emmanuel Vella (emmanuel.vella)
+ - Guillaume BRETOU (guiguiboy)
- Jonathan Johnson (jrjohnson)
- Carsten Nielsen (phreaknerd)
+ - Roger Guasch (rogerguasch)
- Mathieu Rochette
- Jay Severson
- René Kerner
@@ -1343,11 +1365,14 @@ Symfony is the result of the work of many people who made the code better
- Thomas Counsell
- BilgeXA
- r1pp3rj4ck
+ - phydevs
- Robert Queck
- Peter Bouwdewijn
- mlively
- Amine Matmati
+ - caalholm
- Fabian Steiner (fabstei)
+ - Felipy Tavares Amorim (felipyamorim)
- Klaus Silveira (klaussilveira)
- Thomas Chmielowiec (chmielot)
- Jānis Lukss
@@ -1393,7 +1418,9 @@ Symfony is the result of the work of many people who made the code better
- Keith Maika
- Mephistofeles
- Hoffmann András
+ - LubenZA
- Olivier
+ - Anton Chernikov
- Cyril PASCAL
- pscheit
- Wybren Koelmans
@@ -1402,8 +1429,10 @@ Symfony is the result of the work of many people who made the code better
- moldcraft
- Antoine Bellion (abellion)
- Ramon Kleiss (akathos)
+ - Antonio Peric-Mazar (antonioperic)
- César Suárez (csuarez)
- Bjorn Twachtmann (dotbjorn)
+ - Luis Tacón (lutacon)
- Nicolas Badey (nico-b)
- Shane Preece (shane)
- Johannes Goslar
@@ -1436,12 +1465,14 @@ Symfony is the result of the work of many people who made the code better
- Przemysław Piechota (kibao)
- Leonid Terentyev (li0n)
- Martynas Sudintas (martiis)
+ - Gabriel Ostrolucký
- ryunosuke
- zenmate
- victoria
- Francisco Facioni (fran6co)
- Iwan van Staveren (istaveren)
- Povilas S. (povilas)
+ - Evrard Boulou
- pborreli
- Boris Betzholz
- Eric Caron
@@ -1452,10 +1483,13 @@ Symfony is the result of the work of many people who made the code better
- catch
- Alexandre Segura
- Josef Cech
+ - Andrii Boiko
- Harold Iedema
+ - Ikhsan Agustian
- Arnau González (arnaugm)
- Simon Bouland (bouland)
- Matthew Foster (mfoster)
+ - Reyo Stallenberg (reyostallenberg)
- Paul Seiffert (seiffert)
- Vasily Khayrulin (sirian)
- Stefan Koopmanschap (skoop)
@@ -1536,9 +1570,11 @@ Symfony is the result of the work of many people who made the code better
- Normunds
- Luiz “Felds” Liscia
- Thomas Rothe
+ - Martin
- nietonfir
- alefranz
- David Barratt
+ - Andrea Giannantonio
- Pavel.Batanov
- avi123
- Pavel Prischepa
@@ -1559,12 +1595,14 @@ Symfony is the result of the work of many people who made the code better
- Nicolas Pion
- Muhammed Akbulut
- Aaron Somi
+ - Karoly Gossler (connorhu)
- Michał Dąbrowski (defrag)
- Konstantin Grachev (grachevko)
- Simone Fumagalli (hpatoio)
- Brian Graham (incognito)
- Kevin Vergauwen (innocenzo)
- Alessio Baglio (ioalessio)
+ - Jan van Thoor (janvt)
- Johannes Müller (johmue)
- Jordi Llonch (jordillonch)
- Cédric Dugat (ph3nol)
@@ -1680,6 +1718,7 @@ Symfony is the result of the work of many people who made the code better
- Jonny Schmid (schmidjon)
- Götz Gottwald
- Veres Lajos
+ - Nick Chiu
- grifx
- Robert Campbell
- Matt Lehner
@@ -1714,6 +1753,7 @@ Symfony is the result of the work of many people who made the code better
- skafandri
- Derek Bonner
- Alan Chen
+ - insidestyles
- Maerlyn
- Even André Fiskvik
- Arjan Keeman
@@ -1750,8 +1790,10 @@ Symfony is the result of the work of many people who made the code better
- Brieuc THOMAS (brieucthomas)
- Masao Maeda (brtriver)
- Darius Leskauskas (darles)
+ - david perez (davidpv)
- David Joos (djoos)
- Denis Klementjev (dklementjev)
+ - Dominik Hajduk (dominikalp)
- Tomáš Polívka (draczris)
- Dennis Smink (dsmink)
- Franz Liedke (franzliedke)
@@ -1932,13 +1974,14 @@ Symfony is the result of the work of many people who made the code better
- zorn
- Yuriy Potemkin
- Emilie Lorenzo
+ - enomotodev
- Edvin Hultberg
- Benjamin Long
- - Matt Janssen
- Ben Miller
- Peter Gribanov
- kwiateusz
- jspee
+ - Ilya Bulakh
- David Soria Parra
- Sergiy Sokolenko
- Ahmed Abdulrahman
@@ -2042,10 +2085,10 @@ Symfony is the result of the work of many people who made the code better
- Tomas Norkūnas (norkunas)
- Marco Petersen (ocrampete16)
- ollie harridge (ollietb)
+ - Dimitri Gritsajuk (ottaviano)
- Paul Andrieux (paulandrieux)
- Paweł Szczepanek (pauluz)
- Philippe Degeeter (pdegeeter)
- - Pedro Miguel Maymone de Resende (pedroresende)
- Christian López Espínola (penyaskito)
- Petr Jaroš (petajaros)
- Philipp Hoffmann (philipphoffmann)
@@ -2053,6 +2096,7 @@ Symfony is the result of the work of many people who made the code better
- Daniel Perez Pinazo (pitiflautico)
- Phil Taylor (prazgod)
- Maxim Pustynnikov (pustynnikov)
+ - Ralf Kuehnel (ralfkuehnel)
- Brayden Williams (redstar504)
- Rich Sage (richsage)
- Rokas Mikalkėnas (rokasm)
@@ -2113,6 +2157,7 @@ Symfony is the result of the work of many people who made the code better
- Andrew Carter (andrewcarteruk)
- Adam Elsodaney (archfizz)
- Gregório Bonfante Borba (bonfante)
+ - Bogdan Rancichi (devck)
- Daniel Kolvik (dkvk)
- Marc Lemay (flug)
- Henne Van Och (hennevo)
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
index b3d17e3db08c6..49d10a486bfe8 100644
--- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -42,7 +42,7 @@ public function __construct($entityManager)
@trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since Symfony 4.2, inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), E_USER_DEPRECATED);
$this->classMetadataFactory = $entityManager;
} else {
- throw new \InvalidArgumentException(sprintf('$entityManager must be an instance of "%s", "%s" given.', EntityManagerInterface::class, \is_object($entityManager) ? \get_class($entityManager) : \gettype($entityManager)));
+ throw new \TypeError(sprintf('$entityManager must be an instance of "%s", "%s" given.', EntityManagerInterface::class, \is_object($entityManager) ? \get_class($entityManager) : \gettype($entityManager)));
}
}
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
index de021426e03b9..fb668be62b4d5 100644
--- a/src/Symfony/Bridge/Monolog/Logger.php
+++ b/src/Symfony/Bridge/Monolog/Logger.php
@@ -12,6 +12,7 @@
namespace Symfony\Bridge\Monolog;
use Monolog\Logger as BaseLogger;
+use Monolog\ResettableInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
use Symfony\Contracts\Service\ResetInterface;
@@ -73,6 +74,10 @@ public function clear()
public function reset()
{
$this->clear();
+
+ if ($this instanceof ResettableInterface) {
+ parent::reset();
+ }
}
/**
diff --git a/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php b/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
index 2ee7bc7d930a5..143200f6c5718 100644
--- a/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Bridge\Monolog\Tests;
use Monolog\Handler\TestHandler;
+use Monolog\ResettableInterface;
use PHPUnit\Framework\TestCase;
use Symfony\Bridge\Monolog\Logger;
use Symfony\Bridge\Monolog\Processor\DebugProcessor;
@@ -108,6 +109,22 @@ public function testClear()
$this->assertSame(0, $logger->countErrors());
}
+ public function testReset()
+ {
+ $handler = new TestHandler();
+ $logger = new Logger('test', [$handler]);
+ $logger->pushProcessor(new DebugProcessor());
+
+ $logger->info('test');
+ $logger->reset();
+
+ $this->assertEmpty($logger->getLogs());
+ $this->assertSame(0, $logger->countErrors());
+ if (class_exists(ResettableInterface::class)) {
+ $this->assertEmpty($handler->getRecords());
+ }
+ }
+
/**
* @group legacy
* @expectedDeprecation The "Symfony\Bridge\Monolog\Logger::getLogs()" method will have a new "Request $request = null" argument in version 5.0, not defining it is deprecated since Symfony 4.2.
diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
index 8611c7b222155..14b482c87440d 100644
--- a/src/Symfony/Bridge/PhpUnit/ClockMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -83,7 +83,7 @@ public static function register($class)
{
$self = \get_called_class();
- $mockedNs = [substr($class, 0, strrpos($class, '\\'))];
+ $mockedNs = array(substr($class, 0, strrpos($class, '\\')));
if (0 < strpos($class, '\\Tests\\')) {
$ns = str_replace('\\Tests\\', '\\', $class);
$mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index 3b71124eb8e2e..4252f5c2b3cd5 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -54,9 +54,9 @@ public static function register($mode = 0)
if (false === $mode) {
$mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
}
- if (self::MODE_DISABLED !== $mode
- && self::MODE_WEAK !== $mode
- && self::MODE_WEAK_VENDORS !== $mode
+ if (DeprecationErrorHandler::MODE_DISABLED !== $mode
+ && DeprecationErrorHandler::MODE_WEAK !== $mode
+ && DeprecationErrorHandler::MODE_WEAK_VENDORS !== $mode
&& (!isset($mode[0]) || '/' !== $mode[0])
) {
$mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
@@ -92,7 +92,7 @@ public static function register($mode = 0)
return false;
};
- $deprecations = [
+ $deprecations = array(
'unsilencedCount' => 0,
'remainingCount' => 0,
'legacyCount' => 0,
@@ -103,10 +103,9 @@ public static function register($mode = 0)
'legacy' => array(),
'other' => array(),
'remaining vendor' => array(),
- ];
+ );
$deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
- $mode = $getMode();
- if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) {
+ if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {
$ErrorHandler = $UtilPrefix.'ErrorHandler';
return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
@@ -114,7 +113,7 @@ public static function register($mode = 0)
$trace = debug_backtrace();
$group = 'other';
- $isVendor = self::MODE_WEAK_VENDORS === $mode && $inVendors($file);
+ $isVendor = DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && $inVendors($file);
$i = \count($trace);
while (1 < $i && (!isset($trace[--$i]['class']) || ('ReflectionMethod' === $trace[$i]['class'] || 0 === strpos($trace[$i]['class'], 'PHPUnit_') || 0 === strpos($trace[$i]['class'], 'PHPUnit\\')))) {
@@ -131,7 +130,7 @@ public static function register($mode = 0)
// \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest()
// then we need to use the serialized information to determine
// if the error has been triggered from vendor code.
- $isVendor = self::MODE_WEAK_VENDORS === $mode && isset($parsedMsg['triggering_file']) && $inVendors($parsedMsg['triggering_file']);
+ $isVendor = DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && isset($parsedMsg['triggering_file']) && $inVendors($parsedMsg['triggering_file']);
} else {
$class = isset($trace[$i]['object']) ? \get_class($trace[$i]['object']) : $trace[$i]['class'];
$method = $trace[$i]['function'];
@@ -168,13 +167,13 @@ public static function register($mode = 0)
exit(1);
}
- if ('legacy' !== $group && self::MODE_WEAK !== $mode) {
+ if ('legacy' !== $group && DeprecationErrorHandler::MODE_WEAK !== $mode) {
$ref = &$deprecations[$group][$msg]['count'];
++$ref;
$ref = &$deprecations[$group][$msg][$class.'::'.$method];
++$ref;
}
- } elseif (self::MODE_WEAK !== $mode) {
+ } elseif (DeprecationErrorHandler::MODE_WEAK !== $mode) {
$ref = &$deprecations[$group][$msg]['count'];
++$ref;
}
@@ -184,7 +183,7 @@ public static function register($mode = 0)
if (null !== $oldErrorHandler) {
restore_error_handler();
- if ([$UtilPrefix.'ErrorHandler', 'handleError'] === $oldErrorHandler) {
+ if (array($UtilPrefix.'ErrorHandler', 'handleError') === $oldErrorHandler) {
restore_error_handler();
self::register($mode);
}
@@ -207,7 +206,7 @@ public static function register($mode = 0)
$currErrorHandler = set_error_handler('var_dump');
restore_error_handler();
- if (self::MODE_WEAK === $mode) {
+ if (DeprecationErrorHandler::MODE_WEAK === $mode) {
$colorize = function ($str) { return $str; };
}
if ($currErrorHandler !== $deprecationHandler) {
@@ -218,8 +217,8 @@ public static function register($mode = 0)
return $b['count'] - $a['count'];
};
- $groups = ['unsilenced', 'remaining'];
- if (self::MODE_WEAK_VENDORS === $mode) {
+ $groups = array('unsilenced', 'remaining');
+ if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
$groups[] = 'remaining vendor';
}
array_push($groups, 'legacy', 'other');
@@ -255,11 +254,11 @@ public static function register($mode = 0)
$displayDeprecations($deprecations);
// store failing status
- $isFailing = self::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount'];
+ $isFailing = DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount'];
// reset deprecations array
foreach ($deprecations as $group => $arrayOrInt) {
- $deprecations[$group] = \is_int($arrayOrInt) ? 0 : [];
+ $deprecations[$group] = \is_int($arrayOrInt) ? 0 : array();
}
register_shutdown_function(function () use (&$deprecations, $isFailing, $displayDeprecations, $mode) {
@@ -270,7 +269,7 @@ public static function register($mode = 0)
}
}
$displayDeprecations($deprecations);
- if ($isFailing || self::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {
+ if ($isFailing || DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {
exit(1);
}
});
@@ -280,8 +279,8 @@ public static function register($mode = 0)
public static function collectDeprecations($outputFile)
{
- $deprecations = [];
- $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$deprecations, &$previousErrorHandler) {
+ $deprecations = array();
+ $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, &$previousErrorHandler) {
if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
if ($previousErrorHandler) {
return $previousErrorHandler($type, $msg, $file, $line, $context);
@@ -293,7 +292,7 @@ public static function collectDeprecations($outputFile)
return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
}
- $deprecations[] = [error_reporting(), $msg, $file];
+ $deprecations[] = array(error_reporting(), $msg, $file);
});
register_shutdown_function(function () use ($outputFile, &$deprecations) {
diff --git a/src/Symfony/Bridge/PhpUnit/DnsMock.php b/src/Symfony/Bridge/PhpUnit/DnsMock.php
index a58bf2efcde35..790cfa91af5c2 100644
--- a/src/Symfony/Bridge/PhpUnit/DnsMock.php
+++ b/src/Symfony/Bridge/PhpUnit/DnsMock.php
@@ -16,8 +16,8 @@
*/
class DnsMock
{
- private static $hosts = [];
- private static $dnsTypes = [
+ private static $hosts = array();
+ private static $dnsTypes = array(
'A' => DNS_A,
'MX' => DNS_MX,
'NS' => DNS_NS,
@@ -30,7 +30,7 @@ class DnsMock
'NAPTR' => DNS_NAPTR,
'TXT' => DNS_TXT,
'HINFO' => DNS_HINFO,
- ];
+ );
/**
* Configures the mock values for DNS queries.
@@ -68,7 +68,7 @@ public static function getmxrr($hostname, &$mxhosts, &$weight = null)
if (!self::$hosts) {
return \getmxrr($hostname, $mxhosts, $weight);
}
- $mxhosts = $weight = [];
+ $mxhosts = $weight = array();
if (isset(self::$hosts[$hostname])) {
foreach (self::$hosts[$hostname] as $record) {
@@ -125,7 +125,7 @@ public static function gethostbynamel($hostname)
$ips = false;
if (isset(self::$hosts[$hostname])) {
- $ips = [];
+ $ips = array();
foreach (self::$hosts[$hostname] as $record) {
if ('A' === $record['type']) {
@@ -149,11 +149,11 @@ public static function dns_get_record($hostname, $type = DNS_ANY, &$authns = nul
if (DNS_ANY === $type) {
$type = DNS_ALL;
}
- $records = [];
+ $records = array();
foreach (self::$hosts[$hostname] as $record) {
if (isset(self::$dnsTypes[$record['type']]) && (self::$dnsTypes[$record['type']] & $type)) {
- $records[] = array_merge(['host' => $hostname, 'class' => 'IN', 'ttl' => 1, 'type' => $record['type']], $record);
+ $records[] = array_merge(array('host' => $hostname, 'class' => 'IN', 'ttl' => 1, 'type' => $record['type']), $record);
}
}
}
@@ -165,7 +165,7 @@ public static function register($class)
{
$self = \get_called_class();
- $mockedNs = [substr($class, 0, strrpos($class, '\\'))];
+ $mockedNs = array(substr($class, 0, strrpos($class, '\\')));
if (0 < strpos($class, '\\Tests\\')) {
$ns = str_replace('\\Tests\\', '\\', $class);
$mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
index 07a9679d13c1c..8e9bdbe92ed4d 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
@@ -31,7 +31,7 @@ public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFo
{
$this->sutFqcnResolver = $sutFqcnResolver;
$this->warningOnSutNotFound = $warningOnSutNotFound;
- $this->warnings = [];
+ $this->warnings = array();
}
public function startTest($test)
@@ -42,7 +42,7 @@ public function startTest($test)
$annotations = $test->getAnnotations();
- $ignoredAnnotations = ['covers', 'coversDefaultClass', 'coversNothing'];
+ $ignoredAnnotations = array('covers', 'coversDefaultClass', 'coversNothing');
foreach ($ignoredAnnotations as $annotation) {
if (isset($annotations['class'][$annotation]) || isset($annotations['method'][$annotation])) {
@@ -74,11 +74,11 @@ public function startTest($test)
$r->setAccessible(true);
$cache = $r->getValue();
- $cache = array_replace_recursive($cache, [
- \get_class($test) => [
- 'covers' => [$sutFqcn],
- ],
- ]);
+ $cache = array_replace_recursive($cache, array(
+ \get_class($test) => array(
+ 'covers' => array($sutFqcn),
+ ),
+ ));
$r->setValue($testClass, $cache);
}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php
index c825a8ddb2f30..2da40f2c204f1 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php
@@ -22,7 +22,7 @@ class SymfonyTestsListenerForV5 extends \PHPUnit_Framework_BaseTestListener
{
private $trait;
- public function __construct(array $mockedNamespaces = [])
+ public function __construct(array $mockedNamespaces = array())
{
$this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
index 0c0b57080e01f..5b864bfe58a32 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
@@ -27,7 +27,7 @@ class SymfonyTestsListenerForV6 extends BaseTestListener
{
private $trait;
- public function __construct(array $mockedNamespaces = [])
+ public function __construct(array $mockedNamespaces = array())
{
$this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php
index 25ad718a80416..18bbdbeba0f03 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php
@@ -30,7 +30,7 @@ class SymfonyTestsListenerForV7 implements TestListener
private $trait;
- public function __construct(array $mockedNamespaces = [])
+ public function __construct(array $mockedNamespaces = array())
{
$this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 5f219459003c2..b527e039662bb 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -32,10 +32,10 @@ class SymfonyTestsListenerTrait
private static $globallyEnabled = false;
private $state = -1;
private $skippedFile = false;
- private $wasSkipped = [];
- private $isSkipped = [];
- private $expectedDeprecations = [];
- private $gatheredDeprecations = [];
+ private $wasSkipped = array();
+ private $isSkipped = array();
+ private $expectedDeprecations = array();
+ private $gatheredDeprecations = array();
private $previousErrorHandler;
private $testsWithWarnings;
private $reportUselessTests;
@@ -45,7 +45,7 @@ class SymfonyTestsListenerTrait
/**
* @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive or dns-sensitive)
*/
- public function __construct(array $mockedNamespaces = [])
+ public function __construct(array $mockedNamespaces = array())
{
if (class_exists('PHPUnit_Util_Blacklist')) {
\PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
@@ -57,7 +57,7 @@ public function __construct(array $mockedNamespaces = [])
foreach ($mockedNamespaces as $type => $namespaces) {
if (!\is_array($namespaces)) {
- $namespaces = [$namespaces];
+ $namespaces = array($namespaces);
}
if ('time-sensitive' === $type) {
foreach ($namespaces as $ns) {
@@ -104,7 +104,7 @@ public function startTestSuite($suite)
$Test = 'PHPUnit\Util\Test';
}
$suiteName = $suite->getName();
- $this->testsWithWarnings = [];
+ $this->testsWithWarnings = array();
foreach ($suite->tests() as $test) {
if (!($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
@@ -135,11 +135,11 @@ public function startTestSuite($suite)
if (!$this->wasSkipped = require $this->skippedFile) {
echo "All tests already ran successfully.\n";
- $suite->setTests([]);
+ $suite->setTests(array());
}
}
}
- $testSuites = [$suite];
+ $testSuites = array($suite);
for ($i = 0; isset($testSuites[$i]); ++$i) {
foreach ($testSuites[$i]->tests() as $test) {
if ($test instanceof \PHPUnit_Framework_TestSuite || $test instanceof TestSuite) {
@@ -158,7 +158,7 @@ public function startTestSuite($suite)
}
}
} elseif (2 === $this->state) {
- $skipped = [];
+ $skipped = array();
foreach ($suite->tests() as $test) {
if (!($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)
|| isset($this->wasSkipped[$suiteName]['*'])
@@ -230,7 +230,7 @@ public function startTest($test)
$test->getTestResultObject()->beStrictAboutTestsThatDoNotTestAnything(false);
$this->expectedDeprecations = $annotations['method']['expectedDeprecation'];
- $this->previousErrorHandler = set_error_handler([$this, 'handleError']);
+ $this->previousErrorHandler = set_error_handler(array($this, 'handleError'));
}
}
}
@@ -271,8 +271,8 @@ public function endTest($test, $time)
$deprecations = file_get_contents($this->runsInSeparateProcess);
unlink($this->runsInSeparateProcess);
putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
- foreach ($deprecations ? unserialize($deprecations) : [] as $deprecation) {
- $error = serialize(['deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false), 'triggering_file' => isset($deprecation[2]) ? $deprecation[2] : null]);
+ foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
+ $error = serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false), 'triggering_file' => isset($deprecation[2]) ? $deprecation[2] : null));
if ($deprecation[0]) {
@trigger_error($error, E_USER_DEPRECATED);
} else {
@@ -283,13 +283,13 @@ public function endTest($test, $time)
}
if ($this->expectedDeprecations) {
- if (!\in_array($test->getStatus(), [$BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE], true)) {
+ if (!\in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE), true)) {
$test->addToAssertionCount(\count($this->expectedDeprecations));
}
restore_error_handler();
- if (!$errored && !\in_array($test->getStatus(), [$BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE, $BaseTestRunner::STATUS_FAILURE, $BaseTestRunner::STATUS_ERROR], true)) {
+ if (!$errored && !\in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE, $BaseTestRunner::STATUS_FAILURE, $BaseTestRunner::STATUS_ERROR), true)) {
try {
$prefix = "@expectedDeprecation:\n";
$test->assertStringMatchesFormat($prefix.'%A '.implode("\n%A ", $this->expectedDeprecations)."\n%A", $prefix.' '.implode("\n ", $this->gatheredDeprecations)."\n");
@@ -300,7 +300,7 @@ public function endTest($test, $time)
}
}
- $this->expectedDeprecations = $this->gatheredDeprecations = [];
+ $this->expectedDeprecations = $this->gatheredDeprecations = array();
$this->previousErrorHandler = null;
}
if (!$this->runsInSeparateProcess && -2 < $this->state && ($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
@@ -308,12 +308,12 @@ public function endTest($test, $time)
ClockMock::withClockMock(false);
}
if (\in_array('dns-sensitive', $groups, true)) {
- DnsMock::withMockedHosts([]);
+ DnsMock::withMockedHosts(array());
}
}
}
- public function handleError($type, $msg, $file, $line, $context = [])
+ public function handleError($type, $msg, $file, $line, $context = array())
{
if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
$h = $this->previousErrorHandler;
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
index 1a89019fe3060..7897861cf52f7 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
@@ -27,7 +27,7 @@ protected function handleConfiguration(array &$arguments)
$result = parent::handleConfiguration($arguments);
- $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : [];
+ $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
$registeredLocally = false;
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
index 8489a58627fa9..6da7c65448532 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
@@ -30,7 +30,7 @@ protected function handleConfiguration(array &$arguments)
parent::handleConfiguration($arguments);
- $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : [];
+ $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
$registeredLocally = false;
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
index bc5fff95ba716..a175fb65d7f5a 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
@@ -30,7 +30,7 @@ protected function handleConfiguration(array &$arguments): void
parent::handleConfiguration($arguments);
- $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : [];
+ $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
$registeredLocally = false;
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
index 9bc155a7cdebb..7a0595a7ddebc 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -25,7 +25,7 @@ class Test
{
public static function getGroups()
{
- return [];
+ return array();
}
}
EOPHP
@@ -35,7 +35,7 @@ class PHPUnit_Util_Test
{
public static function getGroups()
{
- return [];
+ return array();
}
}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php
index 5229a7a7cc6f5..16a58246d2115 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php
@@ -7,7 +7,7 @@ class Test
{
public static function getGroups()
{
- return [];
+ return array();
}
}
EOPHP
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
index 703db6fd19fa8..fddeed6085dea 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
@@ -25,7 +25,7 @@ class Test
{
public static function getGroups()
{
- return [];
+ return array();
}
}
EOPHP
@@ -35,7 +35,7 @@ class PHPUnit_Util_Test
{
public static function getGroups()
{
- return [];
+ return array();
}
}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt
index b37b623cf297a..e20c7adf6ba1f 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt
@@ -25,7 +25,7 @@ class Test
{
public static function getGroups()
{
- return [];
+ return array();
}
}
EOPHP
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php
index ebbc87a770672..a178ac7e898c7 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php
@@ -18,15 +18,15 @@ class DnsMockTest extends TestCase
{
protected function tearDown()
{
- DnsMock::withMockedHosts([]);
+ DnsMock::withMockedHosts(array());
}
public function testCheckdnsrr()
{
- DnsMock::withMockedHosts(['example.com' => [['type' => 'MX']]]);
+ DnsMock::withMockedHosts(array('example.com' => array(array('type' => 'MX'))));
$this->assertTrue(DnsMock::checkdnsrr('example.com'));
- DnsMock::withMockedHosts(['example.com' => [['type' => 'A']]]);
+ DnsMock::withMockedHosts(array('example.com' => array(array('type' => 'A'))));
$this->assertFalse(DnsMock::checkdnsrr('example.com'));
$this->assertTrue(DnsMock::checkdnsrr('example.com', 'a'));
$this->assertTrue(DnsMock::checkdnsrr('example.com', 'any'));
@@ -35,34 +35,34 @@ public function testCheckdnsrr()
public function testGetmxrr()
{
- DnsMock::withMockedHosts([
- 'example.com' => [[
+ DnsMock::withMockedHosts(array(
+ 'example.com' => array(array(
'type' => 'MX',
'host' => 'mx.example.com',
'pri' => 10,
- ]],
- ]);
+ )),
+ ));
$this->assertFalse(DnsMock::getmxrr('foobar.com', $mxhosts, $weight));
$this->assertTrue(DnsMock::getmxrr('example.com', $mxhosts, $weight));
- $this->assertSame(['mx.example.com'], $mxhosts);
- $this->assertSame([10], $weight);
+ $this->assertSame(array('mx.example.com'), $mxhosts);
+ $this->assertSame(array(10), $weight);
}
public function testGethostbyaddr()
{
- DnsMock::withMockedHosts([
- 'example.com' => [
- [
+ DnsMock::withMockedHosts(array(
+ 'example.com' => array(
+ array(
'type' => 'A',
'ip' => '1.2.3.4',
- ],
- [
+ ),
+ array(
'type' => 'AAAA',
'ipv6' => '::12',
- ],
- ],
- ]);
+ ),
+ ),
+ ));
$this->assertSame('::21', DnsMock::gethostbyaddr('::21'));
$this->assertSame('example.com', DnsMock::gethostbyaddr('::12'));
@@ -71,18 +71,18 @@ public function testGethostbyaddr()
public function testGethostbyname()
{
- DnsMock::withMockedHosts([
- 'example.com' => [
- [
+ DnsMock::withMockedHosts(array(
+ 'example.com' => array(
+ array(
'type' => 'AAAA',
'ipv6' => '::12',
- ],
- [
+ ),
+ array(
'type' => 'A',
'ip' => '1.2.3.4',
- ],
- ],
- ]);
+ ),
+ ),
+ ));
$this->assertSame('foobar.com', DnsMock::gethostbyname('foobar.com'));
$this->assertSame('1.2.3.4', DnsMock::gethostbyname('example.com'));
@@ -90,59 +90,59 @@ public function testGethostbyname()
public function testGethostbynamel()
{
- DnsMock::withMockedHosts([
- 'example.com' => [
- [
+ DnsMock::withMockedHosts(array(
+ 'example.com' => array(
+ array(
'type' => 'A',
'ip' => '1.2.3.4',
- ],
- [
+ ),
+ array(
'type' => 'A',
'ip' => '2.3.4.5',
- ],
- ],
- ]);
+ ),
+ ),
+ ));
$this->assertFalse(DnsMock::gethostbynamel('foobar.com'));
- $this->assertSame(['1.2.3.4', '2.3.4.5'], DnsMock::gethostbynamel('example.com'));
+ $this->assertSame(array('1.2.3.4', '2.3.4.5'), DnsMock::gethostbynamel('example.com'));
}
public function testDnsGetRecord()
{
- DnsMock::withMockedHosts([
- 'example.com' => [
- [
+ DnsMock::withMockedHosts(array(
+ 'example.com' => array(
+ array(
'type' => 'A',
'ip' => '1.2.3.4',
- ],
- [
+ ),
+ array(
'type' => 'PTR',
'ip' => '2.3.4.5',
- ],
- ],
- ]);
+ ),
+ ),
+ ));
- $records = [
- [
+ $records = array(
+ array(
'host' => 'example.com',
'class' => 'IN',
'ttl' => 1,
'type' => 'A',
'ip' => '1.2.3.4',
- ],
- $ptr = [
+ ),
+ $ptr = array(
'host' => 'example.com',
'class' => 'IN',
'ttl' => 1,
'type' => 'PTR',
'ip' => '2.3.4.5',
- ],
- ];
+ ),
+ );
$this->assertFalse(DnsMock::dns_get_record('foobar.com'));
$this->assertSame($records, DnsMock::dns_get_record('example.com'));
$this->assertSame($records, DnsMock::dns_get_record('example.com', DNS_ALL));
$this->assertSame($records, DnsMock::dns_get_record('example.com', DNS_A | DNS_PTR));
- $this->assertSame([$ptr], DnsMock::dns_get_record('example.com', DNS_PTR));
+ $this->assertSame(array($ptr), DnsMock::dns_get_record('example.com', DNS_PTR));
}
}
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 0aab91a5d04a7..d918e8a0a2041 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -56,10 +56,7 @@ if (PHP_VERSION_ID >= 70200) {
$PHPUNIT_VERSION = '4.8';
}
-if ('composer.json' !== $COMPOSER_JSON = getenv('COMPOSER') ?: 'composer.json') {
- putenv('COMPOSER=composer.json');
- $_SERVER['COMPOSER'] = $_ENV['COMPOSER'] = 'composer.json';
-}
+$COMPOSER_JSON = getenv('COMPOSER') ?: 'composer.json';
$root = __DIR__;
while (!file_exists($root.'/'.$COMPOSER_JSON) || file_exists($root.'/DeprecationErrorHandler.php')) {
@@ -77,6 +74,19 @@ if ('phpdbg' === PHP_SAPI) {
$PHP .= ' -qrr';
}
+$defaultEnvs = array(
+ 'COMPOSER' => 'composer.json',
+ 'COMPOSER_VENDOR_DIR' => 'vendor',
+ 'COMPOSER_BIN_DIR' => 'bin',
+);
+
+foreach ($defaultEnvs as $envName => $envValue) {
+ if ($envValue !== getenv($envName)) {
+ putenv("$envName=$envValue");
+ $_SERVER[$envName] = $_ENV[$envName] = $envValue;
+ }
+}
+
$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
? $PHP.' '.escapeshellarg($COMPOSER)
: 'composer';
@@ -114,7 +124,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
- $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", [], $p, getcwd(), null, ['bypass_shell' => true]));
+ $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
if ($exit) {
exit($exit);
@@ -147,9 +157,9 @@ EOPHP
}
global $argv, $argc;
-$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : [];
+$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
$argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;
-$components = [];
+$components = array();
$cmd = array_map('escapeshellarg', $argv);
$exit = 0;
@@ -184,7 +194,7 @@ if ('\\' === DIRECTORY_SEPARATOR) {
if ($components) {
$skippedTests = isset($_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS']) ? $_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS'] : false;
- $runningProcs = [];
+ $runningProcs = array();
foreach ($components as $component) {
// Run phpunit tests in parallel
@@ -195,7 +205,7 @@ if ($components) {
$c = escapeshellarg($component);
- if ($proc = proc_open(sprintf($cmd, $c, " > $c/phpunit.stdout 2> $c/phpunit.stderr"), [], $pipes)) {
+ if ($proc = proc_open(sprintf($cmd, $c, " > $c/phpunit.stdout 2> $c/phpunit.stderr"), array(), $pipes)) {
$runningProcs[$component] = $proc;
} else {
$exit = 1;
@@ -205,7 +215,7 @@ if ($components) {
while ($runningProcs) {
usleep(300000);
- $terminatedProcs = [];
+ $terminatedProcs = array();
foreach ($runningProcs as $component => $proc) {
$procStatus = proc_get_status($proc);
if (!$procStatus['running']) {
@@ -216,7 +226,7 @@ if ($components) {
}
foreach ($terminatedProcs as $component => $procStatus) {
- foreach (['out', 'err'] as $file) {
+ foreach (array('out', 'err') as $file) {
$file = "$component/phpunit.std$file";
readfile($file);
unlink($file);
@@ -226,7 +236,7 @@ if ($components) {
// STATUS_STACK_BUFFER_OVERRUN (-1073740791/0xC0000409)
// STATUS_ACCESS_VIOLATION (-1073741819/0xC0000005)
// STATUS_HEAP_CORRUPTION (-1073740940/0xC0000374)
- if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN) || !in_array($procStatus, [-1073740791, -1073741819, -1073740940]))) {
+ if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN) || !in_array($procStatus, array(-1073740791, -1073741819, -1073740940)))) {
$exit = $procStatus;
echo "\033[41mKO\033[0m $component\n\n";
} else {
@@ -238,7 +248,7 @@ if ($components) {
if (!class_exists('SymfonyBlacklistSimplePhpunit', false)) {
class SymfonyBlacklistSimplePhpunit {}
}
- array_splice($argv, 1, 0, ['--colors=always']);
+ array_splice($argv, 1, 0, array('--colors=always'));
$_SERVER['argv'] = $argv;
$_SERVER['argc'] = ++$argc;
include "$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit";
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index 5ff57e1cf49fc..2439c5bba6ac3 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -13,6 +13,7 @@
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Formatter\OutputFormatter;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@@ -20,6 +21,7 @@
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Finder\Finder;
use Twig\Environment;
+use Twig\Loader\ChainLoader;
use Twig\Loader\FilesystemLoader;
/**
@@ -36,6 +38,7 @@ class DebugCommand extends Command
private $bundlesMetadata;
private $twigDefaultPath;
private $rootDir;
+ private $filesystemLoaders;
public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = [], string $twigDefaultPath = null, string $rootDir = null)
{
@@ -87,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$name = $input->getArgument('name');
$filter = $input->getOption('filter');
- if (null !== $name && !$this->twig->getLoader() instanceof FilesystemLoader) {
+ if (null !== $name && [] === $this->getFilesystemLoaders()) {
throw new InvalidArgumentException(sprintf('Argument "name" not supported, it requires the Twig loader "%s"', FilesystemLoader::class));
}
@@ -150,9 +153,11 @@ private function displayPathsText(SymfonyStyle $io, string $name)
$message = 'No template paths configured for your application';
} else {
$message = sprintf('No template paths configured for "@%s" namespace', $namespace);
- $namespaces = $this->twig->getLoader()->getNamespaces();
- foreach ($this->findAlternatives($namespace, $namespaces) as $namespace) {
- $alternatives[] = '@'.$namespace;
+ foreach ($this->getFilesystemLoaders() as $loader) {
+ $namespaces = $loader->getNamespaces();
+ foreach ($this->findAlternatives($namespace, $namespaces) as $namespace) {
+ $alternatives[] = '@'.$namespace;
+ }
}
}
@@ -184,12 +189,13 @@ private function displayPathsJson(SymfonyStyle $io, string $name)
private function displayGeneralText(SymfonyStyle $io, string $filter = null)
{
+ $decorated = $io->isDecorated();
$types = ['functions', 'filters', 'tests', 'globals'];
foreach ($types as $index => $type) {
$items = [];
foreach ($this->twig->{'get'.ucfirst($type)}() as $name => $entity) {
if (!$filter || false !== strpos($name, $filter)) {
- $items[$name] = $name.$this->getPrettyMetadata($type, $entity);
+ $items[$name] = $name.$this->getPrettyMetadata($type, $entity, $decorated);
}
}
@@ -217,6 +223,7 @@ private function displayGeneralText(SymfonyStyle $io, string $filter = null)
private function displayGeneralJson(SymfonyStyle $io, $filter)
{
+ $decorated = $io->isDecorated();
$types = ['functions', 'filters', 'tests', 'globals'];
$data = [];
foreach ($types as $type) {
@@ -234,34 +241,35 @@ private function displayGeneralJson(SymfonyStyle $io, $filter)
$data['loader_paths'] = $paths;
}
- if ($wronBundles = $this->findWrongBundleOverrides()) {
- $data['warnings'] = $this->buildWarningMessages($wronBundles);
+ if ($wrongBundles = $this->findWrongBundleOverrides()) {
+ $data['warnings'] = $this->buildWarningMessages($wrongBundles);
}
- $io->writeln(json_encode($data));
+ $data = json_encode($data, JSON_PRETTY_PRINT);
+ $io->writeln($decorated ? OutputFormatter::escape($data) : $data);
}
private function getLoaderPaths(string $name = null): array
{
- /** @var FilesystemLoader $loader */
- $loader = $this->twig->getLoader();
$loaderPaths = [];
- $namespaces = $loader->getNamespaces();
- if (null !== $name) {
- $namespace = $this->parseTemplateName($name)[0];
- $namespaces = array_intersect([$namespace], $namespaces);
- }
+ foreach ($this->getFilesystemLoaders() as $loader) {
+ $namespaces = $loader->getNamespaces();
+ if (null !== $name) {
+ $namespace = $this->parseTemplateName($name)[0];
+ $namespaces = array_intersect([$namespace], $namespaces);
+ }
- foreach ($namespaces as $namespace) {
- $paths = array_map([$this, 'getRelativePath'], $loader->getPaths($namespace));
+ foreach ($namespaces as $namespace) {
+ $paths = array_map([$this, 'getRelativePath'], $loader->getPaths($namespace));
- if (FilesystemLoader::MAIN_NAMESPACE === $namespace) {
- $namespace = '(None)';
- } else {
- $namespace = '@'.$namespace;
- }
+ if (FilesystemLoader::MAIN_NAMESPACE === $namespace) {
+ $namespace = '(None)';
+ } else {
+ $namespace = '@'.$namespace;
+ }
- $loaderPaths[$namespace] = $paths;
+ $loaderPaths[$namespace] = array_merge($loaderPaths[$namespace] ?? [], $paths);
+ }
}
return $loaderPaths;
@@ -323,7 +331,7 @@ private function getMetadata($type, $entity)
}
}
- private function getPrettyMetadata($type, $entity)
+ private function getPrettyMetadata($type, $entity, $decorated)
{
if ('tests' === $type) {
return '';
@@ -335,7 +343,7 @@ private function getPrettyMetadata($type, $entity)
return '(unknown?)';
}
} catch (\UnexpectedValueException $e) {
- return ' '.$e->getMessage().'';
+ return sprintf(' %s', $decorated ? OutputFormatter::escape($e->getMessage()) : $e->getMessage());
}
if ('globals' === $type) {
@@ -343,7 +351,9 @@ private function getPrettyMetadata($type, $entity)
return ' = object('.\get_class($meta).')';
}
- return ' = '.substr(@json_encode($meta), 0, 50);
+ $description = substr(@json_encode($meta), 0, 50);
+
+ return sprintf(' = %s', $decorated ? OutputFormatter::escape($description) : $description);
}
if ('functions' === $type) {
@@ -437,22 +447,22 @@ private function error(SymfonyStyle $io, string $message, array $alternatives =
private function findTemplateFiles(string $name): array
{
- /** @var FilesystemLoader $loader */
- $loader = $this->twig->getLoader();
- $files = [];
list($namespace, $shortname) = $this->parseTemplateName($name);
- foreach ($loader->getPaths($namespace) as $path) {
- if (!$this->isAbsolutePath($path)) {
- $path = $this->projectDir.'/'.$path;
- }
- $filename = $path.'/'.$shortname;
+ $files = [];
+ foreach ($this->getFilesystemLoaders() as $loader) {
+ foreach ($loader->getPaths($namespace) as $path) {
+ if (!$this->isAbsolutePath($path)) {
+ $path = $this->projectDir.'/'.$path;
+ }
+ $filename = $path.'/'.$shortname;
- if (is_file($filename)) {
- if (false !== $realpath = realpath($filename)) {
- $files[] = $this->getRelativePath($realpath);
- } else {
- $files[] = $this->getRelativePath($filename);
+ if (is_file($filename)) {
+ if (false !== $realpath = realpath($filename)) {
+ $files[] = $this->getRelativePath($realpath);
+ } else {
+ $files[] = $this->getRelativePath($filename);
+ }
}
}
}
@@ -535,4 +545,28 @@ private function isAbsolutePath(string $file): bool
{
return strspn($file, '/\\', 0, 1) || (\strlen($file) > 3 && ctype_alpha($file[0]) && ':' === $file[1] && strspn($file, '/\\', 2, 1)) || null !== parse_url($file, PHP_URL_SCHEME);
}
+
+ /**
+ * @return FilesystemLoader[]
+ */
+ private function getFilesystemLoaders(): array
+ {
+ if (null !== $this->filesystemLoaders) {
+ return $this->filesystemLoaders;
+ }
+ $this->filesystemLoaders = [];
+
+ $loader = $this->twig->getLoader();
+ if ($loader instanceof FilesystemLoader) {
+ $this->filesystemLoaders[] = $loader;
+ } elseif ($loader instanceof ChainLoader) {
+ foreach ($loader->getLoaders() as $l) {
+ if ($l instanceof FilesystemLoader) {
+ $this->filesystemLoaders[] = $l;
+ }
+ }
+ }
+
+ return $this->filesystemLoaders;
+ }
}
diff --git a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
index 59c8ed045c8f8..16f61a1e3ad21 100644
--- a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
@@ -16,6 +16,7 @@
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use Twig\Environment;
+use Twig\Loader\ChainLoader;
use Twig\Loader\FilesystemLoader;
class DebugCommandTest extends TestCase
@@ -279,7 +280,47 @@ public function getDebugTemplateNameTestData()
];
}
- private function createCommandTester(array $paths = [], array $bundleMetadata = [], string $defaultPath = null, string $rootDir = null): CommandTester
+ public function testDebugTemplateNameWithChainLoader()
+ {
+ $tester = $this->createCommandTester(['templates/' => null], [], null, null, true);
+ $ret = $tester->execute(['name' => 'base.html.twig'], ['decorated' => false]);
+
+ $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+ $this->assertContains('[OK]', $tester->getDisplay());
+ }
+
+ public function testWithGlobals()
+ {
+ $message = 'foo';
+ $tester = $this->createCommandTester([], [], null, null, false, ['message' => $message]);
+ $tester->execute([], ['decorated' => true]);
+ $display = $tester->getDisplay();
+ $this->assertContains(\json_encode($message), $display);
+ }
+
+ public function testWithGlobalsJson()
+ {
+ $globals = ['message' => 'foo'];
+ $tester = $this->createCommandTester([], [], null, null, false, $globals);
+ $tester->execute(['--format' => 'json'], ['decorated' => true]);
+ $display = $tester->getDisplay();
+ $display = \json_decode($display, true);
+ $this->assertSame($globals, $display['globals']);
+ }
+
+ public function testWithFilter()
+ {
+ $tester = $this->createCommandTester();
+ $tester->execute(['--format' => 'json'], ['decorated' => false]);
+ $display = $tester->getDisplay();
+ $display1 = \json_decode($display, true);
+ $tester->execute(['--filter' => 'date', '--format' => 'json'], ['decorated' => false]);
+ $display = $tester->getDisplay();
+ $display2 = \json_decode($display, true);
+ $this->assertNotSame($display1, $display2);
+ }
+
+ private function createCommandTester(array $paths = [], array $bundleMetadata = [], string $defaultPath = null, string $rootDir = null, bool $useChainLoader = false, array $globals = []): CommandTester
{
$projectDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures';
$loader = new FilesystemLoader([], $projectDir);
@@ -291,8 +332,17 @@ private function createCommandTester(array $paths = [], array $bundleMetadata =
}
}
+ if ($useChainLoader) {
+ $loader = new ChainLoader([$loader]);
+ }
+
+ $environment = new Environment($loader);
+ foreach ($globals as $name => $value) {
+ $environment->addGlobal($name, $value);
+ }
+
$application = new Application();
- $application->add(new DebugCommand(new Environment($loader), $projectDir, $bundleMetadata, $defaultPath, $rootDir));
+ $application->add(new DebugCommand($environment, $projectDir, $bundleMetadata, $defaultPath, $rootDir));
$command = $application->find('debug:twig');
return new CommandTester($command);
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
index 4eda8d76d3736..36e9c702a94cd 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
@@ -1,25 +1,19 @@
-{% block _text_id_widget %}
-{% spaceless %}
+{% block _text_id_widget -%}
- {{ form_widget(form) }}
+ {{- form_widget(form) -}}
-{% endspaceless %}
-{% endblock _text_id_widget %}
+{%- endblock _text_id_widget %}
-{% block _names_entry_label %}
-{% spaceless %}
+{% block _names_entry_label -%}
{% if label is empty %}
- {% set label = name|humanize %}
- {% endif %}
+ {%- set label = name|humanize -%}
+ {% endif -%}
-{% endspaceless %}
-{% endblock _names_entry_label %}
+{%- endblock _names_entry_label %}
-{% block _name_c_entry_label %}
-{% spaceless %}
+{% block _name_c_entry_label -%}
{% if label is empty %}
- {% set label = name|humanize %}
- {% endif %}
+ {%- set label = name|humanize -%}
+ {% endif -%}
-{% endspaceless %}
-{% endblock _name_c_entry_label %}
+{%- endblock _name_c_entry_label %}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig
index da1c1b649b62c..e8816be96e54e 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig
@@ -1,6 +1,4 @@
{% block form_widget_simple %}
-{% spaceless %}
- {% set type = type|default('text') %}
+ {%- set type = type|default('text') -%}
-{% endspaceless %}
-{% endblock form_widget_simple %}
+{%- endblock form_widget_simple %}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
index 8c719867ec5b0..501b555efc59f 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
@@ -1,8 +1,6 @@
{% extends 'form_div_layout.html.twig' %}
{% block form_widget_simple %}
-{% spaceless %}
- {% set type = type|default('text') %}
+ {%- set type = type|default('text') -%}
-{% endspaceless %}
-{% endblock form_widget_simple %}
+{%- endblock form_widget_simple %}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
index d485b8d0e7d7d..37150734a4698 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
@@ -1,8 +1,6 @@
{% use 'form_div_layout.html.twig' %}
{% block form_widget_simple %}
-{% spaceless %}
- {% set type = type|default('text') %}
+ {%- set type = type|default('text') -%}
-{% endspaceless %}
-{% endblock form_widget_simple %}
+{%- endblock form_widget_simple %}
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 24034230f8f49..9405dc2c9c3f4 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": "^7.1.3",
"symfony/contracts": "^1.0.2",
- "twig/twig": "^1.37.1|^2.6.2"
+ "twig/twig": "^1.38.1|^2.7.1"
},
"require-dev": {
"symfony/asset": "~3.4|~4.0",
diff --git a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
index b878ee5b62584..75819a017bf33 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
127.0.0.1:9912
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index 7d3373f3ebbf8..4761b66ad9012 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -11,12 +11,12 @@
namespace Symfony\Bundle\FrameworkBundle\Command;
-use Symfony\Component\Config\Definition\Processor;
use Symfony\Component\Console\Exception\LogicException;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\DependencyInjection\Compiler\ValidateEnvPlaceholdersPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Yaml\Yaml;
@@ -80,15 +80,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
$container = $this->compileContainer();
$extensionAlias = $extension->getAlias();
- $configs = $container->getExtensionConfig($extensionAlias);
- $configuration = $extension->getConfiguration($configs, $container);
-
- $this->validateConfiguration($extension, $configuration);
+ $extensionConfig = [];
+ foreach ($container->getCompilerPassConfig()->getPasses() as $pass) {
+ if ($pass instanceof ValidateEnvPlaceholdersPass) {
+ $extensionConfig = $pass->getExtensionConfig();
+ break;
+ }
+ }
- $configs = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($configs));
+ if (!isset($extensionConfig[$extensionAlias])) {
+ throw new \LogicException(sprintf('The extension with alias "%s" does not have configuration.', $extensionAlias));
+ }
- $processor = new Processor();
- $config = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($processor->processConfiguration($configuration, $configs)));
+ $config = $container->resolveEnvPlaceholders($extensionConfig[$extensionAlias]);
if (null === $path = $input->getArgument('path')) {
$io->title(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index 44fae86bc05a7..53cb18910525f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -220,7 +220,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
'autoconfigure' => $definition->isAutoconfigured(),
];
- if ('' !== $classDescription = $this->getClassDescription($definition->getClass())) {
+ if ('' !== $classDescription = $this->getClassDescription((string) $definition->getClass())) {
$data['description'] = $classDescription;
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index 56e11b07f6aba..8d6e3bddc4c9f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -183,7 +183,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
{
$output = '';
- if ('' !== $classDescription = $this->getClassDescription($definition->getClass())) {
+ if ('' !== $classDescription = $this->getClassDescription((string) $definition->getClass())) {
$output .= '- Description: `'.$classDescription.'`'."\n";
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index c0ec5e412e616..0739202166196 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -255,7 +255,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
$options['output']->title(sprintf('Information for Service "%s"', $options['id']));
}
- if ('' !== $classDescription = $this->getClassDescription($definition->getClass())) {
+ if ('' !== $classDescription = $this->getClassDescription((string) $definition->getClass())) {
$options['output']->text($classDescription."\n");
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index 3e66b05d0ba81..d35f5c609bca3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -304,7 +304,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $
$serviceXML->setAttribute('id', $id);
}
- if ('' !== $classDescription = $this->getClassDescription($definition->getClass())) {
+ if ('' !== $classDescription = $this->getClassDescription((string) $definition->getClass())) {
$serviceXML->appendChild($descriptionXML = $dom->createElement('description'));
$descriptionXML->appendChild($dom->createCDATASection($classDescription));
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index b786923b8e045..b390f2978113b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -53,6 +53,7 @@
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Symfony\Component\Finder\Finder;
+use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
use Symfony\Component\Form\FormTypeExtensionInterface;
use Symfony\Component\Form\FormTypeGuesserInterface;
use Symfony\Component\Form\FormTypeInterface;
@@ -410,6 +411,11 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
if (!class_exists(Translator::class)) {
$container->removeDefinition('form.type_extension.upload.validator');
}
+ if (!method_exists(CachingFactoryDecorator::class, 'reset')) {
+ $container->getDefinition('form.choice_list_factory.cached')
+ ->clearTag('kernel.reset')
+ ;
+ }
}
private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
index 807a557dfc54e..05dffbc29755f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
index fd95fbf6bc672..4aaa702df5dc9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
index 488cd868f3e32..9cdd73174e53e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_debug.xml
index 1b9b4077c0dd8..20e22761a308d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index 93005e07ac85f..c745949b43116 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
index 9553d4d60d7ce..1ea6fe8f83c58 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
index 5d64074422a06..2c0d446b323c8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
index 0746f9ccda174..6810eadabe0e3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
-1
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
index cd9fa061dd240..65e26d81e25c3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index b36d7d42d6212..4ca196e47d3ea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
@@ -57,6 +57,7 @@
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml
index 25b1cecc5a731..5e897bea8a30b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
index c8d35db32aaf7..5e3e97aad5242 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
index 49fbbbaf388cb..b7c64119f88e6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
index 3f518522e153c..394033734d2d4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml
index bc98b9f2941f3..4d2d488edb354 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml
@@ -1,7 +1,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml
index e4c2231c1c155..ce5b9c8d3042b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/lock.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
index ef4ae3051a727..dffdc9ee3ebc2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger_debug.xml
index 2f226222ce1ad..96f43b3b33d79 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger_debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
index 8816284fa78ed..166be86b2e203 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
index 91924e5972d8e..4fb4f2ff98abc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
index e8778f70822bf..4768cc98d46fe 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
index 9cb049c01735f..048b61ec466f0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 03bac811b2553..9cad97d984e11 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
localhost
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
index d13e3c7fab738..eefe6ad73601f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index 2cd70ff083894..2c1665bea4965 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
%kernel.cache_dir%/serialization.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index ec6128553ff73..deaffa5946a25 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 7f474bd132893..fd251629d9fd8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
_sf2_meta
@@ -15,6 +15,7 @@
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml
index 8a3c0cb593bff..b4e5b3d3df899 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
index 68b0eeefd7ccf..83c904f16f403 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
index 0bdfbe24ea3bd..f6cfd4ae68dfb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
index 7dbe57dc2e264..06ab2f41fcdea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
index a3c2281c87831..d47bc769d3651 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
index 42434b62d5515..8853914f65261 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
index 945f8653a524a..c9c5385fbfb76 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
index 0d406058fb9d1..8a0919f3e281a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator_debug.xml
index 2548926ca3354..939c55553ca38 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator_debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
index b97125375a57b..41c682c2111c7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.xml
index 6ce82082a3ca5..bf3e8d7211e00 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml
index d881f699f75ec..5f349ea6a0a3c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
index 217c2ae4576be..bc23a39cfad67 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
@@ -15,7 +15,7 @@
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the tearDown method
-if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
+if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
/**
* @internal
*/
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
index e56e938dd9946..74d99194ad9a9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -36,7 +36,10 @@ protected static function createClient(array $options = [], array $server = [])
try {
$client = $kernel->getContainer()->get('test.client');
} catch (ServiceNotFoundException $e) {
- throw new \LogicException('You cannot create the client used in functional tests if the BrowserKit component is not available. Try running "composer require symfony/browser-kit".');
+ if (class_exists(Client::class)) {
+ throw new \LogicException('You cannot create the client used in functional tests if the "framework.test" config is not set to true.');
+ }
+ throw new \LogicException('You cannot create the client used in functional tests if the BrowserKit component is not available. Try running "composer require symfony/browser-kit"');
}
$client->setServerParameters($server);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
index 4881fcdbdef33..d6da5b61510ac 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -78,11 +78,7 @@ private function getKernel()
->expects($this->atLeastOnce())
->method('has')
->will($this->returnCallback(function ($id) {
- if ('console.command_loader' === $id) {
- return false;
- }
-
- return true;
+ return 'console.command_loader' !== $id;
}))
;
$container
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
index b1a957201f508..0b2c341c47b54 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -159,7 +159,7 @@ private function createCommandTester($extractedMessages = [], $loadedMessages =
->expects($this->any())
->method('getFormats')
->will(
- $this->returnValue(['xlf', 'yml'])
+ $this->returnValue(['xlf', 'yml', 'yaml'])
);
if (null === $kernel) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
index caafff6842dc5..a2b8409e8d8b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -139,6 +139,7 @@ public static function getContainerDefinitions()
->addTag('tag2')
->addMethodCall('setMailer', [new Reference('mailer')])
->setFactory([new Reference('factory.service'), 'get']),
+ 'definition_without_class' => new Definition(),
];
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
index a907a5b967f93..7ae57afaab679 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml
index 0ce70d275c324..3c1303144b515 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml
index 353ac487e4044..7bc70332bcc98 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache.xml
index 79ee2a4b37421..0ebf2a960aed7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
index 8f03cb1784b35..81c96b3a7ff85 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
redis://paas.com
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml
index 586d741aa9e5d..4cd628eadc15a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml
index 635557f938acb..63a26d3843970 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml
index 0a08d2351aaf2..a9e168638df31 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml
index af727abdcb8d9..d98c43d992d8e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml
index 7742141035d1a..5fe9be69b7cba 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml
index c358feda807da..d4a46b62fcfb9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml
index 589ec786e3428..1bdf2e528432e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml
index c896acbd6b916..c04193e837b34 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
index fdeb60acf9934..092174a2d9720 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
index e5f8e51a95c73..ed4b14671eca6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
index fc2bf0657a615..d531fbaba218f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
index d36c482de62ea..72e583a902395 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
index 0a130ce0bac3d..e0dc11360a7d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_amqp_transport_no_serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_amqp_transport_no_serializer.xml
index f73ce48787571..b030604466c40 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_amqp_transport_no_serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_amqp_transport_no_serializer.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_buses.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_buses.xml
index db946e45e5ebb..1642e57988505 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_buses.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_buses.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml
index 2ddc776f479fd..ccb93ba7f0330 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport.xml
index 36d1ada9b8ec1..c58fc9a5d4758 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml
index 290fbcf14e47d..7471f32e683d8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml
index 4760368448ff7..ceaba5bfc8f6d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml
index b7da5df70b652..cb50daa65e883 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml
index ef13b906a9c46..db6a8a9bf03c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_log_level.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_log_level.xml
index 40e16defef2ee..ebd7948452b7f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_log_level.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_log_level.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml
index f3b3095ccd951..a5f5448e18f2d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml
index d7db78a6e2e38..95ddef8288e38 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml
index 825bc46e74477..7bf63b6540c54 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/request.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/request.xml
index 320d1b187525a..f1e8184c149d1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/request.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/request.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml
index 73f1dccb1a6ed..0c62272c51003 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml
index e202fc1b5ee20..3d59d62833ea4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
index 237e31e50a2e3..b76ceb86b714a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session.xml
index 118a08c807eef..599cbdee1ccc0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session_cookie_secure_auto.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session_cookie_secure_auto.xml
index 41615a6f563e7..1fff3e090e88f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session_cookie_secure_auto.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/session_cookie_secure_auto.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml
index e7e1880655c58..6aa752a4695d5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml
index 1078976462ff0..8fda04d92a591 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml
index d579ed4c0a181..7bba936c5a58e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml
index 72a78aaf0c090..8e0a8cc039cb5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml
index 036afa38f7034..d1cb1fad83367 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml
index a0e4f4ed32b2e..521f8e381512d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml
index 22f1536e139c3..f993a20d97314 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_email_validation_mode.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_email_validation_mode.xml
index 5b0e3a083e018..7274d815894d7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_email_validation_mode.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_email_validation_mode.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml
index 053f574bafe9b..c2e84c3b906c7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml
index d26c7a2be50ef..61770d88a7fa6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_and_validation_mode.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_and_validation_mode.xml
index 86b9760786957..a88a37f26b03e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_and_validation_mode.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_and_validation_mode.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_disabled.xml
index 349439a7a6774..fa41396161130 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_disabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_enabled.xml
index 5b4aba1b70dd6..ec5c6b94e6592 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_enabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_enabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml
index 733d5fa683ebe..3690f9e10eda4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml
index a061f0b15b9ed..718ceb31a372c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml
index 51023de59dab3..cdb2f997357ee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
index a5124d1fe7776..fa5a96ab11881 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
index 7375e7429a2a4..51413201298de 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
index b640c929ecf50..f3ff577b808d6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml
index b6ae96ca23992..8b4bf305a85cd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml
index fb65b0b018550..3529c50ceed80 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
index d6a1b78efb5ba..fe32756f2e00b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
@@ -3,8 +3,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml
index 51da644be1f9e..26e622e9e0074 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
index a73b553c49568..08855f7569aa2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
index 4b430d9115b34..8415c9c280668 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
index ca2eb72554eb0..ebc37d93bed84 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -30,6 +30,6 @@ public function testAssetsHelperIsRemovedWhenPhpTemplatingEngineIsEnabledAndAsse
public function testMessengerMiddlewareFactoryErroneousFormat()
{
- $this->markTestSkipped('XML configuration will not allow eeroneous format.');
+ $this->markTestSkipped('XML configuration will not allow erroneous format.');
}
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.json
index 959b24b3ffe35..e07b137438464 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.json
@@ -67,6 +67,19 @@
"factory_method": "get",
"tags": []
},
+ "definition_without_class": {
+ "class": "",
+ "public": false,
+ "synthetic": false,
+ "lazy": false,
+ "shared": true,
+ "abstract": false,
+ "autowire": false,
+ "autoconfigure": false,
+ "arguments": [],
+ "file": null,
+ "tags": []
+ },
"service_container": {
"class": "Symfony\\Component\\DependencyInjection\\ContainerInterface",
"public": true,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.md
index efdc188d4315e..08676b31d9b2c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.md
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.md
@@ -18,6 +18,18 @@ Definitions
- Factory Class: `Full\Qualified\FactoryClass`
- Factory Method: `get`
+### definition_without_class
+
+- Class: ``
+- Public: no
+- Synthetic: no
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- Arguments: no
+
### service_container
- Description: `ContainerInterface is the interface implemented by service container classes.`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt
index 5ab36e2ebf186..74166a38706e0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt
@@ -2,11 +2,12 @@
[33mSymfony Container Services[39m
[33m==========================[39m
- ------------------- ----------------------------------------------------------
- [32m Service ID [39m [32m Class name [39m
- ------------------- ----------------------------------------------------------
- alias_1 alias for "service_1"
- definition_1 Full\Qualified\Class1
- service_container Symfony\Component\DependencyInjection\ContainerInterface
- ------------------- ----------------------------------------------------------
+ -------------------------- ----------------------------------------------------------
+ [32m Service ID [39m [32m Class name [39m
+ -------------------------- ----------------------------------------------------------
+ alias_1 alias for "service_1"
+ definition_1 Full\Qualified\Class1
+ definition_without_class
+ service_container Symfony\Component\DependencyInjection\ContainerInterface
+ -------------------------- ----------------------------------------------------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml
index 0a6cfb44a2666..061bb5d6ef219 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml
@@ -23,6 +23,7 @@
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
index d96cf59951e28..49e18b886836e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
@@ -14,6 +14,18 @@
"factory_method": "get",
"tags": []
},
+ "definition_without_class": {
+ "class": "",
+ "public": false,
+ "synthetic": false,
+ "lazy": false,
+ "shared": true,
+ "abstract": false,
+ "autowire": false,
+ "autoconfigure": false,
+ "file": null,
+ "tags": []
+ },
"service_container": {
"class": "Symfony\\Component\\DependencyInjection\\ContainerInterface",
"public": true,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
index cf8aec87e436e..be23f839bf474 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
@@ -17,6 +17,17 @@ Definitions
- Factory Class: `Full\Qualified\FactoryClass`
- Factory Method: `get`
+### definition_without_class
+
+- Class: ``
+- Public: no
+- Synthetic: no
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+
### service_container
- Description: `ContainerInterface is the interface implemented by service container classes.`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
index 5ab36e2ebf186..74166a38706e0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
@@ -2,11 +2,12 @@
[33mSymfony Container Services[39m
[33m==========================[39m
- ------------------- ----------------------------------------------------------
- [32m Service ID [39m [32m Class name [39m
- ------------------- ----------------------------------------------------------
- alias_1 alias for "service_1"
- definition_1 Full\Qualified\Class1
- service_container Symfony\Component\DependencyInjection\ContainerInterface
- ------------------- ----------------------------------------------------------
+ -------------------------- ----------------------------------------------------------
+ [32m Service ID [39m [32m Class name [39m
+ -------------------------- ----------------------------------------------------------
+ alias_1 alias for "service_1"
+ definition_1 Full\Qualified\Class1
+ definition_without_class
+ service_container Symfony\Component\DependencyInjection\ContainerInterface
+ -------------------------- ----------------------------------------------------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
index b6f6302713c03..05f83391f6208 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
@@ -4,6 +4,7 @@
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.json
new file mode 100644
index 0000000000000..90a6b5dece406
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.json
@@ -0,0 +1,13 @@
+{
+ "class": "",
+ "public": false,
+ "synthetic": false,
+ "lazy": false,
+ "shared": true,
+ "abstract": false,
+ "autowire": false,
+ "autoconfigure": false,
+ "arguments": [],
+ "file": null,
+ "tags": []
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.md
new file mode 100644
index 0000000000000..217c965b67a31
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.md
@@ -0,0 +1,9 @@
+- Class: ``
+- Public: no
+- Synthetic: no
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- Arguments: no
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.txt
new file mode 100644
index 0000000000000..ed49579037fda
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.txt
@@ -0,0 +1,15 @@
+ ---------------- -------
+ [32m Option [39m [32m Value [39m
+ ---------------- -------
+ Service ID -
+ Class -
+ Tags -
+ Public no
+ Synthetic no
+ Lazy no
+ Shared yes
+ Abstract no
+ Autowired no
+ Autoconfigured no
+ ---------------- -------
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.xml
new file mode 100644
index 0000000000000..ee6df8928e245
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_without_class.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.json
new file mode 100644
index 0000000000000..eda84251babd5
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.json
@@ -0,0 +1,12 @@
+{
+ "class": "",
+ "public": false,
+ "synthetic": false,
+ "lazy": false,
+ "shared": true,
+ "abstract": false,
+ "autowire": false,
+ "autoconfigure": false,
+ "file": null,
+ "tags": []
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.md
new file mode 100644
index 0000000000000..ca50a70f77111
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.md
@@ -0,0 +1,8 @@
+- Class: ``
+- Public: no
+- Synthetic: no
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.txt
new file mode 100644
index 0000000000000..ed49579037fda
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.txt
@@ -0,0 +1,15 @@
+ ---------------- -------
+ [32m Option [39m [32m Value [39m
+ ---------------- -------
+ Service ID -
+ Class -
+ Tags -
+ Public no
+ Synthetic no
+ Lazy no
+ Shared yes
+ Abstract no
+ Autowired no
+ Autoconfigured no
+ ---------------- -------
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.xml
new file mode 100644
index 0000000000000..ee6df8928e245
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_without_class.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Serialization/Resources/person.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Serialization/Resources/person.xml
index 24f63bf09f132..2d2ab3dd3497a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Serialization/Resources/person.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Serialization/Resources/person.xml
@@ -2,7 +2,7 @@
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
index f3adc3c90f799..71e6b79916b03 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
@@ -1,7 +1,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
index 2c0a75481b390..f52d48e89904f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -66,6 +66,14 @@ public function testDumpUndefinedBundleOption()
$this->assertContains('Unable to find configuration for "test.foo"', $tester->getDisplay());
}
+ public function testDumpWithPrefixedEnv()
+ {
+ $tester = $this->createCommandTester();
+ $tester->execute(['name' => 'FrameworkBundle']);
+
+ $this->assertContains("cookie_httponly: '%env(bool:COOKIE_HTTPONLY)%'", $tester->getDisplay());
+ }
+
/**
* @return CommandTester
*/
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml
index c1d1288046050..432e35bd2f24d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml
@@ -4,7 +4,10 @@ imports:
framework:
secret: '%secret%'
default_locale: '%env(LOCALE)%'
+ session:
+ cookie_httponly: '%env(bool:COOKIE_HTTPONLY)%'
parameters:
env(LOCALE): en
+ env(COOKIE_HTTPONLY): '1'
secret: test
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index e18554972e423..44bb6b0396190 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -21,9 +21,9 @@
"symfony/cache": "~4.2",
"symfony/config": "~4.2",
"symfony/contracts": "^1.0.2",
- "symfony/dependency-injection": "^4.2",
+ "symfony/dependency-injection": "^4.2.5",
"symfony/event-dispatcher": "^4.1",
- "symfony/http-foundation": "^4.1.2",
+ "symfony/http-foundation": "^4.2.5",
"symfony/http-kernel": "^4.2",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "~3.4|~4.0",
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
index a8170af900ff9..2effc4554bb26 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
index 32676bd9229a1..2e28eda8890fa 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml
index 6e07753c896d3..43321494e0194 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index 9fbdae0bdd46f..51e879c946e68 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
null
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml
index fd6504af56e2b..e348cb8b7406a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
index 3837e92453cc7..9e3f96c366bfc 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
index c05cdcaa2d290..956a75a5be2ba 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
index 6f2ec1cbf977e..b2ce15d1b18bd 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml
index a575ca2fa768f..c07547fa17902 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
index a83cf69b8bd50..d811faac4bf06 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -41,7 +41,7 @@ public function __construct(iterable $listeners, ExceptionListener $exceptionLis
$this->logoutListener = $logoutListener;
$this->config = $config;
} else {
- throw new \InvalidArgumentException(sprintf('Argument 3 passed to %s() must be instance of %s or null, %s given.', __METHOD__, LogoutListener::class, \is_object($logoutListener) ? \get_class($logoutListener) : \gettype($logoutListener)));
+ throw new \TypeError(sprintf('Argument 3 passed to %s() must be instance of %s or null, %s given.', __METHOD__, LogoutListener::class, \is_object($logoutListener) ? \get_class($logoutListener) : \gettype($logoutListener)));
}
}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml
index 22123dfa21ce4..0b6861fd9cdb6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml
index 6c267a2e7781c..657f3c4986c06 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml
index 4e67e168c8482..fb51a7413a45d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml
index dbadce4fa740d..460b44cda03d6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
index 83794384ab8a4..21b0c27443822 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
@@ -3,7 +3,7 @@
+ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">