From b389b68c1fcef99de6c31fb5f261d949ff2723dc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Feb 2020 11:16:22 +0100 Subject: [PATCH 01/82] updated CHANGELOG for 3.4.38 --- CHANGELOG-3.4.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index f68d58c658948..fc1d9aa398c2d 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -7,6 +7,36 @@ in 3.4 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/v3.4.0...v3.4.1 +* 3.4.38 (2020-02-29) + + * bug #35781 [Form] NumberToLocalizedStringTransformer return int if scale = 0 (VincentLanglet) + * bug #35846 [Serializer] prevent method calls on null values (xabbuh) + * bug #35839 [Security] Allow switching to another user when already switched (chalasr) + * bug #35817 [DoctrineBridge] Use new Types::* constants and support new json type (fancyweb) + * bug #35707 [ExpressionLanguage] Fixed collisions of character operators with object properties (Andrej-in-ua) + * bug #35794 [DoctrineBridge][DoctrineExtractor] Fix indexBy with custom and some core types (fancyweb) + * bug #35787 [PhpUnitBridge] Use trait instead of extending deprecated class (marcello-moenkemeyer) + * bug #35792 [Security] Prevent TypeError in case RememberMetoken has no attached user (nikophil) + * bug #35772 [Config] don't throw on missing excluded paths (nicolas-grekas) + * bug #35774 [Ldap] force default network timeout (nicolas-grekas) + * bug #35702 [VarDumper] fixed DateCaster not displaying additional fields (Makdessi Alex) + * bug #35722 [HttpKernel] Set previous exception when rethrown from controller resolver (danut007ro) + * bug #35718 [HttpKernel] fix registering DebugHandlersListener regardless of the PHP_SAPI (nicolas-grekas) + * bug #35693 [Finder] Fix unix root dir issue (chr-hertel) + * bug #35696 [Console] Don't load same-namespace alternatives on exact match (chalasr) + * bug #35605 [HttpFoundation][FrameworkBundle] fix support for samesite in session cookies (fabpot) + * bug #35609 [DoctrineBridge] Fixed submitting ids with query limit or offset (HeahDude) + * bug #34123 [Form] Fix handling of empty_data's \Closure value in Date/Time form types (yceruto) + * bug #35546 [Validator] check for __get method existence if property is uninitialized (alekitto) + * bug #35332 [Yaml][Inline] Fail properly on empty object tag and empty const tag (fancyweb) + * bug #35489 [PhpUnitBridge] Fix running skipped tests expecting only deprecations (chalasr) + * bug #35161 [FrameworkBundle] Check non-null type for numeric type (Arman-Hosseini) + * bug #34059 [DomCrawler] Skip disabled fields processing in Form (sbogx) + * bug #34114 [Console] SymonfyStyle - Check value isset to avoid PHP notice (leevigraham) + * bug #35557 [Config] dont catch instances of Error (nicolas-grekas) + * bug #35532 [Validator] fix access to uninitialized property when getting value (greedyivan) + * bug #35305 [HttpKernel] Fix stale-if-error behavior, add tests (mpdude) + * 3.4.37 (2020-01-21) * bug #35065 [Security] Use supportsClass in addition to UnsupportedUserException (linaori) From 42be173dfefd7fc3ac8fb82f5015f432428d8ba9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Feb 2020 11:16:34 +0100 Subject: [PATCH 02/82] update CONTRIBUTORS for 3.4.38 --- CONTRIBUTORS.md | 178 +++++++++++++++++++++++++++++++----------------- 1 file changed, 114 insertions(+), 64 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index aea14fb7e6c5d..468c90ad49d1d 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) - Ryan Weaver (weaverryan) - Javier Eguiluz (javier.eguiluz) + - Grégoire Pineau (lyrixx) - Jakub Zalas (jakubzalas) - Roland Franssen (ro0) - - Grégoire Pineau (lyrixx) - Johannes S (johannes) - Kris Wallsmith (kriswallsmith) - Yonel Ceruto (yonelceruto) @@ -27,31 +27,31 @@ Symfony is the result of the work of many people who made the code better - Abdellatif Ait boudad (aitboudad) - Samuel ROZE (sroze) - Romain Neutron (romain) + - Wouter de Jong (wouterj) - Pascal Borreli (pborreli) - - Wouter De Jong (wouterj) + - Thomas Calvet (fancyweb) - Joseph Bielawski (stloyd) - Alexander M. Turek (derrabus) - Karma Dordrak (drak) - - Thomas Calvet (fancyweb) - Lukas Kahwe Smith (lsmith) - Martin Hasoň (hason) - Hamza Amrouche (simperfit) - - Jeremy Mikola (jmikola) - Jules Pietri (heah) - - Jean-François Simon (jfsimon) + - Jeremy Mikola (jmikola) - Jérémy DERUSSÉ (jderusse) + - Jean-François Simon (jfsimon) - Benjamin Eberlei (beberlei) - Igor Wiedler (igorw) - Eriksen Costa (eriksencosta) - Guilhem Niot (energetick) - - Sarah Khalil (saro0h) - Tobias Nyholm (tobias) + - Sarah Khalil (saro0h) - Jonathan Wage (jwage) - Lynn van der Berg (kjarli) - Diego Saint Esteben (dosten) + - Matthias Pigulla (mpdude) - Alexandre Salomé (alexandresalome) - William Durand (couac) - - Matthias Pigulla (mpdude) - Pierre du Plessis (pierredup) - ornicar - Dany Maillard (maidmaid) @@ -59,29 +59,29 @@ Symfony is the result of the work of many people who made the code better - stealth35 ‏ (stealth35) - Alexander Mols (asm89) - Konstantin Myakshin (koc) + - Grégoire Paris (greg0ire) - Bulat Shakirzyanov (avalanche123) - Valentin Udaltsov (vudaltsov) - - Grégoire Paris (greg0ire) + - Kevin Bond (kbond) - Saša Stamenković (umpirsky) - Peter Rehm (rpet) - - Kevin Bond (kbond) - Henrik Bjørnskov (henrikbjorn) - Miha Vrhovnik + - Gabriel Ostrolucký (gadelat) - Diego Saint Esteben (dii3g0) - Gábor Egyed (1ed) - - Gabriel Ostrolucký (gadelat) - Titouan Galopin (tgalopin) - - Konstantin Kudryashov (everzet) - David Maicher (dmaicher) + - Konstantin Kudryashov (everzet) - Bilal Amarni (bamarni) - Mathieu Piot (mpiot) - Vladimir Reznichenko (kalessil) + - Jan Schädlich (jschaedl) - Florin Patan (florinpatan) - Jáchym Toušek (enumag) - Andrej Hudec (pulzarraider) - Michel Weimerskirch (mweimerskirch) - Issei Murasawa (issei_m) - - Jan Schädlich (jschaedl) - Eric Clemmons (ericclemmons) - Charles Sarrazin (csarrazi) - Christian Raue @@ -96,20 +96,20 @@ Symfony is the result of the work of many people who made the code better - Lee McDermott - Brandon Turner - Luis Cordova (cordoval) + - Jérôme Tamarelle (gromnan) - Daniel Holmes (dholmes) - Toni Uebernickel (havvg) + - Fran Moreno (franmomu) - Bart van den Burg (burgov) - Jordan Alliot (jalliot) - - Jérôme Tamarelle (gromnan) - John Wards (johnwards) - - Fran Moreno (franmomu) - Antoine Hérault (herzult) - Paráda József (paradajozsef) - Arnaud Le Blanc (arnaud-lb) - Maxime STEINHAUSSER + - Baptiste Clavié (talus) - Michal Piotrowski (eventhorizon) - Tim Nagel (merk) - - Baptiste Clavié (talus) - Chris Wilkinson (thewilkybarkid) - Brice BERNARD (brikou) - marc.weistroff @@ -133,10 +133,10 @@ Symfony is the result of the work of many people who made the code better - Tugdual Saunier (tucksaun) - excelwebzone - Gordon Franke (gimler) + - Joel Wurtz (brouznouf) - Fabien Pennequin (fabienpennequin) - Théo FIDRY (theofidry) - Eric GELOEN (gelo) - - Joel Wurtz (brouznouf) - Lars Strojny (lstrojny) - Jannik Zschiesche (apfelbox) - Robert Schönthal (digitalkaoz) @@ -145,6 +145,8 @@ Symfony is the result of the work of many people who made the code better - Gabriel Caruso (carusogabriel) - Stefano Sala (stefano.sala) - Evgeniy (ewgraf) + - Massimiliano Arione (garak) + - Julien Falque (julienfalque) - Vincent AUBERT (vincent) - Juti Noppornpitak (shiroyuki) - Alexander Schranz (alexander-schranz) @@ -155,7 +157,6 @@ Symfony is the result of the work of many people who made the code better - Hidenori Goto (hidenorigoto) - Andréia Bohner (andreia) - Yanick Witschi (toflar) - - Julien Falque (julienfalque) - Arnaud Kleinpeter (nanocom) - Guilherme Blanco (guilhermeblanco) - SpacePossum @@ -163,12 +164,12 @@ Symfony is the result of the work of many people who made the code better - Jérémie Augustin (jaugustin) - François-Xavier de Guillebon (de-gui_f) - Oleg Voronkovich + - Alessandro Chitolina (alekitto) - Philipp Wahala (hifi) - - Massimiliano Arione (garak) - Rafael Dohms (rdohms) - jwdeitch - Mikael Pajunen - - Alessandro Chitolina (alekitto) + - Arman Hosseini (arman) - Niels Keurentjes (curry684) - Vyacheslav Pavlov - Richard van Laak (rvanlaak) @@ -178,9 +179,9 @@ Symfony is the result of the work of many people who made the code better - jeremyFreeAgent (jeremyfreeagent) - Rouven Weßling (realityking) - Jérôme Parmentier (lctrs) + - Andreas Schempp (aschempp) - Clemens Tolboom - Helmer Aaviksoo - - Arman Hosseini (arman) - Hiromi Hishida (77web) - Matthieu Ouellette-Vachon (maoueh) - Michał Pipa (michal.pipa) @@ -193,7 +194,6 @@ Symfony is the result of the work of many people who made the code better - GDIBass - Samuel NELA (snela) - Ben Davies (bendavies) - - Andreas Schempp (aschempp) - James Halsall (jaitsu) - Matthieu Napoli (mnapoli) - Florent Mata (fmata) @@ -226,11 +226,13 @@ Symfony is the result of the work of many people who made the code better - Stadly - Stepan Anchugov (kix) - bronze1man + - Filippo Tessarotto (slamdunk) - sun (sun) - Larry Garfield (crell) - Nikolay Labinskiy (e-moe) - Martin Schuhfuß (usefulthink) - apetitpa + - Antoine Makdessi (amakdessi) - Matthieu Bontemps (mbontemps) - apetitpa - Pierre Minnieur (pminnieur) @@ -246,6 +248,7 @@ Symfony is the result of the work of many people who made the code better - jeff - John Kary (johnkary) - Jan Rosier (rosier) + - Przemysław Bogusz (przemyslaw-bogusz) - Justin Hileman (bobthecow) - Blanchon Vincent (blanchonvincent) - Michele Orselli (orso) @@ -260,9 +263,11 @@ Symfony is the result of the work of many people who made the code better - Tristan Darricau (nicofuma) - Victor Bocharsky (bocharsky_bw) - Tomas Norkūnas (norkunas) + - Wouter J + - Smaine Milianni (ismail1432) - Marcel Beerta (mazen) + - Christopher Hertel (chertel) - Ruud Kamphuis (ruudk) - - Antoine Makdessi (amakdessi) - Maxime Helias (maxhelias) - Pavel Batanov (scaytrase) - Mantis Development @@ -275,7 +280,9 @@ Symfony is the result of the work of many people who made the code better - julien pauli (jpauli) - Lorenz Schori - Sébastien Lavoie (lavoiesl) + - Ahmed TAILOULOUTE (ahmedtai) - Dariusz + - Saif (╯°□°)╯ (azjezz) - Dmitrii Poddubnyi (karser) - Michael Babker (mbabker) - Francois Zaninotto @@ -289,7 +296,6 @@ Symfony is the result of the work of many people who made the code better - Danny Berger (dpb587) - Antonio J. García Lagar (ajgarlag) - Adam Prager (padam87) - - Przemysław Bogusz (przemyslaw-bogusz) - Benoît Burnichon (bburnichon) - Maciej Malarz (malarzm) - Roman Marintšenko (inori) @@ -307,19 +313,17 @@ Symfony is the result of the work of many people who made the code better - Jordan Samouh (jordansamouh) - Baptiste Lafontaine (magnetik) - Jakub Kucharovic (jkucharovic) + - Loick Piera (pyrech) - Uwe Jäger (uwej711) - Eugene Leonovich (rybakit) - - Filippo Tessarotto - Joseph Rouff (rouffj) - Félix Labrecque (woodspire) - GordonsLondon - Quynh Xuan Nguyen (xuanquynh) - Jan Sorgalla (jsor) - Ray - - Smaine Milianni (ismail1432) - Chekote - François Pluchino (francoispluchino) - - Christopher Hertel (chertel) - Thomas Adam - Jhonny Lidfors (jhonne) - Diego Agulló (aeoris) @@ -327,6 +331,7 @@ Symfony is the result of the work of many people who made the code better - Bob den Otter (bopp) - Thomas Schulz (king2500) - Frank de Jonge (frenkynet) + - Jeroen Spee (jeroens) - Nikita Konstantinov - Wodor Wodorski - Thomas Lallement (raziel057) @@ -339,6 +344,7 @@ Symfony is the result of the work of many people who made the code better - Robert Kiss (kepten) - Zan Baldwin (zanderbaldwin) - Roumen Damianoff (roumen) + - Emanuele Panzeri (thepanz) - Kim Hemsø Rasmussen (kimhemsoe) - Pascal Luna (skalpa) - Wouter Van Hecke @@ -352,7 +358,7 @@ Symfony is the result of the work of many people who made the code better - Christian Schmidt - Patrick Landolt (scube) - MatTheCat - - Loick Piera (pyrech) + - Vilius Grigaliūnas - David Badura (davidbadura) - Chad Sikorra (chadsikorra) - Chris Smith (cs278) @@ -371,8 +377,8 @@ Symfony is the result of the work of many people who made the code better - Andrey Esaulov (andremaha) - Grégoire Passault (gregwar) - Jerzy Zawadzki (jzawadzki) - - Wouter J - Ismael Ambrosi (iambrosi) + - Craig Duncan (duncan3dc) - Emmanuel BORGES (eborges78) - Aurelijus Valeiša (aurelijus) - Jan Decavele (jandc) @@ -386,16 +392,19 @@ Symfony is the result of the work of many people who made the code better - Francesc Rosàs (frosas) - Romain Pierre (romain-pierre) - Julien Galenski (ruian) + - Michael Käfer (michael_kaefer) - Bongiraud Dominique - janschoenherr - Emanuele Gaspari (inmarelibero) - Dariusz Rumiński - Berny Cantos (xphere81) + - Laurent VOULLEMIER (lvo) - Thierry Thuon (lepiaf) - Ricard Clau (ricardclau) - Mark Challoner (markchalloner) - Philippe Segatori - Gennady Telegin (gtelegin) + - Mathias Arlaud (mtarld) - Erin Millard - Artur Melo (restless) - Matthew Lewinski (lewinski) @@ -404,6 +413,7 @@ Symfony is the result of the work of many people who made the code better - Nicolas LEFEVRE (nicoweb) - alquerci - Olivier Dolbeau (odolbeau) + - Oleg Andreyev - Mateusz Sip (mateusz_sip) - Francesco Levorato - Vitaliy Zakharov (zakharovvi) @@ -416,22 +426,22 @@ Symfony is the result of the work of many people who made the code better - Artur Eshenbrener - Timo Bakx (timobakx) - Thomas Perez (scullwm) - - Saif Eddin Gmati (azjezz) - Felix Labrecque - Yaroslav Kiliba - Terje Bråten - Robbert Klarenbeek (robbertkl) - Eric Masoero (eric-masoero) + - Denis Brumann (dbrumann) - JhonnyL - hossein zolfi (ocean) - Clément Gautier (clementgautier) - Bastien Jaillot (bastnic) - Dāvis Zālītis (k0d3r1s) - - Emanuele Panzeri (thepanz) - Sanpi - Eduardo Gulias (egulias) - giulio de donato (liuggio) - ShinDarth + - Alan Poulain - Stéphane PY (steph_py) - Philipp Kräutli (pkraeutli) - Grzegorz (Greg) Zdanowski (kiler129) @@ -443,7 +453,6 @@ Symfony is the result of the work of many people who made the code better - Alex Bowers - Philipp Cordes - Costin Bereveanu (schniper) - - Vilius Grigaliūnas - Loïc Chardonnet (gnusat) - Marek Kalnik (marekkalnik) - Vyacheslav Salakhutdinov (megazoll) @@ -488,7 +497,6 @@ Symfony is the result of the work of many people who made the code better - Christophe L. (christophelau) - Sander Toonen (xatoo) - Anthon Pang (robocoder) - - Michael Käfer (michael_kaefer) - Sébastien Santoro (dereckson) - Brian King - Michel Salib (michelsalib) @@ -498,27 +506,28 @@ Symfony is the result of the work of many people who made the code better - Alexandru Furculita (afurculita) - Valentin Jonovs (valentins-jonovs) - Guilhem N (guilhemn) - - Laurent VOULLEMIER (lvo) - Jeanmonod David (jeanmonod) - Christopher Davis (chrisguitarguy) - Webnet team (webnet) - Farhad Safarov - - Jeroen Spee (jeroens) - Jan Schumann - Niklas Fiekas - Markus Bachmann (baachi) - Kévin THERAGE (kevin_therage) + - Erkhembayar Gantulga (erheme318) + - Islam93 - lancergr - Mihai Stancu - Ivan Nikolaev (destillat) - Gildas Quéméner (gquemener) - - Oleg Andreyev - Alessandro Lai (jean85) - Desjardins Jérôme (jewome62) - Arturs Vonda - Josip Kruslin - Matthew Smeets + - Toni Rudolf (toooni) - Asmir Mustafic (goetas) + - Nicolas Philippe (nikophil) - vagrant - Aurimas Niekis (gcds) - EdgarPE @@ -531,6 +540,7 @@ Symfony is the result of the work of many people who made the code better - Chris Sedlmayr (catchamonkey) - Kamil Kokot (pamil) - Seb Koelen + - Antonio Pauletich (x-coder264) - Christoph Mewes (xrstf) - Vitaliy Tverdokhlib (vitaliytv) - Ariel Ferrandini (aferrandini) @@ -542,7 +552,6 @@ Symfony is the result of the work of many people who made the code better - Gonzalo Vilaseca (gonzalovilaseca) - Tarmo Leppänen (tarlepp) - Marcin Sikoń (marphi) - - Denis Brumann (dbrumann) - Dominik Zogg (dominik.zogg) - Marek Pietrzak - Luc Vieillescazes (iamluc) @@ -552,7 +561,6 @@ Symfony is the result of the work of many people who made the code better - Gintautas Miselis - Rob Bast - Roberto Espinoza (respinoza) - - Alan Poulain - Soufian EZ-ZANTAR (soezz) - Zander Baldwin - Gocha Ossinkine (ossinkine) @@ -595,7 +603,6 @@ Symfony is the result of the work of many people who made the code better - Roy Van Ginneken (rvanginneken) - ondrowan - Barry vd. Heuvel (barryvdh) - - Craig Duncan (duncan3dc) - Evan S Kaufman (evanskaufman) - mcben - Jérôme Vieilledent (lolautruche) @@ -606,6 +613,7 @@ Symfony is the result of the work of many people who made the code better - Remi Collet - Vicent Soria Durá (vicentgodella) - Michael Moravec + - Leevi Graham (leevigraham) - Anthony Ferrara - Ioan Negulescu - Jakub Škvára (jskvara) @@ -631,7 +639,9 @@ Symfony is the result of the work of many people who made the code better - Nate (frickenate) - Timothée Barray (tyx) - jhonnyL + - Jacek Jędrzejewski (jacek.jedrzejewski) - sasezaki + - Bozhidar Hristov (warxcell) - Dawid Pakuła (zulusx) - Florian Rey (nervo) - Rodrigo Borrego Bernabé (rodrigobb) @@ -658,13 +668,16 @@ Symfony is the result of the work of many people who made the code better - Jeremy Benoist - fritzmg - Lenar Lõhmus + - Ion Bazan (ionbazan) - Benjamin Laugueux (yzalis) - Zach Badgett (zachbadgett) + - Chi-teck - Aurélien Fredouelle - Pavel Campr (pcampr) - Andrii Dembitskyi - Johnny Robeson (johnny) - Marko Kaznovac (kaznovac) + - Guilliam Xavier - Disquedur - Michiel Boeckaert (milio) - Geoffrey Tran (geoff) @@ -685,6 +698,7 @@ Symfony is the result of the work of many people who made the code better - Dmitry Simushev - Joe Bennett (kralos) - alcaeus + - Thomas Talbot (ioni) - Fred Cox - vitaliytv - Philippe Segatori @@ -703,6 +717,7 @@ Symfony is the result of the work of many people who made the code better - Konstantin S. M. Möllers (ksmmoellers) - James Johnston - Sinan Eldem + - BoShurik - Alexandre Dupuy (satchette) - Malte Blättermann - Simeon Kolev (simeon_kolev9) @@ -725,12 +740,12 @@ Symfony is the result of the work of many people who made the code better - Javier López (loalf) - Reinier Kip - Geoffrey Brier (geoffrey-brier) + - Alexandre Parent - Vladimir Tsykun - Dustin Dobervich (dustin10) - dantleech - Anne-Sophie Bachelard (annesophie) - Sebastian Marek (proofek) - - Erkhembayar Gantulga (erheme318) - zenmate - Michal Trojanowski - David Fuhr @@ -747,7 +762,6 @@ Symfony is the result of the work of many people who made the code better - adev - Stefan Warman - Arkadius Stefanski (arkadius) - - Antonio Pauletich (x-coder264) - Tristan Maindron (tmaindron) - Behnoush Norouzali (behnoush) - Wesley Lancel @@ -759,10 +773,10 @@ Symfony is the result of the work of many people who made the code better - Miquel Rodríguez Telep (mrtorrent) - Sergey Kolodyazhnyy (skolodyazhnyy) - umpirski + - Artem Lopata - M. Vondano - Quentin de Longraye (quentinus95) - Chris Heng (gigablah) - - Islam93 - Shaun Simmons (simshaun) - Richard Bradley - Ulumuddin Yunus (joenoez) @@ -852,7 +866,6 @@ Symfony is the result of the work of many people who made the code better - Yuen-Chi Lian - Tarjei Huse (tarjei) - Besnik Br - - Toni Rudolf (toooni) - Jose Gonzalez - Jonathan (jls-esokia) - Oleksii Zhurbytskyi @@ -871,12 +884,12 @@ Symfony is the result of the work of many people who made the code better - Andrew Tchircoff (andrewtch) - michaelwilliams - 1emming - - Leevi Graham (leevigraham) - Nykopol (nykopol) - Tri Pham (phamuyentri) - Jordan Deitch - Casper Valdemar Poulsen - Josiah (josiah) + - Guillaume Verstraete (versgui) - Greg ORIOL - Joschi Kuphal - John Bohn (jbohn) @@ -890,16 +903,17 @@ Symfony is the result of the work of many people who made the code better - fedor.f - Yosmany Garcia (yosmanyga) - Wouter de Wild + - Trevor North - Degory Valentine - izzyp - Benoit Lévêque (benoit_leveque) - Jeroen Fiege (fieg) - Krzysiek Łabuś - Xavier Lacot (xavier) + - Jon Dufresne - possum - Denis Zunke (donalberto) - Ahmadou Waly Ndiaye (waly) - - Ahmed TAILOULOUTE (ahmedtai) - Jonathan Johnson (jrjohnson) - Olivier Maisonneuve (olineuve) - Pedro Miguel Maymone de Resende (pedroresende) @@ -937,7 +951,6 @@ Symfony is the result of the work of many people who made the code better - Roy Klutman (royklutman) - Sofiane HADDAG (sofhad) - frost-nzcr4 - - Bozhidar Hristov - Laurent Bassin (lbassin) - andrey1s - Abhoryo @@ -954,17 +967,20 @@ Symfony is the result of the work of many people who made the code better - Julie Hourcade (juliehde) - Dmitry Parnas (parnas) - Paul LE CORRE + - Daniel Gorgan - Tony Malzhacker - Mathieu MARCHOIS - Cyril Quintin (cyqui) - Gerard van Helden (drm) - Johnny Peck (johnnypeck) + - Stefan Kruppa - Ivan Menshykov - David Romaní - Patrick Allaert - Gustavo Falco (gfalco) - Matt Robinson (inanimatt) - Kristof Van Cauwenbergh (kristofvc) + - Peter Bowyer (pbowyer) - Aleksey Podskrebyshev - Calin Mihai Pristavu - David Marín Carreño (davefx) @@ -986,8 +1002,6 @@ Symfony is the result of the work of many people who made the code better - Dmytro Boiko (eagle) - Shin Ohno (ganchiku) - Geert De Deckere (geertdd) - - Ion Bazan (ionbazan) - - Jacek Jędrzejewski (jacek.jedrzejewski) - Jan Kramer (jankramer) - abdul malik ikhsan (samsonasik) - Henry Snoek (snoek09) @@ -995,9 +1009,9 @@ Symfony is the result of the work of many people who made the code better - Simone Di Maulo (toretto460) - Christian Morgan - Alexander Miehe (engerim) + - Jesse Rushlow (geeshoe) - Morgan Auchede (mauchede) - Sascha Dens (saschadens) - - Chi-teck - Don Pinkster - Maksim Muruev - Emil Einarsson @@ -1023,7 +1037,6 @@ Symfony is the result of the work of many people who made the code better - Marcos Gómez Vilches (markitosgv) - Matthew Davis (mdavis1982) - Markus S. (staabm) - - Guilliam Xavier - Maks - Antoine LA - den @@ -1046,7 +1059,9 @@ Symfony is the result of the work of many people who made the code better - Koen Kuipers - datibbaw - Erik Saunier (snickers) + - Thiago Cordeiro (thiagocordeiro) - Rootie + - Alireza Mirsepassi (alirezamirsepassi) - Daniel Alejandro Castro Arellano (lexcast) - sensio - Thomas Jarrand @@ -1060,7 +1075,6 @@ Symfony is the result of the work of many people who made the code better - Valérian Galliat - d-ph - Renan Taranto (renan-taranto) - - Thomas Talbot (ioni) - Rikijs Murgs - Uladzimir Tsykun - Ben Ramsey (ramsey) @@ -1077,11 +1091,14 @@ Symfony is the result of the work of many people who made the code better - neghmurken - xaav - Mahmoud Mostafa (mahmoud) - - Mathias Arlaud (mtarld) + - Antonio Jose Cerezo (ajcerezo) + - Baptiste Leduc (korbeil) - Ahmed Abdou - Daniel Iwaniec + - Thomas Ferney - Pieter - Michael Tibben + - Hallison Boaventura (hallisonboaventura) - Billie Thompson - Ganesh Chandrasekaran - Sander Marechal @@ -1093,6 +1110,8 @@ Symfony is the result of the work of many people who made the code better - EStyles (insidestyles) - kevin.nadin - jean pasqualini (darkilliant) + - Iliya Miroslavov Iliev (i.miroslavov) + - Safonov Nikita (ns3777k) - Ross Motley (rossmotley) - ttomor - Mei Gwilym (meigwilym) @@ -1105,6 +1124,7 @@ Symfony is the result of the work of many people who made the code better - Nicolas Le Goff (nlegoff) - Ben Oman - Chris de Kok + - Lorenzo Millucci - Andreas Kleemann - Manuele Menozzi - zairig imad (zairigimad) @@ -1139,11 +1159,14 @@ Symfony is the result of the work of many people who made the code better - Wojciech Sznapka - Luis Pabon (luispabon) - Gavin Staniforth + - Anna Filina (afilina) - Ksaveras Šakys (xawiers) - Ariel J. Birnbaum + - Patrick Luca Fazzi (ap3ir0n) - Danijel Obradović - Pablo Borowicz - Mathieu Santostefano + - Michel Hunziker - Arjan Keeman - Máximo Cuadros (mcuadros) - Lukas Mencl @@ -1175,13 +1198,13 @@ Symfony is the result of the work of many people who made the code better - mlazovla - Alejandro Diaz Torres - Max Beutel + - Jan Vernieuwe (vernija) - Antanas Arvasevicius - Pierre Dudoret - Thomas - Maximilian Berghoff (electricmaxxx) - nacho - Piotr Antosik (antek88) - - Artem Lopata - Vedran Mihočinec (v-m-i) - Sergey Novikov (s12v) - creiner @@ -1199,11 +1222,11 @@ Symfony is the result of the work of many people who made the code better - HypeMC - jfcixmedia - Dominic Tubach - - Nicolas Philippe (nikophil) - Nikita Konstantinov - Martijn Evers - Vitaliy Ryaboy (vitaliy) - Benjamin Paap (benjaminpaap) + - Claus Due (namelesscoder) - Christian - Denis Golubovskiy (bukashk0zzz) - Sergii Smertin (nfx) @@ -1235,6 +1258,7 @@ Symfony is the result of the work of many people who made the code better - Jakub Sacha - Olaf Klischat - orlovv + - Andrey Sevastianov - Claude Dioudonnat - Jonathan Hedstrom - Peter Smeets (darkspartan) @@ -1243,7 +1267,7 @@ Symfony is the result of the work of many people who made the code better - Robert Meijers - James Sansbury - Marcin Chwedziak - - Alexandre Parent + - Benjamin - hjkl - Tony Cosentino (tony-co) - Dan Wilga @@ -1288,14 +1312,17 @@ Symfony is the result of the work of many people who made the code better - Yannick - Vladimir Luchaninov (luchaninov) - spdionis + - maxime.perrimond - rchoquet - gitlost - Taras Girnyk + - Arun Philip - Rémi Leclerc - Jan Vernarsky - Amine Yakoubi - Eduardo García Sanz (coma) - Sergio (deverad) + - Makdessi Alex - James Gilliland - fduch (fduch) - Stuart Fyfe @@ -1315,6 +1342,7 @@ Symfony is the result of the work of many people who made the code better - Roger Webb - Dmitriy Simushev - Pawel Smolinski + - Tomasz (timitao) - Oxan van Leeuwen - pkowalczyk - Soner Sayakci @@ -1329,6 +1357,7 @@ Symfony is the result of the work of many people who made the code better - Derek Lambert - MightyBranch - Kacper Gunia (cakper) + - Jérôme Tamarelle (jtamarelle-prismamedia) - Peter Thompson (petert82) - error56 - Felicitus @@ -1363,8 +1392,10 @@ Symfony is the result of the work of many people who made the code better - Mario Young - Ilia (aliance) - Chris McCafferty (cilefen) + - Florian Hermann (fhermann) - Mo Di (modi) - Pablo Schläpfer + - Patrick Berenschot - SuRiKmAn - Gert de Pagter - Jelte Steijaert (jelte) @@ -1384,6 +1415,7 @@ Symfony is the result of the work of many people who made the code better - Justin Reherman (jreherman) - Rubén Calvo (rubencm) - Abdul.Mohsen B. A. A + - Peter Jaap Blaakmeer - Swen van Zanten - Benoît Burnichon - pthompson @@ -1399,6 +1431,7 @@ Symfony is the result of the work of many people who made the code better - Kévin Gomez (kevin) - Mihai Nica (redecs) - Andrei Igna + - Adam Prickett - azine - Dawid Sajdak - Ludek Stepan @@ -1406,6 +1439,7 @@ Symfony is the result of the work of many people who made the code better - Craig Menning (cmenning) - Balázs Benyó (duplabe) - Erika Heidi Reinaldo (erikaheidi) + - Kyryll Maesh (gauss) - Pierre Tachoire (krichprollsch) - Marc J. Schmidt (marcjs) - František Maša @@ -1460,6 +1494,7 @@ Symfony is the result of the work of many people who made the code better - Antal Áron (antalaron) - Vašek Purchart (vasek-purchart) - Janusz Jabłoński (yanoosh) + - Ivan Grigoriev - Fleuv - Sandro Hopf - Łukasz Makuch @@ -1477,8 +1512,8 @@ Symfony is the result of the work of many people who made the code better - Philip Frank - David Brooks - Lance McNearney - - Guillaume Verstraete - Giorgio Premi + - Aurélien Fontaine - ncou - Ian Carroll - caponica @@ -1488,6 +1523,7 @@ Symfony is the result of the work of many people who made the code better - Pete Mitchell (peterjmit) - Tom Corrigan (tomcorrigan) - Luis Galeas + - Bogdan Scordaliu - Martin Pärtel - Daniel Rotter (danrot) - Frédéric Bouchery (fbouchery) @@ -1497,6 +1533,7 @@ Symfony is the result of the work of many people who made the code better - WedgeSama - Felds Liscia - Chihiro Adachi (chihiro-adachi) + - Axel Guckelsberger (guite) - Raphaëll Roussel - Tadcka - Beth Binkovitz @@ -1527,6 +1564,7 @@ Symfony is the result of the work of many people who made the code better - Arnaud CHASSEUX - tuqqu - Wojciech Gorczyca + - Neagu Cristian-Doru (cristian-neagu) - Rafał Muszyński (rafmus90) - Sébastien Decrême (sebdec) - Timothy Anido (xanido) @@ -1553,6 +1591,7 @@ Symfony is the result of the work of many people who made the code better - Nouhail AL FIDI (alfidi) - Fabian Steiner (fabstei) - Felipy Tavares Amorim (felipyamorim) + - Guillaume Loulier (guikingone) - Klaus Silveira (klaussilveira) - Thomas Chmielowiec (chmielot) - Jānis Lukss @@ -1588,12 +1627,12 @@ Symfony is the result of the work of many people who made the code better - Benhssaein Youssef - Benjamin Bender - Jared Farrish - - Trevor North - karl.rixon - raplider - Konrad Mohrfeldt - Lance Chen - Ciaran McNulty (ciaranmcnulty) + - Dominik Piekarski (dompie) - Andrew (drew) - kor3k kor3k (kor3k) - Stelian Mocanita (stelian) @@ -1607,6 +1646,7 @@ Symfony is the result of the work of many people who made the code better - Hoffmann András - LubenZA - Olivier + - knezmilos13 - Cyril PASCAL - Michael Bessolov - pscheit @@ -1680,6 +1720,7 @@ Symfony is the result of the work of many people who made the code better - Ikhsan Agustian - Arnau González (arnaugm) - Simon Bouland (bouland) + - Dmitry Pigin (dotty) - Jibé Barth (jibbarth) - Matthew Foster (mfoster) - Reyo Stallenberg (reyostallenberg) @@ -1697,7 +1738,6 @@ Symfony is the result of the work of many people who made the code better - stloyd - Andreas - Chris Tickner - - BoShurik - Andrew Coulton - Ulugbek Miniyarov - Jeremy Benoist @@ -1718,7 +1758,6 @@ Symfony is the result of the work of many people who made the code better - Eric Schildkamp - Andreas - Markus - - Daniel Gorgan - kernig - Thomas Chmielowiec - shdev @@ -1762,9 +1801,9 @@ Symfony is the result of the work of many people who made the code better - Andrey Helldar (helldar) - Karim Cassam Chenaï (ka) - Maksym Slesarenko (maksym_slesarenko) + - Marcello Mönkemeyer (marcello-moenkemeyer) - Michal Kurzeja (mkurzeja) - Nicolas Bastien (nicolas_bastien) - - Peter Bowyer (pbowyer) - Nikola Svitlica (thecelavi) - Denis (yethee) - Andrew Zhilin (zhil) @@ -1775,6 +1814,7 @@ Symfony is the result of the work of many people who made the code better - Normunds - Luiz “Felds” Liscia - Thomas Rothe + - Adrien Wilmet - Martin - nietonfir - alefranz @@ -1867,6 +1907,7 @@ Symfony is the result of the work of many people who made the code better - gedrox - Bohan Yang - Alan Bondarchuk + - Pchol - dropfen - Andrey Chernykh - Edvinas Klovas @@ -1889,6 +1930,7 @@ Symfony is the result of the work of many people who made the code better - AmsTaFF (amstaff) - Simon Müller (boscho) - Yannick Bensacq (cibou) + - Cyrille Bourgois (cyrilleb) - Damien (damien_vauchel) - Frédéric G. Marand (fgm) - Freek Van der Herten (freekmurze) @@ -1909,6 +1951,7 @@ Symfony is the result of the work of many people who made the code better - Ahmed Hannachi (tiecoders) - Vincent LEFORT (vlefort) - Walid BOUGHDIRI (walidboughdiri) + - Wim Molenberghs (wimm) - Darryl Hein (xmmedia) - Sadicov Vladimir (xtech) - Kevin EMO (zarcox) @@ -1944,6 +1987,7 @@ Symfony is the result of the work of many people who made the code better - Martin Mayer (martin) - Grzegorz Łukaszewicz (newicz) - Jonny Schmid (schmidjon) + - Ashura - Götz Gottwald - Veres Lajos - Nick Chiu @@ -2015,11 +2059,13 @@ Symfony is the result of the work of many people who made the code better - Achilles Kaloeridis (achilles) - Adria Lopez (adlpz) - Aaron Scherer (aequasi) + - baron (bastien) - Rosio (ben-rosio) - Simon Paarlberg (blamh) - Jeroen Thora (bolle) - Brieuc THOMAS (brieucthomas) - Masao Maeda (brtriver) + - Damien Harper (damien.harper) - Darius Leskauskas (darles) - david perez (davidpv) - Daniël Brekelmans (dbrekelmans) @@ -2059,6 +2105,7 @@ Symfony is the result of the work of many people who made the code better - Pierre Gasté (pierre_g) - Pablo Monterde Perez (plebs) - Jimmy Leger (redpanda) + - Dmitry (staratel) - Marcin Szepczynski (szepczynski) - Cyrille Jouineau (tuxosaurus) - Vladimir Chernyshev (volch) @@ -2069,7 +2116,6 @@ Symfony is the result of the work of many people who made the code better - Angel Fernando Quiroz Campos - Ondrej Mirtes - akimsko - - Stefan Kruppa - Youpie - srsbiz - Taylan Kasap @@ -2087,6 +2133,7 @@ Symfony is the result of the work of many people who made the code better - Damian Sromek - Ben - Evgeniy Tetenchuk + - Sjoerd Adema - Shrey Puranik - Lars Moelleken - dasmfm @@ -2137,6 +2184,7 @@ Symfony is the result of the work of many people who made the code better - BenjaminBeck - Aurelijus Rožėnas - Beno!t POLASZEK + - Armando - Jordan Hoff - znerol - Christian Eikermann @@ -2167,6 +2215,7 @@ Symfony is the result of the work of many people who made the code better - Jack Wright - MrNicodemuz - Anonymous User + - Dieter - Paweł Tomulik - Eric J. Duran - Alexandru Bucur @@ -2224,9 +2273,9 @@ Symfony is the result of the work of many people who made the code better - Shude - Richard Hodgson - Ondřej Führer + - Bogdan - Sema - Elan Ruusamäe - - Jon Dufresne - Thorsten Hallwas - Alex Nostadt - Michael Squires @@ -2278,6 +2327,7 @@ Symfony is the result of the work of many people who made the code better - tirnanog06 - phc - Дмитрий Пацура + - Signor Pedro - ilyes kooli - Ilia Lazarev - Michaël VEROUX @@ -2289,6 +2339,7 @@ Symfony is the result of the work of many people who made the code better - Bilge - ADmad - Nicolas Roudaire + - Matthias Meyer - Temuri Takalandze (abgeo) - Alfonso (afgar) - Andreas Forsblom (aforsblo) @@ -2319,7 +2370,6 @@ Symfony is the result of the work of many people who made the code better - Carsten Eilers (fnc) - Sorin Gitlan (forapathy) - Yohan Giarelli (frequence-web) - - Jesse Rushlow (geeshoe) - Gerry Vandermaesen (gerryvdm) - Ghazy Ben Ahmed (ghazy) - Arash Tabriziyan (ghost098) @@ -2386,10 +2436,10 @@ Symfony is the result of the work of many people who made the code better - Thomas Baumgartner (shoplifter) - Schuyler Jager (sjager) - Volker (skydiablo) + - Success Go (successgo) - Julien Sanchez (sumbobyboys) - Guillermo Gisinger (t3chn0r) - Markus Tacker (tacker) - - Thiago Cordeiro (thiagocordeiro) - Tom Newby (tomnewbyau) - Andrew Clark (tqt_andrew_clark) - David Lumaye (tux1124) @@ -2411,6 +2461,7 @@ Symfony is the result of the work of many people who made the code better - craigmarvelley - Stano Turza - simpson + - Antoine Leblanc - drublic - MaPePeR - Andreas Streichardt @@ -2440,7 +2491,6 @@ Symfony is the result of the work of many people who made the code better - max - Alexander Bauer (abauer) - Ahmad Mayahi (ahmadmayahi) - - Alireza Mirsepassi (alirezamirsepassi) - Mohamed Karnichi (amiral) - Andrew Carter (andrewcarteruk) - Adam Elsodaney (archfizz) From dfc775c59030bb8136e1fefe0da70a7c24489f93 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Feb 2020 11:16:41 +0100 Subject: [PATCH 03/82] updated VERSION for 3.4.38 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 82930d8c27d2b..1c85a2b08fd9b 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -67,12 +67,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '3.4.38-DEV'; + const VERSION = '3.4.38'; const VERSION_ID = 30438; const MAJOR_VERSION = 3; const MINOR_VERSION = 4; const RELEASE_VERSION = 38; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '11/2020'; const END_OF_LIFE = '11/2021'; From 8d2990e636d297161c4c02840adc0355594b1d11 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Feb 2020 11:30:13 +0100 Subject: [PATCH 04/82] bumped Symfony version to 3.4.39 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 1c85a2b08fd9b..4ef763e4862a8 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -67,12 +67,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '3.4.38'; - const VERSION_ID = 30438; + const VERSION = '3.4.39-DEV'; + const VERSION_ID = 30439; const MAJOR_VERSION = 3; const MINOR_VERSION = 4; - const RELEASE_VERSION = 38; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = 39; + const EXTRA_VERSION = 'DEV'; const END_OF_MAINTENANCE = '11/2020'; const END_OF_LIFE = '11/2021'; From 2bd76fa32cb648adcff040cd7cb8edad5c5bef4a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Feb 2020 11:35:30 +0100 Subject: [PATCH 05/82] bumped Symfony version to 4.4.6 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 0b21ee8996e77..281c161b3886d 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - const VERSION = '4.4.5'; - const VERSION_ID = 40405; + const VERSION = '4.4.6-DEV'; + const VERSION_ID = 40406; const MAJOR_VERSION = 4; const MINOR_VERSION = 4; - const RELEASE_VERSION = 5; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = 6; + const EXTRA_VERSION = 'DEV'; const END_OF_MAINTENANCE = '11/2022'; const END_OF_LIFE = '11/2023'; From 1bd779d7c801d2fb56d16f479ca7d41c19185c44 Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Sat, 29 Feb 2020 22:44:21 +0100 Subject: [PATCH 06/82] [SecurityBundle] Minor fixes in configuration tree builder --- .../Security/Factory/RememberMeFactory.php | 4 +++- .../Security/UserProvider/LdapFactory.php | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php index 8d419c0edd8f0..89953502ba764 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php @@ -139,12 +139,14 @@ public function addConfiguration(NodeDefinition $node) ->end() ->prototype('scalar')->end() ->end() - ->scalarNode('catch_exceptions')->defaultTrue()->end() + ->booleanNode('catch_exceptions')->defaultTrue()->end() ; foreach ($this->options as $name => $value) { if (\is_bool($value)) { $builder->booleanNode($name)->defaultValue($value); + } elseif (\is_int($value)) { + $builder->integerNode($name)->defaultValue($value); } else { $builder->scalarNode($name)->defaultValue($value); } diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php index f213a32f8b7dc..35681623ed299 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php @@ -47,11 +47,12 @@ public function getKey() public function addConfiguration(NodeDefinition $node) { $node + ->fixXmlConfig('default_role') ->children() ->scalarNode('service')->isRequired()->cannotBeEmpty()->defaultValue('ldap')->end() ->scalarNode('base_dn')->isRequired()->cannotBeEmpty()->end() - ->scalarNode('search_dn')->end() - ->scalarNode('search_password')->end() + ->scalarNode('search_dn')->defaultNull()->end() + ->scalarNode('search_password')->defaultNull()->end() ->arrayNode('default_roles') ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end() ->requiresAtLeastOneElement() From b01a10c7604e527cc0c0f7c2e3951103863939ae Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 28 Feb 2020 14:45:23 +0100 Subject: [PATCH 07/82] prevent deprecation being triggered from assertion --- .../DomCrawler/Test/Constraint/CrawlerSelectorTextContains.php | 2 +- .../DomCrawler/Test/Constraint/CrawlerSelectorTextSame.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextContains.php b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextContains.php index 0ddca408697fb..c9d996175eab4 100644 --- a/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextContains.php +++ b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextContains.php @@ -45,7 +45,7 @@ protected function matches($crawler): bool return false; } - return false !== mb_strpos($crawler->text(), $this->expectedText); + return false !== mb_strpos($crawler->text(null, false), $this->expectedText); } /** diff --git a/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextSame.php b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextSame.php index 30271f01917a2..66adadd9d4ba8 100644 --- a/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextSame.php +++ b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextSame.php @@ -45,7 +45,7 @@ protected function matches($crawler): bool return false; } - return $this->expectedText === trim($crawler->text()); + return $this->expectedText === trim($crawler->text(null, false)); } /** From 8c498ee48737ceb5ce9612abc277b1480d85997c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Bogusz?= Date: Sun, 1 Mar 2020 22:11:17 +0100 Subject: [PATCH 08/82] Add Polish translation --- .../Validator/Resources/translations/validators.pl.xlf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf index d1dd1471a77ca..5c1e472ab5b66 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf @@ -370,6 +370,10 @@ This value is not a valid hostname. Ta wartość nie jest prawidłową nazwą hosta. + + The number of elements in this collection should be a multiple of {{ compared_value }}. + Liczba elementów w tym zbiorze powinna być wielokrotnością {{ compared_value }}. + From 44ba43d6730b81859989a2267c733b3b7bc32b27 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 2 Mar 2020 09:42:21 +0100 Subject: [PATCH 09/82] Fix typo --- .../Validator/Resources/translations/validators.vi.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf index ead79d2cd7e5b..301d42f027c84 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf @@ -372,7 +372,7 @@ The number of elements in this collection should be a multiple of {{ compared_value }}. - Số lượng các phần tử trong bộ sưu tập này nên là bội số của {{compared_value}}. + Số lượng các phần tử trong bộ sưu tập này nên là bội số của {{ compared_value }}. From af738c0c8f752b8d00020cfdbbcda13da2717103 Mon Sep 17 00:00:00 2001 From: arai Date: Sat, 29 Feb 2020 09:37:39 +0900 Subject: [PATCH 10/82] [Validator] add Japanese translation --- .../Validator/Resources/translations/validators.ja.xlf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf index 21e2392c7d96c..f4e4f699467d1 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf @@ -366,6 +366,14 @@ This value should be between {{ min }} and {{ max }}. {{ min }}以上{{ max }}以下でなければなりません。 + + This value is not a valid hostname. + 有効なホスト名ではありません。 + + + The number of elements in this collection should be a multiple of {{ compared_value }}. + 要素の数は{{Compare_value}}の倍数でなければなりません。 + From 6cb49b5e0cb430e4a7df3962e2fdc9bbe30cca5d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 2 Mar 2020 09:43:43 +0100 Subject: [PATCH 11/82] Fix typo --- .../Validator/Resources/translations/validators.ja.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf index f4e4f699467d1..8bff68b1ee90c 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf @@ -372,7 +372,7 @@ The number of elements in this collection should be a multiple of {{ compared_value }}. - 要素の数は{{Compare_value}}の倍数でなければなりません。 + 要素の数は{{ compared_value }}の倍数でなければなりません。 From 9e67b57baa597303368a01bf485aefdaae51cd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Bogusz?= Date: Sun, 1 Mar 2020 22:30:42 +0100 Subject: [PATCH 12/82] Add Spanish translation --- .../Validator/Resources/translations/validators.es.xlf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf index 75cb60605a6b3..08ec74c05b8f1 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf @@ -364,7 +364,15 @@ This value should be between {{ min }} and {{ max }}. - Este valor debe estar entre {{ min }} y {{ max }}. + Este valor debería estar entre {{ min }} y {{ max }}. + + + This value is not a valid hostname. + Este valor no es un nombre de host válido. + + + The number of elements in this collection should be a multiple of {{ compared_value }}. + El número de elementos en esta colección debería ser múltiplo de {{ compared_value }}. From 650c9f3f4b40a03bb36649ef1dfc86f9f2dd3861 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 29 Feb 2020 16:27:30 +0100 Subject: [PATCH 13/82] register only existing transport factories --- .../FrameworkExtension.php | 20 +++++++++++++++++++ .../Resources/config/messenger.xml | 8 ++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 1d4f669ad5215..00c6f3234847a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -87,6 +87,8 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface; use Symfony\Component\Messenger\MessageBus; use Symfony\Component\Messenger\MessageBusInterface; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory; +use Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory; use Symfony\Component\Messenger\Transport\TransportFactoryInterface; use Symfony\Component\Messenger\Transport\TransportInterface; use Symfony\Component\Mime\MimeTypeGuesserInterface; @@ -314,6 +316,16 @@ public function load(array $configs, ContainerBuilder $container) $container->removeDefinition('console.command.messenger_failed_messages_show'); $container->removeDefinition('console.command.messenger_failed_messages_remove'); $container->removeDefinition('cache.messenger.restart_workers_signal'); + + if ($container->hasDefinition('messenger.transport.amqp.factory') && class_exists(AmqpTransportFactory::class)) { + $container->getDefinition('messenger.transport.amqp.factory') + ->addTag('messenger.transport_factory'); + } + + if ($container->hasDefinition('messenger.transport.redis.factory') && class_exists(RedisTransportFactory::class)) { + $container->getDefinition('messenger.transport.redis.factory') + ->addTag('messenger.transport_factory'); + } } if ($this->httpClientConfigEnabled = $this->isConfigEnabled($container, $config['http_client'])) { @@ -1707,6 +1719,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder $loader->load('messenger.xml'); + if (class_exists(AmqpTransportFactory::class)) { + $container->getDefinition('messenger.transport.amqp.factory')->addTag('messenger.transport_factory'); + } + + if (class_exists(RedisTransportFactory::class)) { + $container->getDefinition('messenger.transport.redis.factory')->addTag('messenger.transport_factory'); + } + if (null === $config['default_bus'] && 1 === \count($config['buses'])) { $config['default_bus'] = key($config['buses']); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml index 14117ee8e40a4..9d30261c7357c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml @@ -67,13 +67,9 @@ - - - + - - - + From 096dc0aeefc3400669ebc34342278fd6ee47f256 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Mon, 2 Mar 2020 16:58:18 +0100 Subject: [PATCH 14/82] [Routing] Prevent localized routes _locale default & requirement from being overridden --- src/Symfony/Component/Routing/Route.php | 21 +++++++ .../Component/Routing/Tests/RouteTest.php | 61 +++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index 03ec76e0dde26..de98e1d76303d 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -376,6 +376,10 @@ public function setDefaults(array $defaults) */ public function addDefaults(array $defaults) { + if (isset($defaults['_locale']) && $this->isLocalized()) { + unset($defaults['_locale']); + } + foreach ($defaults as $name => $default) { $this->defaults[$name] = $default; } @@ -418,6 +422,10 @@ public function hasDefault($name) */ public function setDefault($name, $default) { + if ('_locale' === $name && $this->isLocalized()) { + return $this; + } + $this->defaults[$name] = $default; $this->compiled = null; @@ -461,6 +469,10 @@ public function setRequirements(array $requirements) */ public function addRequirements(array $requirements) { + if (isset($requirements['_locale']) && $this->isLocalized()) { + unset($requirements['_locale']); + } + foreach ($requirements as $key => $regex) { $this->requirements[$key] = $this->sanitizeRequirement($key, $regex); } @@ -503,6 +515,10 @@ public function hasRequirement($key) */ public function setRequirement($key, $regex) { + if ('_locale' === $key && $this->isLocalized()) { + return $this; + } + $this->requirements[$key] = $this->sanitizeRequirement($key, $regex); $this->compiled = null; @@ -577,4 +593,9 @@ private function sanitizeRequirement(string $key, $regex) return $regex; } + + private function isLocalized(): bool + { + return isset($this->defaults['_locale']) && isset($this->defaults['_canonical_route']) && ($this->requirements['_locale'] ?? null) === preg_quote($this->defaults['_locale'], RouteCompiler::REGEX_DELIMITER); + } } diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php index 6add1337ed369..4c767f9d95c83 100644 --- a/src/Symfony/Component/Routing/Tests/RouteTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteTest.php @@ -271,4 +271,65 @@ public function testSerializedRepresentationKeepsWorking() $this->assertEquals($route, $unserialized); $this->assertNotSame($route, $unserialized); } + + /** + * @dataProvider provideNonLocalizedRoutes + */ + public function testLocaleDefaultWithNonLocalizedRoutes(Route $route) + { + $this->assertNotSame('fr', $route->getDefault('_locale')); + $route->setDefault('_locale', 'fr'); + $this->assertSame('fr', $route->getDefault('_locale')); + } + + /** + * @dataProvider provideLocalizedRoutes + */ + public function testLocaleDefaultWithLocalizedRoutes(Route $route) + { + $expected = $route->getDefault('_locale'); + $this->assertIsString($expected); + $this->assertNotSame('fr', $expected); + $route->setDefault('_locale', 'fr'); + $this->assertSame($expected, $route->getDefault('_locale')); + } + + /** + * @dataProvider provideNonLocalizedRoutes + */ + public function testLocaleRequirementWithNonLocalizedRoutes(Route $route) + { + $this->assertNotSame('fr', $route->getRequirement('_locale')); + $route->setRequirement('_locale', 'fr'); + $this->assertSame('fr', $route->getRequirement('_locale')); + } + + /** + * @dataProvider provideLocalizedRoutes + */ + public function testLocaleRequirementWithLocalizedRoutes(Route $route) + { + $expected = $route->getRequirement('_locale'); + $this->assertIsString($expected); + $this->assertNotSame('fr', $expected); + $route->setRequirement('_locale', 'fr'); + $this->assertSame($expected, $route->getRequirement('_locale')); + } + + public function provideNonLocalizedRoutes() + { + return [ + [(new Route('/foo'))], + [(new Route('/foo'))->setDefault('_locale', 'en')], + [(new Route('/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')], + [(new Route('/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'foobar')], + ]; + } + + public function provideLocalizedRoutes() + { + return [ + [(new Route('/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'en')], + ]; + } } From 99ae55ff1acf2355af11058d15bdb94e21f60042 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Mon, 2 Mar 2020 16:43:42 +0100 Subject: [PATCH 15/82] [Routing] Fix some wrong localized routes tests --- .../Dumper/CompiledUrlGeneratorDumperTest.php | 28 +++++++++---------- .../Dumper/PhpGeneratorDumperTest.php | 28 +++++++++---------- .../Tests/Generator/UrlGeneratorTest.php | 20 +++++++------ 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php index de4776ff78331..299e6bd5c695a 100644 --- a/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php +++ b/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php @@ -87,8 +87,8 @@ public function testDumpWithRoutes() public function testDumpWithSimpleLocalizedRoutes() { $this->routeCollection->add('test', (new Route('/foo'))); - $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')); - $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')); + $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en')); + $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'nl')); $code = $this->generatorDumper->dump(); file_put_contents($this->testTmpFilepath, $code); @@ -120,7 +120,7 @@ public function testDumpWithRouteNotFoundLocalizedRoutes() { $this->expectException('Symfony\Component\Routing\Exception\RouteNotFoundException'); $this->expectExceptionMessage('Unable to generate a URL for the named route "test" as such route does not exist.'); - $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')); + $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en')); $code = $this->generatorDumper->dump(); file_put_contents($this->testTmpFilepath, $code); @@ -131,9 +131,9 @@ public function testDumpWithRouteNotFoundLocalizedRoutes() public function testDumpWithFallbackLocaleLocalizedRoutes() { - $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')); - $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')); - $this->routeCollection->add('test.fr', (new Route('/tester/est/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'test')); + $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en')); + $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'nl')); + $this->routeCollection->add('test.fr', (new Route('/tester/est/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'fr')); $code = $this->generatorDumper->dump(); file_put_contents($this->testTmpFilepath, $code); @@ -234,10 +234,10 @@ public function testDumpWithSchemeRequirement() public function testDumpWithLocalizedRoutesPreserveTheGoodLocaleInTheUrl() { - $this->routeCollection->add('foo.en', (new Route('/{_locale}/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')); - $this->routeCollection->add('foo.fr', (new Route('/{_locale}/foo'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'foo')); - $this->routeCollection->add('fun.en', (new Route('/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'fun')); - $this->routeCollection->add('fun.fr', (new Route('/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'fun')); + $this->routeCollection->add('foo.en', (new Route('/{_locale}/fork'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'en')); + $this->routeCollection->add('foo.fr', (new Route('/{_locale}/fourchette'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'fr')); + $this->routeCollection->add('fun.en', (new Route('/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'fun')->setRequirement('_locale', 'en')); + $this->routeCollection->add('fun.fr', (new Route('/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'fun')->setRequirement('_locale', 'fr')); file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump()); @@ -246,10 +246,10 @@ public function testDumpWithLocalizedRoutesPreserveTheGoodLocaleInTheUrl() $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, $requestContext, null, null); - $this->assertSame('/fr/foo', $compiledUrlGenerator->generate('foo')); - $this->assertSame('/en/foo', $compiledUrlGenerator->generate('foo.en')); - $this->assertSame('/en/foo', $compiledUrlGenerator->generate('foo', ['_locale' => 'en'])); - $this->assertSame('/en/foo', $compiledUrlGenerator->generate('foo.fr', ['_locale' => 'en'])); + $this->assertSame('/fr/fourchette', $compiledUrlGenerator->generate('foo')); + $this->assertSame('/en/fork', $compiledUrlGenerator->generate('foo.en')); + $this->assertSame('/en/fork', $compiledUrlGenerator->generate('foo', ['_locale' => 'en'])); + $this->assertSame('/fr/fourchette', $compiledUrlGenerator->generate('foo.fr', ['_locale' => 'en'])); $this->assertSame('/amusant', $compiledUrlGenerator->generate('fun')); $this->assertSame('/fun', $compiledUrlGenerator->generate('fun.en')); diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php index 1787144780f43..28a6782a2eaf0 100644 --- a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php +++ b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php @@ -90,8 +90,8 @@ public function testDumpWithRoutes() public function testDumpWithSimpleLocalizedRoutes() { $this->routeCollection->add('test', (new Route('/foo'))); - $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')); - $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')); + $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en')); + $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'nl')); $code = $this->generatorDumper->dump([ 'class' => 'SimpleLocalizedProjectUrlGenerator', @@ -126,7 +126,7 @@ public function testDumpWithRouteNotFoundLocalizedRoutes() { $this->expectException('Symfony\Component\Routing\Exception\RouteNotFoundException'); $this->expectExceptionMessage('Unable to generate a URL for the named route "test" as such route does not exist.'); - $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')); + $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en')); $code = $this->generatorDumper->dump([ 'class' => 'RouteNotFoundLocalizedProjectUrlGenerator', @@ -140,9 +140,9 @@ public function testDumpWithRouteNotFoundLocalizedRoutes() public function testDumpWithFallbackLocaleLocalizedRoutes() { - $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')); - $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')); - $this->routeCollection->add('test.fr', (new Route('/tester/est/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'test')); + $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en')); + $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'nl')); + $this->routeCollection->add('test.fr', (new Route('/tester/est/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'fr')); $code = $this->generatorDumper->dump([ 'class' => 'FallbackLocaleLocalizedProjectUrlGenerator', @@ -253,10 +253,10 @@ public function testDumpWithSchemeRequirement() public function testDumpWithLocalizedRoutesPreserveTheGoodLocaleInTheUrl() { - $this->routeCollection->add('foo.en', (new Route('/{_locale}/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')); - $this->routeCollection->add('foo.fr', (new Route('/{_locale}/foo'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'foo')); - $this->routeCollection->add('fun.en', (new Route('/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'fun')); - $this->routeCollection->add('fun.fr', (new Route('/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'fun')); + $this->routeCollection->add('foo.en', (new Route('/{_locale}/fork'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'en')); + $this->routeCollection->add('foo.fr', (new Route('/{_locale}/fourchette'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'fr')); + $this->routeCollection->add('fun.en', (new Route('/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'fun')->setRequirement('_locale', 'en')); + $this->routeCollection->add('fun.fr', (new Route('/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'fun')->setRequirement('_locale', 'fr')); file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump([ 'class' => 'PreserveTheGoodLocaleInTheUrlGenerator', @@ -268,10 +268,10 @@ public function testDumpWithLocalizedRoutesPreserveTheGoodLocaleInTheUrl() $phpGenerator = new \PreserveTheGoodLocaleInTheUrlGenerator($requestContext); - $this->assertSame('/fr/foo', $phpGenerator->generate('foo')); - $this->assertSame('/en/foo', $phpGenerator->generate('foo.en')); - $this->assertSame('/en/foo', $phpGenerator->generate('foo', ['_locale' => 'en'])); - $this->assertSame('/en/foo', $phpGenerator->generate('foo.fr', ['_locale' => 'en'])); + $this->assertSame('/fr/fourchette', $phpGenerator->generate('foo')); + $this->assertSame('/en/fork', $phpGenerator->generate('foo.en')); + $this->assertSame('/en/fork', $phpGenerator->generate('foo', ['_locale' => 'en'])); + $this->assertSame('/fr/fourchette', $phpGenerator->generate('foo.fr', ['_locale' => 'en'])); $this->assertSame('/amusant', $phpGenerator->generate('fun')); $this->assertSame('/fun', $phpGenerator->generate('fun.en')); diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php index 01215da2c064e..cc5d894cfa688 100644 --- a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php +++ b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php @@ -171,6 +171,7 @@ public function testGenerateWithDefaultLocale() foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { $localizedRoute = clone $route; $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setRequirement('_locale', $locale); $localizedRoute->setDefault('_canonical_route', $name); $localizedRoute->setPath($path); $routes->add($name.'.'.$locale, $localizedRoute); @@ -195,6 +196,7 @@ public function testGenerateWithOverriddenParameterLocale() foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { $localizedRoute = clone $route; $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setRequirement('_locale', $locale); $localizedRoute->setDefault('_canonical_route', $name); $localizedRoute->setPath($path); $routes->add($name.'.'.$locale, $localizedRoute); @@ -219,6 +221,7 @@ public function testGenerateWithOverriddenParameterLocaleFromRequestContext() foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { $localizedRoute = clone $route; $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setRequirement('_locale', $locale); $localizedRoute->setDefault('_canonical_route', $name); $localizedRoute->setPath($path); $routes->add($name.'.'.$locale, $localizedRoute); @@ -240,18 +243,18 @@ public function testDumpWithLocalizedRoutesPreserveTheGoodLocaleInTheUrl() { $routeCollection = new RouteCollection(); - $routeCollection->add('foo.en', (new Route('/{_locale}/foo'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')); - $routeCollection->add('foo.fr', (new Route('/{_locale}/foo'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'foo')); - $routeCollection->add('fun.en', (new Route('/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'fun')); - $routeCollection->add('fun.fr', (new Route('/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'fun')); + $routeCollection->add('foo.en', (new Route('/{_locale}/fork'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'en')); + $routeCollection->add('foo.fr', (new Route('/{_locale}/fourchette'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'foo')->setRequirement('_locale', 'fr')); + $routeCollection->add('fun.en', (new Route('/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'fun')->setRequirement('_locale', 'en')); + $routeCollection->add('fun.fr', (new Route('/amusant'))->setDefault('_locale', 'fr')->setDefault('_canonical_route', 'fun')->setRequirement('_locale', 'fr')); $urlGenerator = $this->getGenerator($routeCollection); $urlGenerator->getContext()->setParameter('_locale', 'fr'); - $this->assertSame('/app.php/fr/foo', $urlGenerator->generate('foo')); - $this->assertSame('/app.php/en/foo', $urlGenerator->generate('foo.en')); - $this->assertSame('/app.php/en/foo', $urlGenerator->generate('foo', ['_locale' => 'en'])); - $this->assertSame('/app.php/en/foo', $urlGenerator->generate('foo.fr', ['_locale' => 'en'])); + $this->assertSame('/app.php/fr/fourchette', $urlGenerator->generate('foo')); + $this->assertSame('/app.php/en/fork', $urlGenerator->generate('foo.en')); + $this->assertSame('/app.php/en/fork', $urlGenerator->generate('foo', ['_locale' => 'en'])); + $this->assertSame('/app.php/fr/fourchette', $urlGenerator->generate('foo.fr', ['_locale' => 'en'])); $this->assertSame('/app.php/amusant', $urlGenerator->generate('fun')); $this->assertSame('/app.php/fun', $urlGenerator->generate('fun.en')); @@ -278,6 +281,7 @@ public function testGenerateWithInvalidLocale() foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { $localizedRoute = clone $route; $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setRequirement('_locale', $locale); $localizedRoute->setDefault('_canonical_route', $name); $localizedRoute->setPath($path); $routes->add($name.'.'.$locale, $localizedRoute); From af17f5a9ace0ab2013d50f33af9d37f200477d96 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Tue, 3 Mar 2020 14:44:39 +0100 Subject: [PATCH 16/82] Revert "bug symfony#28179 [DomCrawler] Skip disabled fields processing in Form" This reverts commit c73b042044ef26e0d9b7eec2c6ea9db0a74759ef. --- src/Symfony/Component/DomCrawler/Form.php | 10 +++++++++- .../Component/DomCrawler/Tests/FormTest.php | 16 ++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 0a86c7e6d4069..8a6e28ca86c36 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -89,6 +89,10 @@ public function getValues() { $values = []; foreach ($this->fields->all() as $name => $field) { + if ($field->isDisabled()) { + continue; + } + if (!$field instanceof Field\FileFormField && $field->hasValue()) { $values[$name] = $field->getValue(); } @@ -111,6 +115,10 @@ public function getFiles() $files = []; foreach ($this->fields->all() as $name => $field) { + if ($field->isDisabled()) { + continue; + } + if ($field instanceof Field\FileFormField) { $files[$name] = $field->getValue(); } @@ -455,7 +463,7 @@ private function initialize() private function addField(\DOMElement $node) { - if (!$node->hasAttribute('name') || !$node->getAttribute('name') || $node->hasAttribute('disabled')) { + if (!$node->hasAttribute('name') || !$node->getAttribute('name')) { return; } diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php index 9894eb429a9ee..f042513f8d685 100644 --- a/src/Symfony/Component/DomCrawler/Tests/FormTest.php +++ b/src/Symfony/Component/DomCrawler/Tests/FormTest.php @@ -159,12 +159,12 @@ public function testConstructorHandlesFormValues() public function testMultiValuedFields() { $form = $this->createForm('
- - - - - - + + + + + +
'); @@ -227,10 +227,10 @@ public function provideInitializeValues() [], ], [ - 'skips disabled input fields', + 'takes into account disabled input fields', ' ', - [], + ['foo' => ['InputFormField', 'foo']], ], [ 'appends the submitted button value', From bf5d25c8381f535102d11634625d900f3aa88107 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 3 Mar 2020 21:52:41 +0100 Subject: [PATCH 17/82] [DI] relax test to ignore changes to error message in master --- .../Tests/Compiler/ValidateEnvPlaceholdersPassTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php index 3a89b11c8c8ae..457c7a7e5cf03 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php @@ -105,7 +105,7 @@ public function testInvalidEnvInConfig() public function testNulledEnvInConfig() { $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException'); - $this->expectExceptionMessage('Invalid type for path "env_extension.int_node". Expected int, but got NULL.'); + $this->expectExceptionMessageRegexp('/^Invalid type for path "env_extension\.int_node"\. Expected "?int"?, but got (NULL|"null")\.$/'); $container = new ContainerBuilder(); $container->setParameter('env(NULLED)', null); $container->registerExtension(new EnvExtension()); From 09770aa93010ae2329e66b91a41f9705919575a0 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 3 Mar 2020 18:05:02 +0100 Subject: [PATCH 18/82] [DI] ignore extra tags added by autoconfiguration in PriorityTaggedServiceTrait --- .../Compiler/PriorityTaggedServiceTrait.php | 137 ++++++++++-------- .../PriorityTaggedServiceTraitTest.php | 46 ++++++ 2 files changed, 125 insertions(+), 58 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php index 1a2c829854dc6..121b1dc716025 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php @@ -15,7 +15,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\TypedReference; /** * Trait that allows a generic method to find and sort service by priority option in the tag. @@ -50,11 +49,10 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container $tagName = $tagName->getTag(); } + $i = 0; $services = []; foreach ($container->findTaggedServiceIds($tagName, true) as $serviceId => $attributes) { - $class = $r = null; - $defaultPriority = null; $defaultIndex = null; @@ -64,78 +62,101 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container if (isset($attribute['priority'])) { $priority = $attribute['priority']; } elseif (null === $defaultPriority && $defaultPriorityMethod) { - $class = $container->getDefinition($serviceId)->getClass(); - $class = $container->getParameterBag()->resolveValue($class) ?: null; - - if (($r = ($r ?? $container->getReflectionClass($class))) && $r->hasMethod($defaultPriorityMethod)) { - if (!($rm = $r->getMethod($defaultPriorityMethod))->isStatic()) { - throw new InvalidArgumentException(sprintf('Method "%s::%s()" should be static: tag "%s" on service "%s".', $class, $defaultPriorityMethod, $tagName, $serviceId)); - } - - if (!$rm->isPublic()) { - throw new InvalidArgumentException(sprintf('Method "%s::%s()" should be public: tag "%s" on service "%s".', $class, $defaultPriorityMethod, $tagName, $serviceId)); - } - - $defaultPriority = $rm->invoke(null); - - if (!\is_int($defaultPriority)) { - throw new InvalidArgumentException(sprintf('Method "%s::%s()" should return an integer, got %s: tag "%s" on service "%s".', $class, $defaultPriorityMethod, \gettype($priority), $tagName, $serviceId)); - } - } + $defaultPriority = PriorityTaggedServiceUtil::getDefaultPriority($container, $serviceId, $defaultPriorityMethod, $tagName); } + $priority = $priority ?? $defaultPriority ?? $defaultPriority = 0; - $priority = $priority ?? $defaultPriority ?? 0; + if (null === $indexAttribute && !$needsIndexes) { + $services[] = [$priority, ++$i, null, $serviceId]; + continue 2; + } if (null !== $indexAttribute && isset($attribute[$indexAttribute])) { $index = $attribute[$indexAttribute]; - } elseif (null === $defaultIndex && null === $indexAttribute && !$needsIndexes) { - // With partially associative array, insertion to get next key is simpler. - $services[$priority][] = null; - end($services[$priority]); - $defaultIndex = key($services[$priority]); } elseif (null === $defaultIndex && $defaultIndexMethod) { - $class = $container->getDefinition($serviceId)->getClass(); - $class = $container->getParameterBag()->resolveValue($class) ?: null; + $defaultIndex = PriorityTaggedServiceUtil::getDefaultIndex($container, $serviceId, $defaultIndexMethod, $tagName, $indexAttribute); + } + $index = $index ?? $defaultIndex ?? $defaultIndex = $serviceId; - if (($r = ($r ?? $container->getReflectionClass($class))) && $r->hasMethod($defaultIndexMethod)) { - if (!($rm = $r->getMethod($defaultIndexMethod))->isStatic()) { - throw new InvalidArgumentException(sprintf('Method "%s::%s()" should be static: tag "%s" on service "%s" is missing "%s" attribute.', $class, $defaultIndexMethod, $tagName, $serviceId, $indexAttribute)); - } + $services[] = [$priority, ++$i, $index, $serviceId]; + } + } - if (!$rm->isPublic()) { - throw new InvalidArgumentException(sprintf('Method "%s::%s()" should be public: tag "%s" on service "%s" is missing "%s" attribute.', $class, $defaultIndexMethod, $tagName, $serviceId, $indexAttribute)); - } + uasort($services, static function ($a, $b) { return $b[0] <=> $a[0] ?: $a[1] <=> $b[1]; }); - $defaultIndex = $rm->invoke(null); + $refs = []; + foreach ($services as [, , $index, $serviceId]) { + if (null === $index) { + $refs[] = new Reference($serviceId); + } else { + $refs[$index] = new Reference($serviceId); + } + } - if (!\is_string($defaultIndex)) { - throw new InvalidArgumentException(sprintf('Method "%s::%s()" should return a string, got %s: tag "%s" on service "%s" is missing "%s" attribute.', $class, $defaultIndexMethod, \gettype($defaultIndex), $tagName, $serviceId, $indexAttribute)); - } - } + return $refs; + } +} - $defaultIndex = $defaultIndex ?? $serviceId; - } +/** + * @internal + */ +class PriorityTaggedServiceUtil +{ + /** + * Gets the index defined by the default index method. + */ + public static function getDefaultIndex(ContainerBuilder $container, string $serviceId, string $defaultIndexMethod, string $tagName, string $indexAttribute): ?string + { + $class = $container->getDefinition($serviceId)->getClass(); + $class = $container->getParameterBag()->resolveValue($class) ?: null; - $index = $index ?? $defaultIndex; + if (!($r = $container->getReflectionClass($class)) || !$r->hasMethod($defaultIndexMethod)) { + return null; + } - $reference = null; - if (!$class || 'stdClass' === $class) { - $reference = new Reference($serviceId); - } elseif ($index === $serviceId) { - $reference = new TypedReference($serviceId, $class); - } else { - $reference = new TypedReference($serviceId, $class, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, \is_string($index) ? $index : null); - } + if (!($rm = $r->getMethod($defaultIndexMethod))->isStatic()) { + throw new InvalidArgumentException(sprintf('Either method "%s::%s()" should be static or tag "%s" on service "%s" is missing attribute "%s".', $class, $defaultIndexMethod, $tagName, $serviceId, $indexAttribute)); + } - $services[$priority][$index] = $reference; - } + if (!$rm->isPublic()) { + throw new InvalidArgumentException(sprintf('Either method "%s::%s()" should be public or tag "%s" on service "%s" is missing attribute "%s".', $class, $defaultIndexMethod, $tagName, $serviceId, $indexAttribute)); + } + + $defaultIndex = $rm->invoke(null); + + if (!\is_string($defaultIndex)) { + throw new InvalidArgumentException(sprintf('Either method "%s::%s()" should return a string (got %s) or tag "%s" on service "%s" is missing attribute "%s".', $class, $defaultIndexMethod, \gettype($defaultIndex), $tagName, $serviceId, $indexAttribute)); + } + + return $defaultIndex; + } + + /** + * Gets the priority defined by the default priority method. + */ + public static function getDefaultPriority(ContainerBuilder $container, string $serviceId, string $defaultPriorityMethod, string $tagName): ?int + { + $class = $container->getDefinition($serviceId)->getClass(); + $class = $container->getParameterBag()->resolveValue($class) ?: null; + + if (!($r = $container->getReflectionClass($class)) || !$r->hasMethod($defaultPriorityMethod)) { + return null; } - if ($services) { - krsort($services); - $services = array_merge(...$services); + if (!($rm = $r->getMethod($defaultPriorityMethod))->isStatic()) { + throw new InvalidArgumentException(sprintf('Either method "%s::%s()" should be static or tag "%s" on service "%s" is missing attribute "priority".', $class, $defaultPriorityMethod, $tagName, $serviceId)); + } + + if (!$rm->isPublic()) { + throw new InvalidArgumentException(sprintf('Either method "%s::%s()" should be public or tag "%s" on service "%s" is missing attribute "priority".', $class, $defaultPriorityMethod, $tagName, $serviceId)); + } + + $defaultPriority = $rm->invoke(null); + + if (!\is_int($defaultPriority)) { + throw new InvalidArgumentException(sprintf('Method "%s::%s()" should return an integer (got %s) or tag "%s" on service "%s" is missing attribute "priority".', $class, $defaultPriorityMethod, \gettype($defaultPriority), $tagName, $serviceId)); } - return $services; + return $defaultPriority; } } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php index 57ca9af427128..25ac597844520 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php @@ -12,9 +12,11 @@ namespace Symfony\Component\DependencyInjection\Tests\Compiler; use PHPUnit\Framework\TestCase; +use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument; use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; +use Symfony\Component\DependencyInjection\Tests\Fixtures\BarTagClass; class PriorityTaggedServiceTraitTest extends TestCase { @@ -85,6 +87,50 @@ public function testWithEmptyArray() $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation(); $this->assertEquals([], $priorityTaggedServiceTraitImplementation->test('my_custom_tag', $container)); } + + public function testOnlyTheFirstNonIndexedTagIsListed() + { + $container = new ContainerBuilder(); + $container->register('service1')->addTag('my_custom_tag'); + + $definition = $container->register('service2', BarTagClass::class); + $definition->addTag('my_custom_tag', ['priority' => 100]); + $definition->addTag('my_custom_tag', []); + + $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation(); + + $expected = [ + new Reference('service2'), + new Reference('service1'), + ]; + $this->assertEquals($expected, $priorityTaggedServiceTraitImplementation->test('my_custom_tag', $container)); + } + + public function testOnlyTheIndexedTagsAreListed() + { + $container = new ContainerBuilder(); + $container->register('service1')->addTag('my_custom_tag', ['foo' => 'bar']); + + $definition = $container->register('service2', BarTagClass::class); + $definition->addTag('my_custom_tag', ['priority' => 100]); + $definition->addTag('my_custom_tag', ['foo' => 'a']); + $definition->addTag('my_custom_tag', ['foo' => 'b', 'priority' => 100]); + $definition->addTag('my_custom_tag', ['foo' => 'b']); + $definition->addTag('my_custom_tag', []); + + $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation(); + + $tag = new TaggedIteratorArgument('my_custom_tag', 'foo'); + $expected = [ + 'bar_tag_class' => new Reference('service2'), + 'b' => new Reference('service2'), + 'bar' => new Reference('service1'), + 'a' => new Reference('service2'), + ]; + $services = $priorityTaggedServiceTraitImplementation->test($tag, $container); + $this->assertSame(array_keys($expected), array_keys($services)); + $this->assertEquals($expected, $priorityTaggedServiceTraitImplementation->test($tag, $container)); + } } class PriorityTaggedServiceTraitImplementation From 817992833640d8518f4eba673a792dab634059e9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 4 Mar 2020 16:44:30 +0100 Subject: [PATCH 19/82] [DI] fix dumping errored definitions --- .../DependencyInjection/Dumper/PhpDumper.php | 28 +++++++++++-------- .../php/services_service_locator_argument.php | 7 ++++- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 15d5c09f767ca..7c3119e7492fb 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -794,20 +794,26 @@ protected function {$methodName}($lazyInitialization) EOF; } - $this->serviceCalls = []; - $this->inlinedDefinitions = $this->getDefinitionsFromArguments([$definition], null, $this->serviceCalls); + if ($definition->hasErrors() && $e = $definition->getErrors()) { + $this->addThrow = true; - if ($definition->isDeprecated()) { - $code .= sprintf(" @trigger_error(%s, E_USER_DEPRECATED);\n\n", $this->export($definition->getDeprecationMessage($id))); - } + $code .= sprintf(" \$this->throw(%s);\n", $this->export(reset($e))); + } else { + $this->serviceCalls = []; + $this->inlinedDefinitions = $this->getDefinitionsFromArguments([$definition], null, $this->serviceCalls); - if ($this->getProxyDumper()->isProxyCandidate($definition)) { - $factoryCode = $asFile ? ($definition->isShared() ? "\$this->load('%s.php', false)" : '$this->factories[%2$s](false)') : '$this->%s(false)'; - $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName, $this->doExport($id))); - } + if ($definition->isDeprecated()) { + $code .= sprintf(" @trigger_error(%s, E_USER_DEPRECATED);\n\n", $this->export($definition->getDeprecationMessage($id))); + } - $code .= $this->addServiceInclude($id, $definition); - $code .= $this->addInlineService($id, $definition); + if ($this->getProxyDumper()->isProxyCandidate($definition)) { + $factoryCode = $asFile ? ($definition->isShared() ? "\$this->load('%s.php', false)" : '$this->factories[%2$s](false)') : '$this->%s(false)'; + $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName, $this->doExport($id))); + } + + $code .= $this->addServiceInclude($id, $definition); + $code .= $this->addInlineService($id, $definition); + } if ($asFile) { $code = implode("\n", array_map(function ($line) { return $line ? substr($line, 8) : $line; }, explode("\n", $code))); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php index 427fad6c986f8..fb264737902e4 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php @@ -120,6 +120,11 @@ protected function getFoo3Service() */ protected function getFoo4Service() { - return $this->privates['foo4'] = new \stdClass(); + $this->throw('BOOM'); + } + + protected function throw($message) + { + throw new RuntimeException($message); } } From 2a2bb66ff26822afe78cf2e66ad0fcf4396659c1 Mon Sep 17 00:00:00 2001 From: Maxime Helias Date: Wed, 4 Mar 2020 17:22:45 +0100 Subject: [PATCH 20/82] Add new packages on the link script --- link | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/link b/link index cea19663e8873..1525ab0cb9bbf 100755 --- a/link +++ b/link @@ -38,7 +38,7 @@ if (!is_dir("$pathToProject/vendor/symfony")) { $sfPackages = array('symfony/symfony' => __DIR__); $filesystem = new Filesystem(); -$braces = array('Bundle', 'Bridge', 'Component', 'Component/Security', 'Contracts'); +$braces = array('Bundle', 'Bridge', 'Component', 'Component/Security', 'Component/Mailer/Bridge', 'Component/Messenger/Bridge', 'Component/Notifier/Bridge', 'Contracts'); $directories = array_merge(...array_values(array_map(function ($part) { return glob(__DIR__.'/src/Symfony/'.$part.'/*', GLOB_ONLYDIR | GLOB_NOSORT); }, $braces))); From 0caf94792479c43111339f6f1062a9de88e573d1 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Thu, 5 Mar 2020 10:39:55 +0100 Subject: [PATCH 21/82] Use some PHP 5.4 constants unconditionally --- .../Bundle/FrameworkBundle/Templating/Helper/FormHelper.php | 4 ++-- src/Symfony/Component/Form/FormRenderer.php | 4 ++-- src/Symfony/Component/Translation/Dumper/JsonFileDumper.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index 686777f74557c..d9a008c690ac9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -243,9 +243,9 @@ public function humanize($text) public function formEncodeCurrency($text, $widget = '') { if ('UTF-8' === $charset = $this->getCharset()) { - $text = htmlspecialchars($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8'); + $text = htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); } else { - $text = htmlentities($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8'); + $text = htmlentities($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); $text = iconv('UTF-8', $charset, $text); $widget = iconv('UTF-8', $charset, $widget); } diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php index 8b15e0344d0ce..61adc203765e4 100644 --- a/src/Symfony/Component/Form/FormRenderer.php +++ b/src/Symfony/Component/Form/FormRenderer.php @@ -291,9 +291,9 @@ public function humanize($text) public function encodeCurrency(Environment $environment, $text, $widget = '') { if ('UTF-8' === $charset = $environment->getCharset()) { - $text = htmlspecialchars($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8'); + $text = htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); } else { - $text = htmlentities($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8'); + $text = htmlentities($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); $text = iconv('UTF-8', $charset, $text); $widget = iconv('UTF-8', $charset, $widget); } diff --git a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php index 3ee446dc73183..15e065acecbd2 100644 --- a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php @@ -28,7 +28,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti if (isset($options['json_encoding'])) { $flags = $options['json_encoding']; } else { - $flags = \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0; + $flags = JSON_PRETTY_PRINT; } return json_encode($messages->all($domain), $flags); From 9cc8d39c3966cb96ab2f62e5957d7b9accd131d0 Mon Sep 17 00:00:00 2001 From: Reda DAOUDI Date: Thu, 5 Mar 2020 11:31:37 +0100 Subject: [PATCH 22/82] [Validator] Add two missing translations for the Arabic (ar) locale --- .../Validator/Resources/translations/validators.ar.xlf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf index 79dab63d7de58..7c509b4822507 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf @@ -366,6 +366,14 @@ This value should be between {{ min }} and {{ max }}. يجب أن تكون هذه القيمة بين {{ min }} و {{ max }}. + + This value is not a valid hostname. + هذه القيمة ليست اسم مضيف صالح. + + + The number of elements in this collection should be a multiple of {{ compared_value }}. + يجب أن يكون عدد العناصر في هذه المجموعة مضاعف {{ compared_value }}. + From a56d2626392a163fb12f6772d076a07ba463bef4 Mon Sep 17 00:00:00 2001 From: Jesse Rushlow Date: Tue, 3 Mar 2020 08:15:33 -0500 Subject: [PATCH 23/82] improve PlaintextPasswordEncoder docBlock summary --- .../Security/Core/Encoder/PlaintextPasswordEncoder.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php index bda6269a52012..9e6c7570d8abf 100644 --- a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php @@ -14,7 +14,9 @@ use Symfony\Component\Security\Core\Exception\BadCredentialsException; /** - * PlaintextPasswordEncoder does not do any encoding. + * PlaintextPasswordEncoder does not do any encoding but is useful in testing environments. + * + * As this encoder is not cryptographically secure, usage of it in production environments is not recommended. * * @author Fabien Potencier */ From 622facfe94e347e31b46e2d86297a1c1ca74cbc3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 5 Mar 2020 12:34:29 +0100 Subject: [PATCH 24/82] Tweak message --- .../Security/Core/Encoder/PlaintextPasswordEncoder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php index 9e6c7570d8abf..e2c127aa538f6 100644 --- a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php @@ -16,7 +16,7 @@ /** * PlaintextPasswordEncoder does not do any encoding but is useful in testing environments. * - * As this encoder is not cryptographically secure, usage of it in production environments is not recommended. + * As this encoder is not cryptographically secure, usage of it in production environments is discouraged. * * @author Fabien Potencier */ From 31f899019462cb4a7dc49d2615c227cc25cbb287 Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Thu, 5 Mar 2020 16:34:25 +0100 Subject: [PATCH 25/82] [Messenger] Add ext-redis min version req to tests --- .../Tests/Transport/RedisExt/RedisTransportFactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php index 58b71536cf9d6..41856b6c46ca3 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php @@ -18,7 +18,7 @@ use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; /** - * @requires extension redis + * @requires extension redis >= 4.3.0 */ class RedisTransportFactoryTest extends TestCase { From f9f5f8df3ea940a7ece7cb74cecf56be816e2eb5 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Fri, 6 Mar 2020 09:58:06 +0100 Subject: [PATCH 26/82] [DoctrineBridge][DoctrineExtractor] Fix wrong guessed type for "json" type --- src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php | 2 -- .../Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php index 4ceca2c6acae9..8917ce4327c61 100644 --- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php +++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php @@ -178,7 +178,6 @@ public function getTypes($class, $property, array $context = []) switch ($typeOfField) { case self::$useDeprecatedConstants ? DBALType::TARRAY : 'array': case 'json_array': - case self::$useDeprecatedConstants ? false : Types::JSON: return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)]; case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY: @@ -266,7 +265,6 @@ private function getPhpType($doctrineType) case self::$useDeprecatedConstants ? DBALType::TARRAY : 'array': case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY: case 'json_array': - case self::$useDeprecatedConstants ? false : Types::JSON: return Type::BUILTIN_TYPE_ARRAY; } diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php index c4efb6c936106..b9abd03347e83 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php @@ -182,7 +182,7 @@ public function typesProvider() ]; if (class_exists(Types::class)) { - $provider[] = ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]]; + $provider[] = ['json', null]; } return $provider; From 1a366bc378762cff1068bff12385021751cd1dc7 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Tue, 3 Mar 2020 15:10:33 +0100 Subject: [PATCH 27/82] [Form] Handle false as empty value on expanded choices --- .../Form/Extension/Core/Type/CheckboxType.php | 1 + src/Symfony/Component/Form/Form.php | 4 +- .../Extension/Core/Type/CheckboxTypeTest.php | 9 ++++ .../Extension/Core/Type/ChoiceTypeTest.php | 41 +++++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php index 19ff62c154a04..b7226768642c7 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php @@ -33,6 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) // doing so also calls setDataLocked(true). $builder->setData(isset($options['data']) ? $options['data'] : false); $builder->addViewTransformer(new BooleanToStringTransformer($options['value'])); + $builder->setAttribute('_false_is_empty', true); // @internal - A boolean flag to treat false as empty, see Form::isEmpty() - Do not rely on it, it will be removed in Symfony 5.1. } /** diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 67fd234fe9612..b25afe3a9e494 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -725,7 +725,9 @@ public function isEmpty() // arrays, countables ((\is_array($this->modelData) || $this->modelData instanceof \Countable) && 0 === \count($this->modelData)) || // traversables that are not countable - ($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData)); + ($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData)) || + // @internal - Do not rely on it, it will be removed in Symfony 5.1. + (false === $this->modelData && $this->config->getAttribute('_false_is_empty')); } /** diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php index fb2d571884ad0..297b45a9d282d 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php @@ -190,4 +190,13 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expect $this->assertSame($expectedData, $form->getNormData()); $this->assertSame($expectedData, $form->getData()); } + + public function testSubmitNullIsEmpty() + { + $form = $this->factory->create(static::TESTED_TYPE); + + $form->submit(null); + + $this->assertTrue($form->isEmpty()); + } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php index b81ecb87671ab..9b2b0e64a576e 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php @@ -2046,4 +2046,45 @@ public function provideTrimCases() 'Multiple expanded' => [true, true], ]; } + + /** + * @dataProvider expandedIsEmptyWhenNoRealChoiceIsSelectedProvider + */ + public function testExpandedIsEmptyWhenNoRealChoiceIsSelected($expected, $submittedData, $multiple, $required, $placeholder) + { + $options = [ + 'expanded' => true, + 'choices' => [ + 'foo' => 'bar', + ], + 'multiple' => $multiple, + 'required' => $required, + ]; + + if (!$multiple) { + $options['placeholder'] = $placeholder; + } + + $form = $this->factory->create(static::TESTED_TYPE, null, $options); + + $form->submit($submittedData); + + $this->assertSame($expected, $form->isEmpty()); + } + + public function expandedIsEmptyWhenNoRealChoiceIsSelectedProvider() + { + // Some invalid cases are voluntarily not tested: + // - multiple with placeholder + // - required with placeholder + return [ + 'Nothing submitted / single / not required / without a placeholder -> should be empty' => [true, null, false, false, null], + 'Nothing submitted / single / not required / with a placeholder -> should not be empty' => [false, null, false, false, 'ccc'], // It falls back on the placeholder + 'Nothing submitted / single / required / without a placeholder -> should be empty' => [true, null, false, true, null], + 'Nothing submitted / single / required / with a placeholder -> should be empty' => [true, null, false, true, 'ccc'], + 'Nothing submitted / multiple / not required / without a placeholder -> should be empty' => [true, null, true, false, null], + 'Nothing submitted / multiple / required / without a placeholder -> should be empty' => [true, null, true, true, null], + 'Placeholder submitted / single / not required / with a placeholder -> should not be empty' => [false, '', false, false, 'ccc'], // The placeholder is a selected value + ]; + } } From be7afc6d85cae3d745a7fbc2af0c14b7870c80f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Bogusz?= Date: Thu, 5 Mar 2020 17:34:39 +0100 Subject: [PATCH 28/82] [DI] Fix XmlFileLoader bad error message --- .../Tests/Fixtures/Util/not_readable.xml | 0 .../Config/Tests/Util/XmlUtilsTest.php | 29 +++++++++++++++++-- .../Component/Config/Util/XmlUtils.php | 11 ++++++- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 src/Symfony/Component/Config/Tests/Fixtures/Util/not_readable.xml diff --git a/src/Symfony/Component/Config/Tests/Fixtures/Util/not_readable.xml b/src/Symfony/Component/Config/Tests/Fixtures/Util/not_readable.xml new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php index d1a47a8ea3376..0378e7b69a97e 100644 --- a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php +++ b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php @@ -20,6 +20,31 @@ public function testLoadFile() { $fixtures = __DIR__.'/../Fixtures/Util/'; + try { + XmlUtils::loadFile($fixtures); + $this->fail(); + } catch (\InvalidArgumentException $e) { + $this->assertStringContainsString('is not a file', $e->getMessage()); + } + + try { + XmlUtils::loadFile($fixtures.'non_existing.xml'); + $this->fail(); + } catch (\InvalidArgumentException $e) { + $this->assertStringContainsString('is not a file', $e->getMessage()); + } + + try { + if ('\\' === \DIRECTORY_SEPARATOR) { + $this->markTestSkipped('chmod is not supported on Windows'); + } + chmod($fixtures.'not_readable.xml', 000); + XmlUtils::loadFile($fixtures.'not_readable.xml'); + $this->fail(); + } catch (\InvalidArgumentException $e) { + $this->assertStringContainsString('is not readable', $e->getMessage()); + } + try { XmlUtils::loadFile($fixtures.'invalid.xml'); $this->fail(); @@ -165,7 +190,7 @@ public function testLoadEmptyXmlFile() $file = __DIR__.'/../Fixtures/foo.xml'; $this->expectException('InvalidArgumentException'); - $this->expectExceptionMessage(sprintf('File %s does not contain valid XML, it is empty.', $file)); + $this->expectExceptionMessage(sprintf('File "%s" does not contain valid XML, it is empty.', $file)); XmlUtils::loadFile($file); } @@ -186,7 +211,7 @@ public function testLoadWrongEmptyXMLWithErrorHandler() XmlUtils::loadFile($file); $this->fail('An exception should have been raised'); } catch (\InvalidArgumentException $e) { - $this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage()); + $this->assertEquals(sprintf('File "%s" does not contain valid XML, it is empty.', $file), $e->getMessage()); } } finally { restore_error_handler(); diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php index d0042af302268..c925f315e5ed3 100644 --- a/src/Symfony/Component/Config/Util/XmlUtils.php +++ b/src/Symfony/Component/Config/Util/XmlUtils.php @@ -122,9 +122,18 @@ public static function parse($content, $schemaOrCallable = null) */ public static function loadFile($file, $schemaOrCallable = null) { + if (!is_file($file)) { + throw new \InvalidArgumentException(sprintf('Resource "%s" is not a file.', $file)); + } + + if (!is_readable($file)) { + throw new \InvalidArgumentException(sprintf('File "%s" is not readable.', $file)); + } + $content = @file_get_contents($file); + if ('' === trim($content)) { - throw new \InvalidArgumentException(sprintf('File %s does not contain valid XML, it is empty.', $file)); + throw new \InvalidArgumentException(sprintf('File "%s" does not contain valid XML, it is empty.', $file)); } try { From da7870433f0567cde7371d66192103d417e99661 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 7 Mar 2020 12:56:51 +0100 Subject: [PATCH 29/82] [Yaml] fix dumping strings containing CRs --- src/Symfony/Component/Yaml/Dumper.php | 2 +- src/Symfony/Component/Yaml/Tests/DumperTest.php | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php index a496dcc88ec2f..5daf22e3119f0 100644 --- a/src/Symfony/Component/Yaml/Dumper.php +++ b/src/Symfony/Component/Yaml/Dumper.php @@ -99,7 +99,7 @@ public function dump($input, $inline = 0, $indent = 0, $flags = 0) $dumpAsMap = Inline::isHash($input); foreach ($input as $key => $value) { - if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r\n")) { + if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r")) { // If the first line starts with a space character, the spec requires a blockIndicationIndicator // http://www.yaml.org/spec/1.2/spec.html#id2793979 $blockIndentationIndicator = (' ' === substr($value, 0, 1)) ? (string) $this->indentation : ''; diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php index 1a1ef25a5a4bc..074c94942acf7 100644 --- a/src/Symfony/Component/Yaml/Tests/DumperTest.php +++ b/src/Symfony/Component/Yaml/Tests/DumperTest.php @@ -580,11 +580,26 @@ public function testDumpMultiLineStringAsScalarBlockWhenFirstLineHasLeadingSpace $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK)); } - public function testCarriageReturnIsMaintainedWhenDumpingAsMultiLineLiteralBlock() + public function testCarriageReturnFollowedByNewlineIsMaintainedWhenDumpingAsMultiLineLiteralBlock() { $this->assertSame("- \"a\\r\\nb\\nc\"\n", $this->dumper->dump(["a\r\nb\nc"], 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK)); } + public function testCarriageReturnNotFollowedByNewlineIsPreservedWhenDumpingAsMultiLineLiteralBlock() + { + $expected = <<<'YAML' +parent: + foo: "bar\n\rbaz: qux" + +YAML; + + $this->assertSame($expected, $this->dumper->dump([ + 'parent' => [ + 'foo' => "bar\n\rbaz: qux", + ], + ], 4, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK)); + } + public function testZeroIndentationThrowsException() { $this->expectException('InvalidArgumentException'); From 0f22e076c4bd6455a2727fd3eb01b40bcd9df4fe Mon Sep 17 00:00:00 2001 From: Martin Kirilov Date: Sat, 7 Mar 2020 05:36:24 +0200 Subject: [PATCH 30/82] Remove int return type from FlattenException::getCode --- .../Exception/FlattenException.php | 2 +- .../Tests/Exception/FlattenExceptionTest.php | 18 ++++++++++++++++++ .../Fixtures/StringErrorCodeException.php | 13 +++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/Symfony/Component/ErrorHandler/Tests/Fixtures/StringErrorCodeException.php diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php index 07c3d49db05d1..900cbaad0a299 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php @@ -206,7 +206,7 @@ public function setMessage($message): self return $this; } - public function getCode(): int + public function getCode() { return $this->code; } diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php index 66212a81ad84d..437d211f71590 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php @@ -14,6 +14,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Debug\Exception\FatalThrowableError; use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorHandler\Tests\Fixtures\StringErrorCodeException; use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; @@ -197,6 +198,15 @@ public function testFile(\Throwable $exception) $this->assertSame($exception->getFile(), $flattened->getFile()); } + /** + * @dataProvider stringAndIntDataProvider + */ + public function testCode(\Throwable $exception) + { + $flattened = FlattenException::createFromThrowable($exception); + $this->assertSame($exception->getCode(), $flattened->getCode()); + } + /** * @dataProvider flattenDataProvider */ @@ -238,6 +248,14 @@ public function flattenDataProvider(): array ]; } + public function stringAndIntDataProvider(): array + { + return [ + [new \Exception('test1', 123)], + [new StringErrorCodeException('test2', '42S02')], + ]; + } + public function testArguments() { if (\PHP_VERSION_ID >= 70400) { diff --git a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/StringErrorCodeException.php b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/StringErrorCodeException.php new file mode 100644 index 0000000000000..d4cbc02abe9b6 --- /dev/null +++ b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/StringErrorCodeException.php @@ -0,0 +1,13 @@ +code = $code; + } + +} From c1ed1007cd40b866e00a123507966cc5a0d33df3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 9 Mar 2020 13:54:19 +0100 Subject: [PATCH 31/82] Add missing phpdoc --- .../Component/ErrorHandler/Exception/FlattenException.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php index 900cbaad0a299..61a3497adc9f8 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php @@ -206,6 +206,9 @@ public function setMessage($message): self return $this; } + /** + * @return int|string int most of the time (might be a string with PDOException) + */ public function getCode() { return $this->code; From a85fb6c496fd3983d07fe7378f135e7898d1ecc9 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Sun, 8 Mar 2020 11:36:03 +0100 Subject: [PATCH 32/82] [Mime] remove phpdoc mentioning Utf8AddressEncoder that class does not exist. --- src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php b/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php index 1c5e32c069412..cdd5d4cade815 100644 --- a/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php +++ b/src/Symfony/Component/Mime/Encoder/IdnAddressEncoder.php @@ -20,9 +20,7 @@ * SMTP servers. * * This encoder does not support email addresses with non-ASCII characters in - * local-part (the substring before @). To send to such addresses, use - * Utf8AddressEncoder together with SmtpUtf8Handler. Your outbound SMTP server must support - * the SMTPUTF8 extension. + * local-part (the substring before @). * * @author Christian Schmidt */ From e535e7d2ff922f1f010a96f5b43570778790e726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20Sala=C3=BCn?= Date: Mon, 9 Mar 2020 19:12:25 +0100 Subject: [PATCH 33/82] [FrameworkBundle] remove redundant PHPDoc in console Descriptor and subclass The PHPDoc for some describeXXX methods in the abstract Descriptor was inacurate or redundant. --- .../Console/Descriptor/Descriptor.php | 21 ------------------- .../Console/Descriptor/JsonDescriptor.php | 21 ------------------- .../Console/Descriptor/MarkdownDescriptor.php | 21 ------------------- .../Console/Descriptor/TextDescriptor.php | 21 ------------------- .../Console/Descriptor/XmlDescriptor.php | 21 ------------------- 5 files changed, 105 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php index 23d9ccc777bd9..a28ca356d88b7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php @@ -100,24 +100,12 @@ protected function write($content, $decorated = false) $this->output->write($content, false, $decorated ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW); } - /** - * Describes an InputArgument instance. - */ abstract protected function describeRouteCollection(RouteCollection $routes, array $options = []); - /** - * Describes an InputOption instance. - */ abstract protected function describeRoute(Route $route, array $options = []); - /** - * Describes container parameters. - */ abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = []); - /** - * Describes container tags. - */ abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = []); /** @@ -138,19 +126,10 @@ abstract protected function describeContainerService($service, array $options = */ abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = []); - /** - * Describes a service definition. - */ abstract protected function describeContainerDefinition(Definition $definition, array $options = []); - /** - * Describes a service alias. - */ abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null); - /** - * Describes a container parameter. - */ abstract protected function describeContainerParameter($parameter, array $options = []); /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php index 197db657f0015..74d9b0c61a05a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php @@ -29,9 +29,6 @@ */ class JsonDescriptor extends Descriptor { - /** - * {@inheritdoc} - */ protected function describeRouteCollection(RouteCollection $routes, array $options = []) { $data = []; @@ -42,25 +39,16 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio $this->writeData($data, $options); } - /** - * {@inheritdoc} - */ protected function describeRoute(Route $route, array $options = []) { $this->writeData($this->getRouteData($route), $options); } - /** - * {@inheritdoc} - */ protected function describeContainerParameters(ParameterBag $parameters, array $options = []) { $this->writeData($this->sortParameters($parameters), $options); } - /** - * {@inheritdoc} - */ protected function describeContainerTags(ContainerBuilder $builder, array $options = []) { $showPrivate = isset($options['show_private']) && $options['show_private']; @@ -128,17 +116,11 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o $this->writeData($data, $options); } - /** - * {@inheritdoc} - */ protected function describeContainerDefinition(Definition $definition, array $options = []) { $this->writeData($this->getContainerDefinitionData($definition, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']), $options); } - /** - * {@inheritdoc} - */ protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) { if (!$builder) { @@ -169,9 +151,6 @@ protected function describeCallable($callable, array $options = []) $this->writeData($this->getCallableData($callable), $options); } - /** - * {@inheritdoc} - */ protected function describeContainerParameter($parameter, array $options = []) { $key = isset($options['parameter']) ? $options['parameter'] : ''; diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php index 2c31bdc19d611..5ebaed0248953 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php @@ -27,9 +27,6 @@ */ class MarkdownDescriptor extends Descriptor { - /** - * {@inheritdoc} - */ protected function describeRouteCollection(RouteCollection $routes, array $options = []) { $first = true; @@ -44,9 +41,6 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio $this->write("\n"); } - /** - * {@inheritdoc} - */ protected function describeRoute(Route $route, array $options = []) { $output = '- Path: '.$route->getPath() @@ -66,9 +60,6 @@ protected function describeRoute(Route $route, array $options = []) $this->write("\n"); } - /** - * {@inheritdoc} - */ protected function describeContainerParameters(ParameterBag $parameters, array $options = []) { $this->write("Container parameters\n====================\n"); @@ -77,9 +68,6 @@ protected function describeContainerParameters(ParameterBag $parameters, array $ } } - /** - * {@inheritdoc} - */ protected function describeContainerTags(ContainerBuilder $builder, array $options = []) { $showPrivate = isset($options['show_private']) && $options['show_private']; @@ -176,9 +164,6 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o } } - /** - * {@inheritdoc} - */ protected function describeContainerDefinition(Definition $definition, array $options = []) { $output = '- Class: `'.$definition->getClass().'`' @@ -240,9 +225,6 @@ protected function describeContainerDefinition(Definition $definition, array $op $this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output); } - /** - * {@inheritdoc} - */ protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) { $output = '- Service: `'.$alias.'`' @@ -264,9 +246,6 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias])); } - /** - * {@inheritdoc} - */ protected function describeContainerParameter($parameter, array $options = []) { $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php index f17a1bba21218..a32a2128e2c83 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php @@ -33,9 +33,6 @@ */ class TextDescriptor extends Descriptor { - /** - * {@inheritdoc} - */ protected function describeRouteCollection(RouteCollection $routes, array $options = []) { $showControllers = isset($options['show_controllers']) && $options['show_controllers']; @@ -72,9 +69,6 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio } } - /** - * {@inheritdoc} - */ protected function describeRoute(Route $route, array $options = []) { $tableHeaders = ['Property', 'Value']; @@ -100,9 +94,6 @@ protected function describeRoute(Route $route, array $options = []) $table->render(); } - /** - * {@inheritdoc} - */ protected function describeContainerParameters(ParameterBag $parameters, array $options = []) { $tableHeaders = ['Parameter', 'Value']; @@ -116,9 +107,6 @@ protected function describeContainerParameters(ParameterBag $parameters, array $ $options['output']->table($tableHeaders, $tableRows); } - /** - * {@inheritdoc} - */ protected function describeContainerTags(ContainerBuilder $builder, array $options = []) { $showPrivate = isset($options['show_private']) && $options['show_private']; @@ -252,9 +240,6 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o $options['output']->table($tableHeaders, $tableRows); } - /** - * {@inheritdoc} - */ protected function describeContainerDefinition(Definition $definition, array $options = []) { if (isset($options['id'])) { @@ -358,9 +343,6 @@ protected function describeContainerDefinition(Definition $definition, array $op $options['output']->table($tableHeaders, $tableRows); } - /** - * {@inheritdoc} - */ protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) { $options['output']->comment(sprintf('This service is an alias for the service %s', (string) $alias)); @@ -372,9 +354,6 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias])); } - /** - * {@inheritdoc} - */ protected function describeContainerParameter($parameter, array $options = []) { $options['output']->table( diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php index 96b9a261ae3a3..996ac11c7b3c3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php @@ -29,33 +29,21 @@ */ class XmlDescriptor extends Descriptor { - /** - * {@inheritdoc} - */ protected function describeRouteCollection(RouteCollection $routes, array $options = []) { $this->writeDocument($this->getRouteCollectionDocument($routes)); } - /** - * {@inheritdoc} - */ protected function describeRoute(Route $route, array $options = []) { $this->writeDocument($this->getRouteDocument($route, isset($options['name']) ? $options['name'] : null)); } - /** - * {@inheritdoc} - */ protected function describeContainerParameters(ParameterBag $parameters, array $options = []) { $this->writeDocument($this->getContainerParametersDocument($parameters)); } - /** - * {@inheritdoc} - */ protected function describeContainerTags(ContainerBuilder $builder, array $options = []) { $this->writeDocument($this->getContainerTagsDocument($builder, isset($options['show_private']) && $options['show_private'])); @@ -81,17 +69,11 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o $this->writeDocument($this->getContainerServicesDocument($builder, isset($options['tag']) ? $options['tag'] : null, isset($options['show_private']) && $options['show_private'], isset($options['show_arguments']) && $options['show_arguments'], isset($options['filter']) ? $options['filter'] : null)); } - /** - * {@inheritdoc} - */ protected function describeContainerDefinition(Definition $definition, array $options = []) { $this->writeDocument($this->getContainerDefinitionDocument($definition, isset($options['id']) ? $options['id'] : null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'])); } - /** - * {@inheritdoc} - */ protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) { $dom = new \DOMDocument('1.0', 'UTF-8'); @@ -124,9 +106,6 @@ protected function describeCallable($callable, array $options = []) $this->writeDocument($this->getCallableDocument($callable)); } - /** - * {@inheritdoc} - */ protected function describeContainerParameter($parameter, array $options = []) { $this->writeDocument($this->getContainerParameterDocument($parameter, $options)); From 4b4568530641b1ceb67fe9245dfdda04fce8eff1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 11 Mar 2020 09:13:51 +0100 Subject: [PATCH 34/82] [HttpClient] fix requests to hosts that idn_to_ascii() cannot handle --- .../Component/HttpClient/HttpClientTrait.php | 5 +---- .../HttpClient/Test/HttpClientTestCase.php | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php index 3eeb52fdd5cea..bace40a117dad 100644 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php @@ -441,10 +441,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS throw new InvalidArgumentException(sprintf('Unsupported IDN "%s", try enabling the "intl" PHP extension or running "composer require symfony/polyfill-intl-idn".', $host)); } - if (false === $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46) : strtolower($host)) { - throw new InvalidArgumentException(sprintf('Unsupported host in "%s".', $url)); - } - + $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46) ?: strtolower($host) : strtolower($host); $host .= $port ? ':'.$port : ''; } diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php index de13686819fc6..8e61f801aaacd 100644 --- a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php +++ b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php @@ -703,6 +703,23 @@ public function testResolve() $client->request('GET', 'http://symfony.com:8057/', ['timeout' => 1]); } + public function testIdnResolve() + { + $client = $this->getHttpClient(__FUNCTION__); + + $response = $client->request('GET', 'http://0-------------------------------------------------------------0.com:8057/', [ + 'resolve' => ['0-------------------------------------------------------------0.com' => '127.0.0.1'], + ]); + + $this->assertSame(200, $response->getStatusCode()); + + $response = $client->request('GET', 'http://Bücher.example:8057/', [ + 'resolve' => ['xn--bcher-kva.example' => '127.0.0.1'], + ]); + + $this->assertSame(200, $response->getStatusCode()); + } + public function testNotATimeout() { $client = $this->getHttpClient(__FUNCTION__); From 468a201d3436843448cbb2367abd5f657e01382f Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Wed, 11 Mar 2020 18:56:21 +0100 Subject: [PATCH 35/82] [SecurityBundle] Minor fix in LDAP config tree builder --- .../DependencyInjection/Security/UserProvider/LdapFactory.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php index cbd5f038964cb..5007b740363f4 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php @@ -48,6 +48,7 @@ public function getKey() public function addConfiguration(NodeDefinition $node) { $node + ->fixXmlConfig('extra_field') ->fixXmlConfig('default_role') ->children() ->scalarNode('service')->isRequired()->cannotBeEmpty()->defaultValue('ldap')->end() From a08d5191d2a07565a74ffa466cd40e7413cd965c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Bogusz?= Date: Wed, 11 Mar 2020 21:51:14 +0100 Subject: [PATCH 36/82] [Validator][Range] Fix typos --- src/Symfony/Component/Validator/Constraints/Range.php | 2 +- src/Symfony/Component/Validator/Tests/Constraints/RangeTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Validator/Constraints/Range.php b/src/Symfony/Component/Validator/Constraints/Range.php index a916a9625b9e0..b922135ee063e 100644 --- a/src/Symfony/Component/Validator/Constraints/Range.php +++ b/src/Symfony/Component/Validator/Constraints/Range.php @@ -65,7 +65,7 @@ public function __construct($options = null) parent::__construct($options); if (null === $this->min && null === $this->minPropertyPath && null === $this->max && null === $this->maxPropertyPath) { - throw new MissingOptionsException(sprintf('Either option "min", "minPropertyPath", "max" or "maxPropertyPath" must be given for constraint %s', __CLASS__), ['min', 'max']); + throw new MissingOptionsException(sprintf('Either option "min", "minPropertyPath", "max" or "maxPropertyPath" must be given for constraint %s', __CLASS__), ['min', 'minPropertyPath', 'max', 'maxPropertyPath']); } } } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RangeTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RangeTest.php index 333edada004a6..052a8ee024f67 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/RangeTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/RangeTest.php @@ -22,7 +22,7 @@ public function testThrowsConstraintExceptionIfBothMaxLimitAndPropertyPath() $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException'); $this->expectExceptionMessage('requires only one of the "max" or "maxPropertyPath" options to be set, not both.'); new Range([ - 'max' => 'min', + 'max' => 'max', 'maxPropertyPath' => 'maxPropertyPath', ]); } From 6b70511bc696ad70f688c08c492c38e86bfa69e2 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Thu, 12 Mar 2020 17:27:02 +0100 Subject: [PATCH 37/82] fix import from config file using type: glob --- src/Symfony/Component/Config/Loader/FileLoader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php index 5ad53885c726a..2f1d471bddc0e 100644 --- a/src/Symfony/Component/Config/Loader/FileLoader.php +++ b/src/Symfony/Component/Config/Loader/FileLoader.php @@ -76,7 +76,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe $ret = []; $isSubpath = 0 !== $i && false !== strpos(substr($resource, 0, $i), '/'); foreach ($this->glob($resource, false, $_, $ignoreErrors || !$isSubpath) as $path => $info) { - if (null !== $res = $this->doImport($path, $type, $ignoreErrors, $sourceResource)) { + if (null !== $res = $this->doImport($path, 'glob' === $type ? null : $type, $ignoreErrors, $sourceResource)) { $ret[] = $res; } $isSubpath = true; From e7fa73a32b6edc6bb50a1eb8d007eb156cb1f4f9 Mon Sep 17 00:00:00 2001 From: HypeMC Date: Sat, 29 Feb 2020 18:13:08 +0100 Subject: [PATCH 38/82] Fix container lint command when a synthetic service is used in combination with the expression language --- .../Compiler/CheckTypeDeclarationsPass.php | 7 ++++++- .../Compiler/CheckTypeDeclarationsPassTest.php | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php index b132174932dc7..2d69fe6eb6655 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php @@ -191,7 +191,12 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar } elseif ($value instanceof Parameter) { $value = $this->container->getParameter($value); } elseif ($value instanceof Expression) { - $value = $this->getExpressionLanguage()->evaluate($value, ['container' => $this->container]); + try { + $value = $this->getExpressionLanguage()->evaluate($value, ['container' => $this->container]); + } catch (\Exception $e) { + // If a service from the expression cannot be fetched from the container, we skip the validation. + return; + } } elseif (\is_string($value)) { if ('%' === ($value[0] ?? '') && preg_match('/^%([^%]+)%$/', $value, $match)) { // Only array parameters are not inlined when dumped. diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php index 79cbacecfc5b6..081db17468b16 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php @@ -739,4 +739,20 @@ public function testProcessSuccessWhenPassingServiceClosureArgumentToClosure() $this->addToAssertionCount(1); } + + public function testExpressionLanguageWithSyntheticService() + { + $container = new ContainerBuilder(); + + $container->register('synthetic') + ->setSynthetic(true); + $container->register('baz', \stdClass::class) + ->addArgument(new Reference('synthetic')); + $container->register('bar', Bar::class) + ->addArgument(new Expression('service("baz").getStdClass()')); + + (new CheckTypeDeclarationsPass())->process($container); + + $this->addToAssertionCount(1); + } } From 7aa4e10473a234061408eef966bc01f8cad5daf8 Mon Sep 17 00:00:00 2001 From: Denis Yuzhanin Date: Wed, 4 Mar 2020 13:27:46 +0300 Subject: [PATCH 39/82] Add test for tagged iterator with numeric index --- .../ResolveTaggedIteratorArgumentPassTest.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php index 2322817e86662..2a07f26178980 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php @@ -37,4 +37,20 @@ public function testProcess() $expected->setValues([new Reference('b'), new Reference('c'), new Reference('a')]); $this->assertEquals($expected, $properties['foos']); } + + public function testProcessWithIndexes() + { + $container = new ContainerBuilder(); + $container->register('service_a', 'stdClass')->addTag('foo', ['key' => '1']); + $container->register('service_b', 'stdClass')->addTag('foo', ['key' => '2']); + $container->register('service_c', 'stdClass')->setProperty('foos', new TaggedIteratorArgument('foo', 'key')); + + (new ResolveTaggedIteratorArgumentPass())->process($container); + + $properties = $container->getDefinition('service_c')->getProperties(); + + $expected = new TaggedIteratorArgument('foo', 'key'); + $expected->setValues(['1' => new Reference('service_a'), '2' => new Reference('service_b')]); + $this->assertEquals($expected, $properties['foos']); + } } From 2275689cf8e0198500e7260f0d37e06fd1d31e4e Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Thu, 12 Mar 2020 20:58:31 +0100 Subject: [PATCH 40/82] [Intl][3.4] Bump ICU 66.1 --- src/Symfony/Component/Intl/Intl.php | 2 +- .../Component/Intl/Resources/data/currencies/af.json | 2 +- .../Component/Intl/Resources/data/currencies/af_NA.json | 2 +- .../Component/Intl/Resources/data/currencies/ak.json | 2 +- .../Component/Intl/Resources/data/currencies/am.json | 2 +- .../Component/Intl/Resources/data/currencies/ar.json | 2 +- .../Component/Intl/Resources/data/currencies/ar_DJ.json | 2 +- .../Component/Intl/Resources/data/currencies/ar_ER.json | 2 +- .../Component/Intl/Resources/data/currencies/ar_KM.json | 2 +- .../Component/Intl/Resources/data/currencies/ar_LB.json | 2 +- .../Component/Intl/Resources/data/currencies/ar_SO.json | 2 +- .../Component/Intl/Resources/data/currencies/ar_SS.json | 2 +- .../Component/Intl/Resources/data/currencies/as.json | 2 +- .../Component/Intl/Resources/data/currencies/az.json | 2 +- .../Component/Intl/Resources/data/currencies/az_Cyrl.json | 2 +- .../Component/Intl/Resources/data/currencies/be.json | 2 +- .../Component/Intl/Resources/data/currencies/bg.json | 2 +- .../Component/Intl/Resources/data/currencies/bm.json | 2 +- .../Component/Intl/Resources/data/currencies/bn.json | 2 +- .../Component/Intl/Resources/data/currencies/bo.json | 2 +- .../Component/Intl/Resources/data/currencies/bo_IN.json | 2 +- .../Component/Intl/Resources/data/currencies/br.json | 2 +- .../Component/Intl/Resources/data/currencies/bs.json | 2 +- .../Component/Intl/Resources/data/currencies/bs_Cyrl.json | 2 +- .../Component/Intl/Resources/data/currencies/ca.json | 2 +- .../Component/Intl/Resources/data/currencies/ca_FR.json | 2 +- .../Component/Intl/Resources/data/currencies/ce.json | 2 +- .../Component/Intl/Resources/data/currencies/cs.json | 2 +- .../Component/Intl/Resources/data/currencies/cy.json | 2 +- .../Component/Intl/Resources/data/currencies/da.json | 2 +- .../Component/Intl/Resources/data/currencies/de.json | 2 +- .../Component/Intl/Resources/data/currencies/de_CH.json | 2 +- .../Component/Intl/Resources/data/currencies/de_LI.json | 2 +- .../Component/Intl/Resources/data/currencies/de_LU.json | 2 +- .../Component/Intl/Resources/data/currencies/dz.json | 2 +- .../Component/Intl/Resources/data/currencies/ee.json | 2 +- .../Component/Intl/Resources/data/currencies/el.json | 2 +- .../Component/Intl/Resources/data/currencies/en.json | 2 +- .../Component/Intl/Resources/data/currencies/en_001.json | 2 +- .../Component/Intl/Resources/data/currencies/en_150.json | 2 +- .../Component/Intl/Resources/data/currencies/en_AE.json | 2 +- .../Component/Intl/Resources/data/currencies/en_AG.json | 2 +- .../Component/Intl/Resources/data/currencies/en_AI.json | 2 +- .../Component/Intl/Resources/data/currencies/en_AU.json | 2 +- .../Component/Intl/Resources/data/currencies/en_BB.json | 2 +- .../Component/Intl/Resources/data/currencies/en_BI.json | 2 +- .../Component/Intl/Resources/data/currencies/en_BM.json | 2 +- .../Component/Intl/Resources/data/currencies/en_BS.json | 2 +- .../Component/Intl/Resources/data/currencies/en_BW.json | 2 +- .../Component/Intl/Resources/data/currencies/en_BZ.json | 2 +- .../Component/Intl/Resources/data/currencies/en_CA.json | 2 +- .../Component/Intl/Resources/data/currencies/en_CC.json | 2 +- .../Component/Intl/Resources/data/currencies/en_CK.json | 2 +- .../Component/Intl/Resources/data/currencies/en_CX.json | 2 +- .../Component/Intl/Resources/data/currencies/en_DK.json | 2 +- .../Component/Intl/Resources/data/currencies/en_DM.json | 2 +- .../Component/Intl/Resources/data/currencies/en_ER.json | 2 +- .../Component/Intl/Resources/data/currencies/en_FJ.json | 2 +- .../Component/Intl/Resources/data/currencies/en_FK.json | 2 +- .../Component/Intl/Resources/data/currencies/en_GD.json | 2 +- .../Component/Intl/Resources/data/currencies/en_GG.json | 2 +- .../Component/Intl/Resources/data/currencies/en_GH.json | 2 +- .../Component/Intl/Resources/data/currencies/en_GI.json | 2 +- .../Component/Intl/Resources/data/currencies/en_GM.json | 2 +- .../Component/Intl/Resources/data/currencies/en_GY.json | 2 +- .../Component/Intl/Resources/data/currencies/en_IM.json | 2 +- .../Component/Intl/Resources/data/currencies/en_IN.json | 2 +- .../Component/Intl/Resources/data/currencies/en_JE.json | 2 +- .../Component/Intl/Resources/data/currencies/en_JM.json | 2 +- .../Component/Intl/Resources/data/currencies/en_KE.json | 2 +- .../Component/Intl/Resources/data/currencies/en_KI.json | 2 +- .../Component/Intl/Resources/data/currencies/en_KN.json | 2 +- .../Component/Intl/Resources/data/currencies/en_KY.json | 2 +- .../Component/Intl/Resources/data/currencies/en_LC.json | 2 +- .../Component/Intl/Resources/data/currencies/en_LR.json | 2 +- .../Component/Intl/Resources/data/currencies/en_LS.json | 2 +- .../Component/Intl/Resources/data/currencies/en_MG.json | 2 +- .../Component/Intl/Resources/data/currencies/en_MO.json | 2 +- .../Component/Intl/Resources/data/currencies/en_MS.json | 2 +- .../Component/Intl/Resources/data/currencies/en_MT.json | 2 +- .../Component/Intl/Resources/data/currencies/en_MU.json | 2 +- .../Component/Intl/Resources/data/currencies/en_MW.json | 2 +- .../Component/Intl/Resources/data/currencies/en_MY.json | 2 +- .../Component/Intl/Resources/data/currencies/en_NA.json | 2 +- .../Component/Intl/Resources/data/currencies/en_NF.json | 2 +- .../Component/Intl/Resources/data/currencies/en_NG.json | 2 +- .../Component/Intl/Resources/data/currencies/en_NH.json | 2 +- .../Component/Intl/Resources/data/currencies/en_NR.json | 2 +- .../Component/Intl/Resources/data/currencies/en_NU.json | 2 +- .../Component/Intl/Resources/data/currencies/en_NZ.json | 2 +- .../Component/Intl/Resources/data/currencies/en_PG.json | 2 +- .../Component/Intl/Resources/data/currencies/en_PH.json | 2 +- .../Component/Intl/Resources/data/currencies/en_PK.json | 2 +- .../Component/Intl/Resources/data/currencies/en_PN.json | 2 +- .../Component/Intl/Resources/data/currencies/en_RW.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SB.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SC.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SE.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SG.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SH.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SL.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SS.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SX.json | 2 +- .../Component/Intl/Resources/data/currencies/en_SZ.json | 2 +- .../Component/Intl/Resources/data/currencies/en_TK.json | 2 +- .../Component/Intl/Resources/data/currencies/en_TO.json | 2 +- .../Component/Intl/Resources/data/currencies/en_TT.json | 2 +- .../Component/Intl/Resources/data/currencies/en_TV.json | 2 +- .../Component/Intl/Resources/data/currencies/en_TZ.json | 2 +- .../Component/Intl/Resources/data/currencies/en_UG.json | 2 +- .../Component/Intl/Resources/data/currencies/en_VC.json | 2 +- .../Component/Intl/Resources/data/currencies/en_VU.json | 2 +- .../Component/Intl/Resources/data/currencies/en_WS.json | 2 +- .../Component/Intl/Resources/data/currencies/en_ZA.json | 2 +- .../Component/Intl/Resources/data/currencies/en_ZM.json | 2 +- .../Component/Intl/Resources/data/currencies/es.json | 2 +- .../Component/Intl/Resources/data/currencies/es_419.json | 2 +- .../Component/Intl/Resources/data/currencies/es_AR.json | 2 +- .../Component/Intl/Resources/data/currencies/es_BO.json | 2 +- .../Component/Intl/Resources/data/currencies/es_BR.json | 2 +- .../Component/Intl/Resources/data/currencies/es_BZ.json | 2 +- .../Component/Intl/Resources/data/currencies/es_CL.json | 2 +- .../Component/Intl/Resources/data/currencies/es_CO.json | 2 +- .../Component/Intl/Resources/data/currencies/es_CR.json | 2 +- .../Component/Intl/Resources/data/currencies/es_CU.json | 2 +- .../Component/Intl/Resources/data/currencies/es_DO.json | 2 +- .../Component/Intl/Resources/data/currencies/es_EC.json | 2 +- .../Component/Intl/Resources/data/currencies/es_GQ.json | 2 +- .../Component/Intl/Resources/data/currencies/es_GT.json | 2 +- .../Component/Intl/Resources/data/currencies/es_HN.json | 2 +- .../Component/Intl/Resources/data/currencies/es_MX.json | 2 +- .../Component/Intl/Resources/data/currencies/es_NI.json | 2 +- .../Component/Intl/Resources/data/currencies/es_PA.json | 2 +- .../Component/Intl/Resources/data/currencies/es_PE.json | 2 +- .../Component/Intl/Resources/data/currencies/es_PH.json | 2 +- .../Component/Intl/Resources/data/currencies/es_PR.json | 2 +- .../Component/Intl/Resources/data/currencies/es_PY.json | 2 +- .../Component/Intl/Resources/data/currencies/es_SV.json | 2 +- .../Component/Intl/Resources/data/currencies/es_US.json | 2 +- .../Component/Intl/Resources/data/currencies/es_UY.json | 2 +- .../Component/Intl/Resources/data/currencies/es_VE.json | 2 +- .../Component/Intl/Resources/data/currencies/et.json | 2 +- .../Component/Intl/Resources/data/currencies/eu.json | 2 +- .../Component/Intl/Resources/data/currencies/fa.json | 2 +- .../Component/Intl/Resources/data/currencies/fa_AF.json | 2 +- .../Component/Intl/Resources/data/currencies/ff.json | 2 +- .../Component/Intl/Resources/data/currencies/ff_GN.json | 2 +- .../Intl/Resources/data/currencies/ff_Latn_GH.json | 2 +- .../Intl/Resources/data/currencies/ff_Latn_GM.json | 2 +- .../Intl/Resources/data/currencies/ff_Latn_GN.json | 2 +- .../Intl/Resources/data/currencies/ff_Latn_LR.json | 2 +- .../Intl/Resources/data/currencies/ff_Latn_MR.json | 2 +- .../Intl/Resources/data/currencies/ff_Latn_NG.json | 2 +- .../Intl/Resources/data/currencies/ff_Latn_SL.json | 2 +- .../Component/Intl/Resources/data/currencies/ff_MR.json | 2 +- .../Component/Intl/Resources/data/currencies/fi.json | 2 +- .../Component/Intl/Resources/data/currencies/fo.json | 2 +- .../Component/Intl/Resources/data/currencies/fo_DK.json | 2 +- .../Component/Intl/Resources/data/currencies/fr.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_BI.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_CA.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_CD.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_DJ.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_DZ.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_GN.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_HT.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_KM.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_LU.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_MG.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_MR.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_MU.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_RW.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_SC.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_SY.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_TN.json | 2 +- .../Component/Intl/Resources/data/currencies/fr_VU.json | 2 +- .../Component/Intl/Resources/data/currencies/fy.json | 2 +- .../Component/Intl/Resources/data/currencies/ga.json | 2 +- .../Component/Intl/Resources/data/currencies/gd.json | 2 +- .../Component/Intl/Resources/data/currencies/gl.json | 2 +- .../Component/Intl/Resources/data/currencies/gu.json | 2 +- .../Component/Intl/Resources/data/currencies/ha.json | 2 +- .../Component/Intl/Resources/data/currencies/ha_GH.json | 2 +- .../Component/Intl/Resources/data/currencies/he.json | 2 +- .../Component/Intl/Resources/data/currencies/hi.json | 2 +- .../Component/Intl/Resources/data/currencies/hr.json | 2 +- .../Component/Intl/Resources/data/currencies/hr_BA.json | 2 +- .../Component/Intl/Resources/data/currencies/hu.json | 2 +- .../Component/Intl/Resources/data/currencies/hy.json | 2 +- .../Component/Intl/Resources/data/currencies/ia.json | 2 +- .../Component/Intl/Resources/data/currencies/id.json | 2 +- .../Component/Intl/Resources/data/currencies/ig.json | 2 +- .../Component/Intl/Resources/data/currencies/ii.json | 2 +- .../Component/Intl/Resources/data/currencies/in.json | 2 +- .../Component/Intl/Resources/data/currencies/is.json | 2 +- .../Component/Intl/Resources/data/currencies/it.json | 2 +- .../Component/Intl/Resources/data/currencies/iw.json | 2 +- .../Component/Intl/Resources/data/currencies/ja.json | 2 +- .../Component/Intl/Resources/data/currencies/jv.json | 2 +- .../Component/Intl/Resources/data/currencies/ka.json | 2 +- .../Component/Intl/Resources/data/currencies/ki.json | 2 +- .../Component/Intl/Resources/data/currencies/kk.json | 2 +- .../Component/Intl/Resources/data/currencies/kl.json | 2 +- .../Component/Intl/Resources/data/currencies/km.json | 2 +- .../Component/Intl/Resources/data/currencies/kn.json | 2 +- .../Component/Intl/Resources/data/currencies/ko.json | 2 +- .../Component/Intl/Resources/data/currencies/ks.json | 2 +- .../Component/Intl/Resources/data/currencies/ku.json | 2 +- .../Component/Intl/Resources/data/currencies/ky.json | 2 +- .../Component/Intl/Resources/data/currencies/lb.json | 2 +- .../Component/Intl/Resources/data/currencies/lg.json | 2 +- .../Component/Intl/Resources/data/currencies/ln.json | 2 +- .../Component/Intl/Resources/data/currencies/ln_AO.json | 2 +- .../Component/Intl/Resources/data/currencies/lo.json | 2 +- .../Component/Intl/Resources/data/currencies/lt.json | 2 +- .../Component/Intl/Resources/data/currencies/lu.json | 2 +- .../Component/Intl/Resources/data/currencies/lv.json | 2 +- .../Component/Intl/Resources/data/currencies/meta.json | 2 +- .../Component/Intl/Resources/data/currencies/mg.json | 2 +- .../Component/Intl/Resources/data/currencies/mi.json | 2 +- .../Component/Intl/Resources/data/currencies/mk.json | 2 +- .../Component/Intl/Resources/data/currencies/ml.json | 2 +- .../Component/Intl/Resources/data/currencies/mn.json | 2 +- .../Component/Intl/Resources/data/currencies/mo.json | 2 +- .../Component/Intl/Resources/data/currencies/mr.json | 2 +- .../Component/Intl/Resources/data/currencies/ms.json | 2 +- .../Component/Intl/Resources/data/currencies/ms_BN.json | 2 +- .../Component/Intl/Resources/data/currencies/ms_SG.json | 2 +- .../Component/Intl/Resources/data/currencies/mt.json | 2 +- .../Component/Intl/Resources/data/currencies/my.json | 2 +- .../Component/Intl/Resources/data/currencies/nb.json | 2 +- .../Component/Intl/Resources/data/currencies/nd.json | 2 +- .../Component/Intl/Resources/data/currencies/ne.json | 2 +- .../Component/Intl/Resources/data/currencies/nl.json | 2 +- .../Component/Intl/Resources/data/currencies/nl_AW.json | 2 +- .../Component/Intl/Resources/data/currencies/nl_BQ.json | 2 +- .../Component/Intl/Resources/data/currencies/nl_CW.json | 2 +- .../Component/Intl/Resources/data/currencies/nl_SR.json | 2 +- .../Component/Intl/Resources/data/currencies/nl_SX.json | 2 +- .../Component/Intl/Resources/data/currencies/nn.json | 2 +- .../Component/Intl/Resources/data/currencies/no.json | 2 +- .../Component/Intl/Resources/data/currencies/om.json | 2 +- .../Component/Intl/Resources/data/currencies/om_KE.json | 2 +- .../Component/Intl/Resources/data/currencies/or.json | 2 +- .../Component/Intl/Resources/data/currencies/os.json | 2 +- .../Component/Intl/Resources/data/currencies/os_RU.json | 2 +- .../Component/Intl/Resources/data/currencies/pa.json | 2 +- .../Component/Intl/Resources/data/currencies/pa_Arab.json | 2 +- .../Component/Intl/Resources/data/currencies/pl.json | 2 +- .../Component/Intl/Resources/data/currencies/ps.json | 2 +- .../Component/Intl/Resources/data/currencies/ps_PK.json | 2 +- .../Component/Intl/Resources/data/currencies/pt.json | 2 +- .../Component/Intl/Resources/data/currencies/pt_AO.json | 2 +- .../Component/Intl/Resources/data/currencies/pt_CV.json | 2 +- .../Component/Intl/Resources/data/currencies/pt_LU.json | 2 +- .../Component/Intl/Resources/data/currencies/pt_MO.json | 2 +- .../Component/Intl/Resources/data/currencies/pt_MZ.json | 2 +- .../Component/Intl/Resources/data/currencies/pt_PT.json | 2 +- .../Component/Intl/Resources/data/currencies/pt_ST.json | 2 +- .../Component/Intl/Resources/data/currencies/qu.json | 2 +- .../Component/Intl/Resources/data/currencies/qu_BO.json | 2 +- .../Component/Intl/Resources/data/currencies/qu_EC.json | 2 +- .../Component/Intl/Resources/data/currencies/rm.json | 2 +- .../Component/Intl/Resources/data/currencies/rn.json | 2 +- .../Component/Intl/Resources/data/currencies/ro.json | 2 +- .../Component/Intl/Resources/data/currencies/ro_MD.json | 2 +- .../Component/Intl/Resources/data/currencies/root.json | 2 +- .../Component/Intl/Resources/data/currencies/ru.json | 2 +- .../Component/Intl/Resources/data/currencies/ru_BY.json | 2 +- .../Component/Intl/Resources/data/currencies/ru_KG.json | 2 +- .../Component/Intl/Resources/data/currencies/ru_KZ.json | 2 +- .../Component/Intl/Resources/data/currencies/ru_MD.json | 2 +- .../Component/Intl/Resources/data/currencies/rw.json | 2 +- .../Component/Intl/Resources/data/currencies/sd.json | 2 +- .../Component/Intl/Resources/data/currencies/se.json | 2 +- .../Component/Intl/Resources/data/currencies/se_SE.json | 2 +- .../Component/Intl/Resources/data/currencies/sg.json | 2 +- .../Component/Intl/Resources/data/currencies/sh.json | 2 +- .../Component/Intl/Resources/data/currencies/si.json | 2 +- .../Component/Intl/Resources/data/currencies/sk.json | 2 +- .../Component/Intl/Resources/data/currencies/sl.json | 2 +- .../Component/Intl/Resources/data/currencies/sn.json | 2 +- .../Component/Intl/Resources/data/currencies/so.json | 2 +- .../Component/Intl/Resources/data/currencies/so_DJ.json | 2 +- .../Component/Intl/Resources/data/currencies/so_ET.json | 2 +- .../Component/Intl/Resources/data/currencies/so_KE.json | 2 +- .../Component/Intl/Resources/data/currencies/sq.json | 2 +- .../Component/Intl/Resources/data/currencies/sq_MK.json | 2 +- .../Component/Intl/Resources/data/currencies/sr.json | 2 +- .../Component/Intl/Resources/data/currencies/sr_Latn.json | 2 +- .../Component/Intl/Resources/data/currencies/sv.json | 2 +- .../Component/Intl/Resources/data/currencies/sw.json | 2 +- .../Component/Intl/Resources/data/currencies/sw_CD.json | 2 +- .../Component/Intl/Resources/data/currencies/sw_KE.json | 2 +- .../Component/Intl/Resources/data/currencies/sw_UG.json | 2 +- .../Component/Intl/Resources/data/currencies/ta.json | 2 +- .../Component/Intl/Resources/data/currencies/ta_LK.json | 2 +- .../Component/Intl/Resources/data/currencies/ta_MY.json | 2 +- .../Component/Intl/Resources/data/currencies/ta_SG.json | 2 +- .../Component/Intl/Resources/data/currencies/te.json | 2 +- .../Component/Intl/Resources/data/currencies/tg.json | 2 +- .../Component/Intl/Resources/data/currencies/th.json | 2 +- .../Component/Intl/Resources/data/currencies/ti.json | 2 +- .../Component/Intl/Resources/data/currencies/ti_ER.json | 2 +- .../Component/Intl/Resources/data/currencies/tk.json | 2 +- .../Component/Intl/Resources/data/currencies/tl.json | 2 +- .../Component/Intl/Resources/data/currencies/to.json | 2 +- .../Component/Intl/Resources/data/currencies/tr.json | 2 +- .../Component/Intl/Resources/data/currencies/tt.json | 2 +- .../Component/Intl/Resources/data/currencies/ug.json | 2 +- .../Component/Intl/Resources/data/currencies/uk.json | 2 +- .../Component/Intl/Resources/data/currencies/ur.json | 2 +- .../Component/Intl/Resources/data/currencies/ur_IN.json | 2 +- .../Component/Intl/Resources/data/currencies/uz.json | 2 +- .../Component/Intl/Resources/data/currencies/uz_Arab.json | 2 +- .../Component/Intl/Resources/data/currencies/uz_Cyrl.json | 2 +- .../Component/Intl/Resources/data/currencies/vi.json | 2 +- .../Component/Intl/Resources/data/currencies/wo.json | 2 +- .../Component/Intl/Resources/data/currencies/xh.json | 2 +- .../Component/Intl/Resources/data/currencies/yi.json | 2 +- .../Component/Intl/Resources/data/currencies/yo.json | 2 +- .../Component/Intl/Resources/data/currencies/yo_BJ.json | 2 +- .../Component/Intl/Resources/data/currencies/zh.json | 2 +- .../Component/Intl/Resources/data/currencies/zh_HK.json | 2 +- .../Intl/Resources/data/currencies/zh_Hans_HK.json | 2 +- .../Intl/Resources/data/currencies/zh_Hans_MO.json | 2 +- .../Intl/Resources/data/currencies/zh_Hans_SG.json | 2 +- .../Component/Intl/Resources/data/currencies/zh_Hant.json | 2 +- .../Intl/Resources/data/currencies/zh_Hant_HK.json | 2 +- .../Intl/Resources/data/currencies/zh_Hant_MO.json | 2 +- .../Component/Intl/Resources/data/currencies/zh_MO.json | 2 +- .../Component/Intl/Resources/data/currencies/zh_SG.json | 2 +- .../Component/Intl/Resources/data/currencies/zu.json | 2 +- src/Symfony/Component/Intl/Resources/data/git-info.txt | 6 +++--- src/Symfony/Component/Intl/Resources/data/languages/af.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ak.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/am.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ar.json | 2 +- .../Component/Intl/Resources/data/languages/ar_EG.json | 2 +- .../Component/Intl/Resources/data/languages/ar_LY.json | 2 +- .../Component/Intl/Resources/data/languages/ar_SA.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/as.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/az.json | 2 +- .../Component/Intl/Resources/data/languages/az_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/be.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/bg.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/bm.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/bn.json | 2 +- .../Component/Intl/Resources/data/languages/bn_IN.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/bo.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/br.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/bs.json | 2 +- .../Component/Intl/Resources/data/languages/bs_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ca.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ce.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/cs.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/cy.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/da.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/de.json | 2 +- .../Component/Intl/Resources/data/languages/de_AT.json | 2 +- .../Component/Intl/Resources/data/languages/de_CH.json | 2 +- .../Component/Intl/Resources/data/languages/de_LU.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/dz.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ee.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/el.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/en.json | 2 +- .../Component/Intl/Resources/data/languages/en_001.json | 2 +- .../Component/Intl/Resources/data/languages/en_AU.json | 2 +- .../Component/Intl/Resources/data/languages/en_CA.json | 2 +- .../Component/Intl/Resources/data/languages/en_GB.json | 2 +- .../Component/Intl/Resources/data/languages/en_IN.json | 2 +- .../Component/Intl/Resources/data/languages/en_NZ.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/eo.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/es.json | 2 +- .../Component/Intl/Resources/data/languages/es_419.json | 2 +- .../Component/Intl/Resources/data/languages/es_AR.json | 2 +- .../Component/Intl/Resources/data/languages/es_BO.json | 2 +- .../Component/Intl/Resources/data/languages/es_CL.json | 2 +- .../Component/Intl/Resources/data/languages/es_CO.json | 2 +- .../Component/Intl/Resources/data/languages/es_CR.json | 2 +- .../Component/Intl/Resources/data/languages/es_DO.json | 2 +- .../Component/Intl/Resources/data/languages/es_EC.json | 2 +- .../Component/Intl/Resources/data/languages/es_GT.json | 2 +- .../Component/Intl/Resources/data/languages/es_HN.json | 2 +- .../Component/Intl/Resources/data/languages/es_MX.json | 2 +- .../Component/Intl/Resources/data/languages/es_NI.json | 2 +- .../Component/Intl/Resources/data/languages/es_PA.json | 2 +- .../Component/Intl/Resources/data/languages/es_PE.json | 2 +- .../Component/Intl/Resources/data/languages/es_PR.json | 2 +- .../Component/Intl/Resources/data/languages/es_PY.json | 2 +- .../Component/Intl/Resources/data/languages/es_SV.json | 2 +- .../Component/Intl/Resources/data/languages/es_US.json | 2 +- .../Component/Intl/Resources/data/languages/es_VE.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/et.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/eu.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/fa.json | 2 +- .../Component/Intl/Resources/data/languages/fa_AF.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ff.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/fi.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/fo.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/fr.json | 2 +- .../Component/Intl/Resources/data/languages/fr_BE.json | 2 +- .../Component/Intl/Resources/data/languages/fr_CA.json | 2 +- .../Component/Intl/Resources/data/languages/fr_CH.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/fy.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ga.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/gd.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/gl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/gu.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/gv.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ha.json | 2 +- .../Component/Intl/Resources/data/languages/ha_NE.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/he.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/hi.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/hr.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/hu.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/hy.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ia.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/id.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ig.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ii.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/in.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/is.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/it.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/iw.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ja.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/jv.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ka.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ki.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/kk.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/kl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/km.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/kn.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ko.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ks.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ku.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/kw.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ky.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/lb.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/lg.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ln.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/lo.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/lt.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/lu.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/lv.json | 2 +- .../Component/Intl/Resources/data/languages/meta.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/mg.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/mi.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/mk.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ml.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/mn.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/mo.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/mr.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ms.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/mt.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/my.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/nb.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/nd.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ne.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/nl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/nn.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/no.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/om.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/or.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/os.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/pa.json | 2 +- .../Component/Intl/Resources/data/languages/pa_Arab.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/pl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ps.json | 2 +- .../Component/Intl/Resources/data/languages/ps_PK.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/pt.json | 2 +- .../Component/Intl/Resources/data/languages/pt_PT.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/qu.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/rm.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/rn.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ro.json | 2 +- .../Component/Intl/Resources/data/languages/ro_MD.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ru.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/rw.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sd.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/se.json | 2 +- .../Component/Intl/Resources/data/languages/se_FI.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sg.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sh.json | 2 +- .../Component/Intl/Resources/data/languages/sh_BA.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/si.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sk.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sn.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/so.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sq.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sr.json | 2 +- .../Component/Intl/Resources/data/languages/sr_BA.json | 2 +- .../Component/Intl/Resources/data/languages/sr_Cyrl_BA.json | 2 +- .../Component/Intl/Resources/data/languages/sr_Cyrl_ME.json | 2 +- .../Component/Intl/Resources/data/languages/sr_Cyrl_XK.json | 2 +- .../Component/Intl/Resources/data/languages/sr_Latn.json | 2 +- .../Component/Intl/Resources/data/languages/sr_Latn_BA.json | 2 +- .../Component/Intl/Resources/data/languages/sr_Latn_ME.json | 2 +- .../Component/Intl/Resources/data/languages/sr_Latn_XK.json | 2 +- .../Component/Intl/Resources/data/languages/sr_ME.json | 2 +- .../Component/Intl/Resources/data/languages/sr_XK.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sv.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/sw.json | 2 +- .../Component/Intl/Resources/data/languages/sw_CD.json | 2 +- .../Component/Intl/Resources/data/languages/sw_KE.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ta.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/te.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/tg.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/th.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ti.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/tk.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/tl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/to.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/tr.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/tt.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ug.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/uk.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/ur.json | 2 +- .../Component/Intl/Resources/data/languages/ur_IN.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/uz.json | 2 +- .../Component/Intl/Resources/data/languages/uz_Arab.json | 2 +- .../Component/Intl/Resources/data/languages/uz_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/vi.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/wo.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/xh.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/yi.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/yo.json | 2 +- .../Component/Intl/Resources/data/languages/yo_BJ.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/zh.json | 2 +- .../Component/Intl/Resources/data/languages/zh_HK.json | 2 +- .../Component/Intl/Resources/data/languages/zh_Hant.json | 2 +- .../Component/Intl/Resources/data/languages/zh_Hant_HK.json | 2 +- src/Symfony/Component/Intl/Resources/data/languages/zu.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/af.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ak.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/am.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ar.json | 2 +- .../Component/Intl/Resources/data/regions/ar_LY.json | 2 +- .../Component/Intl/Resources/data/regions/ar_SA.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/as.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/az.json | 2 +- .../Component/Intl/Resources/data/regions/az_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/be.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/bg.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/bm.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/bn.json | 2 +- .../Component/Intl/Resources/data/regions/bn_IN.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/bo.json | 2 +- .../Component/Intl/Resources/data/regions/bo_IN.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/br.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/bs.json | 2 +- .../Component/Intl/Resources/data/regions/bs_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ca.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ce.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/cs.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/cy.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/da.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/de.json | 2 +- .../Component/Intl/Resources/data/regions/de_AT.json | 2 +- .../Component/Intl/Resources/data/regions/de_CH.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/dz.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ee.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/el.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/en.json | 2 +- .../Component/Intl/Resources/data/regions/en_001.json | 2 +- .../Component/Intl/Resources/data/regions/en_AU.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/eo.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/es.json | 2 +- .../Component/Intl/Resources/data/regions/es_419.json | 2 +- .../Component/Intl/Resources/data/regions/es_AR.json | 2 +- .../Component/Intl/Resources/data/regions/es_BO.json | 2 +- .../Component/Intl/Resources/data/regions/es_CL.json | 2 +- .../Component/Intl/Resources/data/regions/es_CO.json | 2 +- .../Component/Intl/Resources/data/regions/es_CR.json | 2 +- .../Component/Intl/Resources/data/regions/es_DO.json | 2 +- .../Component/Intl/Resources/data/regions/es_EC.json | 2 +- .../Component/Intl/Resources/data/regions/es_GT.json | 2 +- .../Component/Intl/Resources/data/regions/es_HN.json | 2 +- .../Component/Intl/Resources/data/regions/es_MX.json | 2 +- .../Component/Intl/Resources/data/regions/es_NI.json | 2 +- .../Component/Intl/Resources/data/regions/es_PA.json | 2 +- .../Component/Intl/Resources/data/regions/es_PE.json | 2 +- .../Component/Intl/Resources/data/regions/es_PR.json | 2 +- .../Component/Intl/Resources/data/regions/es_PY.json | 2 +- .../Component/Intl/Resources/data/regions/es_SV.json | 2 +- .../Component/Intl/Resources/data/regions/es_US.json | 2 +- .../Component/Intl/Resources/data/regions/es_VE.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/et.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/eu.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/fa.json | 2 +- .../Component/Intl/Resources/data/regions/fa_AF.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ff.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/fi.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/fo.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/fr.json | 2 +- .../Component/Intl/Resources/data/regions/fr_BE.json | 2 +- .../Component/Intl/Resources/data/regions/fr_CA.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/fy.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ga.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/gd.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/gl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/gu.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/gv.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ha.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/he.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/hi.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/hr.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/hu.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/hy.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ia.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/id.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ig.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ii.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/in.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/is.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/it.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/iw.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ja.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/jv.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ka.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ki.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/kk.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/kl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/km.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/kn.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ko.json | 2 +- .../Component/Intl/Resources/data/regions/ko_KP.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ks.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ku.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/kw.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ky.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/lb.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/lg.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ln.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/lo.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/lt.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/lu.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/lv.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/meta.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/mg.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/mi.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/mk.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ml.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/mn.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/mo.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/mr.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ms.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/mt.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/my.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/nb.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/nd.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ne.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/nl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/nn.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/no.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/om.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/or.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/os.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/pa.json | 2 +- .../Component/Intl/Resources/data/regions/pa_Arab.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/pl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ps.json | 2 +- .../Component/Intl/Resources/data/regions/ps_PK.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/pt.json | 2 +- .../Component/Intl/Resources/data/regions/pt_PT.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/qu.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/rm.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/rn.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ro.json | 2 +- .../Component/Intl/Resources/data/regions/ro_MD.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ru.json | 2 +- .../Component/Intl/Resources/data/regions/ru_UA.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/rw.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sd.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/se.json | 2 +- .../Component/Intl/Resources/data/regions/se_FI.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sg.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sh.json | 2 +- .../Component/Intl/Resources/data/regions/sh_BA.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/si.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sk.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sn.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/so.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sq.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sr.json | 2 +- .../Component/Intl/Resources/data/regions/sr_BA.json | 2 +- .../Component/Intl/Resources/data/regions/sr_Cyrl_BA.json | 2 +- .../Component/Intl/Resources/data/regions/sr_Cyrl_ME.json | 2 +- .../Component/Intl/Resources/data/regions/sr_Cyrl_XK.json | 2 +- .../Component/Intl/Resources/data/regions/sr_Latn.json | 2 +- .../Component/Intl/Resources/data/regions/sr_Latn_BA.json | 2 +- .../Component/Intl/Resources/data/regions/sr_Latn_ME.json | 2 +- .../Component/Intl/Resources/data/regions/sr_Latn_XK.json | 2 +- .../Component/Intl/Resources/data/regions/sr_ME.json | 2 +- .../Component/Intl/Resources/data/regions/sr_XK.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sv.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/sw.json | 2 +- .../Component/Intl/Resources/data/regions/sw_CD.json | 2 +- .../Component/Intl/Resources/data/regions/sw_KE.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ta.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/te.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/tg.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/th.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ti.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/tk.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/tl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/to.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/tr.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/tt.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ug.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/uk.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/ur.json | 2 +- .../Component/Intl/Resources/data/regions/ur_IN.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/uz.json | 2 +- .../Component/Intl/Resources/data/regions/uz_Arab.json | 2 +- .../Component/Intl/Resources/data/regions/uz_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/vi.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/wo.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/xh.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/yi.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/yo.json | 2 +- .../Component/Intl/Resources/data/regions/yo_BJ.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/zh.json | 2 +- .../Component/Intl/Resources/data/regions/zh_HK.json | 2 +- .../Component/Intl/Resources/data/regions/zh_Hant.json | 2 +- .../Component/Intl/Resources/data/regions/zh_Hant_HK.json | 2 +- src/Symfony/Component/Intl/Resources/data/regions/zu.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/af.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/am.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ar.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/as.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/az.json | 2 +- .../Component/Intl/Resources/data/scripts/az_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/be.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/bg.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/bn.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/bo.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/br.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/bs.json | 2 +- .../Component/Intl/Resources/data/scripts/bs_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ca.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ce.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/cs.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/cy.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/da.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/de.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/dz.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ee.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/el.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/en.json | 6 +++++- .../Component/Intl/Resources/data/scripts/en_AU.json | 2 +- .../Component/Intl/Resources/data/scripts/en_IN.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/es.json | 2 +- .../Component/Intl/Resources/data/scripts/es_419.json | 2 +- .../Component/Intl/Resources/data/scripts/es_MX.json | 2 +- .../Component/Intl/Resources/data/scripts/es_US.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/et.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/eu.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/fa.json | 2 +- .../Component/Intl/Resources/data/scripts/fa_AF.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/fi.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/fo.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/fr.json | 2 +- .../Component/Intl/Resources/data/scripts/fr_CA.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/fy.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ga.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/gd.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/gl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/gu.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ha.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/he.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/hi.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/hr.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/hu.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/hy.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ia.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/id.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ig.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ii.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/in.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/is.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/it.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/iw.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ja.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/jv.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ka.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/kk.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/km.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/kn.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ko.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ks.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ku.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ky.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/lb.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/lo.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/lt.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/lv.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/meta.json | 6 +++++- src/Symfony/Component/Intl/Resources/data/scripts/mi.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/mk.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ml.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/mn.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/mo.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/mr.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ms.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/mt.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/my.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/nb.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ne.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/nl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/nn.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/no.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/om.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/or.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/os.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/pa.json | 2 +- .../Component/Intl/Resources/data/scripts/pa_Arab.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/pl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ps.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/pt.json | 2 +- .../Component/Intl/Resources/data/scripts/pt_PT.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/rm.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ro.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ru.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sd.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/se.json | 2 +- .../Component/Intl/Resources/data/scripts/se_FI.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sh.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/si.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sk.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/so.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sq.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sr.json | 2 +- .../Component/Intl/Resources/data/scripts/sr_Latn.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sv.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/sw.json | 2 +- .../Component/Intl/Resources/data/scripts/sw_KE.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ta.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/te.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/tg.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/th.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ti.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/tk.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/tl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/to.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/tr.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/tt.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ug.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/uk.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/ur.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/uz.json | 2 +- .../Component/Intl/Resources/data/scripts/uz_Arab.json | 2 +- .../Component/Intl/Resources/data/scripts/uz_Cyrl.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/vi.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/wo.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/yi.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/yo.json | 2 +- .../Component/Intl/Resources/data/scripts/yo_BJ.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/zh.json | 2 +- .../Component/Intl/Resources/data/scripts/zh_HK.json | 2 +- .../Component/Intl/Resources/data/scripts/zh_Hant.json | 2 +- .../Component/Intl/Resources/data/scripts/zh_Hant_HK.json | 2 +- src/Symfony/Component/Intl/Resources/data/scripts/zu.json | 2 +- src/Symfony/Component/Intl/Resources/data/version.txt | 2 +- 867 files changed, 877 insertions(+), 869 deletions(-) diff --git a/src/Symfony/Component/Intl/Intl.php b/src/Symfony/Component/Intl/Intl.php index 5722138ace148..0a795c0de0f5d 100644 --- a/src/Symfony/Component/Intl/Intl.php +++ b/src/Symfony/Component/Intl/Intl.php @@ -235,7 +235,7 @@ public static function getIcuDataVersion() */ public static function getIcuStubVersion() { - return '65.1'; + return '66.1'; } /** diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/af.json b/src/Symfony/Component/Intl/Resources/data/currencies/af.json index ca1681554fb6d..904aed5806732 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/af.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/af.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json b/src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json index cf82f91f4b1ca..af0bcb9939c7c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NAD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ak.json b/src/Symfony/Component/Intl/Resources/data/currencies/ak.json index 15ac347813f82..c9c5c193f616e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ak.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ak.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/am.json b/src/Symfony/Component/Intl/Resources/data/currencies/am.json index 5cb0ba415736d..f5bd0840ca668 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/am.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/am.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar.json index e12bb0a8a0b84..92e0f602b0646 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json index 1997e2ec15730..531af78eb0a19 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DJF": [ "Fdj", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json index 29b41dbfe95f2..53bd5cd88c8aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ERN": [ "Nfk", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_KM.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_KM.json index d96c2debe8bbf..7ee6f3bc8e941 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar_KM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar_KM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KMF": [ "CF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json index 409e952d1f296..357702ad7f03e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SDG": [ "SDG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json index dfcbfcded30c4..c9633b6388269 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SOS": [ "S", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json index 64ceab00eb815..2358cf3375dd9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "GB£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/as.json b/src/Symfony/Component/Intl/Resources/data/currencies/as.json index 6e3bd46461d98..62f15dd112fcd 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/as.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/as.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/az.json b/src/Symfony/Component/Intl/Resources/data/currencies/az.json index 1fec8dfca9ccb..3fc0b41e42f5a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/az.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/az.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json index e78fe4d9d2462..99e463b7884a9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AZN": [ "₼", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/be.json b/src/Symfony/Component/Intl/Resources/data/currencies/be.json index ccd8e78df7424..116cada512c1e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/be.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/be.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bg.json b/src/Symfony/Component/Intl/Resources/data/currencies/bg.json index 8b80de92ed684..77909c04b3a5b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bg.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bm.json b/src/Symfony/Component/Intl/Resources/data/currencies/bm.json index 6de0991f2396b..05729c5ee48a7 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bm.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bm.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bn.json b/src/Symfony/Component/Intl/Resources/data/currencies/bn.json index 2b5513c77725d..7127fce6f407f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bo.json b/src/Symfony/Component/Intl/Resources/data/currencies/bo.json index f6d5eacd6ff5b..0f0f31c85cf83 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CNY": [ "¥", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json b/src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json index 144a0f55850b5..b9096e92b3270 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CNY": [ "CN¥", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/br.json b/src/Symfony/Component/Intl/Resources/data/currencies/br.json index d2b01d1a14af5..0fc540af42394 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/br.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/br.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bs.json b/src/Symfony/Component/Intl/Resources/data/currencies/bs.json index 93d6fee8c48b2..984d91f9dc29d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json index 80f4fc10d33d7..0ad689f90601f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ca.json b/src/Symfony/Component/Intl/Resources/data/currencies/ca.json index ec7b34bbb4ba4..7e5fc8b6806de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ca.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ca.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json b/src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json index e6120982c4ce5..1decc8a6ea3d6 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "FRF": [ "F", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ce.json b/src/Symfony/Component/Intl/Resources/data/currencies/ce.json index 83f3abff2bb8a..ecfcc18222070 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ce.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ce.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/cs.json b/src/Symfony/Component/Intl/Resources/data/currencies/cs.json index c393b3fd46d18..959510d9a0908 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/cs.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/cs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/cy.json b/src/Symfony/Component/Intl/Resources/data/currencies/cy.json index 3a85facb9d80a..8b3e3b414173a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/cy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/da.json b/src/Symfony/Component/Intl/Resources/data/currencies/da.json index 87231da4ce6b0..075ff1dedd732 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/da.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/da.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/de.json b/src/Symfony/Component/Intl/Resources/data/currencies/de.json index 2830ced8a49eb..66ad7fb629dd9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/de.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/de.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/de_CH.json b/src/Symfony/Component/Intl/Resources/data/currencies/de_CH.json index 29398682b8a4b..ea72d8efe8878 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/de_CH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/de_CH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BYN": [ "BYN", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/de_LI.json b/src/Symfony/Component/Intl/Resources/data/currencies/de_LI.json index bd82eb972b726..b0dc8ca47687a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/de_LI.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/de_LI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "EUR": [ "EUR", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/de_LU.json b/src/Symfony/Component/Intl/Resources/data/currencies/de_LU.json index a7a3dd162f9f1..0f3132c66e3f9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/de_LU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/de_LU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "LUF": [ "F", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/dz.json b/src/Symfony/Component/Intl/Resources/data/currencies/dz.json index 7c6cb78893586..00e6c88f8fa1c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/dz.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/dz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ee.json b/src/Symfony/Component/Intl/Resources/data/currencies/ee.json index ba3929597e5bc..bf3f82d730fae 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ee.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ee.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/el.json b/src/Symfony/Component/Intl/Resources/data/currencies/el.json index 65b56fc3fb767..13fc181bdd683 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/el.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/el.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en.json b/src/Symfony/Component/Intl/Resources/data/currencies/en.json index 19fd10236275e..f32b82d016f1a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_001.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_001.json index 7451dc1108d62..d37c96ed934a3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_001.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_001.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BYB": [ "BYB", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_150.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_150.json index 851ef1ac7a788..7eb0ad8c5fff7 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_150.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_150.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "EUR": [ "€", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_AE.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_AE.json index f0a010b16cf1f..5ea9359c88acb 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_AE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_AE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_AG.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_AG.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_AG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_AG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_AI.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_AI.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_AI.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_AI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_AU.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_AU.json index 9760a58d2e742..51e1bac8f2702 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_AU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_AU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_BB.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_BB.json index a0bc40121a3b0..4d3f097fd925b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_BB.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_BB.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BBD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_BI.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_BI.json index 4a96139c7d38f..87b2d2043ed4c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_BI.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_BI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BIF": [ "FBu", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_BM.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_BM.json index abf1b2c6feb21..1fd5003916f85 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_BM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_BM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BMD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_BS.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_BS.json index aec811ab38bdc..8266e6035559c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_BS.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_BS.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BSD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_BW.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_BW.json index f2e2d3384b824..fa20ef2fc8c60 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_BW.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_BW.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BWP": [ "P", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_BZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_BZ.json index 567a7e9f612e1..67ab88d490140 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_BZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_BZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BZD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_CA.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_CA.json index 1dfd79828d154..1e4243327c678 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_CA.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_CA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CAD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_CC.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_CC.json index e06ba740bc917..3ff72c4b97f60 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_CC.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_CC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_CK.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_CK.json index 9593a04ee699b..756b6cf69e54b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_CK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_CK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NZD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_CX.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_CX.json index e06ba740bc917..3ff72c4b97f60 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_CX.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_CX.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_DK.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_DK.json index f8de5f607c488..54561ac3b33cf 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_DK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_DK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DKK": [ "kr.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_DM.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_DM.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_DM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_DM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_ER.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_ER.json index 3f8f576a6f193..a2ff768d8c7aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_ER.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_ER.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ERN": [ "Nfk", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_FJ.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_FJ.json index ec4d41fc80fb0..9a3cd36e9626a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_FJ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_FJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "FJD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_FK.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_FK.json index 3cabc4f7d2e1b..f0dc3a4c60f94 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_FK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_FK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "FKP": [ "£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_GD.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_GD.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_GD.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_GD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_GG.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_GG.json index c2dd9dbd104c1..50442161dfea3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_GG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_GG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_GH.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_GH.json index 298ca6c14b3f8..f1d1c00f4ba9d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_GH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_GH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GHS": [ "GH₵", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_GI.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_GI.json index df990f8df2a2d..90c7c864f9714 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_GI.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_GI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "GB£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_GM.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_GM.json index 3857bbe02abd2..067174a8b6e88 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_GM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_GM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GMD": [ "D", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_GY.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_GY.json index 846901026d094..da20dd2969e91 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_GY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_GY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GYD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_IM.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_IM.json index c2dd9dbd104c1..50442161dfea3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_IM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_IM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_IN.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_IN.json index 5fd20deee67ff..3694aaa6fb979 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "VEF": [ "VEF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_JE.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_JE.json index c2dd9dbd104c1..50442161dfea3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_JE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_JE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_JM.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_JM.json index b5b1ecdfbdc76..67554526aebcf 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_JM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_JM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "JMD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_KE.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_KE.json index c24257b97e63b..25b94ef9f6a69 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_KE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_KE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KES": [ "Ksh", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_KI.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_KI.json index e06ba740bc917..3ff72c4b97f60 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_KI.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_KI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_KN.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_KN.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_KN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_KN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_KY.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_KY.json index 7693660cf7d54..1f174cc260447 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_KY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_KY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KYD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_LC.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_LC.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_LC.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_LC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_LR.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_LR.json index 95c1d80703c50..82b50eae11049 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_LR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_LR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "LRD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_LS.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_LS.json index 286306aff8177..4bcf6b6d8480c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_LS.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_LS.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ZAR": [ "R", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_MG.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_MG.json index a277e5e6a1e2a..df23a8c9f6762 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_MG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_MG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MGA": [ "Ar", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_MO.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_MO.json index 514da628c9207..0f35dcacb7982 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_MO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_MO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MOP": [ "MOP$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_MS.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_MS.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_MS.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_MS.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_MT.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_MT.json index a5d7ee2fcd671..592b54aa889cb 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_MT.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_MT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "GB£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_MU.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_MU.json index e40ac109a677e..2ec72cc182d7c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_MU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_MU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MUR": [ "Rs", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_MW.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_MW.json index 3d02557995172..f8199ad2756aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_MW.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_MW.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MWK": [ "MK", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_MY.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_MY.json index c7748df6ed816..1793b1390a294 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_MY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_MY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MYR": [ "RM", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_NA.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_NA.json index 36d726d9ed858..0214cbea393ed 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_NA.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_NA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NAD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_NF.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_NF.json index e06ba740bc917..3ff72c4b97f60 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_NF.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_NF.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_NG.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_NG.json index eaa9515f1798a..fdcc6dfd08e17 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_NG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_NG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NGN": [ "₦", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_NH.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_NH.json index 43e0b04c8688e..10911e7ac9181 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_NH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_NH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "VUV": [ "VT", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_NR.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_NR.json index e06ba740bc917..3ff72c4b97f60 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_NR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_NR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_NU.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_NU.json index 9593a04ee699b..756b6cf69e54b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_NU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_NU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NZD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_NZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_NZ.json index 9593a04ee699b..756b6cf69e54b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_NZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_NZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NZD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_PG.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_PG.json index 936b3d8500090..599d79c3f5b58 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_PG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_PG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PGK": [ "K", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_PH.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_PH.json index f4cb9636fd2c6..aa79fcb8a3954 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_PH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_PH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PHP": [ "₱", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_PK.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_PK.json index 1f8b7663353e2..3dbb247ebb973 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_PK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_PK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PKR": [ "Rs", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_PN.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_PN.json index 9593a04ee699b..756b6cf69e54b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_PN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_PN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NZD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_RW.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_RW.json index 5d0836ffd7609..9dfb4655eb5fe 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_RW.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_RW.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "RWF": [ "RF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SB.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SB.json index 7091119ef1a38..546fe5461731d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SB.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SB.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SBD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SC.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SC.json index b4a80e4a21b1e..069772bd47cfc 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SC.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SCR": [ "SR", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SE.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SE.json index b976e2252f556..9ef9ff516d3a9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SEK": [ "kr", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SG.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SG.json index decbaedde3bf5..8726a0b68325f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SGD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SH.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SH.json index 6bb522946652d..a8dcb8b20509a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "GB£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SL.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SL.json index 7e7b54f702aa3..57dabc442f66f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SL.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SL.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SLL": [ "Le", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SS.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SS.json index 4db4d22095551..4472e6932993c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SS.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SS.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GBP": [ "GB£", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SX.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SX.json index d89618cc129bb..1900377d50c3d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SX.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SX.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ANG": [ "NAf.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_SZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_SZ.json index e630cd7f53ae9..02fd9082be04e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_SZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_SZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SZL": [ "E", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_TK.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_TK.json index 9593a04ee699b..756b6cf69e54b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_TK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_TK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NZD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_TO.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_TO.json index 7923b9e08eb09..e4a0fcc6125bc 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_TO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_TO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "TOP": [ "T$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_TT.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_TT.json index 831c897437171..bf735349a1871 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_TT.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_TT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "TTD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_TV.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_TV.json index e06ba740bc917..3ff72c4b97f60 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_TV.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_TV.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_TZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_TZ.json index 331cf2f4a4c74..fd3380adf229a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_TZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_TZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "TZS": [ "TSh", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_UG.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_UG.json index fe7fa9222ab5c..4309d6f4cddb3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_UG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_UG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "UGX": [ "USh", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_VC.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_VC.json index 75da27b3c7fe6..42a4fef3647de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_VC.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_VC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XCD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_VU.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_VU.json index 43e0b04c8688e..10911e7ac9181 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_VU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_VU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "VUV": [ "VT", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_WS.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_WS.json index 7a7881e0b43e6..5ffd99a1eb9dc 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_WS.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_WS.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "WST": [ "WS$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_ZA.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_ZA.json index 286306aff8177..4bcf6b6d8480c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_ZA.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_ZA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ZAR": [ "R", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/en_ZM.json b/src/Symfony/Component/Intl/Resources/data/currencies/en_ZM.json index 9008b3bc0fb63..b1da438859f4f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/en_ZM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/en_ZM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ZMW": [ "K", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es.json b/src/Symfony/Component/Intl/Resources/data/currencies/es.json index f7c19a6219fe0..41420b28ba7ed 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_419.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_419.json index bf2d68794cfc1..eb2f82deff162 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_419.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_419.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CAD": [ "CAD", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_AR.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_AR.json index 9a4f37c36b619..a0063d9729509 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_AR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_AR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ARS": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_BO.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_BO.json index 0bc297d1c12f0..3098ef4b28cf3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_BO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_BO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BOB": [ "Bs", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_BR.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_BR.json index 4c044b8dfd570..8bb96d37cd5ae 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_BR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_BR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_BZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_BZ.json index 49879bc818ca4..bab949eb0a369 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_BZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_BZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BZD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_CL.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_CL.json index 77c9468d3fbe5..cab702cef413d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_CL.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_CL.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CLP": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_CO.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_CO.json index 78eb949bad5e2..61d1db1e07e7d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_CO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_CO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "COP": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_CR.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_CR.json index 3f467551d266d..936dafb5ac5cc 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_CR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_CR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CRC": [ "₡", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_CU.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_CU.json index d2b332758d133..bf435c4469ab2 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_CU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_CU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CUP": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_DO.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_DO.json index bd835b50240b0..8fcb9ae862ad8 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_DO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_DO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DOP": [ "RD$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_EC.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_EC.json index c8a948296c4cc..79cd1708ff1ef 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_EC.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_EC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "USD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_GQ.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_GQ.json index 9ed6cb76c199d..2fbe79196b38b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_GQ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_GQ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "XAF": [ "FCFA", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_GT.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_GT.json index 4e0aacef3fb37..87363aac39cdf 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_GT.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_GT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GTQ": [ "Q", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_HN.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_HN.json index 2b2e08624ccc7..3a55a8fd148df 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_HN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_HN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "HNL": [ "L", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_MX.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_MX.json index bf92abbde712f..58e03068e7853 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_MX.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_MX.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BDT": [ "BDT", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_NI.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_NI.json index ea51767071482..bfa33ca3cbb4b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_NI.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_NI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NIO": [ "C$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_PA.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_PA.json index fe7cfe2b5d0b7..f649a00138d43 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_PA.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_PA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PAB": [ "B\/.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_PE.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_PE.json index 82a13a02e0099..90f45fa1c3004 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_PE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_PE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PEN": [ "S\/", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_PH.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_PH.json index 7321c452bfc70..5b03fdca3b863 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_PH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_PH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PHP": [ "₱", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_PR.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_PR.json index c8a948296c4cc..79cd1708ff1ef 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_PR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_PR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "USD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_PY.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_PY.json index 43799041eef52..aa397972f519a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_PY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_PY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PYG": [ "Gs.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_SV.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_SV.json index c8a948296c4cc..79cd1708ff1ef 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_SV.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_SV.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "USD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_US.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_US.json index 296845a37988e..3e0d66545be1d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_US.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_US.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BDT": [ "BDT", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_UY.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_UY.json index 90a7d4e75f6b2..6c405ee7e506d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_UY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_UY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "USD": [ "US$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es_VE.json b/src/Symfony/Component/Intl/Resources/data/currencies/es_VE.json index 44c32df34c373..43c743c58b609 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es_VE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es_VE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "VEF": [ "Bs.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/et.json b/src/Symfony/Component/Intl/Resources/data/currencies/et.json index 2daf4ef9dfd04..9ea44017a6c95 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/et.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/et.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/eu.json b/src/Symfony/Component/Intl/Resources/data/currencies/eu.json index 9e688293cd4b7..b37feb6db7fe0 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/eu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fa.json b/src/Symfony/Component/Intl/Resources/data/currencies/fa.json index b597c08fcc8d7..9461bf1ddb56d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fa_AF.json b/src/Symfony/Component/Intl/Resources/data/currencies/fa_AF.json index beedaee84ebc9..0f646d734a437 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fa_AF.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fa_AF.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "A$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff.json index 88aa6f1541afd..61193b59e4ea3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_GN.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_GN.json index edfa7c4143764..2c526d97a25a4 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_GN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_GN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GNF": [ "FG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GH.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GH.json index 1942ca156f860..6af1ef38110ff 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GHS": [ "GH₵", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GM.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GM.json index c80cfd0c5c90a..c72dad59c30f4 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GMD": [ "D", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GN.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GN.json index edfa7c4143764..2c526d97a25a4 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_GN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GNF": [ "FG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_LR.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_LR.json index cf9fd44cd7c39..e88262cf52a2a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_LR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_LR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "LRD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_MR.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_MR.json index 94c4f3fa782b3..80fdd4b81e5fc 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_MR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_MR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MRU": [ "UM", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_NG.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_NG.json index 4c7dac14375dc..66ac4b25577d7 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_NG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_NG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NGN": [ "₦", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_SL.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_SL.json index fbb480572cf20..81dd91e125dae 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_SL.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_Latn_SL.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SLL": [ "Le", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ff_MR.json b/src/Symfony/Component/Intl/Resources/data/currencies/ff_MR.json index 94c4f3fa782b3..80fdd4b81e5fc 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ff_MR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ff_MR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MRU": [ "UM", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fi.json b/src/Symfony/Component/Intl/Resources/data/currencies/fi.json index 7b19f385304b8..14ecc6ffddd2b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fo.json b/src/Symfony/Component/Intl/Resources/data/currencies/fo.json index f38cabf7ecae6..83aa90be078e3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fo_DK.json b/src/Symfony/Component/Intl/Resources/data/currencies/fo_DK.json index efdb0760f9662..4bab06e04193d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fo_DK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fo_DK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DKK": [ "kr.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr.json index 3f15b3e4c8017..5aefbf44d9667 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_BI.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_BI.json index 8b4df7d6a8937..2f5576e4e3efb 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_BI.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_BI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BIF": [ "FBu", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_CA.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_CA.json index 77dc3324359dc..1da34ed90fe5b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_CA.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_CA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ARS": [ "ARS", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_CD.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_CD.json index 913db11eee8ca..57b570b1e58de 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_CD.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_CD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CDF": [ "FC", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_DJ.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_DJ.json index 8554b632c7c65..7d9224664919e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_DJ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_DJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DJF": [ "Fdj", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_DZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_DZ.json index 491b3f6c1b014..5f30c2afa292f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_DZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_DZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DZD": [ "DA", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_GN.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_GN.json index 1527693db5a69..86947c3a62a4f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_GN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_GN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GNF": [ "FG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_HT.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_HT.json index 4c8e140c5e684..265c3d4a73e6d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_HT.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_HT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "HTG": [ "G", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_KM.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_KM.json index 1ea4d0a759445..ac26dc1ad6790 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_KM.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_KM.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KMF": [ "CF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_LU.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_LU.json index ecc4d77d48596..d13c5ad69167b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_LU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_LU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "FRF": [ "FRF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_MG.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_MG.json index c0694b24a617f..1401ef06ce3e2 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_MG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_MG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MGA": [ "Ar", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_MR.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_MR.json index 98ca2d20c22fc..425c01aa43109 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_MR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_MR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MRU": [ "UM", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_MU.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_MU.json index f2ae54be1a681..08fe126048aa3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_MU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_MU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MUR": [ "Rs", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_RW.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_RW.json index b935a5b482595..8cdf4b56363b2 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_RW.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_RW.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "RWF": [ "RF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_SC.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_SC.json index 5c57822659fe7..a4bc53ebb746e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_SC.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_SC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SCR": [ "SR", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_SY.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_SY.json index 27211b979e259..8c5f3b6506153 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_SY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_SY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SYP": [ "LS", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_TN.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_TN.json index a4ed2fe3129a9..ab639ef5e9778 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_TN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_TN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "TND": [ "DT", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr_VU.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr_VU.json index 688d934cee635..156efcb6c584b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr_VU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr_VU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "VUV": [ "VT", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fy.json b/src/Symfony/Component/Intl/Resources/data/currencies/fy.json index 40ab6c94d0b55..f284629363b4f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fy.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ga.json b/src/Symfony/Component/Intl/Resources/data/currencies/ga.json index 79adbb5942170..7b74e5f93fb87 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ga.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/gd.json b/src/Symfony/Component/Intl/Resources/data/currencies/gd.json index 6bee4feaded20..e323444968d99 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/gd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/gl.json b/src/Symfony/Component/Intl/Resources/data/currencies/gl.json index 9f1cf184a281a..adbc9b6879e70 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/gl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/gu.json b/src/Symfony/Component/Intl/Resources/data/currencies/gu.json index 047bcf36f7b7b..1086aad00de26 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/gu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/gu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ha.json b/src/Symfony/Component/Intl/Resources/data/currencies/ha.json index c8614b7918776..a46198678d012 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ha.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ha.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ha_GH.json b/src/Symfony/Component/Intl/Resources/data/currencies/ha_GH.json index 1942ca156f860..6af1ef38110ff 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ha_GH.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ha_GH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GHS": [ "GH₵", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/he.json b/src/Symfony/Component/Intl/Resources/data/currencies/he.json index 29f03346d8105..5fe1074c73d46 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/he.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/he.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/hi.json b/src/Symfony/Component/Intl/Resources/data/currencies/hi.json index 3f3c5e5bb9079..83ecc2073189a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/hi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/hr.json b/src/Symfony/Component/Intl/Resources/data/currencies/hr.json index d226960555c27..be467a8cab93a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/hr.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/hr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/hr_BA.json b/src/Symfony/Component/Intl/Resources/data/currencies/hr_BA.json index 8ce6f5f732895..236e78a394add 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/hr_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/hr_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BAM": [ "KM", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/hu.json b/src/Symfony/Component/Intl/Resources/data/currencies/hu.json index dd34737dd2cf1..ae13d6ef6f635 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/hu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/hu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/hy.json b/src/Symfony/Component/Intl/Resources/data/currencies/hy.json index fe85bc22d5bbd..5d023065ecc2c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/hy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ia.json b/src/Symfony/Component/Intl/Resources/data/currencies/ia.json index 779776dc0f692..65ac44e1c425e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ia.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ia.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ALL": [ "ALL", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/id.json b/src/Symfony/Component/Intl/Resources/data/currencies/id.json index 202fb9660c571..39deb096afbee 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/id.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/id.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ig.json b/src/Symfony/Component/Intl/Resources/data/currencies/ig.json index 13c237cef5e76..56be0256ea290 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ig.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ig.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BMD": [ "BMD", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ii.json b/src/Symfony/Component/Intl/Resources/data/currencies/ii.json index 0841520efbd36..3dbdaeabc22f3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ii.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ii.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CNY": [ "¥", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/in.json b/src/Symfony/Component/Intl/Resources/data/currencies/in.json index 202fb9660c571..39deb096afbee 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/in.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/in.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/is.json b/src/Symfony/Component/Intl/Resources/data/currencies/is.json index 120a51962f1e7..bf64dd7c4476c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/is.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/is.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/it.json b/src/Symfony/Component/Intl/Resources/data/currencies/it.json index f3d2259909e6a..387e2f701904e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/it.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/it.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/iw.json b/src/Symfony/Component/Intl/Resources/data/currencies/iw.json index 29f03346d8105..5fe1074c73d46 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/iw.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/iw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ja.json b/src/Symfony/Component/Intl/Resources/data/currencies/ja.json index a09af6446fb10..a40f4afb27177 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ja.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/jv.json b/src/Symfony/Component/Intl/Resources/data/currencies/jv.json index 55a69fb983743..33bd761a4dc46 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/jv.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/jv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ka.json b/src/Symfony/Component/Intl/Resources/data/currencies/ka.json index 97938794cdfb3..bb40d624d67bd 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ka.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ka.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ki.json b/src/Symfony/Component/Intl/Resources/data/currencies/ki.json index 1d24c041287da..b9e3241e81bc8 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ki.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ki.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/kk.json b/src/Symfony/Component/Intl/Resources/data/currencies/kk.json index 58b4f96b978a7..fac3602dade61 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/kk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/kl.json b/src/Symfony/Component/Intl/Resources/data/currencies/kl.json index 81621d74c029d..b8cebbdf41b8f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/kl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/kl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DKK": [ "kr.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/km.json b/src/Symfony/Component/Intl/Resources/data/currencies/km.json index ea16d82e06599..db6fbb7a21de2 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/km.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/km.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/kn.json b/src/Symfony/Component/Intl/Resources/data/currencies/kn.json index 496b138519d00..b06f7eaaf02db 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/kn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/kn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ko.json b/src/Symfony/Component/Intl/Resources/data/currencies/ko.json index 64746b6ea0430..62a541fa97d95 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ko.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ks.json b/src/Symfony/Component/Intl/Resources/data/currencies/ks.json index 8c1101badd29c..2f98ab994d886 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ks.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ks.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ku.json b/src/Symfony/Component/Intl/Resources/data/currencies/ku.json index 99bccabcff83a..4639d47bb6734 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ku.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ku.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "EUR": [ "€", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ky.json b/src/Symfony/Component/Intl/Resources/data/currencies/ky.json index babc33eada314..8bd49a6147940 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ky.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/lb.json b/src/Symfony/Component/Intl/Resources/data/currencies/lb.json index 655f02d458f4b..820d1e1d839a4 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/lb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/lg.json b/src/Symfony/Component/Intl/Resources/data/currencies/lg.json index 30b779466ff81..672140091757b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/lg.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/lg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ln.json b/src/Symfony/Component/Intl/Resources/data/currencies/ln.json index 8617b1ac9241e..44924f8389f53 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ln.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ln.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ln_AO.json b/src/Symfony/Component/Intl/Resources/data/currencies/ln_AO.json index 2e51c9aeca340..e7c31c8a24b25 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ln_AO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ln_AO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AOA": [ "Kz", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/lo.json b/src/Symfony/Component/Intl/Resources/data/currencies/lo.json index 5c0c28bc3295f..17c80297269ca 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/lo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/lo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/lt.json b/src/Symfony/Component/Intl/Resources/data/currencies/lt.json index 65afdd843e1e5..ab12165a400f5 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/lt.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/lt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/lu.json b/src/Symfony/Component/Intl/Resources/data/currencies/lu.json index 970eb82f2a5c6..e77059d7ec58b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/lu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/lu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/lv.json b/src/Symfony/Component/Intl/Resources/data/currencies/lv.json index dd5586b6c1b92..8823c9ff4a7ea 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/lv.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/lv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/meta.json b/src/Symfony/Component/Intl/Resources/data/currencies/meta.json index 664a651edaea9..27e0e79e52878 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/meta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Currencies": [ "ADP", "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mg.json b/src/Symfony/Component/Intl/Resources/data/currencies/mg.json index 71aec58ca3dc2..8436b6ac607b7 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mg.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mi.json b/src/Symfony/Component/Intl/Resources/data/currencies/mi.json index 74179d5052c6a..e17d95645055b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ANG": [ "ANG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mk.json b/src/Symfony/Component/Intl/Resources/data/currencies/mk.json index 787203a04fc66..8db824dcdc00a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ml.json b/src/Symfony/Component/Intl/Resources/data/currencies/ml.json index c65462c152118..208a8a9ef7b0f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ml.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ml.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mn.json b/src/Symfony/Component/Intl/Resources/data/currencies/mn.json index 91beb45e5b394..8ba906ddea380 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mo.json b/src/Symfony/Component/Intl/Resources/data/currencies/mo.json index 062050f722e20..ed2e341fb002f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mr.json b/src/Symfony/Component/Intl/Resources/data/currencies/mr.json index de58880091d3c..234dc013b92d7 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mr.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ms.json b/src/Symfony/Component/Intl/Resources/data/currencies/ms.json index fe919b7c0c065..c36ea2670bfd5 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ms.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ms.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ms_BN.json b/src/Symfony/Component/Intl/Resources/data/currencies/ms_BN.json index 0571439f671e2..45ffa45673fcc 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ms_BN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ms_BN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BND": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ms_SG.json b/src/Symfony/Component/Intl/Resources/data/currencies/ms_SG.json index 7675efe6a8773..58b9eb6cde576 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ms_SG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ms_SG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SGD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mt.json b/src/Symfony/Component/Intl/Resources/data/currencies/mt.json index d0959e37329f7..020849fca4d6a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/my.json b/src/Symfony/Component/Intl/Resources/data/currencies/my.json index a11d16518f4e6..316990e4a7038 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/my.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/my.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nb.json b/src/Symfony/Component/Intl/Resources/data/currencies/nb.json index 5b6dc1d0b895b..6d9337e1d902f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nb.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nd.json b/src/Symfony/Component/Intl/Resources/data/currencies/nd.json index 525b738a71fcf..52ac51393fb17 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nd.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ne.json b/src/Symfony/Component/Intl/Resources/data/currencies/ne.json index 1b3225b18eee8..01533e35aec51 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ne.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nl.json b/src/Symfony/Component/Intl/Resources/data/currencies/nl.json index b18cc3f28fcb4..226a015e8cfa5 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nl_AW.json b/src/Symfony/Component/Intl/Resources/data/currencies/nl_AW.json index fc7a0b2e0fe5c..524888726ce2d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nl_AW.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nl_AW.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AWG": [ "Afl.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nl_BQ.json b/src/Symfony/Component/Intl/Resources/data/currencies/nl_BQ.json index f0b5e3e11dada..492b7e6ccce91 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nl_BQ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nl_BQ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "USD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nl_CW.json b/src/Symfony/Component/Intl/Resources/data/currencies/nl_CW.json index 1d5cf435941c7..f8a487fa8b553 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nl_CW.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nl_CW.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ANG": [ "NAf.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nl_SR.json b/src/Symfony/Component/Intl/Resources/data/currencies/nl_SR.json index 3f6063631b024..a322428b81147 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nl_SR.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nl_SR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SRD": [ "$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nl_SX.json b/src/Symfony/Component/Intl/Resources/data/currencies/nl_SX.json index 1d5cf435941c7..f8a487fa8b553 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nl_SX.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nl_SX.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ANG": [ "NAf.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nn.json b/src/Symfony/Component/Intl/Resources/data/currencies/nn.json index a0f7ca3f1d9fe..02f1bd013a204 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/no.json b/src/Symfony/Component/Intl/Resources/data/currencies/no.json index 5b6dc1d0b895b..6d9337e1d902f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/no.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/no.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/om.json b/src/Symfony/Component/Intl/Resources/data/currencies/om.json index 9ff103a0cf169..0e2bb55f7d3c7 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/om.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/om.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/om_KE.json b/src/Symfony/Component/Intl/Resources/data/currencies/om_KE.json index 6f249a7070d3f..47ff74908481e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/om_KE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/om_KE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KES": [ "Ksh", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/or.json b/src/Symfony/Component/Intl/Resources/data/currencies/or.json index 0905c2d901a97..003d3991a350d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/or.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/or.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/os.json b/src/Symfony/Component/Intl/Resources/data/currencies/os.json index 075e5cb905913..0f56664886cca 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/os.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/os.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/os_RU.json b/src/Symfony/Component/Intl/Resources/data/currencies/os_RU.json index d10c7bfdb4cf2..2dd3c878622b9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/os_RU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/os_RU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GEL": [ "GEL", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pa.json b/src/Symfony/Component/Intl/Resources/data/currencies/pa.json index 06145963c23ab..2dee6c91d6ea3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pa.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pa_Arab.json b/src/Symfony/Component/Intl/Resources/data/currencies/pa_Arab.json index 71117b1922aa5..70f869e58b768 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pa_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pa_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "EUR": [ "€", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pl.json b/src/Symfony/Component/Intl/Resources/data/currencies/pl.json index 10d793c3b1c79..e0afcdc10cf8c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ps.json b/src/Symfony/Component/Intl/Resources/data/currencies/ps.json index 4e54ea3cf907a..fbbcd985a5d92 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ps.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ps_PK.json b/src/Symfony/Component/Intl/Resources/data/currencies/ps_PK.json index 0f234ee6fdf6e..7b3a29b69c193 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ps_PK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ps_PK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PKR": [ "Rs", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt.json index 77a9fe4d1a55c..b4ea906f5fe36 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_AO.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_AO.json index 5b89811e6cce7..a3c5b630c1841 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_AO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_AO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AOA": [ "Kz", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_CV.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_CV.json index 72625b8614cd1..3e763f9f8ae58 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_CV.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_CV.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CVE": [ "​", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_LU.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_LU.json index 90dc7661a474b..08e084d422a75 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_LU.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_LU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "LUF": [ "F", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_MO.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_MO.json index 816baa526a1ff..2c51f9d066132 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_MO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_MO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MOP": [ "MOP$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_MZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_MZ.json index a121304d832bc..76fab2b5d9b01 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_MZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_MZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MZN": [ "MTn", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json index c5d74219c8ff6..afa4c5babe2f0 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_ST.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_ST.json index c87492e243566..41e51e8481a13 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_ST.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_ST.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "STN": [ "Db", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/qu.json b/src/Symfony/Component/Intl/Resources/data/currencies/qu.json index c69f3682d101b..8fab0c7950ffe 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/qu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/qu_BO.json b/src/Symfony/Component/Intl/Resources/data/currencies/qu_BO.json index a36ac057171c4..c826aedffb69f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/qu_BO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/qu_BO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BOB": [ "Bs", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/qu_EC.json b/src/Symfony/Component/Intl/Resources/data/currencies/qu_EC.json index ef56ffae0ff17..dd7c9cf6abb4f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/qu_EC.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/qu_EC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PEN": [ "PEN", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/rm.json b/src/Symfony/Component/Intl/Resources/data/currencies/rm.json index 519dd786404c1..2d7b0bf27f55e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/rm.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/rm.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/rn.json b/src/Symfony/Component/Intl/Resources/data/currencies/rn.json index b6a974c325cca..67cae3ae33dd0 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/rn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/rn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ro.json b/src/Symfony/Component/Intl/Resources/data/currencies/ro.json index 062050f722e20..ed2e341fb002f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ro.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ro_MD.json b/src/Symfony/Component/Intl/Resources/data/currencies/ro_MD.json index b4077faae2511..1ed8199cefc87 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ro_MD.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ro_MD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MDL": [ "L", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/root.json b/src/Symfony/Component/Intl/Resources/data/currencies/root.json index 1e89a16491ecc..de391f8ba3436 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/root.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/root.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "A$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ru.json b/src/Symfony/Component/Intl/Resources/data/currencies/ru.json index 0f84c97a694b6..205c6e55ece0a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ru.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ru_BY.json b/src/Symfony/Component/Intl/Resources/data/currencies/ru_BY.json index ee89a95483da8..638fe706c2302 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ru_BY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ru_BY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BYN": [ "Br", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ru_KG.json b/src/Symfony/Component/Intl/Resources/data/currencies/ru_KG.json index c540c16828f24..61e3a0154763b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ru_KG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ru_KG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KGS": [ "сом", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ru_KZ.json b/src/Symfony/Component/Intl/Resources/data/currencies/ru_KZ.json index b7a1f4bf0bef3..a6430abde10f1 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ru_KZ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ru_KZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KZT": [ "₸", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ru_MD.json b/src/Symfony/Component/Intl/Resources/data/currencies/ru_MD.json index 5bd8b15184eb4..46552ffc51b8f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ru_MD.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ru_MD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MDL": [ "L", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/rw.json b/src/Symfony/Component/Intl/Resources/data/currencies/rw.json index 6e7627015a2bf..619f3e944c365 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/rw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "RWF": [ "RF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sd.json b/src/Symfony/Component/Intl/Resources/data/currencies/sd.json index 0b5434ba96159..125c666c97efd 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/se.json b/src/Symfony/Component/Intl/Resources/data/currencies/se.json index 1f9260f4d2076..c6ef60512dbee 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/se.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/se.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DKK": [ "Dkr", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/se_SE.json b/src/Symfony/Component/Intl/Resources/data/currencies/se_SE.json index dca505f1049b0..439a218513308 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/se_SE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/se_SE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "NOK": [ "Nkr", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sg.json b/src/Symfony/Component/Intl/Resources/data/currencies/sg.json index cb8d319c478cf..17b28374b9c0f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sg.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sh.json b/src/Symfony/Component/Intl/Resources/data/currencies/sh.json index 58ac2fb505e62..8c29c2097d1b8 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/si.json b/src/Symfony/Component/Intl/Resources/data/currencies/si.json index e5ee6b2a997d8..2d632a15ebd2a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/si.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/si.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sk.json b/src/Symfony/Component/Intl/Resources/data/currencies/sk.json index 209152ea222d9..c289c5199aebb 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sl.json b/src/Symfony/Component/Intl/Resources/data/currencies/sl.json index 1af7c074a17c6..87d2107b57d72 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sn.json b/src/Symfony/Component/Intl/Resources/data/currencies/sn.json index 6fe9cb943ac29..f8dc423c6feac 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/so.json b/src/Symfony/Component/Intl/Resources/data/currencies/so.json index b8f5dfe7a4431..7cae03a58a122 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/so.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/so.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/so_DJ.json b/src/Symfony/Component/Intl/Resources/data/currencies/so_DJ.json index a3a3fd4181762..eeb05f0cbd44f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/so_DJ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/so_DJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "DJF": [ "Fdj", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/so_ET.json b/src/Symfony/Component/Intl/Resources/data/currencies/so_ET.json index 3c4ec498e7da6..c7889e62f3281 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/so_ET.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/so_ET.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ETB": [ "Br", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/so_KE.json b/src/Symfony/Component/Intl/Resources/data/currencies/so_KE.json index 554e94c95a928..c95b6b8164c1b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/so_KE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/so_KE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KES": [ "Ksh", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sq.json b/src/Symfony/Component/Intl/Resources/data/currencies/sq.json index ee13f4ea25c36..566dde702c6a0 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sq.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sq.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sq_MK.json b/src/Symfony/Component/Intl/Resources/data/currencies/sq_MK.json index 21534be17fcda..ac16b9f349791 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sq_MK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sq_MK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MKD": [ "den", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sr.json b/src/Symfony/Component/Intl/Resources/data/currencies/sr.json index b757622161ef5..64f0db662eed6 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json index 58ac2fb505e62..8c29c2097d1b8 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sv.json b/src/Symfony/Component/Intl/Resources/data/currencies/sv.json index 36884178d4597..c66c3c46caba6 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sv.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sw.json b/src/Symfony/Component/Intl/Resources/data/currencies/sw.json index 795ba5b9e3094..32d514a9038f5 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sw.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sw_CD.json b/src/Symfony/Component/Intl/Resources/data/currencies/sw_CD.json index 631dc031546fb..6514995eefd49 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sw_CD.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sw_CD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CDF": [ "FC", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sw_KE.json b/src/Symfony/Component/Intl/Resources/data/currencies/sw_KE.json index 7aa6095c056a7..4109c1128ff28 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sw_KE.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sw_KE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sw_UG.json b/src/Symfony/Component/Intl/Resources/data/currencies/sw_UG.json index fca3c48eb6806..6c876d812d0ac 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sw_UG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sw_UG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "UGX": [ "USh", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ta.json b/src/Symfony/Component/Intl/Resources/data/currencies/ta.json index 0a773073064f6..95bbfd1ecd3c2 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ta.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ta_LK.json b/src/Symfony/Component/Intl/Resources/data/currencies/ta_LK.json index 0b167fae9ca57..1f7897793252c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ta_LK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ta_LK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "LKR": [ "Rs.", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ta_MY.json b/src/Symfony/Component/Intl/Resources/data/currencies/ta_MY.json index a8526baa3852b..4a085f45ca6e8 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ta_MY.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ta_MY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MYR": [ "RM", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ta_SG.json b/src/Symfony/Component/Intl/Resources/data/currencies/ta_SG.json index b3d75e8860f2b..4ece8a9326920 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ta_SG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ta_SG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MYR": [ "RM", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/te.json b/src/Symfony/Component/Intl/Resources/data/currencies/te.json index dab955785a3b6..a253e255f2310 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/te.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/te.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tg.json b/src/Symfony/Component/Intl/Resources/data/currencies/tg.json index 246339b9615bf..5a50eece5e97e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/th.json b/src/Symfony/Component/Intl/Resources/data/currencies/th.json index e8d74c5b9660e..b60f800ef2011 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/th.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/th.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ti.json b/src/Symfony/Component/Intl/Resources/data/currencies/ti.json index e71e383270ade..72fab57813a0c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ti.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ti_ER.json b/src/Symfony/Component/Intl/Resources/data/currencies/ti_ER.json index 5019f02b63116..d6ad6e4fafd69 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ti_ER.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ti_ER.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ERN": [ "Nfk", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tk.json b/src/Symfony/Component/Intl/Resources/data/currencies/tk.json index 5f15cf5706fcf..264d9245eb012 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tl.json b/src/Symfony/Component/Intl/Resources/data/currencies/tl.json index 59101fe152d87..7bc16d0be8230 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/to.json b/src/Symfony/Component/Intl/Resources/data/currencies/to.json index 00166b230bd34..05eecb5ee619e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/to.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/to.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AUD": [ "AUD$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tr.json b/src/Symfony/Component/Intl/Resources/data/currencies/tr.json index 4224f28dab1de..43808ebd5973f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tr.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tt.json b/src/Symfony/Component/Intl/Resources/data/currencies/tt.json index fbc05d9f57179..2d12be5891daf 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ug.json b/src/Symfony/Component/Intl/Resources/data/currencies/ug.json index 74911d0bb840c..d749ab07865aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ug.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/uk.json b/src/Symfony/Component/Intl/Resources/data/currencies/uk.json index b80a5494b8915..43dae80e59e41 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/uk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ur.json b/src/Symfony/Component/Intl/Resources/data/currencies/ur.json index aeb04ae0bcb3e..c576763c10eac 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ur.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ur_IN.json b/src/Symfony/Component/Intl/Resources/data/currencies/ur_IN.json index 34c5edf9d0c8e..c663ebbad9e2e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ur_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ur_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CRC": [ "CRC", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/uz.json b/src/Symfony/Component/Intl/Resources/data/currencies/uz.json index 3f69405df391b..7c7cb3ed15557 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/uz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/uz_Arab.json b/src/Symfony/Component/Intl/Resources/data/currencies/uz_Arab.json index 5772faf476876..d131865fecf0e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/uz_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/uz_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AFN": [ "؋", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json index 70799400ace89..fe1a2fd4efe5d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ANG": [ "ANG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/vi.json b/src/Symfony/Component/Intl/Resources/data/currencies/vi.json index e504695fe6a53..0cfd13ebd237d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/vi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/wo.json b/src/Symfony/Component/Intl/Resources/data/currencies/wo.json index d993629c27e5e..a8abaeec529c9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/wo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/xh.json b/src/Symfony/Component/Intl/Resources/data/currencies/xh.json index 89db0354a9b53..3860ab0871b66 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/xh.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/xh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ZAR": [ "R", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/yi.json b/src/Symfony/Component/Intl/Resources/data/currencies/yi.json index 568926166f7ee..e8bf1047105c3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/yi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/yi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/yo.json b/src/Symfony/Component/Intl/Resources/data/currencies/yo.json index eac610ebb9d0e..d9a5a36a6d240 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/yo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/yo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/yo_BJ.json b/src/Symfony/Component/Intl/Resources/data/currencies/yo_BJ.json index f6962c1df685d..c4a338af2300e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/yo_BJ.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/yo_BJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh.json index 0cdbc4fe1e316..d87fb74494b54 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_HK.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_HK.json index bac3f60782ca3..fc52eabf1960f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_HK.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_HK.json index b440bb72e521f..dda3b5355ec23 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CNY": [ "CN¥", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_MO.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_MO.json index 981e26c8b90ac..f06fa4c3cfbcf 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_MO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_MO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CNY": [ "CN¥", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_SG.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_SG.json index 8f48a02670581..d4fec5421b465 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_SG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hans_SG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CNY": [ "CN¥", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json index 1d69e005c895e..3453835bb040d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_HK.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_HK.json index bac3f60782ca3..fc52eabf1960f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_MO.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_MO.json index 2477be64b3ac8..10d0e3e82a578 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_MO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant_MO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MOP": [ "MOP$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_MO.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_MO.json index 2477be64b3ac8..10d0e3e82a578 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_MO.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_MO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MOP": [ "MOP$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_SG.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_SG.json index 8f48a02670581..d4fec5421b465 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_SG.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_SG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CNY": [ "CN¥", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zu.json b/src/Symfony/Component/Intl/Resources/data/currencies/zu.json index ebab2f1441906..04a9fd62d688b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/git-info.txt b/src/Symfony/Component/Intl/Resources/data/git-info.txt index 30257ca635ebd..3a5b9f5744862 100644 --- a/src/Symfony/Component/Intl/Resources/data/git-info.txt +++ b/src/Symfony/Component/Intl/Resources/data/git-info.txt @@ -2,6 +2,6 @@ Git information =============== URL: https://github.com/unicode-org/icu.git -Revision: fd123bf023882f07bfacf51c39111be2f946d8f8 -Author: Steven R. Loomis -Date: 2019-10-02T10:25:22-07:00 +Revision: 5f681ecbc75898a6484217b322f3883b6d1b2049 +Author: Jeff Genovy +Date: 2020-03-09T17:38:44-07:00 diff --git a/src/Symfony/Component/Intl/Resources/data/languages/af.json b/src/Symfony/Component/Intl/Resources/data/languages/af.json index ceb600dde44a9..05f02cddfa26a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/af.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/af.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abkasies", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ak.json b/src/Symfony/Component/Intl/Resources/data/languages/ak.json index 0f4215effd692..001cc0d72de65 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ak.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ak.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Akan", "am": "Amarik", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/am.json b/src/Symfony/Component/Intl/Resources/data/languages/am.json index 7bc503fa79f22..b0c7e9ca60f87 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/am.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/am.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "አፋርኛ", "ab": "አብሐዚኛ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ar.json b/src/Symfony/Component/Intl/Resources/data/languages/ar.json index ca3b5d08f5db8..6fa36c712d5b9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ar.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "الأفارية", "ab": "الأبخازية", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ar_EG.json b/src/Symfony/Component/Intl/Resources/data/languages/ar_EG.json index e1dbe6c344ae3..8a78a841c4a76 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ar_EG.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ar_EG.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "da": "الدنماركية" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ar_LY.json b/src/Symfony/Component/Intl/Resources/data/languages/ar_LY.json index 3fe1ee8f99d9a..fa77f019274fa 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ar_LY.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ar_LY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "المابودونجونية", "gn": "الغورانية", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ar_SA.json b/src/Symfony/Component/Intl/Resources/data/languages/ar_SA.json index 0744b6cd215da..8b50d41712428 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ar_SA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ar_SA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "العربية الرسمية الحديثة", "arn": "المابودونجونية", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/as.json b/src/Symfony/Component/Intl/Resources/data/languages/as.json index 8901026a1a914..e6bc969017e40 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/as.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/as.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "আফাৰ", "ab": "আবখাজিয়ান", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/az.json b/src/Symfony/Component/Intl/Resources/data/languages/az.json index 3b0d9d900893e..9ac822c98ea8c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/az.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/az.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abxaz", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/az_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/languages/az_Cyrl.json index 18efabd21ddc3..ec94f62fa3f11 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/az_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/az_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афар", "ab": "абхаз", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/be.json b/src/Symfony/Component/Intl/Resources/data/languages/be.json index 4585f5ec45c64..33d042df87b2a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/be.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/be.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарская", "ab": "абхазская", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bg.json b/src/Symfony/Component/Intl/Resources/data/languages/bg.json index 8c9dd2bbb48c6..523a5dd5e5533 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bg.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарски", "ab": "абхазки", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bm.json b/src/Symfony/Component/Intl/Resources/data/languages/bm.json index f38afe0707a36..592966c7deac1 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bm.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bm.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "akankan", "am": "amarikikan", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bn.json b/src/Symfony/Component/Intl/Resources/data/languages/bn.json index f5ba607a3289c..5e8df80cc2ad1 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "আফার", "ab": "আবখাজিয়ান", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bn_IN.json b/src/Symfony/Component/Intl/Resources/data/languages/bn_IN.json index 3a691f99cd765..ef9815d7c1829 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bn_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bn_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ksh": "কোলোনিয়ান" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bo.json b/src/Symfony/Component/Intl/Resources/data/languages/bo.json index d2dec5911cbee..28326f6a00a2a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "bo": "བོད་སྐད་", "dz": "རྫོང་ཁ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/br.json b/src/Symfony/Component/Intl/Resources/data/languages/br.json index 00afdbed345de..3bf54774dbb8e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/br.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/br.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhazeg", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bs.json b/src/Symfony/Component/Intl/Resources/data/languages/bs.json index dcf4ebc739e87..ea12e0dbe8e3d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarski", "ab": "abhaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json index 9b680f15fecff..011ecdd9f6296 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарски", "ab": "абказијски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ca.json b/src/Symfony/Component/Intl/Resources/data/languages/ca.json index 1f022d7b19472..2bc8dbafd3a92 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ca.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ca.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "àfar", "ab": "abkhaz", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ce.json b/src/Symfony/Component/Intl/Resources/data/languages/ce.json index b002351d216c1..71835c3c4cebe 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ce.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ce.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарийн", "ab": "абхазхойн", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/cs.json b/src/Symfony/Component/Intl/Resources/data/languages/cs.json index 4321bcbfb6b02..96a985035ea7a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/cs.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/cs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarština", "ab": "abcházština", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/cy.json b/src/Symfony/Component/Intl/Resources/data/languages/cy.json index 1629e65b7d509..1506de71a83c4 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/cy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Affareg", "ab": "Abchaseg", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/da.json b/src/Symfony/Component/Intl/Resources/data/languages/da.json index 96d529819f416..96af1647b5823 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/da.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/da.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhasisk", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/de.json b/src/Symfony/Component/Intl/Resources/data/languages/de.json index c44b16a07b291..4f4031525daf7 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/de.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/de.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abchasisch", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/de_AT.json b/src/Symfony/Component/Intl/Resources/data/languages/de_AT.json index 2549cf699a9b4..86cf6f18e4dd9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/de_AT.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/de_AT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "modernes Hocharabisch", "car": "karibische Sprache", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/de_CH.json b/src/Symfony/Component/Intl/Resources/data/languages/de_CH.json index e9e158c3646f5..d1e4d80abb01a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/de_CH.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/de_CH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "Aceh-Sprache", "ach": "Acholi-Sprache", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/de_LU.json b/src/Symfony/Component/Intl/Resources/data/languages/de_LU.json index 99ca098e73ac0..fc8b8af7bd13c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/de_LU.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/de_LU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "be": "Belarussisch" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/dz.json b/src/Symfony/Component/Intl/Resources/data/languages/dz.json index cbffc7b128012..929a3394f42f7 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/dz.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/dz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "ཨ་ཕར་ཁ", "ab": "ཨཱབ་ཁ་ཟི་ཡ་ཁ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ee.json b/src/Symfony/Component/Intl/Resources/data/languages/ee.json index 07cab652a4fc4..f85f826d81062 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ee.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ee.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ab": "abkhaziagbe", "af": "afrikaangbe", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/el.json b/src/Symfony/Component/Intl/Resources/data/languages/el.json index bbd0bcf16f999..5ae0e552d75c8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/el.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/el.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Αφάρ", "ab": "Αμπχαζικά", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/en.json b/src/Symfony/Component/Intl/Resources/data/languages/en.json index 4aa3a4af01458..75a7e28b46620 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/en.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/en.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abkhazian", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/en_001.json b/src/Symfony/Component/Intl/Resources/data/languages/en_001.json index 963d0413b6894..2bc6f6cef66d9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/en_001.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/en_001.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "mus": "Creek", "nds_NL": "West Low German" diff --git a/src/Symfony/Component/Intl/Resources/data/languages/en_AU.json b/src/Symfony/Component/Intl/Resources/data/languages/en_AU.json index cf2497879a543..c6f5f5c2dbf0b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/en_AU.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/en_AU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "Modern Standard Arabic", "bn": "Bengali", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/en_CA.json b/src/Symfony/Component/Intl/Resources/data/languages/en_CA.json index 657b3d27caeb2..ba6710d57573c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/en_CA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/en_CA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "Modern Standard Arabic", "bn": "Bengali", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/en_GB.json b/src/Symfony/Component/Intl/Resources/data/languages/en_GB.json index f5b3ec1fcd611..99c8c72dd94a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/en_GB.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/en_GB.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "Modern Standard Arabic", "de_AT": "Austrian German", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/en_IN.json b/src/Symfony/Component/Intl/Resources/data/languages/en_IN.json index 6ccb775188e15..bc91e5f740a08 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/en_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/en_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "bn": "Bengali", "ro_MD": "Moldavian" diff --git a/src/Symfony/Component/Intl/Resources/data/languages/en_NZ.json b/src/Symfony/Component/Intl/Resources/data/languages/en_NZ.json index 7b7fc2c26b873..2fa2de7c5581f 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/en_NZ.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/en_NZ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "mi": "Māori" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/eo.json b/src/Symfony/Component/Intl/Resources/data/languages/eo.json index 832bb82ce038a..55b60762c8ef0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/eo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/eo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afara", "ab": "abĥaza", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es.json b/src/Symfony/Component/Intl/Resources/data/languages/es.json index b183ceaa5e09d..3a4a5fb2beb33 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abjasio", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_419.json b/src/Symfony/Component/Intl/Resources/data/languages/es_419.json index ba342e6a8316c..74132ca1e6c52 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_419.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_419.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "achenés", "ady": "adigeo", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_AR.json b/src/Symfony/Component/Intl/Resources/data/languages/es_AR.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_AR.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_AR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_BO.json b/src/Symfony/Component/Intl/Resources/data/languages/es_BO.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_BO.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_BO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_CL.json b/src/Symfony/Component/Intl/Resources/data/languages/es_CL.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_CL.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_CL.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_CO.json b/src/Symfony/Component/Intl/Resources/data/languages/es_CO.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_CO.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_CO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_CR.json b/src/Symfony/Component/Intl/Resources/data/languages/es_CR.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_CR.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_CR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_DO.json b/src/Symfony/Component/Intl/Resources/data/languages/es_DO.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_DO.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_DO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_EC.json b/src/Symfony/Component/Intl/Resources/data/languages/es_EC.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_EC.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_EC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_GT.json b/src/Symfony/Component/Intl/Resources/data/languages/es_GT.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_GT.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_GT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_HN.json b/src/Symfony/Component/Intl/Resources/data/languages/es_HN.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_HN.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_HN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_MX.json b/src/Symfony/Component/Intl/Resources/data/languages/es_MX.json index d8bfa4f493455..1b84e06263b65 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_MX.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_MX.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "ar_001": "árabe estándar moderno", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_NI.json b/src/Symfony/Component/Intl/Resources/data/languages/es_NI.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_NI.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_NI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_PA.json b/src/Symfony/Component/Intl/Resources/data/languages/es_PA.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_PA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_PA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_PE.json b/src/Symfony/Component/Intl/Resources/data/languages/es_PE.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_PE.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_PE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_PR.json b/src/Symfony/Component/Intl/Resources/data/languages/es_PR.json index 338a32b2d60c3..1a3bdf4622990 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_PR.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_PR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_PY.json b/src/Symfony/Component/Intl/Resources/data/languages/es_PY.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_PY.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_PY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_SV.json b/src/Symfony/Component/Intl/Resources/data/languages/es_SV.json index 338a32b2d60c3..1a3bdf4622990 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_SV.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_SV.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_US.json b/src/Symfony/Component/Intl/Resources/data/languages/es_US.json index f2919e40dc806..a709ab30ec601 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_US.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_US.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "alt": "altái meridional", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es_VE.json b/src/Symfony/Component/Intl/Resources/data/languages/es_VE.json index 7186cddfdc253..26024579b08b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es_VE.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es_VE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehnés", "arp": "arapaho", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/et.json b/src/Symfony/Component/Intl/Resources/data/languages/et.json index 16f30156d8d6f..0403b11a063e2 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/et.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/et.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afari", "ab": "abhaasi", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/eu.json b/src/Symfony/Component/Intl/Resources/data/languages/eu.json index 62a0d448cea0b..8fdc409ff73a4 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/eu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarera", "ab": "abkhaziera", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fa.json b/src/Symfony/Component/Intl/Resources/data/languages/fa.json index 52f4c3bdb9963..5e7ffd168e7d0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "آفاری", "ab": "آبخازی", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fa_AF.json b/src/Symfony/Component/Intl/Resources/data/languages/fa_AF.json index 82025f0741294..44e863471ff5a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fa_AF.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fa_AF.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ab": "افریکانس", "ar_001": "عربی فصیح", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ff.json b/src/Symfony/Component/Intl/Resources/data/languages/ff.json index 8957c1003e0d7..92cd3d3d85199 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ff.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ff.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Akaan", "am": "Amarik", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fi.json b/src/Symfony/Component/Intl/Resources/data/languages/fi.json index b2b31bfb0ed47..709214fa8877f 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abhaasi", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fo.json b/src/Symfony/Component/Intl/Resources/data/languages/fo.json index 80e588ed909fd..20908d7573765 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhasiskt", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fr.json b/src/Symfony/Component/Intl/Resources/data/languages/fr.json index e32dfabb6d86b..06f2a81caa0df 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhaze", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fr_BE.json b/src/Symfony/Component/Intl/Resources/data/languages/fr_BE.json index 4cf5b4e0f6c92..78213c0058b4d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fr_BE.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fr_BE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "frp": "franco-provençal", "goh": "ancien haut-allemand", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fr_CA.json b/src/Symfony/Component/Intl/Resources/data/languages/fr_CA.json index 27c7eaeb50f76..4bb1dd36dda47 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fr_CA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fr_CA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ady": "adygué", "ang": "vieil anglais", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fr_CH.json b/src/Symfony/Component/Intl/Resources/data/languages/fr_CH.json index c6b77ba76362a..fcefe8d3f82f2 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fr_CH.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fr_CH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "gu": "goudjrati", "pdc": "allemand de Pennsylvanie", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fy.json b/src/Symfony/Component/Intl/Resources/data/languages/fy.json index 60c6349012918..7795dfb4ba172 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fy.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abchazysk", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ga.json b/src/Symfony/Component/Intl/Resources/data/languages/ga.json index de985c18bc50e..285bdc235725d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ga.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afáiris", "ab": "Abcáisis", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/gd.json b/src/Symfony/Component/Intl/Resources/data/languages/gd.json index 0769fdf22fd3d..a268ba8c18404 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/gd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abchasais", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/gl.json b/src/Symfony/Component/Intl/Resources/data/languages/gl.json index 77f22c0e2f8bb..1dea6c72f1a0d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/gl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhazo", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/gu.json b/src/Symfony/Component/Intl/Resources/data/languages/gu.json index 62c571662b305..71ed09fb7dbe9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/gu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/gu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "અફાર", "ab": "અબખાજિયન", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/gv.json b/src/Symfony/Component/Intl/Resources/data/languages/gv.json index 204b4ae075f4d..065c2ac76d7e3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/gv.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/gv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "gv": "Gaelg" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ha.json b/src/Symfony/Component/Intl/Resources/data/languages/ha.json index 8cd89ff9e0d15..46dc0b0c480bb 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ha.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ha.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "Afirkanci", "agq": "Aghem", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ha_NE.json b/src/Symfony/Component/Intl/Resources/data/languages/ha_NE.json index 9567cd1ae8a9b..b395599fc6653 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ha_NE.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ha_NE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "Larabci Asali Na Zamani", "de_AT": "Jamusanci Ostiriya", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/he.json b/src/Symfony/Component/Intl/Resources/data/languages/he.json index 626a045e073dd..5cbab8ce305a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/he.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/he.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "אפארית", "ab": "אבחזית", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/hi.json b/src/Symfony/Component/Intl/Resources/data/languages/hi.json index 3dce24462e9be..b2465bab6abca 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/hi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "अफ़ार", "ab": "अब्ख़ाज़ियन", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/hr.json b/src/Symfony/Component/Intl/Resources/data/languages/hr.json index 5afd5c9ba6ab7..55ce6f6091b2f 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/hr.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/hr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarski", "ab": "abhaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/hu.json b/src/Symfony/Component/Intl/Resources/data/languages/hu.json index bc3f811ce92e4..d63ee8e376025 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/hu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/hu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abház", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/hy.json b/src/Symfony/Component/Intl/Resources/data/languages/hy.json index 18275dede47a3..256daae7a049e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/hy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "աֆարերեն", "ab": "աբխազերեն", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ia.json b/src/Symfony/Component/Intl/Resources/data/languages/ia.json index d5e4140d08b5f..0431e5a42170d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ia.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ia.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhazo", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/id.json b/src/Symfony/Component/Intl/Resources/data/languages/id.json index b0ae423c5a0c5..9bfdef558384b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/id.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/id.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abkhaz", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ig.json b/src/Symfony/Component/Intl/Resources/data/languages/ig.json index b7a36cea60be5..ad1e8f014f775 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ig.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ig.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Akan", "am": "Amariikị", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ii.json b/src/Symfony/Component/Intl/Resources/data/languages/ii.json index 24c0997ea2cb5..c0cceb4697144 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ii.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ii.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "de": "ꄓꇩꉙ", "en": "ꑱꇩꉙ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/in.json b/src/Symfony/Component/Intl/Resources/data/languages/in.json index b0ae423c5a0c5..9bfdef558384b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/in.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/in.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abkhaz", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/is.json b/src/Symfony/Component/Intl/Resources/data/languages/is.json index d95cf29b7f8c8..2fa5c347ea577 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/is.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/is.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afár", "ab": "abkasíska", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/it.json b/src/Symfony/Component/Intl/Resources/data/languages/it.json index a9b4300c041f6..721c07c6e76c7 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/it.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/it.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abcaso", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/iw.json b/src/Symfony/Component/Intl/Resources/data/languages/iw.json index 626a045e073dd..5cbab8ce305a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/iw.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/iw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "אפארית", "ab": "אבחזית", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ja.json b/src/Symfony/Component/Intl/Resources/data/languages/ja.json index 967b62a8d282d..1e873a0c0ebc8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ja.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "アファル語", "ab": "アブハズ語", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/jv.json b/src/Symfony/Component/Intl/Resources/data/languages/jv.json index a4d37315dd6b6..e199a081b9667 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/jv.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/jv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "af", "agq": "Aghem", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ka.json b/src/Symfony/Component/Intl/Resources/data/languages/ka.json index 4479ed4e34b19..cd7aa28306e0c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ka.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ka.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "აფარი", "ab": "აფხაზური", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ki.json b/src/Symfony/Component/Intl/Resources/data/languages/ki.json index 7b20e374c58b9..38b0594aeebc5 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ki.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ki.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Kiakan", "am": "Kiamhari", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/kk.json b/src/Symfony/Component/Intl/Resources/data/languages/kk.json index 4a0a52bdd5591..a90169b2004aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/kk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афар тілі", "ab": "абхаз тілі", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/kl.json b/src/Symfony/Component/Intl/Resources/data/languages/kl.json index b2411f683650a..38820f073a243 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/kl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/kl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "kl": "kalaallisut" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/km.json b/src/Symfony/Component/Intl/Resources/data/languages/km.json index 212d25773dd81..6d1fc53421bde 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/km.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/km.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "អាហ្វារ", "ab": "អាប់ខាហ៊្សាន", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/kn.json b/src/Symfony/Component/Intl/Resources/data/languages/kn.json index 7e7da1310926a..406e831a23bbb 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/kn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/kn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "ಅಫಾರ್", "ab": "ಅಬ್ಖಾಜಿಯನ್", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ko.json b/src/Symfony/Component/Intl/Resources/data/languages/ko.json index 46501b4e01c5c..7af9c3940b9c3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ko.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "아파르어", "ab": "압카즈어", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ks.json b/src/Symfony/Component/Intl/Resources/data/languages/ks.json index 51da34468db40..d80ce0b0d12ee 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ks.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ks.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "اَفار", "ab": "اَبخازِیان", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ku.json b/src/Symfony/Component/Intl/Resources/data/languages/ku.json index 217e01a1f5257..c0a061b2ac458 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ku.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ku.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarî", "ab": "abxazî", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/kw.json b/src/Symfony/Component/Intl/Resources/data/languages/kw.json index 9cfa7696c1ed5..c9b2d4b621bcb 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/kw.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/kw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "kw": "kernewek" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ky.json b/src/Symfony/Component/Intl/Resources/data/languages/ky.json index 6870a17a33d6c..fd8ee5d305e7a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ky.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарча", "ab": "абхазча", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/lb.json b/src/Symfony/Component/Intl/Resources/data/languages/lb.json index 30f761e0edc64..1f620194b6cee 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/lb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abchasesch", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/lg.json b/src/Symfony/Component/Intl/Resources/data/languages/lg.json index c76546d4160df..68cdb04532b1d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/lg.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/lg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Lu-akaani", "am": "Lu-amhariki", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ln.json b/src/Symfony/Component/Intl/Resources/data/languages/ln.json index db0ff58ac1d82..03c31285a091c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ln.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ln.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "akan", "am": "liamariki", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/lo.json b/src/Symfony/Component/Intl/Resources/data/languages/lo.json index 70b52bd84da94..063294e006a89 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/lo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/lo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "ອະຟາ", "ab": "ແອບຄາຊຽນ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/lt.json b/src/Symfony/Component/Intl/Resources/data/languages/lt.json index 04e1666205269..4c6e814278a02 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/lt.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/lt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarų", "ab": "abchazų", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/lu.json b/src/Symfony/Component/Intl/Resources/data/languages/lu.json index 83a3e438036eb..5f18a3d2ae584 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/lu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/lu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Liakan", "am": "Liamhariki", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/lv.json b/src/Symfony/Component/Intl/Resources/data/languages/lv.json index 2d16603a3271c..52e911f0c505d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/lv.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/lv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afāru", "ab": "abhāzu", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/meta.json b/src/Symfony/Component/Intl/Resources/data/languages/meta.json index 7bb02de7048dc..87a38d9430212 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/meta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Languages": [ "aa", "ab", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mg.json b/src/Symfony/Component/Intl/Resources/data/languages/mg.json index 9180975a14f03..014ffcf985286 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mg.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Akan", "am": "Amharika", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mi.json b/src/Symfony/Component/Intl/Resources/data/languages/mi.json index c31fa9fdbac27..5937766bae1bf 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "de": "Tiamana", "de_AT": "Tiamana Atiria", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mk.json b/src/Symfony/Component/Intl/Resources/data/languages/mk.json index a005ff57732aa..850e2e2bb1cad 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарски", "ab": "апхаски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ml.json b/src/Symfony/Component/Intl/Resources/data/languages/ml.json index 9ba274f0d6bc3..b8ca4e3466b15 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ml.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ml.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "അഫാർ", "ab": "അബ്‌ഖാസിയൻ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mn.json b/src/Symfony/Component/Intl/Resources/data/languages/mn.json index bd3cd0ef4e6ab..652e744d3c367 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афар", "ab": "абхаз", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mo.json b/src/Symfony/Component/Intl/Resources/data/languages/mo.json index a262ef51c04c5..4502bf2e28954 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abhază", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mr.json b/src/Symfony/Component/Intl/Resources/data/languages/mr.json index 7cef4e3d548ed..90ce6cbd5871c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mr.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "अफार", "ab": "अबखेजियन", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ms.json b/src/Symfony/Component/Intl/Resources/data/languages/ms.json index 638be569ae0fa..56a39d9fa95e3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ms.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ms.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abkhazia", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mt.json b/src/Symfony/Component/Intl/Resources/data/languages/mt.json index ac99857573390..93c8c2cce7dd9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abkażjan", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/my.json b/src/Symfony/Component/Intl/Resources/data/languages/my.json index acc05d8162f4e..4cf7251f11119 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/my.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/my.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "အာဖာ", "ab": "အဘ်ခါဇီရာ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/nb.json b/src/Symfony/Component/Intl/Resources/data/languages/nb.json index fdc1dcf990e75..25dba7ebc65e8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/nb.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/nb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhasisk", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/nd.json b/src/Symfony/Component/Intl/Resources/data/languages/nd.json index d31d758e7a663..cad53c477c278 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/nd.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/nd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "isi-Akhani", "am": "isi-Amaharikhi", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ne.json b/src/Symfony/Component/Intl/Resources/data/languages/ne.json index 057043ac543b4..5b21e87211767 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ne.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "अफार", "ab": "अब्खाजियाली", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/nl.json b/src/Symfony/Component/Intl/Resources/data/languages/nl.json index aa4e6090a3ace..8a9f6fdce1f9d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/nl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abchazisch", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/nn.json b/src/Symfony/Component/Intl/Resources/data/languages/nn.json index 4e4cc2558181b..7b37f2e2aeedf 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/nn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhasisk", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/no.json b/src/Symfony/Component/Intl/Resources/data/languages/no.json index fdc1dcf990e75..25dba7ebc65e8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/no.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/no.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abkhasisk", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/om.json b/src/Symfony/Component/Intl/Resources/data/languages/om.json index 466a1391f57cf..0abf3ae02e7b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/om.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/om.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "Afrikoota", "am": "Afaan Sidaamaa", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/or.json b/src/Symfony/Component/Intl/Resources/data/languages/or.json index 0cdf1a113885f..94abb2766e803 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/or.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/or.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "ଅଫାର୍", "ab": "ଆବ୍ଖାଜିଆନ୍", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/os.json b/src/Symfony/Component/Intl/Resources/data/languages/os.json index 501edc11955e1..824f61cdef287 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/os.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/os.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ab": "абхазаг", "ady": "адыгейаг", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/pa.json b/src/Symfony/Component/Intl/Resources/data/languages/pa.json index 47e391365fe18..46a860fd9cbb5 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/pa.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/pa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "ਅਫ਼ਾਰ", "ab": "ਅਬਖਾਜ਼ੀਅਨ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/pa_Arab.json b/src/Symfony/Component/Intl/Resources/data/languages/pa_Arab.json index 638161bb0f436..d912cbcf12dcf 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/pa_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/pa_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "pa": "پنجابی" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/pl.json b/src/Symfony/Component/Intl/Resources/data/languages/pl.json index 13f7ab872df64..90febbc5c8d2e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/pl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/pl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abchaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ps.json b/src/Symfony/Component/Intl/Resources/data/languages/ps.json index 18cadf20e7f7d..12eadd091e6a3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ps.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "افري", "ab": "ابخازي", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ps_PK.json b/src/Symfony/Component/Intl/Resources/data/languages/ps_PK.json index 096023da9fda0..72832d029b09d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ps_PK.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ps_PK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "نوے معياري عربي", "dsb": "لوړے سربي", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/pt.json b/src/Symfony/Component/Intl/Resources/data/languages/pt.json index f88ba6691a711..a3a08b1064d79 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/pt.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/pt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abcázio", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json index 1e96096a0e84d..404cfaac5f7db 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "africanês", "alt": "altai do sul", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/qu.json b/src/Symfony/Component/Intl/Resources/data/languages/qu.json index 65bd1977db60b..060889a8a6b51 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/qu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "Afrikaans Simi", "agq": "Aghem Simi", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/rm.json b/src/Symfony/Component/Intl/Resources/data/languages/rm.json index aa1b6bac2be61..8943ef701d127 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/rm.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/rm.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abchasian", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/rn.json b/src/Symfony/Component/Intl/Resources/data/languages/rn.json index 31d0c9e2d17c2..eaa3ca83bf22e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/rn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/rn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Igikani", "am": "Ikimuhariki", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ro.json b/src/Symfony/Component/Intl/Resources/data/languages/ro.json index a262ef51c04c5..4502bf2e28954 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ro.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abhază", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ro_MD.json b/src/Symfony/Component/Intl/Resources/data/languages/ro_MD.json index 9a7286132b74f..8194c1db06722 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ro_MD.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ro_MD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "sw_CD": "swahili (R. D. Congo)", "wal": "wolaytta" diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ru.json b/src/Symfony/Component/Intl/Resources/data/languages/ru.json index 6e7db1c33a884..71f76081624cf 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ru.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарский", "ab": "абхазский", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/rw.json b/src/Symfony/Component/Intl/Resources/data/languages/rw.json index d429f82d83b99..b178f7a5be08b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/rw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "Ikinyafurikaneri", "am": "Inyamuhariki", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sd.json b/src/Symfony/Component/Intl/Resources/data/languages/sd.json index 1f752018895bd..8939c02be2f6b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "افار", "ab": "ابقازیان", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/se.json b/src/Symfony/Component/Intl/Resources/data/languages/se.json index 0e3d47cc35a30..36cb23ad5cb22 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/se.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/se.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "acehgiella", "af": "afrikánsagiella", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/se_FI.json b/src/Symfony/Component/Intl/Resources/data/languages/se_FI.json index 0939bc662df7a..b1f906291704c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/se_FI.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/se_FI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ace": "ačehgiella", "ar_001": "standárda arábagiella", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sg.json b/src/Symfony/Component/Intl/Resources/data/languages/sg.json index 48f2bf530ec1a..235befde5cb11 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sg.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Akâan", "am": "Amarîki", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sh.json b/src/Symfony/Component/Intl/Resources/data/languages/sh.json index 6f8d5c5b07b6c..0097827d5e62d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarski", "ab": "abhaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sh_BA.json b/src/Symfony/Component/Intl/Resources/data/languages/sh_BA.json index 10b02c30b84b8..9793696da0843 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sh_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sh_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "mapudungun", "be": "bjeloruski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/si.json b/src/Symfony/Component/Intl/Resources/data/languages/si.json index f28128901eae9..c9f7b10bbf699 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/si.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/si.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "අෆාර්", "ab": "ඇබ්කාසියානු", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sk.json b/src/Symfony/Component/Intl/Resources/data/languages/sk.json index a64bf1c5955d1..f12ceac3dcae4 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarčina", "ab": "abcházčina", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sl.json b/src/Symfony/Component/Intl/Resources/data/languages/sl.json index 9f7fc134d2330..29a86ca848799 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarščina", "ab": "abhaščina", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sn.json b/src/Symfony/Component/Intl/Resources/data/languages/sn.json index b37e808b3b3a0..cb1fa66a5359a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "chiAkani", "am": "chiAmaric", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/so.json b/src/Symfony/Component/Intl/Resources/data/languages/so.json index eb0c32fd59970..b6b875d7d7d89 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/so.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/so.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "Afrikaanka", "agq": "Ageem", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sq.json b/src/Symfony/Component/Intl/Resources/data/languages/sq.json index 4208d4724d245..93c74f3d92bba 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sq.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sq.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarisht", "ab": "abkazisht", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr.json b/src/Symfony/Component/Intl/Resources/data/languages/sr.json index cb4d46e7bb424..0fe5a64f990d2 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарски", "ab": "абхаски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_BA.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_BA.json index ff019802626d5..0d0708b41f7b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "мапудунгун", "be": "бјелоруски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_BA.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_BA.json index ff019802626d5..0d0708b41f7b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "мапудунгун", "be": "бјелоруски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_ME.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_ME.json index b4da1e7f7760b..e28ef6e209336 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_ME.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_ME.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "мапудунгун", "be": "бјелоруски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_XK.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_XK.json index 7a66f3941feb7..e5d5608e4150f 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_XK.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Cyrl_XK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "bm": "бамананкан", "bn": "бангла", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json index 6f8d5c5b07b6c..0097827d5e62d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afarski", "ab": "abhaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_BA.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_BA.json index 10b02c30b84b8..9793696da0843 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "mapudungun", "be": "bjeloruski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_ME.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_ME.json index 88a559a8f301b..a7f7df1c3e9ea 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_ME.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_ME.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "mapudungun", "be": "bjeloruski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_XK.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_XK.json index 571314ca6975c..9c4d37e978330 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_XK.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn_XK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "bm": "bamanankan", "bn": "bangla", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_ME.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_ME.json index 88a559a8f301b..a7f7df1c3e9ea 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_ME.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_ME.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "arn": "mapudungun", "be": "bjeloruski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_XK.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_XK.json index 7a66f3941feb7..e5d5608e4150f 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_XK.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_XK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "bm": "бамананкан", "bn": "бангла", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sv.json b/src/Symfony/Component/Intl/Resources/data/languages/sv.json index 2d54f5cef8968..beb536e4f2da4 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sv.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abchaziska", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sw.json b/src/Symfony/Component/Intl/Resources/data/languages/sw.json index 9ed16623cb9ca..aacf5cd3dbc28 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sw.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Kiafar", "ab": "Kiabkhazi", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sw_CD.json b/src/Symfony/Component/Intl/Resources/data/languages/sw_CD.json index 43d97d8f0fca4..42695b975439c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sw_CD.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sw_CD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ak": "Kiakan", "ar_001": "Kiarabu cha Dunia Kilichosanifishwa", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sw_KE.json b/src/Symfony/Component/Intl/Resources/data/languages/sw_KE.json index 04599d2c9f69c..f4a1b2fee9254 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sw_KE.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sw_KE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "Kiarabu sanifu", "arq": "Kiarabu cha Aljeria", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ta.json b/src/Symfony/Component/Intl/Resources/data/languages/ta.json index 44bada55ed580..7c48e05f44a04 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ta.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "அஃபார்", "ab": "அப்காஜியான்", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/te.json b/src/Symfony/Component/Intl/Resources/data/languages/te.json index b37881958ae2d..195f731fd92c9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/te.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/te.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "అఫార్", "ab": "అబ్ఖాజియన్", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tg.json b/src/Symfony/Component/Intl/Resources/data/languages/tg.json index 604452f51621a..2e8e85d5ac80e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "африкаанс", "am": "амҳарӣ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/th.json b/src/Symfony/Component/Intl/Resources/data/languages/th.json index 712312c6b1a71..335d019a77554 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/th.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/th.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "อะฟาร์", "ab": "อับฮาเซีย", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ti.json b/src/Symfony/Component/Intl/Resources/data/languages/ti.json index 8624d59f855b1..0a1bfe2b2e9c5 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ti.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "አፍሪቃንሰኛ", "am": "አምሐረኛ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tk.json b/src/Symfony/Component/Intl/Resources/data/languages/tk.json index 2248d8438df54..93518d7a1f071 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar dili", "ab": "abhaz dili", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tl.json b/src/Symfony/Component/Intl/Resources/data/languages/tl.json index c2d200e825c27..f22e2e9b75170 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abkhazian", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/to.json b/src/Symfony/Component/Intl/Resources/data/languages/to.json index 5e875450e4ffb..45b1b4a58fd08 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/to.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/to.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "lea fakaʻafāla", "ab": "lea fakaʻapakasia", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tr.json b/src/Symfony/Component/Intl/Resources/data/languages/tr.json index b22267129c0a4..5bbc01e42974b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tr.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Afar", "ab": "Abhazca", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tt.json b/src/Symfony/Component/Intl/Resources/data/languages/tt.json index c99ac3fbe5a87..2025ef7429f64 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "африкаанс", "am": "амхар", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ug.json b/src/Symfony/Component/Intl/Resources/data/languages/ug.json index 513b8012374de..fd5fff37593ed 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ug.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "ئافارچە", "ab": "ئابخازچە", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/uk.json b/src/Symfony/Component/Intl/Resources/data/languages/uk.json index 306991cedff59..2d0e28f35c784 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/uk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарська", "ab": "абхазька", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ur.json b/src/Symfony/Component/Intl/Resources/data/languages/ur.json index d5469fb0d6141..a808358954dd6 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ur.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "افار", "ab": "ابقازیان", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ur_IN.json b/src/Symfony/Component/Intl/Resources/data/languages/ur_IN.json index f98723cda29da..1b52cabb6c79b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ur_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ur_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "ar_001": "جدید معیاری عربی", "awa": "اودھی", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/uz.json b/src/Symfony/Component/Intl/Resources/data/languages/uz.json index c5aebf38d2195..6202f2eaaa4c9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/uz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "afar", "ab": "abxaz", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/uz_Arab.json b/src/Symfony/Component/Intl/Resources/data/languages/uz_Arab.json index c2e64d35c1dd5..bd5a73334f66c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/uz_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/uz_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "fa": "دری", "ps": "پشتو", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json index fbdb8e2ec7d31..26ec5e6639e1c 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "афарча", "ab": "абхазча", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/vi.json b/src/Symfony/Component/Intl/Resources/data/languages/vi.json index 954edb29dade1..f4ebf8ce984d8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/vi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "Tiếng Afar", "ab": "Tiếng Abkhazia", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/wo.json b/src/Symfony/Component/Intl/Resources/data/languages/wo.json index e766a65030d99..f20a2eddf2f35 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/wo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "Afrikaans", "am": "Amharik", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/xh.json b/src/Symfony/Component/Intl/Resources/data/languages/xh.json index cfc1355c2b2af..59d4a98c8180a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/xh.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/xh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "xh": "isiXhosa" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/yi.json b/src/Symfony/Component/Intl/Resources/data/languages/yi.json index fd6243b38e9a7..d2c08af1f41cb 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/yi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/yi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "אַפֿאַר", "af": "אַפֿריקאַנס", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/yo.json b/src/Symfony/Component/Intl/Resources/data/languages/yo.json index dc4d3a83f7cae..6b68586579ead 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/yo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/yo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "af": "Èdè Afrikani", "ak": "Èdè Akani", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/yo_BJ.json b/src/Symfony/Component/Intl/Resources/data/languages/yo_BJ.json index e5ee8bd9f39a8..1d315095c11b8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/yo_BJ.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/yo_BJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "da": "Èdè Ilɛ̀ Denmark", "de_AT": "Èdè Jámánì (Ɔ́síríà )", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/zh.json b/src/Symfony/Component/Intl/Resources/data/languages/zh.json index 70e2a778f29a8..e432c21d1acef 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/zh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "阿法尔语", "ab": "阿布哈西亚语", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/zh_HK.json b/src/Symfony/Component/Intl/Resources/data/languages/zh_HK.json index 5d8194d6003e2..9afdc3c758630 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/zh_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/zh_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "阿法爾文", "az": "阿塞拜疆文", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json index 8e918cee8d516..dbefdf9b93615 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "阿法文", "ab": "阿布哈茲文", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant_HK.json b/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant_HK.json index 5d8194d6003e2..9afdc3c758630 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "阿法爾文", "az": "阿塞拜疆文", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/zu.json b/src/Symfony/Component/Intl/Resources/data/languages/zu.json index 319742f91f98b..f5d2ccad1e104 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/zu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/zu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "aa": "isi-Afar", "ab": "isi-Abkhazian", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/af.json b/src/Symfony/Component/Intl/Resources/data/regions/af.json index 0d78d89f607fb..61b63f35bac97 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/af.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/af.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascensioneiland", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ak.json b/src/Symfony/Component/Intl/Resources/data/regions/ak.json index 9575d615f8328..a1aacb308012f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ak.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ak.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andora", "AE": "United Arab Emirates", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/am.json b/src/Symfony/Component/Intl/Resources/data/regions/am.json index bb8e86d1c4688..db65b1d9ff89a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/am.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/am.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "አሴንሽን ደሴት", "AD": "አንዶራ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ar.json b/src/Symfony/Component/Intl/Resources/data/regions/ar.json index 514fa077d4896..c93ddeea94b32 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ar.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "جزيرة أسينشيون", "AD": "أندورا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ar_LY.json b/src/Symfony/Component/Intl/Resources/data/regions/ar_LY.json index c1094f6326510..147fe60bf268c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ar_LY.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ar_LY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "EA": "سبتة ومليلية", "MS": "مونتيسيرات", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ar_SA.json b/src/Symfony/Component/Intl/Resources/data/regions/ar_SA.json index a72a28c542179..e4def07a8b2a2 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ar_SA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ar_SA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "جزيرة أسينشين", "EA": "سبتة ومليلية", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/as.json b/src/Symfony/Component/Intl/Resources/data/regions/as.json index 4e43ac5a63ef9..1e7372d17583a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/as.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/as.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "এচেনচিয়ন দ্বীপ", "AD": "আন্দোৰা", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/az.json b/src/Symfony/Component/Intl/Resources/data/regions/az.json index 10f6a86ff933c..ed594387f237f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/az.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/az.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Askenson adası", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/az_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/regions/az_Cyrl.json index 73f2662eb97f7..7b529326fe234 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/az_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/az_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Аскенсон адасы", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/be.json b/src/Symfony/Component/Intl/Resources/data/regions/be.json index 5742c04419ec9..b703fd80b31f2 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/be.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/be.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Востраў Узнясення", "AD": "Андора", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bg.json b/src/Symfony/Component/Intl/Resources/data/regions/bg.json index 468b9f275297c..98103fc8cd7f7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bg.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "остров Възнесение", "AD": "Андора", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bm.json b/src/Symfony/Component/Intl/Resources/data/regions/bm.json index c7f754ebf419f..f6b06d0e08216 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bm.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bm.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andɔr", "AE": "Arabu mara kafoli", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bn.json b/src/Symfony/Component/Intl/Resources/data/regions/bn.json index 801228076316a..63cff023c7de2 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "অ্যাসসেনশন আইল্যান্ড", "AD": "আন্ডোরা", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bn_IN.json b/src/Symfony/Component/Intl/Resources/data/regions/bn_IN.json index 9501c7f229844..c3f8efe974af4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bn_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bn_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "UM": "মার্কিন যুক্তরাষ্ট্রের পার্শ্ববর্তী দ্বীপপুঞ্জ" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bo.json b/src/Symfony/Component/Intl/Resources/data/regions/bo.json index 69d699de82b80..54830071fbd47 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CN": "རྒྱ་ནག", "DE": "འཇར་མན་", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bo_IN.json b/src/Symfony/Component/Intl/Resources/data/regions/bo_IN.json index 926801b767187..98588d8002b2b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bo_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bo_IN.json @@ -1,4 +1,4 @@ { - "Version": "36", + "Version": "36.1", "Names": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/br.json b/src/Symfony/Component/Intl/Resources/data/regions/br.json index 40f22eca5bd38..1b80ce1e9d94f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/br.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/br.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Enez Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs.json b/src/Symfony/Component/Intl/Resources/data/regions/bs.json index 79f58bcbd7a1a..68c9810cb32e0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ostrvo Ascension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json index 554cb05b5018c..62bf00613c473 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Острво Асенсион", "AD": "Андора", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ca.json b/src/Symfony/Component/Intl/Resources/data/regions/ca.json index c2705ca5ffb94..c896fdd622bb9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ca.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ca.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Illa de l’Ascensió", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ce.json b/src/Symfony/Component/Intl/Resources/data/regions/ce.json index 7e2cf64a5e80c..333fbe4be777f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ce.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ce.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Айъадаларан гӀайре", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cs.json b/src/Symfony/Component/Intl/Resources/data/regions/cs.json index 705ca5d9a6422..71572db78a8cd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/cs.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/cs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cy.json b/src/Symfony/Component/Intl/Resources/data/regions/cy.json index fc386b712baf0..1027e248ea5ed 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/cy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ynys Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/da.json b/src/Symfony/Component/Intl/Resources/data/regions/da.json index f49f616b4d922..9f2d2df662bf8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/da.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/da.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascensionøen", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/de.json b/src/Symfony/Component/Intl/Resources/data/regions/de.json index 3604075853506..3b2608fba75bd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/de.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/de.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/de_AT.json b/src/Symfony/Component/Intl/Resources/data/regions/de_AT.json index 93eaecdcf686e..6330c51857fc7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/de_AT.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/de_AT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "SJ": "Svalbard und Jan Mayen" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/de_CH.json b/src/Symfony/Component/Intl/Resources/data/regions/de_CH.json index 2191489733156..3c7daab639ed2 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/de_CH.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/de_CH.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BN": "Brunei", "BW": "Botswana", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/dz.json b/src/Symfony/Component/Intl/Resources/data/regions/dz.json index 5859973b64676..9a946f36a6461 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/dz.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/dz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ཨེ་སེན་ཤུན་ཚོ་གླིང༌", "AD": "ཨཱན་དོ་ར", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ee.json b/src/Symfony/Component/Intl/Resources/data/regions/ee.json index eb88b29f69dff..550c896c46e9e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ee.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ee.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension ƒudomekpo nutome", "AD": "Andorra nutome", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/el.json b/src/Symfony/Component/Intl/Resources/data/regions/el.json index c3d982504c499..951d6a008876a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/el.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/el.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Νήσος Ασενσιόν", "AD": "Ανδόρα", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/en.json b/src/Symfony/Component/Intl/Resources/data/regions/en.json index 2c74cecce5c2a..b258071a120a5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/en.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/en.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension Island", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/en_001.json b/src/Symfony/Component/Intl/Resources/data/regions/en_001.json index ca394a1572f0e..6bc6012632d2d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/en_001.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/en_001.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BL": "St Barthélemy", "KN": "St Kitts & Nevis", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/en_AU.json b/src/Symfony/Component/Intl/Resources/data/regions/en_AU.json index bf50970760ebe..eff29f21f7254 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/en_AU.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/en_AU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BL": "St. Barthélemy", "KN": "St. Kitts & Nevis", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/eo.json b/src/Symfony/Component/Intl/Resources/data/regions/eo.json index bd3f08cb491d1..abfbb71d1db9e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/eo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/eo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andoro", "AE": "Unuiĝintaj Arabaj Emirlandoj", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es.json b/src/Symfony/Component/Intl/Resources/data/regions/es.json index 0c9cbb0d3dc3a..2e6c035004d7d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Isla de la Ascensión", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_419.json b/src/Symfony/Component/Intl/Resources/data/regions/es_419.json index 36e2df393de8e..9104af3d780c5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_419.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_419.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Isla Ascensión", "BA": "Bosnia-Herzegovina", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_AR.json b/src/Symfony/Component/Intl/Resources/data/regions/es_AR.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_AR.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_AR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_BO.json b/src/Symfony/Component/Intl/Resources/data/regions/es_BO.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_BO.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_BO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_CL.json b/src/Symfony/Component/Intl/Resources/data/regions/es_CL.json index 807499b0ab505..89aeea6c5e595 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_CL.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_CL.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "EH": "Sahara Occidental", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_CO.json b/src/Symfony/Component/Intl/Resources/data/regions/es_CO.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_CO.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_CO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_CR.json b/src/Symfony/Component/Intl/Resources/data/regions/es_CR.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_CR.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_CR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_DO.json b/src/Symfony/Component/Intl/Resources/data/regions/es_DO.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_DO.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_DO.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_EC.json b/src/Symfony/Component/Intl/Resources/data/regions/es_EC.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_EC.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_EC.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_GT.json b/src/Symfony/Component/Intl/Resources/data/regions/es_GT.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_GT.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_GT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_HN.json b/src/Symfony/Component/Intl/Resources/data/regions/es_HN.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_HN.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_HN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json b/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json index 1bd007bf049dd..10835c3bd3204 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "CI": "Côte d’Ivoire", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_NI.json b/src/Symfony/Component/Intl/Resources/data/regions/es_NI.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_NI.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_NI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_PA.json b/src/Symfony/Component/Intl/Resources/data/regions/es_PA.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_PA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_PA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_PE.json b/src/Symfony/Component/Intl/Resources/data/regions/es_PE.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_PE.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_PE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_PR.json b/src/Symfony/Component/Intl/Resources/data/regions/es_PR.json index 5b82ae2884696..9da9e4c46f344 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_PR.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_PR.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "UM": "Islas menores alejadas de EE. UU." } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_PY.json b/src/Symfony/Component/Intl/Resources/data/regions/es_PY.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_PY.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_PY.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_SV.json b/src/Symfony/Component/Intl/Resources/data/regions/es_SV.json index 5b82ae2884696..9da9e4c46f344 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_SV.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_SV.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "UM": "Islas menores alejadas de EE. UU." } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_US.json b/src/Symfony/Component/Intl/Resources/data/regions/es_US.json index 08b3dfa799baf..76c239647fb1f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_US.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_US.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Isla de la Ascensión", "BA": "Bosnia y Herzegovina", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_VE.json b/src/Symfony/Component/Intl/Resources/data/regions/es_VE.json index bfe0012bd7847..832fa10ba9128 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_VE.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_VE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia y Herzegovina", "TA": "Tristán de Acuña", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/et.json b/src/Symfony/Component/Intl/Resources/data/regions/et.json index 82e319d118f0d..d949fbec401f4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/et.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/et.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascensioni saar", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/eu.json b/src/Symfony/Component/Intl/Resources/data/regions/eu.json index 79f3b4a03b796..9f88e2c21b212 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/eu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension uhartea", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fa.json b/src/Symfony/Component/Intl/Resources/data/regions/fa.json index ec854a054480e..f09fb16c617fd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "جزایر آسنسیون", "AD": "آندورا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fa_AF.json b/src/Symfony/Component/Intl/Resources/data/regions/fa_AF.json index 38d4f3dca854c..0c14e3aff9108 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fa_AF.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fa_AF.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "اندورا", "AG": "انتیگوا و باربودا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ff.json b/src/Symfony/Component/Intl/Resources/data/regions/ff.json index ad9ad16701756..68bd9c40dd7d5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ff.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ff.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Anndoora", "AE": "Emiraat Araab Denntuɗe", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fi.json b/src/Symfony/Component/Intl/Resources/data/regions/fi.json index 6fa1e976a4c65..180de4025f329 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension-saari", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fo.json b/src/Symfony/Component/Intl/Resources/data/regions/fo.json index 0981b062add89..6fb69a88d0f5e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fr.json b/src/Symfony/Component/Intl/Resources/data/regions/fr.json index 74abdfba42899..0bf3acec5e25e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Île de l’Ascension", "AD": "Andorre", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fr_BE.json b/src/Symfony/Component/Intl/Resources/data/regions/fr_BE.json index ae2413d98bfdc..2790802091bff 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fr_BE.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fr_BE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BN": "Brunei", "GS": "Îles Géorgie du Sud et Sandwich du Sud" diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fr_CA.json b/src/Symfony/Component/Intl/Resources/data/regions/fr_CA.json index 25e6cb2f276fa..379bc73078aa8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fr_CA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fr_CA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "île de l’Ascension", "AX": "îles d’Åland", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fy.json b/src/Symfony/Component/Intl/Resources/data/regions/fy.json index f0ede7a66a522..3eb69d074b974 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fy.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ga.json b/src/Symfony/Component/Intl/Resources/data/regions/ga.json index 0a082e3e74f20..d8796559dd470 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ga.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Oileán na Deascabhála", "AD": "Andóra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gd.json b/src/Symfony/Component/Intl/Resources/data/regions/gd.json index 0bc6d3c7ed4d2..17faa6791c5c9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Eilean na Deasgabhalach", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gl.json b/src/Symfony/Component/Intl/Resources/data/regions/gl.json index c85c1e66996c1..f2d9deac9a610 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Illa de Ascensión", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gu.json b/src/Symfony/Component/Intl/Resources/data/regions/gu.json index cb84a951df008..1b7a22373c07a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "એસેન્શન આઇલેન્ડ", "AD": "ઍંડોરા", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gv.json b/src/Symfony/Component/Intl/Resources/data/regions/gv.json index 4d020d39f531c..8fa5295acfe6a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gv.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GB": "Rywvaneth Unys", "IM": "Ellan Vannin" diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ha.json b/src/Symfony/Component/Intl/Resources/data/regions/ha.json index 94e21f3f32352..89f5c757484ba 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ha.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ha.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andora", "AE": "Haɗaɗɗiyar Daular Larabawa", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/he.json b/src/Symfony/Component/Intl/Resources/data/regions/he.json index 23a7363eba301..9328661d0e44a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/he.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/he.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "האי אסנשן", "AD": "אנדורה", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hi.json b/src/Symfony/Component/Intl/Resources/data/regions/hi.json index 3302851bafc7e..423dca4904a30 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "असेंशन द्वीप", "AD": "एंडोरा", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hr.json b/src/Symfony/Component/Intl/Resources/data/regions/hr.json index a5a33ccfe0994..882e54bffd1e6 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Otok Ascension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hu.json b/src/Symfony/Component/Intl/Resources/data/regions/hu.json index c65a2da42ffa8..8b9fb63a50902 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension-sziget", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hy.json b/src/Symfony/Component/Intl/Resources/data/regions/hy.json index 8906e0e23c33d..8f29690f8b9e2 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Համբարձման կղզի", "AD": "Անդորրա", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ia.json b/src/Symfony/Component/Intl/Resources/data/regions/ia.json index 64ede601ca9c9..c856d206ce0af 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ia.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ia.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andorra", "AE": "Emiratos Arabe Unite", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/id.json b/src/Symfony/Component/Intl/Resources/data/regions/id.json index b3b03c1e6d3e8..8672fce3a0e51 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/id.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/id.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Pulau Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ig.json b/src/Symfony/Component/Intl/Resources/data/regions/ig.json index 1029c827e5d12..5a040d4d55a30 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ig.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ig.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension Island", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ii.json b/src/Symfony/Component/Intl/Resources/data/regions/ii.json index 924f6aa6ad830..e127bd3129166 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ii.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ii.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BR": "ꀠꑭ", "CN": "ꍏꇩ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/in.json b/src/Symfony/Component/Intl/Resources/data/regions/in.json index b3b03c1e6d3e8..8672fce3a0e51 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/in.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/in.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Pulau Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/is.json b/src/Symfony/Component/Intl/Resources/data/regions/is.json index 6582b2f8c4ce2..089cde1cf3f85 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/is.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/is.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension-eyja", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/it.json b/src/Symfony/Component/Intl/Resources/data/regions/it.json index 7d332096189ba..309e854a571d7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/it.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/it.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Isola Ascensione", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/iw.json b/src/Symfony/Component/Intl/Resources/data/regions/iw.json index 23a7363eba301..9328661d0e44a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/iw.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/iw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "האי אסנשן", "AD": "אנדורה", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ja.json b/src/Symfony/Component/Intl/Resources/data/regions/ja.json index d8de414377134..2dc9cf19db90b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ja.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "アセンション島", "AD": "アンドラ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/jv.json b/src/Symfony/Component/Intl/Resources/data/regions/jv.json index 1ede781f1f0a0..a4b90311739b7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/jv.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/jv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Pulo Ascension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ka.json b/src/Symfony/Component/Intl/Resources/data/regions/ka.json index 071ccb195210b..1ea9c7cc4ee14 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ka.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ka.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ამაღლების კუნძული", "AD": "ანდორა", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ki.json b/src/Symfony/Component/Intl/Resources/data/regions/ki.json index 05938b601387b..4721b21eac768 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ki.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ki.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andora", "AE": "Falme za Kiarabu", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kk.json b/src/Symfony/Component/Intl/Resources/data/regions/kk.json index a42c452ba9d5d..251d8a6fd863d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/kk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Әскенжін аралы", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kl.json b/src/Symfony/Component/Intl/Resources/data/regions/kl.json index 7da31a22e6523..4ba056cba39f7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/kl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/kl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GL": "Kalaallit Nunaat" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/km.json b/src/Symfony/Component/Intl/Resources/data/regions/km.json index 8faf8665b6beb..4fd91f93c29ae 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/km.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/km.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "កោះ​អាសេនសិន", "AD": "អង់ដូរ៉ា", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kn.json b/src/Symfony/Component/Intl/Resources/data/regions/kn.json index ba789d0f7b1e7..ffc91ade01d65 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/kn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/kn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ಅಸೆನ್ಶನ್ ದ್ವೀಪ", "AD": "ಅಂಡೋರಾ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ko.json b/src/Symfony/Component/Intl/Resources/data/regions/ko.json index eda83143958b4..4916a1c7671b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ko.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "어센션 섬", "AD": "안도라", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ko_KP.json b/src/Symfony/Component/Intl/Resources/data/regions/ko_KP.json index 3028a9ef22461..4248255f8701d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ko_KP.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ko_KP.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "KP": "조선민주주의인민공화국" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ks.json b/src/Symfony/Component/Intl/Resources/data/regions/ks.json index 117985dc54764..d73905538fdaa 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ks.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ks.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "اؠنڑورا", "AE": "مُتحدہ عرَب امارات", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ku.json b/src/Symfony/Component/Intl/Resources/data/regions/ku.json index 6277f877f3419..889e923122d75 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ku.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ku.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andorra", "AE": "Emîrtiyên Erebî yên Yekbûyî", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kw.json b/src/Symfony/Component/Intl/Resources/data/regions/kw.json index ef01280c44147..3313ad49e4d76 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/kw.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/kw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "GB": "Rywvaneth Unys" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ky.json b/src/Symfony/Component/Intl/Resources/data/regions/ky.json index 3d5f65cb28966..0496522ba5eee 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ky.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Вознесение аралы", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lb.json b/src/Symfony/Component/Intl/Resources/data/regions/lb.json index 598933b0e384d..e4da6831b7d6f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lg.json b/src/Symfony/Component/Intl/Resources/data/regions/lg.json index 9951f93d15217..1ea6ace3e04b4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lg.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andora", "AE": "Emireeti", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ln.json b/src/Symfony/Component/Intl/Resources/data/regions/ln.json index 448ff65a60c27..ed9233a9cb930 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ln.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ln.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andorɛ", "AE": "Lɛmila alabo", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lo.json b/src/Symfony/Component/Intl/Resources/data/regions/lo.json index f36198839c024..02a9ff575eeb1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ເກາະອາເຊນຊັນ", "AD": "ອັນດໍຣາ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lt.json b/src/Symfony/Component/Intl/Resources/data/regions/lt.json index 73b64413c3f9c..8c8a1c22b66df 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Dangun Žengimo sala", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lu.json b/src/Symfony/Component/Intl/Resources/data/regions/lu.json index fc1b871365297..5443fad09b4cd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andore", "AE": "Lemila alabu", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lv.json b/src/Symfony/Component/Intl/Resources/data/regions/lv.json index 2fd6f50cb2937..5af1172a0c96d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lv.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Debesbraukšanas sala", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/meta.json b/src/Symfony/Component/Intl/Resources/data/regions/meta.json index c910e6427cabb..714a32e4c0414 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/meta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Regions": [ "AC", "AD", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mg.json b/src/Symfony/Component/Intl/Resources/data/regions/mg.json index 48f5c22eb7a2f..3ffda70e8fc03 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mg.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andorra", "AE": "Emirà Arabo mitambatra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mi.json b/src/Symfony/Component/Intl/Resources/data/regions/mi.json index 6feb8ebd63f3f..3996948eb2d3f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BR": "Parahi", "CN": "Haina", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mk.json b/src/Symfony/Component/Intl/Resources/data/regions/mk.json index f6973be4b44b1..0247d5d4715b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Остров Асенсион", "AD": "Андора", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ml.json b/src/Symfony/Component/Intl/Resources/data/regions/ml.json index 5dd87529d2e48..4fc0d21c83b77 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ml.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ml.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "അസൻഷൻ ദ്വീപ്", "AD": "അൻഡോറ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mn.json b/src/Symfony/Component/Intl/Resources/data/regions/mn.json index 94c6c2f0b215b..b438b36912157 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Асенсион арал", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mo.json b/src/Symfony/Component/Intl/Resources/data/regions/mo.json index bda5d0102e68e..3b3f86d3b3de3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Insula Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mr.json b/src/Symfony/Component/Intl/Resources/data/regions/mr.json index 56387cc30611a..b4d4cc93c4c9d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "अ‍ॅसेन्शियन बेट", "AD": "अँडोरा", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ms.json b/src/Symfony/Component/Intl/Resources/data/regions/ms.json index 6ced5a76a93fa..bc8d1c53ed75b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ms.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ms.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Pulau Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mt.json b/src/Symfony/Component/Intl/Resources/data/regions/mt.json index 83899b6667202..32f41a0574b4f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension Island", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/my.json b/src/Symfony/Component/Intl/Resources/data/regions/my.json index 5a9d77d8c58c8..9734a2f114723 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/my.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/my.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "အဆန်းရှင်းကျွန်း", "AD": "အန်ဒိုရာ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nb.json b/src/Symfony/Component/Intl/Resources/data/regions/nb.json index 8d9465c74ee4c..816e5825ab12a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nb.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nd.json b/src/Symfony/Component/Intl/Resources/data/regions/nd.json index 83344c4dc7450..990cf645687b5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nd.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andora", "AE": "United Arab Emirates", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ne.json b/src/Symfony/Component/Intl/Resources/data/regions/ne.json index d72dd7c642f77..af4a6dbf33a1d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ne.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "असेन्सन टापु", "AD": "अन्डोर्रा", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nl.json b/src/Symfony/Component/Intl/Resources/data/regions/nl.json index 8cc7ea18c8890..a09ada12e0249 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nn.json b/src/Symfony/Component/Intl/Resources/data/regions/nn.json index 2898a76494bb3..906b471690bc1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/no.json b/src/Symfony/Component/Intl/Resources/data/regions/no.json index 8d9465c74ee4c..816e5825ab12a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/no.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/no.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/om.json b/src/Symfony/Component/Intl/Resources/data/regions/om.json index f7d72a855df5d..13abe3b82b6f5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/om.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/om.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BR": "Brazil", "CN": "China", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/or.json b/src/Symfony/Component/Intl/Resources/data/regions/or.json index aabcb1d599ebf..11986ff24cc2c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/or.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/or.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ଆସେନସିଅନ୍‌ ଦ୍ୱୀପ", "AD": "ଆଣ୍ଡୋରା", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/os.json b/src/Symfony/Component/Intl/Resources/data/regions/os.json index 4d162da8b005a..9cf4834a00ec8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/os.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/os.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BR": "Бразили", "CN": "Китай", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pa.json b/src/Symfony/Component/Intl/Resources/data/regions/pa.json index 60eae0fea260c..dc9faea015289 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pa.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ਅਸੈਂਸ਼ਨ ਟਾਪੂ", "AD": "ਅੰਡੋਰਾ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pa_Arab.json b/src/Symfony/Component/Intl/Resources/data/regions/pa_Arab.json index 36f1c201f661d..cacbcd241e972 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pa_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pa_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PK": "پاکستان" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pl.json b/src/Symfony/Component/Intl/Resources/data/regions/pl.json index f99ff2ac47f45..10bf0b5e243a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Wyspa Wniebowstąpienia", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ps.json b/src/Symfony/Component/Intl/Resources/data/regions/ps.json index 44ac94ba9fb9e..0a621e6fb0ca9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ps.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "اسينشان ټاپو", "AD": "اندورا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ps_PK.json b/src/Symfony/Component/Intl/Resources/data/regions/ps_PK.json index fcb3949eab2aa..c7e81fe75dbd1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ps_PK.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ps_PK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "PS": "فلسطين سيمے", "TC": "د ترکیے او کیکاسو ټاپو", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pt.json b/src/Symfony/Component/Intl/Resources/data/regions/pt.json index 1a8df2330caad..7f5937b974afb 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ilha de Ascensão", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json index c7db8d1e400e7..976bde2ea8181 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AM": "Arménia", "AX": "Alanda", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/qu.json b/src/Symfony/Component/Intl/Resources/data/regions/qu.json index 932265ead6e2e..179054017f8f7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/qu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Islas Ascensión", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/rm.json b/src/Symfony/Component/Intl/Resources/data/regions/rm.json index 1d2089142db15..49b4a0b9e003e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/rm.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/rm.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andorra", "AE": "Emirats Arabs Unids", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/rn.json b/src/Symfony/Component/Intl/Resources/data/regions/rn.json index 693b8ef56b6c4..8d2518d950955 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/rn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/rn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andora", "AE": "Leta Zunze Ubumwe z’Abarabu", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ro.json b/src/Symfony/Component/Intl/Resources/data/regions/ro.json index bda5d0102e68e..3b3f86d3b3de3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ro.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Insula Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ro_MD.json b/src/Symfony/Component/Intl/Resources/data/regions/ro_MD.json index 7a40176ce139f..ae9c4052bbbc3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ro_MD.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ro_MD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MM": "Myanmar" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ru.json b/src/Symfony/Component/Intl/Resources/data/regions/ru.json index b4b35e5b59473..ea6bf36f88554 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ru.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "о-в Вознесения", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ru_UA.json b/src/Symfony/Component/Intl/Resources/data/regions/ru_UA.json index c753851080d34..048ab3c6a152b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ru_UA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ru_UA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "О-в Вознесения", "AE": "Объединенные Арабские Эмираты", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/rw.json b/src/Symfony/Component/Intl/Resources/data/regions/rw.json index 1e806c45cdb2b..2c3d6b09cb992 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/rw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MK": "Masedoniya y’Amajyaruguru", "RW": "U Rwanda", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sd.json b/src/Symfony/Component/Intl/Resources/data/regions/sd.json index cc2f434921385..2aaf79338da0d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "طلوع ٻيٽ", "AD": "اندورا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/se.json b/src/Symfony/Component/Intl/Resources/data/regions/se.json index e9a198ab5e68e..57d4d0c3f7662 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/se.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/se.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json b/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json index 39ae86e4baab3..f052eb91b42c0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BA": "Bosnia ja Hercegovina", "KH": "Kamboža", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sg.json b/src/Symfony/Component/Intl/Resources/data/regions/sg.json index 2f39313736a45..eb0a28682e949 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sg.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andôro", "AE": "Arâbo Emirâti Ôko", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sh.json b/src/Symfony/Component/Intl/Resources/data/regions/sh.json index fa115c3f5fcad..26ea85413ce9b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ostrvo Asension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sh_BA.json b/src/Symfony/Component/Intl/Resources/data/regions/sh_BA.json index ad0d6cf230785..177c2e776c0c4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sh_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sh_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BY": "Bjelorusija", "CG": "Kongo", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/si.json b/src/Symfony/Component/Intl/Resources/data/regions/si.json index c4c4d093c0ea1..fb675c4975066 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/si.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/si.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ඇසෙන්ෂන් දිවයින", "AD": "ඇන්ඩෝරාව", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sk.json b/src/Symfony/Component/Intl/Resources/data/regions/sk.json index bf15dd523dc19..0bdedd11c59a9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sl.json b/src/Symfony/Component/Intl/Resources/data/regions/sl.json index 08ef20d67fb6a..75696d8ea962d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Otok Ascension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sn.json b/src/Symfony/Component/Intl/Resources/data/regions/sn.json index 6d33400fc0cbc..233be84b5b3d5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andora", "AE": "United Arab Emirates", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/so.json b/src/Symfony/Component/Intl/Resources/data/regions/so.json index 3a52f2200152b..020c65aa0b34a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/so.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/so.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Jasiiradda Asensiyoon", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sq.json b/src/Symfony/Component/Intl/Resources/data/regions/sq.json index 9452ce8601ec8..1c0f61abe85c9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sq.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sq.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ishulli Asenshion", "AD": "Andorrë", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr.json b/src/Symfony/Component/Intl/Resources/data/regions/sr.json index 190fd3ee6638f..6e7d4c4040937 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Острво Асенсион", "AD": "Андора", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_BA.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_BA.json index 22669b87a8904..1dbbf5aff3856 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BY": "Бјелорусија", "CG": "Конго", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_BA.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_BA.json index 22669b87a8904..1dbbf5aff3856 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BY": "Бјелорусија", "CG": "Конго", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_ME.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_ME.json index 2a23d4af60d1d..8461dee0d9fa8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_ME.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_ME.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BY": "Бјелорусија", "CG": "Конго", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_XK.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_XK.json index 6bc2bcd033053..5f08e093fb8b4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_XK.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Cyrl_XK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CG": "Конго", "CV": "Кабо Верде", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json index fa115c3f5fcad..26ea85413ce9b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ostrvo Asension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_BA.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_BA.json index ad0d6cf230785..177c2e776c0c4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_BA.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_BA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BY": "Bjelorusija", "CG": "Kongo", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_ME.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_ME.json index adc4b94c9b5c0..33df6ef6eca3b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_ME.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_ME.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BY": "Bjelorusija", "CG": "Kongo", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_XK.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_XK.json index b5085614f252f..eca2feb71884c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_XK.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn_XK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CG": "Kongo", "CV": "Kabo Verde", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_ME.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_ME.json index adc4b94c9b5c0..33df6ef6eca3b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_ME.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_ME.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "BY": "Bjelorusija", "CG": "Kongo", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_XK.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_XK.json index 6bc2bcd033053..5f08e093fb8b4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_XK.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_XK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "CG": "Конго", "CV": "Кабо Верде", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sv.json b/src/Symfony/Component/Intl/Resources/data/regions/sv.json index 1a05336552fbe..d9b20eddc6c4d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sv.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sw.json b/src/Symfony/Component/Intl/Resources/data/regions/sw.json index 95da1d3d5cdb3..0c1f9011cd74e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sw.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Kisiwa cha Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sw_CD.json b/src/Symfony/Component/Intl/Resources/data/regions/sw_CD.json index ea65973ec9a12..2fdded51ec53d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sw_CD.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sw_CD.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AF": "Afuganistani", "AZ": "Azabajani", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sw_KE.json b/src/Symfony/Component/Intl/Resources/data/regions/sw_KE.json index 16537deae22fa..faa6ef2ae68d4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sw_KE.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sw_KE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AF": "Afghanistani", "AI": "Anguila", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ta.json b/src/Symfony/Component/Intl/Resources/data/regions/ta.json index ed2caeb6dac68..6a8d33022e5ba 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ta.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "அஷன்ஷியன் தீவு", "AD": "அன்டோரா", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/te.json b/src/Symfony/Component/Intl/Resources/data/regions/te.json index f0f0c1ca2d0da..d4cbecb59faef 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/te.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/te.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "అసెన్షన్ దీవి", "AD": "ఆండోరా", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tg.json b/src/Symfony/Component/Intl/Resources/data/regions/tg.json index 6708c680c08e5..50702f99709fd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Асунсон", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/th.json b/src/Symfony/Component/Intl/Resources/data/regions/th.json index ee3a70c8d2528..f4ba4abb0ce26 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/th.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/th.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "เกาะแอสเซนชัน", "AD": "อันดอร์รา", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ti.json b/src/Symfony/Component/Intl/Resources/data/regions/ti.json index de9b17e118382..13cc0346e7a30 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ti.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "አሴንሽን ደሴት", "AD": "አንዶራ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tk.json b/src/Symfony/Component/Intl/Resources/data/regions/tk.json index cc25aeb52fba5..bd2c1ddf7996a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Beýgeliş adasy", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tl.json b/src/Symfony/Component/Intl/Resources/data/regions/tl.json index fa3b322976e22..f130352bbf567 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Acsencion island", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/to.json b/src/Symfony/Component/Intl/Resources/data/regions/to.json index be91f00c3d8ee..51322484b8163 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/to.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/to.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Motu ʻAsenisini", "AD": "ʻAnitola", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tr.json b/src/Symfony/Component/Intl/Resources/data/regions/tr.json index 375488ce8f2cb..77888c7a8a4bf 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Ascension Adası", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tt.json b/src/Symfony/Component/Intl/Resources/data/regions/tt.json index 24603c973683c..b8a1d7d8173b9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Андорра", "AE": "Берләшкән Гарәп Әмирлекләре", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ug.json b/src/Symfony/Component/Intl/Resources/data/regions/ug.json index 24ea86d4aa1bf..73d2630bd3770 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ug.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "ئاسسېنسىيون ئارىلى", "AD": "ئاندوررا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uk.json b/src/Symfony/Component/Intl/Resources/data/regions/uk.json index 57f3a85b06d99..1dc8ce6cd093b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Острів Вознесіння", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ur.json b/src/Symfony/Component/Intl/Resources/data/regions/ur.json index f1b9653b17d70..6be2959421f91 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ur.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "اسینشن آئلینڈ", "AD": "انڈورا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ur_IN.json b/src/Symfony/Component/Intl/Resources/data/regions/ur_IN.json index accc0bed7a827..39cddd629bf40 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ur_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ur_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "جزیرہ اسینشن", "AX": "جزائر آلینڈ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uz.json b/src/Symfony/Component/Intl/Resources/data/regions/uz.json index 1deb9aa369768..b03ffaf3bd3eb 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Me’roj oroli", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uz_Arab.json b/src/Symfony/Component/Intl/Resources/data/regions/uz_Arab.json index 9a33c9513c694..092fc95b42507 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uz_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uz_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AF": "افغانستان" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json index 40a65e59d02b0..97722ae687cb8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Меърож ороли", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/vi.json b/src/Symfony/Component/Intl/Resources/data/regions/vi.json index 1091e31f42121..8a8aaf830e291 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/vi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "Đảo Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/wo.json b/src/Symfony/Component/Intl/Resources/data/regions/wo.json index 52518d48a2195..64a1757cc96c7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/wo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Andoor", "AE": "Emira Arab Ini", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/xh.json b/src/Symfony/Component/Intl/Resources/data/regions/xh.json index ca235a2963083..a6d834ebd16ad 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/xh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/xh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "MK": "uMntla Macedonia", "ZA": "eMzantsi Afrika" diff --git a/src/Symfony/Component/Intl/Resources/data/regions/yi.json b/src/Symfony/Component/Intl/Resources/data/regions/yi.json index 420936c25b921..774111a3d308b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/yi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/yi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "אַנדארע", "AF": "אַפֿגהאַניסטאַן", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/yo.json b/src/Symfony/Component/Intl/Resources/data/regions/yo.json index 0c38f4eff6cfe..6ce011714310a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/yo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/yo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Orílẹ́ède Ààndórà", "AE": "Orílẹ́ède Ẹmirate ti Awọn Arabu", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/yo_BJ.json b/src/Symfony/Component/Intl/Resources/data/regions/yo_BJ.json index e96d5b6b99a04..450e3c3b2c09e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/yo_BJ.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/yo_BJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AD": "Orílɛ́ède Ààndórà", "AE": "Orílɛ́ède Ɛmirate ti Awɔn Arabu", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh.json b/src/Symfony/Component/Intl/Resources/data/regions/zh.json index f95de6b465795..0156e477dc045 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "阿森松岛", "AD": "安道尔", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh_HK.json b/src/Symfony/Component/Intl/Resources/data/regions/zh_HK.json index 29a38ea40f963..92aa77ef43e15 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AE": "阿拉伯聯合酋長國", "AG": "安提瓜和巴布達", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json index cdcf1e9a961ef..d8aae6f6da56a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "阿森松島", "AD": "安道爾", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant_HK.json b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant_HK.json index 29a38ea40f963..92aa77ef43e15 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AE": "阿拉伯聯合酋長國", "AG": "安提瓜和巴布達", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zu.json b/src/Symfony/Component/Intl/Resources/data/regions/zu.json index 04a8eaaca6f3b..4520aad3e854b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "AC": "i-Ascension Island", "AD": "i-Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/af.json b/src/Symfony/Component/Intl/Resources/data/scripts/af.json index d5da500c22237..4556e55228977 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/af.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/af.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arabies", "Armn": "Armeens", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/am.json b/src/Symfony/Component/Intl/Resources/data/scripts/am.json index c52d01c62cb8a..e7ccc11a8dfc0 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/am.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/am.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ዓረብኛ", "Armn": "አርሜንያዊ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ar.json b/src/Symfony/Component/Intl/Resources/data/scripts/ar.json index f2784b0168205..c5e865a5d78cd 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ar.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "العربية", "Armn": "الأرمينية", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/as.json b/src/Symfony/Component/Intl/Resources/data/scripts/as.json index ac9d93d26763b..1e448d021b8dc 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/as.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/as.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "আৰবী", "Armn": "আৰ্মেনীয়", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/az.json b/src/Symfony/Component/Intl/Resources/data/scripts/az.json index 8a25ab07a9b55..e501eae3c2655 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/az.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/az.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ərəb", "Armi": "armi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/az_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/scripts/az_Cyrl.json index aaba2983369f5..5aff7ca78e711 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/az_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/az_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Cyrl": "Кирил" } diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/be.json b/src/Symfony/Component/Intl/Resources/data/scripts/be.json index 636beb414b893..0ef0da0691a0d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/be.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/be.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "арабскае", "Armn": "армянскае", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/bg.json b/src/Symfony/Component/Intl/Resources/data/scripts/bg.json index 7cf4b603699f5..5c00881bb890b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/bg.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/bg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "арабска", "Armi": "Арамейска", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/bn.json b/src/Symfony/Component/Intl/Resources/data/scripts/bn.json index 592ecdc97f630..ee06a77b58dfe 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/bn.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/bn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "আরবি", "Armi": "আরমি", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/bo.json b/src/Symfony/Component/Intl/Resources/data/scripts/bo.json index 64e0b06f94e8d..240a93878c573 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/bo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/bo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Hans": "རྒྱ་ཡིག་གསར་པ།", "Hant": "རྒྱ་ཡིག་རྙིང་པ།", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/br.json b/src/Symfony/Component/Intl/Resources/data/scripts/br.json index 7003bd95d79f6..fdfd221368e98 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/br.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/br.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "adlam", "Arab": "arabek", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/bs.json b/src/Symfony/Component/Intl/Resources/data/scripts/bs.json index c0b66b7a32e09..b64b7cc9fc43c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/bs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arapsko pismo", "Armi": "imperijsko aramejsko pismo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json index 54577f293d3c9..0fe4d9ed24cf2 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "арапско писмо", "Armi": "империјско арамејско писмо", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ca.json b/src/Symfony/Component/Intl/Resources/data/scripts/ca.json index 6013143cd6c5e..5076f65496320 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ca.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ca.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "adlam", "Afak": "afaka", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ce.json b/src/Symfony/Component/Intl/Resources/data/scripts/ce.json index 59494d3d03add..6a9a7601e9ea2 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ce.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ce.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Ӏаьрбийн", "Armn": "эрмалойн", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/cs.json b/src/Symfony/Component/Intl/Resources/data/scripts/cs.json index d428af307148b..e622ae45363f2 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/cs.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/cs.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "afaka", "Aghb": "kavkazskoalbánské", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/cy.json b/src/Symfony/Component/Intl/Resources/data/scripts/cy.json index 396399f1fcbe6..e25078e1bf5f6 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/cy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arabaidd", "Armn": "Armenaidd", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/da.json b/src/Symfony/Component/Intl/Resources/data/scripts/da.json index 589131513fd2f..597d9d84c67e0 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/da.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/da.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "afaka", "Arab": "arabisk", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/de.json b/src/Symfony/Component/Intl/Resources/data/scripts/de.json index fef5cb176acfa..e2baf9264bab1 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/de.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/de.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "Afaka", "Aghb": "Kaukasisch-Albanisch", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/dz.json b/src/Symfony/Component/Intl/Resources/data/scripts/dz.json index 29da6351e7310..1f788f72fc777 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/dz.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/dz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ཨེ་ར་བིཀ་ཡིག་གུ", "Armn": "ཨར་མི་ནི་ཡཱན་ཡིག་གུ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ee.json b/src/Symfony/Component/Intl/Resources/data/scripts/ee.json index a10a0ff4624e0..c5e4b50f28ba9 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ee.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ee.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arabiagbeŋɔŋlɔ", "Armn": "armeniagbeŋɔŋlɔ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/el.json b/src/Symfony/Component/Intl/Resources/data/scripts/el.json index bcb369487a3bf..5c8743fbdf4f3 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/el.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/el.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Αραβικό", "Armi": "Αυτοκρατορικό Αραμαϊκό", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/en.json b/src/Symfony/Component/Intl/Resources/data/scripts/en.json index 872d4cdabc102..0d0c6e0f29e54 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/en.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/en.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "Adlam", "Afak": "Afaka", @@ -26,12 +26,14 @@ "Cari": "Carian", "Cham": "Cham", "Cher": "Cherokee", + "Chrs": "Chorasmian", "Cirt": "Cirth", "Copt": "Coptic", "Cprt": "Cypriot", "Cyrl": "Cyrillic", "Cyrs": "Old Church Slavonic Cyrillic", "Deva": "Devanagari", + "Diak": "Dives Akuru", "Dogr": "Dogra", "Dsrt": "Deseret", "Dupl": "Duployan shorthand", @@ -76,6 +78,7 @@ "Khar": "Kharoshthi", "Khmr": "Khmer", "Khoj": "Khojki", + "Kits": "Khitan small script", "Knda": "Kannada", "Kore": "Korean", "Kpel": "Kpelle", @@ -182,6 +185,7 @@ "Wole": "Woleai", "Xpeo": "Old Persian", "Xsux": "Sumero-Akkadian Cuneiform", + "Yezi": "Yezidi", "Yiii": "Yi", "Zanb": "Zanabazar Square", "Zinh": "Inherited", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/en_AU.json b/src/Symfony/Component/Intl/Resources/data/scripts/en_AU.json index 87a1540139e9f..41212b08daa28 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/en_AU.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/en_AU.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Beng": "Bengali" } diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/en_IN.json b/src/Symfony/Component/Intl/Resources/data/scripts/en_IN.json index 87828a9b75775..874fbd0535827 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/en_IN.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/en_IN.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Beng": "Bengali", "Orya": "Oriya" diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/es.json b/src/Symfony/Component/Intl/Resources/data/scripts/es.json index d4133d366d789..a8cccd7a4c979 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/es.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/es.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "árabe", "Armn": "armenio", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/es_419.json b/src/Symfony/Component/Intl/Resources/data/scripts/es_419.json index 9ec9633f94e5e..0f3e0f4baeadc 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/es_419.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/es_419.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Hanb": "han con bopomofo", "Hrkt": "katakana o hiragana", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/es_MX.json b/src/Symfony/Component/Intl/Resources/data/scripts/es_MX.json index eeca1aab22d9e..4f09be2e3c182 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/es_MX.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/es_MX.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Hanb": "hanb", "Mlym": "malayálam" diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/es_US.json b/src/Symfony/Component/Intl/Resources/data/scripts/es_US.json index e846c49502422..a1356cb99641a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/es_US.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/es_US.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Hanb": "hanb", "Mlym": "malayálam", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/et.json b/src/Symfony/Component/Intl/Resources/data/scripts/et.json index 737eb50ec7c15..d88e7d838be72 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/et.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/et.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "afaka", "Aghb": "albaani", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/eu.json b/src/Symfony/Component/Intl/Resources/data/scripts/eu.json index 2255372497cd8..15bb1b29877f4 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/eu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabiarra", "Armn": "armeniarra", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fa.json b/src/Symfony/Component/Intl/Resources/data/scripts/fa.json index b74ae17e1a85b..5d626e5e8d3c9 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Aghb": "آلبانیایی قفقازی", "Arab": "عربی", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fa_AF.json b/src/Symfony/Component/Intl/Resources/data/scripts/fa_AF.json index a2d1d8623f999..149b212e8390f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fa_AF.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fa_AF.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Mong": "مغلی" } diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fi.json b/src/Symfony/Component/Intl/Resources/data/scripts/fi.json index 982efcd164bfa..b7f6e9d9d5db3 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "fulanin adlam-aakkosto", "Afak": "afaka", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fo.json b/src/Symfony/Component/Intl/Resources/data/scripts/fo.json index 5083dc633aedc..c221e02ffa669 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabisk", "Armn": "armenskt", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fr.json b/src/Symfony/Component/Intl/Resources/data/scripts/fr.json index c80636cbe9acf..d915ea212691a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabe", "Armi": "araméen impérial", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fr_CA.json b/src/Symfony/Component/Intl/Resources/data/scripts/fr_CA.json index 0ff9b2841ea7f..2c022b7b56eb1 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fr_CA.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fr_CA.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Deva": "devanagari", "Gujr": "gujarati", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fy.json b/src/Symfony/Component/Intl/Resources/data/scripts/fy.json index 13fd5ee70d000..9f0213440a8bc 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fy.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "Defaka", "Arab": "Arabysk", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ga.json b/src/Symfony/Component/Intl/Resources/data/scripts/ga.json index f8ce288b72c99..de17a6cbdc9db 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ga.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "Adlm", "Aghb": "Albánach Cugasach", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/gd.json b/src/Symfony/Component/Intl/Resources/data/scripts/gd.json index 9fd720e5f92aa..01a6dd10379cd 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/gd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "Adlam", "Afak": "Afaka", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/gl.json b/src/Symfony/Component/Intl/Resources/data/scripts/gl.json index 12c61a305765e..62f119364b7ee 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/gl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "árabe", "Armn": "armenio", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/gu.json b/src/Symfony/Component/Intl/Resources/data/scripts/gu.json index e5b97e608d863..09787d68851fe 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/gu.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/gu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "અરબી", "Armi": "ઇમ્પિરિયલ આર્મનિક", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ha.json b/src/Symfony/Component/Intl/Resources/data/scripts/ha.json index a96c600157c42..30d64172dc28e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ha.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ha.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Larabci", "Armn": "Armeniyawa", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/he.json b/src/Symfony/Component/Intl/Resources/data/scripts/he.json index 8d8829d053059..c9f6f3816982e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/he.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/he.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ערבי", "Armn": "ארמני", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/hi.json b/src/Symfony/Component/Intl/Resources/data/scripts/hi.json index 1348715681185..143443dcf8dfc 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/hi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "अरबी", "Armi": "इम्पिरियल आर्मेनिक", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/hr.json b/src/Symfony/Component/Intl/Resources/data/scripts/hr.json index 21e4d1408c504..c0473c5cbbc9b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/hr.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/hr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "afaka pismo", "Arab": "arapsko pismo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/hu.json b/src/Symfony/Component/Intl/Resources/data/scripts/hu.json index c21df0b6ace86..7113c51a2c21b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/hu.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/hu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arab", "Armi": "Birodalmi arámi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/hy.json b/src/Symfony/Component/Intl/Resources/data/scripts/hy.json index c6f719a98bd5d..e69f99cd5f151 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/hy.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "արաբական", "Armn": "հայկական", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ia.json b/src/Symfony/Component/Intl/Resources/data/scripts/ia.json index f39c95c2ee981..596a37e0b931a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ia.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ia.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabe", "Armn": "armenian", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/id.json b/src/Symfony/Component/Intl/Resources/data/scripts/id.json index 8300c12bdfb5a..26ff2ecd5bc92 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/id.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/id.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "Afaka", "Aghb": "Albania Kaukasia", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ig.json b/src/Symfony/Component/Intl/Resources/data/scripts/ig.json index efe4ac49a3317..5d957f66bb507 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ig.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ig.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Mkpụrụ Okwu Arabic", "Cyrl": "Mkpụrụ Okwu Cyrillic", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ii.json b/src/Symfony/Component/Intl/Resources/data/scripts/ii.json index ffde6d44a542c..31288014b3d8d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ii.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ii.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ꀊꇁꀨꁱꂷ", "Cyrl": "ꀊꆨꌦꇁꃚꁱꂷ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/in.json b/src/Symfony/Component/Intl/Resources/data/scripts/in.json index 8300c12bdfb5a..26ff2ecd5bc92 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/in.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/in.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "Afaka", "Aghb": "Albania Kaukasia", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/is.json b/src/Symfony/Component/Intl/Resources/data/scripts/is.json index a21b2240eed70..641c4899fe71c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/is.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/is.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabískt", "Armn": "armenskt", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/it.json b/src/Symfony/Component/Intl/Resources/data/scripts/it.json index 906642057a876..be8e5e7f530e4 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/it.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/it.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "afaka", "Arab": "arabo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/iw.json b/src/Symfony/Component/Intl/Resources/data/scripts/iw.json index 8d8829d053059..c9f6f3816982e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/iw.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/iw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ערבי", "Armn": "ארמני", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ja.json b/src/Symfony/Component/Intl/Resources/data/scripts/ja.json index db3409cf46297..4487e35e00a53 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ja.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "アファカ文字", "Aghb": "カフカス・アルバニア文字", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/jv.json b/src/Symfony/Component/Intl/Resources/data/scripts/jv.json index 301612ea6fe12..15db11319e561 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/jv.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/jv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arab", "Armn": "Armenia", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ka.json b/src/Symfony/Component/Intl/Resources/data/scripts/ka.json index 3b0f32b778a86..4007ef0f19197 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ka.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ka.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "აფაკა", "Arab": "არაბული", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/kk.json b/src/Symfony/Component/Intl/Resources/data/scripts/kk.json index 9bfa78f2c8e98..fce53fa65ad22 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/kk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "араб жазуы", "Armn": "армян жазуы", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/km.json b/src/Symfony/Component/Intl/Resources/data/scripts/km.json index 15ac7c5e5a9b8..7d7fbf37e4728 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/km.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/km.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "អារ៉ាប់", "Armn": "អាមេនី", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/kn.json b/src/Symfony/Component/Intl/Resources/data/scripts/kn.json index 115a47dac7dfb..cf273c076d955 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/kn.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/kn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ಅರೇಬಿಕ್", "Armi": "ಇಂಪೀರಿಯಲ್ ಅರೆಮಾಯಿಕ್", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ko.json b/src/Symfony/Component/Intl/Resources/data/scripts/ko.json index 62627719404a9..9cbfba3695975 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ko.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "아파카 문자", "Aghb": "코카시안 알바니아 문자", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ks.json b/src/Symfony/Component/Intl/Resources/data/scripts/ks.json index 4543179a91155..08ab0414e4c18 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ks.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ks.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "اَربی", "Armn": "اَرمانیَن", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ku.json b/src/Symfony/Component/Intl/Resources/data/scripts/ku.json index 51fde5ae06993..50bf7830538cc 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ku.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ku.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "erebî", "Armn": "ermenî", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ky.json b/src/Symfony/Component/Intl/Resources/data/scripts/ky.json index 6a9ed5bea5ab2..41b4b16af1405 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ky.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Араб", "Armn": "Армян", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/lb.json b/src/Symfony/Component/Intl/Resources/data/scripts/lb.json index e3932213874fb..4405665de39ab 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/lb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arabesch", "Armi": "Armi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/lo.json b/src/Symfony/Component/Intl/Resources/data/scripts/lo.json index bbcef0339db76..2e62f312e681a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/lo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/lo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "ອັບຟາກາ", "Arab": "ອາຣາບິກ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/lt.json b/src/Symfony/Component/Intl/Resources/data/scripts/lt.json index c3407b0e00a48..a8f7837281ea4 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/lt.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/lt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "Afaka", "Aghb": "Kaukazo Albanijos", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/lv.json b/src/Symfony/Component/Intl/Resources/data/scripts/lv.json index 4c0f5127f8700..0d98aaa32ecd3 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/lv.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/lv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arābu", "Armi": "aramiešu", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/meta.json b/src/Symfony/Component/Intl/Resources/data/scripts/meta.json index 76194e33efec9..b7556560a6d0a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/meta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Scripts": [ "Adlm", "Afak", @@ -26,12 +26,14 @@ "Cari", "Cham", "Cher", + "Chrs", "Cirt", "Copt", "Cprt", "Cyrl", "Cyrs", "Deva", + "Diak", "Dogr", "Dsrt", "Dupl", @@ -76,6 +78,7 @@ "Khar", "Khmr", "Khoj", + "Kits", "Knda", "Kore", "Kpel", @@ -182,6 +185,7 @@ "Wole", "Xpeo", "Xsux", + "Yezi", "Yiii", "Zanb", "Zinh", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mi.json b/src/Symfony/Component/Intl/Resources/data/scripts/mi.json index 9a5d870d9666d..bbfe6cf87f937 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arapika", "Cyrl": "Hīririki", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mk.json b/src/Symfony/Component/Intl/Resources/data/scripts/mk.json index 067276623de79..1739d840acae7 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "афака", "Aghb": "кавкаскоалбански", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ml.json b/src/Symfony/Component/Intl/Resources/data/scripts/ml.json index 9b780cfc477ec..49f4db1feb014 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ml.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ml.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "അറബിക്", "Armi": "അർമി", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mn.json b/src/Symfony/Component/Intl/Resources/data/scripts/mn.json index 6506c035bebb0..1e91832edb6be 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mn.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "араб", "Armn": "армени", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mo.json b/src/Symfony/Component/Intl/Resources/data/scripts/mo.json index d306b2359e204..0cfc01586a59d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabă", "Armn": "armeană", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mr.json b/src/Symfony/Component/Intl/Resources/data/scripts/mr.json index f2f166bcb5ad7..d50443ec487d9 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mr.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "अरबी", "Armi": "इम्पिरियल आर्मेनिक", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ms.json b/src/Symfony/Component/Intl/Resources/data/scripts/ms.json index c9f3a1605e0f3..1cfba128ac174 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ms.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ms.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "Adlam", "Aghb": "Kaukasia Albania", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mt.json b/src/Symfony/Component/Intl/Resources/data/scripts/mt.json index ff78e7c6d1d2d..0fe26f9960c0b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Għarbi", "Cyrl": "Ċirilliku", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/my.json b/src/Symfony/Component/Intl/Resources/data/scripts/my.json index 895da9ad822de..4ba2ff7e93c37 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/my.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/my.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "အာရေဗျ", "Armn": "အာမေးနီးယား", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/nb.json b/src/Symfony/Component/Intl/Resources/data/scripts/nb.json index 87dab74681676..cf1a7a4d50098 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/nb.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/nb.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "afaka", "Aghb": "kaukasus-albansk", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ne.json b/src/Symfony/Component/Intl/Resources/data/scripts/ne.json index c60ca0145ff50..fcc3a5331995d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ne.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "अरबी", "Armi": "आर्मी", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/nl.json b/src/Symfony/Component/Intl/Resources/data/scripts/nl.json index 80227b2b53d2a..00c0968195dcc 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/nl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "Adlam", "Afak": "Defaka", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/nn.json b/src/Symfony/Component/Intl/Resources/data/scripts/nn.json index 408721ff73346..c34d942feaae9 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/nn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabisk", "Armi": "armisk", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/no.json b/src/Symfony/Component/Intl/Resources/data/scripts/no.json index 87dab74681676..cf1a7a4d50098 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/no.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/no.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "afaka", "Aghb": "kaukasus-albansk", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/om.json b/src/Symfony/Component/Intl/Resources/data/scripts/om.json index 205b40dca7fdd..ee0a35d575226 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/om.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/om.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Latn": "Latin" } diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/or.json b/src/Symfony/Component/Intl/Resources/data/scripts/or.json index c01337131854b..cb3720efedf6a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/or.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/or.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ଆରବିକ୍", "Armi": "ଇମ୍ପେରିଆଲ୍ ଆରମିକ୍", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/os.json b/src/Symfony/Component/Intl/Resources/data/scripts/os.json index c718d9446bf63..731650bb489bd 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/os.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/os.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Араббаг", "Cyrl": "Киррилицӕ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/pa.json b/src/Symfony/Component/Intl/Resources/data/scripts/pa.json index c5a410a3ac901..34ddfc98dbd29 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/pa.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/pa.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "ਅਰਬੀ", "Armn": "ਅਰਮੀਨੀਆਈ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/pa_Arab.json b/src/Symfony/Component/Intl/Resources/data/scripts/pa_Arab.json index 4cfe0fc0bb6bc..3c4fd193491cb 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/pa_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/pa_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "عربی", "Guru": "گُرمُکھی" diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/pl.json b/src/Symfony/Component/Intl/Resources/data/scripts/pl.json index 5fe686e7713e5..7cdd4a568556f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/pl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/pl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabskie", "Armi": "armi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ps.json b/src/Symfony/Component/Intl/Resources/data/scripts/ps.json index f1c96fe3d0341..20ea2fa68fa30 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ps.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "عربي", "Armn": "ارمانیایي", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/pt.json b/src/Symfony/Component/Intl/Resources/data/scripts/pt.json index dbac83aff70a0..37b01d982a6ff 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/pt.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/pt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "árabe", "Armi": "armi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json index 44c1bf6eb2aa5..392c4491b9322 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Armn": "arménio", "Beng": "bengalês", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/rm.json b/src/Symfony/Component/Intl/Resources/data/scripts/rm.json index 87694d430f6fc..d29151f449103 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/rm.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/rm.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arab", "Armi": "arameic imperial", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ro.json b/src/Symfony/Component/Intl/Resources/data/scripts/ro.json index d306b2359e204..0cfc01586a59d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ro.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabă", "Armn": "armeană", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ru.json b/src/Symfony/Component/Intl/Resources/data/scripts/ru.json index accb883d29911..3ab523710003c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ru.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "афака", "Arab": "арабица", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sd.json b/src/Symfony/Component/Intl/Resources/data/scripts/sd.json index 8498bb6e8130a..d7de324f54cf1 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sd.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "عربي", "Armn": "عرماني", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/se.json b/src/Symfony/Component/Intl/Resources/data/scripts/se.json index 3b25e1f9c3cfa..c467385ec18ac 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/se.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/se.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arába", "Cyrl": "kyrillalaš", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/se_FI.json b/src/Symfony/Component/Intl/Resources/data/scripts/se_FI.json index caa73d6ef5138..bd0afa6d8a9f5 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/se_FI.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/se_FI.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arábalaš", "Hani": "kiinnálaš", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sh.json b/src/Symfony/Component/Intl/Resources/data/scripts/sh.json index 263bd4aadb7e2..34374f83ffb44 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arapsko pismo", "Armi": "imperijsko aramejsko pismo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/si.json b/src/Symfony/Component/Intl/Resources/data/scripts/si.json index b319d135b9e4d..459779da8372f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/si.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/si.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "අරාබි", "Armn": "ආර්මේනියානු", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sk.json b/src/Symfony/Component/Intl/Resources/data/scripts/sk.json index c70b807f0a114..e525197a9d69c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabské", "Armn": "arménske", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sl.json b/src/Symfony/Component/Intl/Resources/data/scripts/sl.json index 95f62a009a0a0..741a2fe3c09d1 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabski", "Armi": "imperialno-aramejski", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/so.json b/src/Symfony/Component/Intl/Resources/data/scripts/so.json index 9f6e5ee2167d8..2170b1b6e52a3 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/so.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/so.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Carabi", "Armn": "Armeeniyaan", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sq.json b/src/Symfony/Component/Intl/Resources/data/scripts/sq.json index e750b29f4753b..3a19fc2193d89 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sq.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sq.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arabik", "Armn": "armen", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sr.json b/src/Symfony/Component/Intl/Resources/data/scripts/sr.json index bde0995dff21d..1a757229045e5 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "арапско писмо", "Armi": "империјско арамејско писмо", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json index 263bd4aadb7e2..34374f83ffb44 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arapsko pismo", "Armi": "imperijsko aramejsko pismo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sv.json b/src/Symfony/Component/Intl/Resources/data/scripts/sv.json index 175acd8dd40b9..c0fb0b1715c51 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sv.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sv.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "adlamiska", "Afak": "afakiska", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sw.json b/src/Symfony/Component/Intl/Resources/data/scripts/sw.json index 1ec1ec18fc0cd..e4dabe529f5fe 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sw.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sw.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Kiarabu", "Armn": "Kiarmenia", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sw_KE.json b/src/Symfony/Component/Intl/Resources/data/scripts/sw_KE.json index 0dce57527355b..09c0ff4bfe0b4 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sw_KE.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sw_KE.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Brai": "Breli", "Ethi": "Kihabeshi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ta.json b/src/Symfony/Component/Intl/Resources/data/scripts/ta.json index 03c86668efe72..bae59865fe220 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ta.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ta.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "அரபிக்", "Armi": "இம்பேரியல் அரமெய்க்", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/te.json b/src/Symfony/Component/Intl/Resources/data/scripts/te.json index f1fbc96500c6c..83a4b52196546 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/te.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/te.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "అరబిక్", "Armi": "ఇంపీరియల్ అరామాక్", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tg.json b/src/Symfony/Component/Intl/Resources/data/scripts/tg.json index 4ce9248df8b42..948cd93aef51c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tg.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Арабӣ", "Cyrl": "Кириллӣ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/th.json b/src/Symfony/Component/Intl/Resources/data/scripts/th.json index c2fca814b25f6..ca50c7454a31c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/th.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/th.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "อะฟาคา", "Aghb": "แอลเบเนีย คอเคเซีย", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ti.json b/src/Symfony/Component/Intl/Resources/data/scripts/ti.json index eb8060a16854b..a36cf3771d37c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ti.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Ethi": "ፊደል", "Latn": "ላቲን" diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tk.json b/src/Symfony/Component/Intl/Resources/data/scripts/tk.json index 3800d1a43d7c4..aa4f521924b32 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arap elipbiýi", "Armn": "Ermeni elipbiýi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tl.json b/src/Symfony/Component/Intl/Resources/data/scripts/tl.json index 17dd00d8c8ed5..ee59ad9c6f215 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Arabic", "Armn": "Armenian", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/to.json b/src/Symfony/Component/Intl/Resources/data/scripts/to.json index 3aa3fbf5ee404..b4e0aba2ae6a7 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/to.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/to.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "tohinima fakaʻafaka", "Aghb": "tohinima fakaʻalapēnia-kaukasia", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tr.json b/src/Symfony/Component/Intl/Resources/data/scripts/tr.json index c2a7ae518c323..d3be655ad8332 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tr.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tr.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "Afaka", "Aghb": "Kafkas Albanyası", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tt.json b/src/Symfony/Component/Intl/Resources/data/scripts/tt.json index 6bbae75408807..21c303dd7ffc5 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tt.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "гарәп", "Cyrl": "кирилл", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ug.json b/src/Symfony/Component/Intl/Resources/data/scripts/ug.json index bfdd090a03074..ff20a5e044a0b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ug.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "ئافاكا", "Arab": "ئەرەب", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/uk.json b/src/Symfony/Component/Intl/Resources/data/scripts/uk.json index 64f2f02290441..9cb64c70fad48 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/uk.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "адлам", "Afak": "афака", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ur.json b/src/Symfony/Component/Intl/Resources/data/scripts/ur.json index c3026fe93ecc5..fe9c9859df675 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ur.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "عربی", "Armn": "آرمینیائی", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/uz.json b/src/Symfony/Component/Intl/Resources/data/scripts/uz.json index 8b19ff8bea96c..54b834215e07f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/uz.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "arab", "Armn": "arman", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/uz_Arab.json b/src/Symfony/Component/Intl/Resources/data/scripts/uz_Arab.json index 1f6ed41327bfc..16cf4cfed89e3 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/uz_Arab.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/uz_Arab.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "عربی" } diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json index 5cce2ec4bf17a..e21150aa95c8f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Араб", "Armn": "Арман", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/vi.json b/src/Symfony/Component/Intl/Resources/data/scripts/vi.json index dffbbccd5331a..e046fb2e9692d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/vi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Afak": "Chữ Afaka", "Arab": "Chữ Ả Rập", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/wo.json b/src/Symfony/Component/Intl/Resources/data/scripts/wo.json index 1b973f0c66f97..a9d31724946a0 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/wo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "Araab", "Cyrl": "Sirilik", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/yi.json b/src/Symfony/Component/Intl/Resources/data/scripts/yi.json index 2991b832a10f9..59f1b83831d50 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/yi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/yi.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "אַראַביש", "Cyrl": "ציריליש", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/yo.json b/src/Symfony/Component/Intl/Resources/data/scripts/yo.json index bba6723f20b83..2c32fe7e45564 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/yo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/yo.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "èdè Lárúbáwá", "Cyrl": "èdè ilẹ̀ Rọ́ṣíà", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/yo_BJ.json b/src/Symfony/Component/Intl/Resources/data/scripts/yo_BJ.json index 799b2a29db6f1..6d6003d5ea80b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/yo_BJ.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/yo_BJ.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Cyrl": "èdè ilɛ̀ Rɔ́shíà", "Hans": "tí wɔ́n mú rɔrùn.", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/zh.json b/src/Symfony/Component/Intl/Resources/data/scripts/zh.json index 96ae8bb75e180..15cf647dd967e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/zh.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "阿德拉姆文", "Afak": "阿法卡文", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/zh_HK.json b/src/Symfony/Component/Intl/Resources/data/scripts/zh_HK.json index e9a9079936a67..edea872a6e10b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/zh_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/zh_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Cyrl": "西里爾文", "Ethi": "埃塞俄比亞文", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json index 353ee3ae1da61..88ef005a3947e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Adlm": "富拉文", "Afak": "阿法卡文字", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant_HK.json b/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant_HK.json index e9a9079936a67..edea872a6e10b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant_HK.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Cyrl": "西里爾文", "Ethi": "埃塞俄比亞文", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/zu.json b/src/Symfony/Component/Intl/Resources/data/scripts/zu.json index 78aee6c7e1913..5f1601277565f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/zu.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/zu.json @@ -1,5 +1,5 @@ { - "Version": "36", + "Version": "36.1", "Names": { "Arab": "isi-Arabic", "Armn": "isi-Armenian", diff --git a/src/Symfony/Component/Intl/Resources/data/version.txt b/src/Symfony/Component/Intl/Resources/data/version.txt index fcf99cb65db3b..4afa81b96f43d 100644 --- a/src/Symfony/Component/Intl/Resources/data/version.txt +++ b/src/Symfony/Component/Intl/Resources/data/version.txt @@ -1 +1 @@ -65.1 +66.1 From 8ddaa20b29caa7aeb505681f12e86a7a444ae8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Wed, 11 Mar 2020 19:41:03 +0100 Subject: [PATCH 41/82] [Console] Fallback to default answers when unable to read input --- .../Exception/MissingInputException.php | 21 +++++ .../Console/Helper/QuestionHelper.php | 85 ++++++++++++------- .../Tests/Helper/QuestionHelperTest.php | 6 +- .../phpt/uses_stdin_as_interactive_input.phpt | 4 +- 4 files changed, 79 insertions(+), 37 deletions(-) create mode 100644 src/Symfony/Component/Console/Exception/MissingInputException.php diff --git a/src/Symfony/Component/Console/Exception/MissingInputException.php b/src/Symfony/Component/Console/Exception/MissingInputException.php new file mode 100644 index 0000000000000..04f02ade45001 --- /dev/null +++ b/src/Symfony/Component/Console/Exception/MissingInputException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Console\Exception; + +/** + * Represents failure to read input from stdin. + * + * @author Gabriel Ostrolucký + */ +class MissingInputException extends RuntimeException implements ExceptionInterface +{ +} diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php index 40709cedd929d..b383252c5a3bc 100644 --- a/src/Symfony/Component/Console/Helper/QuestionHelper.php +++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Console\Helper; +use Symfony\Component\Console\Exception\MissingInputException; use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Formatter\OutputFormatter; use Symfony\Component\Console\Formatter\OutputFormatterStyle; @@ -48,44 +49,32 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu } if (!$input->isInteractive()) { - $default = $question->getDefault(); - - if (null === $default) { - return $default; - } - - if ($validator = $question->getValidator()) { - return \call_user_func($question->getValidator(), $default); - } elseif ($question instanceof ChoiceQuestion) { - $choices = $question->getChoices(); - - if (!$question->isMultiselect()) { - return isset($choices[$default]) ? $choices[$default] : $default; - } - - $default = explode(',', $default); - foreach ($default as $k => $v) { - $v = $question->isTrimmable() ? trim($v) : $v; - $default[$k] = isset($choices[$v]) ? $choices[$v] : $v; - } - } - - return $default; + return $this->getDefaultAnswer($question); } if ($input instanceof StreamableInputInterface && $stream = $input->getStream()) { $this->inputStream = $stream; } - if (!$question->getValidator()) { - return $this->doAsk($output, $question); - } + try { + if (!$question->getValidator()) { + return $this->doAsk($output, $question); + } - $interviewer = function () use ($output, $question) { - return $this->doAsk($output, $question); - }; + $interviewer = function () use ($output, $question) { + return $this->doAsk($output, $question); + }; - return $this->validateAttempts($interviewer, $output, $question); + return $this->validateAttempts($interviewer, $output, $question); + } catch (MissingInputException $exception) { + $input->setInteractive(false); + + if (null === $fallbackOutput = $this->getDefaultAnswer($question)) { + throw $exception; + } + + return $fallbackOutput; + } } /** @@ -134,7 +123,7 @@ private function doAsk(OutputInterface $output, Question $question) if (false === $ret) { $ret = fgets($inputStream, 4096); if (false === $ret) { - throw new RuntimeException('Aborted.'); + throw new MissingInputException('Aborted.'); } if ($question->isTrimmable()) { $ret = trim($ret); @@ -158,6 +147,36 @@ private function doAsk(OutputInterface $output, Question $question) return $ret; } + /** + * @return mixed + */ + private function getDefaultAnswer(Question $question) + { + $default = $question->getDefault(); + + if (null === $default) { + return $default; + } + + if ($validator = $question->getValidator()) { + return \call_user_func($question->getValidator(), $default); + } elseif ($question instanceof ChoiceQuestion) { + $choices = $question->getChoices(); + + if (!$question->isMultiselect()) { + return isset($choices[$default]) ? $choices[$default] : $default; + } + + $default = explode(',', $default); + foreach ($default as $k => $v) { + $v = $question->isTrimmable() ? trim($v) : $v; + $default[$k] = isset($choices[$v]) ? $choices[$v] : $v; + } + } + + return $default; + } + /** * Outputs the question prompt. */ @@ -240,7 +259,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu // as opposed to fgets(), fread() returns an empty string when the stream content is empty, not false. if (false === $c || ('' === $ret && '' === $c && null === $question->getDefault())) { shell_exec(sprintf('stty %s', $sttyMode)); - throw new RuntimeException('Aborted.'); + throw new MissingInputException('Aborted.'); } elseif ("\177" === $c) { // Backspace Character if (0 === $numMatches && 0 !== $i) { --$i; @@ -406,7 +425,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream, bool $ shell_exec(sprintf('stty %s', $sttyMode)); if (false === $value) { - throw new RuntimeException('Aborted.'); + throw new MissingInputException('Aborted.'); } if ($trimmable) { $value = trim($value); diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php index fcba3b3b2fd19..461318efe7397 100644 --- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php +++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php @@ -696,7 +696,7 @@ public function testChoiceOutputFormattingQuestionForUtf8Keys() public function testAskThrowsExceptionOnMissingInput() { - $this->expectException('Symfony\Component\Console\Exception\RuntimeException'); + $this->expectException('Symfony\Component\Console\Exception\MissingInputException'); $this->expectExceptionMessage('Aborted.'); $dialog = new QuestionHelper(); $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?')); @@ -704,7 +704,7 @@ public function testAskThrowsExceptionOnMissingInput() public function testAskThrowsExceptionOnMissingInputForChoiceQuestion() { - $this->expectException('Symfony\Component\Console\Exception\RuntimeException'); + $this->expectException('Symfony\Component\Console\Exception\MissingInputException'); $this->expectExceptionMessage('Aborted.'); $dialog = new QuestionHelper(); $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new ChoiceQuestion('Choice', ['a', 'b'])); @@ -712,7 +712,7 @@ public function testAskThrowsExceptionOnMissingInputForChoiceQuestion() public function testAskThrowsExceptionOnMissingInputWithValidator() { - $this->expectException('Symfony\Component\Console\Exception\RuntimeException'); + $this->expectException('Symfony\Component\Console\Exception\MissingInputException'); $this->expectExceptionMessage('Aborted.'); $dialog = new QuestionHelper(); diff --git a/src/Symfony/Component/Console/Tests/phpt/uses_stdin_as_interactive_input.phpt b/src/Symfony/Component/Console/Tests/phpt/uses_stdin_as_interactive_input.phpt index db1bb4ce436e2..3f329cc73f805 100644 --- a/src/Symfony/Component/Console/Tests/phpt/uses_stdin_as_interactive_input.phpt +++ b/src/Symfony/Component/Console/Tests/phpt/uses_stdin_as_interactive_input.phpt @@ -18,7 +18,8 @@ require $vendor.'/vendor/autoload.php'; (new Application()) ->register('app') ->setCode(function(InputInterface $input, OutputInterface $output) { - $output->writeln((new QuestionHelper())->ask($input, $output, new Question('Foo?'))); + $output->writeln((new QuestionHelper())->ask($input, $output, new Question('Foo?', 'foo'))); + $output->writeln((new QuestionHelper())->ask($input, $output, new Question('Bar?', 'bar'))); }) ->getApplication() ->setDefaultCommand('app', true) @@ -26,3 +27,4 @@ require $vendor.'/vendor/autoload.php'; ; --EXPECT-- Foo?Hello World +Bar?bar From d4cde319404b64b9f4506eb1191b2a6434383e6f Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 12 Mar 2020 15:38:01 +0100 Subject: [PATCH 42/82] [HttpClient] disable debug log with curl 7.64.0 --- src/Symfony/Component/HttpClient/CurlHttpClient.php | 2 +- .../Component/HttpClient/Response/CurlResponse.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index b076e9a7b5209..b037ca0fc29e2 100644 --- a/src/Symfony/Component/HttpClient/CurlHttpClient.php +++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php @@ -308,7 +308,7 @@ public function request(string $method, string $url, array $options = []): Respo } } - return $pushedResponse ?? new CurlResponse($this->multi, $ch, $options, $this->logger, $method, self::createRedirectResolver($options, $host)); + return $pushedResponse ?? new CurlResponse($this->multi, $ch, $options, $this->logger, $method, self::createRedirectResolver($options, $host), self::$curlVersion['version_number']); } /** diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php index 0a6597fb0852a..58528108e8d1a 100644 --- a/src/Symfony/Component/HttpClient/Response/CurlResponse.php +++ b/src/Symfony/Component/HttpClient/Response/CurlResponse.php @@ -37,15 +37,19 @@ final class CurlResponse implements ResponseInterface /** * @internal */ - public function __construct(CurlClientState $multi, $ch, array $options = null, LoggerInterface $logger = null, string $method = 'GET', callable $resolveRedirect = null) + public function __construct(CurlClientState $multi, $ch, array $options = null, LoggerInterface $logger = null, string $method = 'GET', callable $resolveRedirect = null, int $curlVersion = null) { $this->multi = $multi; if (\is_resource($ch)) { $this->handle = $ch; $this->debugBuffer = fopen('php://temp', 'w+'); - curl_setopt($ch, CURLOPT_VERBOSE, true); - curl_setopt($ch, CURLOPT_STDERR, $this->debugBuffer); + if (0x074000 === $curlVersion) { + fwrite($this->debugBuffer, 'Due to a bug in curl 7.64.0, the debug log is disabled; use another version to work around the issue.'); + } else { + curl_setopt($ch, CURLOPT_VERBOSE, true); + curl_setopt($ch, CURLOPT_STDERR, $this->debugBuffer); + } } else { $this->info['url'] = $ch; $ch = $this->handle; From 2d509623b0dcddd473a7afda49170963007ed7a1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 13 Mar 2020 08:50:02 +0100 Subject: [PATCH 43/82] [Config] fix test --- src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php index 0378e7b69a97e..2aecdf8259c65 100644 --- a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php +++ b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php @@ -42,6 +42,7 @@ public function testLoadFile() XmlUtils::loadFile($fixtures.'not_readable.xml'); $this->fail(); } catch (\InvalidArgumentException $e) { + chmod($fixtures.'not_readable.xml', 0644); $this->assertStringContainsString('is not readable', $e->getMessage()); } @@ -49,7 +50,7 @@ public function testLoadFile() XmlUtils::loadFile($fixtures.'invalid.xml'); $this->fail(); } catch (\InvalidArgumentException $e) { - $this->assertStringContainsString('ERROR 77', $e->getMessage()); + $this->assertStringContainsString('ERROR ', $e->getMessage()); } try { From 8e873d0b5be64f88b10ba7996300146770f29d1b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 13 Mar 2020 10:53:59 +0100 Subject: [PATCH 44/82] [Security/Core] fix some annotations --- .../Core/Authentication/Token/AbstractToken.php | 4 ++-- .../Core/Authentication/Token/AnonymousToken.php | 7 ++++--- .../Authentication/Token/PreAuthenticatedToken.php | 11 ++++++----- .../Core/Authentication/Token/TokenInterface.php | 6 +++--- .../Authentication/Token/UsernamePasswordToken.php | 11 ++++++----- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 9d5a01d942ad4..d10b938bf0ff5 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -31,7 +31,7 @@ abstract class AbstractToken implements TokenInterface private $attributes = []; /** - * @param (RoleInterface|string)[] $roles An array of roles + * @param (Role|string)[] $roles An array of roles * * @throws \InvalidArgumentException */ @@ -41,7 +41,7 @@ public function __construct(array $roles = []) if (\is_string($role)) { $role = new Role($role); } elseif (!$role instanceof RoleInterface) { - throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, Role instances or RoleInterface instances, but got %s.', \gettype($role))); + throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, Role instances, but got %s.', \gettype($role))); } $this->roles[] = $role; diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php index 7677b90d274df..2cbb788490d79 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token; use Symfony\Component\Security\Core\Role\Role; +use Symfony\Component\Security\Core\User\UserInterface; /** * AnonymousToken represents an anonymous token. @@ -23,9 +24,9 @@ class AnonymousToken extends AbstractToken private $secret; /** - * @param string $secret A secret used to make sure the token is created by the app and not by a malicious client - * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string - * @param Role[] $roles An array of roles + * @param string $secret A secret used to make sure the token is created by the app and not by a malicious client + * @param string|\Stringable|UserInterface $user + * @param (Role|string)[] $roles */ public function __construct($secret, $user, array $roles = []) { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php index 7ff0cfe8a5ba4..31a7b666cca5e 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php @@ -11,7 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\RoleInterface; +use Symfony\Component\Security\Core\Role\Role; +use Symfony\Component\Security\Core\User\UserInterface; /** * PreAuthenticatedToken implements a pre-authenticated token. @@ -24,10 +25,10 @@ class PreAuthenticatedToken extends AbstractToken private $providerKey; /** - * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string - * @param mixed $credentials The user credentials - * @param string $providerKey The provider key - * @param (RoleInterface|string)[] $roles An array of roles + * @param string|\Stringable|UserInterface $user + * @param mixed $credentials + * @param string $providerKey + * @param (Role|string)[] $roles */ public function __construct($user, $credentials, $providerKey, array $roles = []) { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php index 583700c178a71..ff30ef9078539 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token; use Symfony\Component\Security\Core\Role\RoleInterface; +use Symfony\Component\Security\Core\User\UserInterface; /** * TokenInterface is the interface for the user authentication information. @@ -47,8 +48,7 @@ public function getCredentials(); /** * Returns a user representation. * - * @return string|object Can be a UserInterface instance, an object implementing a __toString method, - * or the username as a regular string + * @return string|\Stringable|UserInterface * * @see AbstractToken::setUser() */ @@ -60,7 +60,7 @@ public function getUser(); * The user can be a UserInterface instance, or an object implementing * a __toString method or the username as a regular string. * - * @param string|object $user The user + * @param string|\Stringable|UserInterface $user * * @throws \InvalidArgumentException */ diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php index 9b71520a2b1c0..ae69107edd1ad 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php @@ -11,7 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\RoleInterface; +use Symfony\Component\Security\Core\Role\Role; +use Symfony\Component\Security\Core\User\UserInterface; /** * UsernamePasswordToken implements a username and password token. @@ -24,10 +25,10 @@ class UsernamePasswordToken extends AbstractToken private $providerKey; /** - * @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method - * @param mixed $credentials This usually is the password of the user - * @param string $providerKey The provider key - * @param (RoleInterface|string)[] $roles An array of roles + * @param string|\Stringable|UserInterface $user The username (like a nickname, email address, etc.) or a UserInterface instance + * @param mixed $credentials + * @param string $providerKey + * @param (Role|string)[] $roles * * @throws \InvalidArgumentException */ From 0ee97f23a6711ff302686549a876ae6831192a6c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 13 Mar 2020 11:25:23 +0100 Subject: [PATCH 45/82] [Validator] clarify stringable type annotations --- .../Validator/ConstraintViolation.php | 32 +++++++++---------- .../ConstraintViolationInterface.php | 2 +- .../Context/ExecutionContextInterface.php | 8 ++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php index ae9ff89eb54cf..a90a7a0bd83ab 100644 --- a/src/Symfony/Component/Validator/ConstraintViolation.php +++ b/src/Symfony/Component/Validator/ConstraintViolation.php @@ -32,22 +32,22 @@ class ConstraintViolation implements ConstraintViolationInterface /** * Creates a new constraint violation. * - * @param string $message The violation message - * @param string $messageTemplate The raw violation message - * @param array $parameters The parameters to substitute in the - * raw violation message - * @param mixed $root The value originally passed to the - * validator - * @param string $propertyPath The property path from the root - * value to the invalid value - * @param mixed $invalidValue The invalid value that caused this - * violation - * @param int|null $plural The number for determining the plural - * form when translating the message - * @param mixed $code The error code of the violation - * @param Constraint|null $constraint The constraint whose validation - * caused the violation - * @param mixed $cause The cause of the violation + * @param string|\Stringable $message The violation message as a string or a stringable object + * @param string $messageTemplate The raw violation message + * @param array $parameters The parameters to substitute in the + * raw violation message + * @param mixed $root The value originally passed to the + * validator + * @param string $propertyPath The property path from the root + * value to the invalid value + * @param mixed $invalidValue The invalid value that caused this + * violation + * @param int|null $plural The number for determining the plural + * form when translating the message + * @param mixed $code The error code of the violation + * @param Constraint|null $constraint The constraint whose validation + * caused the violation + * @param mixed $cause The cause of the violation */ public function __construct($message, $messageTemplate, array $parameters, $root, $propertyPath, $invalidValue, $plural = null, $code = null, Constraint $constraint = null, $cause = null) { diff --git a/src/Symfony/Component/Validator/ConstraintViolationInterface.php b/src/Symfony/Component/Validator/ConstraintViolationInterface.php index 5ac25cf9ba53a..137d7015bfa3d 100644 --- a/src/Symfony/Component/Validator/ConstraintViolationInterface.php +++ b/src/Symfony/Component/Validator/ConstraintViolationInterface.php @@ -36,7 +36,7 @@ interface ConstraintViolationInterface /** * Returns the violation message. * - * @return string The violation message + * @return string|\Stringable The violation message as a string or a stringable object */ public function getMessage(); diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php index 09137f8511afa..3d7925b471a06 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php @@ -64,8 +64,8 @@ interface ExecutionContextInterface /** * Adds a violation at the current node of the validation graph. * - * @param string $message The error message - * @param array $params The parameters substituted in the error message + * @param string|\Stringable $message The error message as a string or a stringable object + * @param array $params The parameters substituted in the error message */ public function addViolation($message, array $params = []); @@ -81,8 +81,8 @@ public function addViolation($message, array $params = []); * ->setTranslationDomain('number_validation') * ->addViolation(); * - * @param string $message The error message - * @param array $parameters The parameters substituted in the error message + * @param string|\Stringable $message The error message as a string or a stringable object + * @param array $parameters The parameters substituted in the error message * * @return ConstraintViolationBuilderInterface The violation builder */ From 523f5c04ab8c11b04097db74a4de96da3688d92b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 13 Mar 2020 11:30:33 +0100 Subject: [PATCH 46/82] fix typo --- .../Security/Core/Authentication/Token/AbstractToken.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index d10b938bf0ff5..99bc3d6d8f9c0 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -41,7 +41,7 @@ public function __construct(array $roles = []) if (\is_string($role)) { $role = new Role($role); } elseif (!$role instanceof RoleInterface) { - throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, Role instances, but got %s.', \gettype($role))); + throw new \InvalidArgumentException(sprintf('$roles must be an array of strings or Role instances, but got %s.', \gettype($role))); } $this->roles[] = $role; From 228b59da56a1b58ea74e3dc1a5aed0c95677baa1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 13 Mar 2020 11:38:56 +0100 Subject: [PATCH 47/82] [Security/Core] fix merge --- .../Security/Core/Authentication/Token/AbstractToken.php | 4 ++-- .../Security/Core/Authentication/Token/AnonymousToken.php | 3 +-- .../Core/Authentication/Token/PreAuthenticatedToken.php | 3 +-- .../Core/Authentication/Token/UsernamePasswordToken.php | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 3758dbf45b830..8a91d0438b0a5 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -31,7 +31,7 @@ abstract class AbstractToken implements TokenInterface private $attributes = []; /** - * @param (Role|string)[] $roles An array of roles + * @param string[] $roles An array of roles * * @throws \InvalidArgumentException */ @@ -41,7 +41,7 @@ public function __construct(array $roles = []) if (\is_string($role)) { $role = new Role($role, false); } elseif (!$role instanceof Role) { - throw new \InvalidArgumentException(sprintf('$roles must be an array of strings or Role instances, but got %s.', \gettype($role))); + throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, but got %s.', \gettype($role))); } $this->roles[] = $role; diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php index f9333bc7afd1f..8c658060ad4a5 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\User\UserInterface; /** @@ -26,7 +25,7 @@ class AnonymousToken extends AbstractToken /** * @param string $secret A secret used to make sure the token is created by the app and not by a malicious client * @param string|\Stringable|UserInterface $user - * @param (Role|string)[] $roles + * @param string[] $roles */ public function __construct(string $secret, $user, array $roles = []) { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php index 3555eef9bb918..eb20f7fe6bbde 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\User\UserInterface; /** @@ -28,7 +27,7 @@ class PreAuthenticatedToken extends AbstractToken * @param string|\Stringable|UserInterface $user * @param mixed $credentials * @param string $providerKey - * @param (Role|string)[] $roles + * @param string[] $roles */ public function __construct($user, $credentials, string $providerKey, array $roles = []) { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php index bd22eb620666c..2b493c70f30ad 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Security\Core\Authentication\Token; -use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\User\UserInterface; /** @@ -28,7 +27,7 @@ class UsernamePasswordToken extends AbstractToken * @param string|\Stringable|UserInterface $user The username (like a nickname, email address, etc.) or a UserInterface instance * @param mixed $credentials * @param string $providerKey - * @param (Role|string)[] $roles + * @param string[] $roles * * @throws \InvalidArgumentException */ From 20971dff8297d59c8cd4bc5f2ba604a4c13913c8 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 10 Mar 2020 20:37:52 +0100 Subject: [PATCH 48/82] ignore microseconds submitted by Edge --- .../Form/Extension/Core/Type/TimeType.php | 20 ++++---- .../Extension/Core/Type/TimeTypeTest.php | 48 +++++++++++++++++++ 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php index f0b5ac2ac4df8..2fcf2005185b3 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php @@ -57,16 +57,18 @@ public function buildForm(FormBuilderInterface $builder, array $options) if ('single_text' === $options['widget']) { $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format)); - // handle seconds ignored by user's browser when with_seconds enabled - // https://codereview.chromium.org/450533009/ - if ($options['with_seconds']) { - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) { - $data = $e->getData(); - if ($data && preg_match('/^\d{2}:\d{2}$/', $data)) { - $e->setData($data.':00'); + $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) use ($options) { + $data = $e->getData(); + if ($data && preg_match('/^(?P\d{2}):(?P\d{2})(?::(?P\d{2})(?:\.\d+)?)?$/', $data, $matches)) { + if ($options['with_seconds']) { + // handle seconds ignored by user's browser when with_seconds enabled + // https://codereview.chromium.org/450533009/ + $e->setData(sprintf('%s:%s:%s', $matches['hours'], $matches['minutes'], isset($matches['seconds']) ? $matches['seconds'] : '00')); + } else { + $e->setData(sprintf('%s:%s', $matches['hours'], $matches['minutes'])); } - }); - } + } + }); } else { $hourOptions = $minuteOptions = $secondOptions = [ 'error_bubbling' => true, diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php index 1f0797f000db4..3a911de8fe99b 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php @@ -239,6 +239,54 @@ public function testSubmitWithSecondsAndBrowserOmissionSeconds() $this->assertEquals('03:04:00', $form->getViewData()); } + public function testSubmitWithoutSecondsAndBrowserAddingSeconds() + { + $form = $this->factory->create(static::TESTED_TYPE, null, [ + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', + 'input' => 'string', + 'widget' => 'single_text', + 'with_seconds' => false, + ]); + + $form->submit('03:04:00'); + + $this->assertEquals('03:04:00', $form->getData()); + $this->assertEquals('03:04', $form->getViewData()); + } + + public function testSubmitWithSecondsAndBrowserAddingMicroseconds() + { + $form = $this->factory->create(static::TESTED_TYPE, null, [ + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', + 'input' => 'string', + 'widget' => 'single_text', + 'with_seconds' => true, + ]); + + $form->submit('03:04:00.000'); + + $this->assertEquals('03:04:00', $form->getData()); + $this->assertEquals('03:04:00', $form->getViewData()); + } + + public function testSubmitWithoutSecondsAndBrowserAddingMicroseconds() + { + $form = $this->factory->create(static::TESTED_TYPE, null, [ + 'model_timezone' => 'UTC', + 'view_timezone' => 'UTC', + 'input' => 'string', + 'widget' => 'single_text', + 'with_seconds' => false, + ]); + + $form->submit('03:04:00.000'); + + $this->assertEquals('03:04:00', $form->getData()); + $this->assertEquals('03:04', $form->getViewData()); + } + public function testSetDataWithoutMinutes() { $form = $this->factory->create(static::TESTED_TYPE, null, [ From 453078ff37a6019d5862056ed0421d04af3f8295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20P=C3=A9delagrabe?= Date: Wed, 11 Mar 2020 13:15:35 +0100 Subject: [PATCH 49/82] [Mime] Fix boundary header --- .../Component/Mime/Part/AbstractMultipartPart.php | 2 +- .../Mime/Tests/Part/Multipart/FormDataPartTest.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Mime/Part/AbstractMultipartPart.php b/src/Symfony/Component/Mime/Part/AbstractMultipartPart.php index 48b8620232c49..685d250627e43 100644 --- a/src/Symfony/Component/Mime/Part/AbstractMultipartPart.php +++ b/src/Symfony/Component/Mime/Part/AbstractMultipartPart.php @@ -91,7 +91,7 @@ public function asDebugString(): string private function getBoundary(): string { if (null === $this->boundary) { - $this->boundary = '_=_symfony_'.time().'_'.bin2hex(random_bytes(16)).'_=_'; + $this->boundary = strtr(base64_encode(random_bytes(6)), '+/', '-_'); } return $this->boundary; diff --git a/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php b/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php index a74ecea316ec9..dbc2e6eff9a22 100644 --- a/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php +++ b/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php @@ -91,4 +91,16 @@ public function testContentLineLength() $this->assertEquals($foo, $parts[0]->bodyToString()); $this->assertEquals($bar, $parts[1]->bodyToString()); } + + public function testBoundaryContentTypeHeader() + { + $f = new FormDataPart([ + 'file' => new DataPart('data.csv', 'data.csv', 'text/csv'), + ]); + $headers = $f->getPreparedHeaders()->toArray(); + $this->assertRegExp( + '/^Content-Type: multipart\/form-data; boundary=[a-zA-Z0-9\-_]{8}$/', + $headers[0] + ); + } } From 186ee831d706496c28aaee2d70355e231954470c Mon Sep 17 00:00:00 2001 From: Matthieu Mota Date: Sat, 14 Mar 2020 19:44:21 +0100 Subject: [PATCH 50/82] [HttpClient] Fix typo --- src/Symfony/Component/HttpClient/CurlHttpClient.php | 2 +- src/Symfony/Component/HttpClient/HttpClient.php | 2 +- src/Symfony/Component/HttpClient/NativeHttpClient.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index b037ca0fc29e2..d20d8b6f328c6 100644 --- a/src/Symfony/Component/HttpClient/CurlHttpClient.php +++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php @@ -53,7 +53,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface, private static $curlVersion; /** - * @param array $defaultOptions Default requests' options + * @param array $defaultOptions Default request's options * @param int $maxHostConnections The maximum number of connections to a single host * @param int $maxPendingPushes The maximum number of pushed responses to accept in the queue * diff --git a/src/Symfony/Component/HttpClient/HttpClient.php b/src/Symfony/Component/HttpClient/HttpClient.php index 3eb3a4c8849ea..b8ce62a233c83 100644 --- a/src/Symfony/Component/HttpClient/HttpClient.php +++ b/src/Symfony/Component/HttpClient/HttpClient.php @@ -21,7 +21,7 @@ final class HttpClient { /** - * @param array $defaultOptions Default requests' options + * @param array $defaultOptions Default request's options * @param int $maxHostConnections The maximum number of connections to a single host * @param int $maxPendingPushes The maximum number of pushed responses to accept in the queue * diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php index 2cdb2029220b5..90524db1ae4e6 100644 --- a/src/Symfony/Component/HttpClient/NativeHttpClient.php +++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php @@ -41,7 +41,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac private $multi; /** - * @param array $defaultOptions Default requests' options + * @param array $defaultOptions Default request's options * @param int $maxHostConnections The maximum number of connections to open * * @see HttpClientInterface::OPTIONS_DEFAULTS for available options From bb8a66e3fc95537f9d734b5c7ae0f673416badc2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Mar 2020 10:01:00 +0100 Subject: [PATCH 51/82] Add missing dots at the end of exception messages --- ...gisterEventListenersAndSubscribersPass.php | 4 ++-- .../CompilerPass/RegisterMappingsPass.php | 4 ++-- .../HttpFoundation/DbalSessionHandler.php | 8 ++++---- .../Security/User/EntityUserProvider.php | 2 +- .../Monolog/Handler/SwiftMailerHandler.php | 2 +- .../LazyLoadingValueHolderGenerator.php | 2 +- .../Bridge/Twig/Command/DebugCommand.php | 2 +- .../Bridge/Twig/Command/LintCommand.php | 2 +- .../Command/AbstractConfigCommand.php | 4 ++-- .../Command/CacheClearCommand.php | 2 +- .../Command/ConfigDebugCommand.php | 2 +- .../Compiler/ProfilerPass.php | 2 +- .../FrameworkExtension.php | 4 ++-- .../Templating/Helper/StopwatchHelper.php | 2 +- .../FrameworkBundle/Test/WebTestCase.php | 2 +- .../Compiler/AddSecurityVotersPass.php | 2 +- .../Factory/GuardAuthenticationFactory.php | 2 +- .../DependencyInjection/SecurityExtension.php | 4 ++-- .../Compiler/TwigLoaderPass.php | 2 +- src/Symfony/Component/Asset/UrlPackage.php | 2 +- .../JsonManifestVersionStrategy.php | 2 +- src/Symfony/Component/BrowserKit/Client.php | 2 +- .../Cache/Adapter/AbstractAdapter.php | 2 +- .../Cache/Adapter/PhpFilesAdapter.php | 2 +- src/Symfony/Component/Cache/CacheItem.php | 16 +++++++-------- .../Component/Cache/Simple/AbstractCache.php | 10 +++++----- .../Component/Cache/Simple/ArrayCache.php | 8 ++++---- .../Component/Cache/Simple/PhpArrayCache.php | 6 +++--- .../Component/Cache/Simple/PhpFilesCache.php | 2 +- .../Component/Cache/Simple/Psr6Cache.php | 6 +++--- .../Component/Cache/Traits/AbstractTrait.php | 2 +- .../Component/Cache/Traits/ApcuTrait.php | 2 +- .../Cache/Traits/FilesystemCommonTrait.php | 2 +- .../Cache/Traits/FilesystemTrait.php | 2 +- .../Component/Cache/Traits/MemcachedTrait.php | 10 +++++----- .../Component/Cache/Traits/PdoTrait.php | 2 +- .../Component/Cache/Traits/PhpFilesTrait.php | 2 +- .../Component/Cache/Traits/RedisTrait.php | 20 +++++++++---------- .../ClassLoader/ClassCollectionLoader.php | 6 +++--- .../Component/Config/Definition/ArrayNode.php | 2 +- .../Component/Config/Definition/BaseNode.php | 2 +- .../Builder/ArrayNodeDefinition.php | 16 +++++++-------- .../Config/Definition/Builder/ExprBuilder.php | 2 +- .../Builder/NumericNodeDefinition.php | 4 ++-- .../Definition/Dumper/YamlReferenceDumper.php | 4 ++-- .../Config/Definition/PrototypedArrayNode.php | 2 +- src/Symfony/Component/Console/Application.php | 4 ++-- .../Component/Console/Command/Command.php | 2 +- .../Console/Formatter/OutputFormatter.php | 2 +- .../Formatter/OutputFormatterStyle.php | 8 ++++---- .../Component/Console/Helper/TableStyle.php | 2 +- .../Component/Console/Input/StringInput.php | 2 +- .../Tests/Formatter/OutputFormatterTest.php | 2 +- .../XPath/Extension/FunctionExtension.php | 2 +- src/Symfony/Component/Debug/ErrorHandler.php | 4 ++-- .../DependencyInjection/ContainerBuilder.php | 10 +++++----- .../DependencyInjection/Dumper/PhpDumper.php | 8 ++++---- .../Configurator/AbstractConfigurator.php | 2 +- .../Configurator/ContainerConfigurator.php | 2 +- .../DependencyInjection/Loader/FileLoader.php | 2 +- .../Loader/XmlFileLoader.php | 6 +++--- .../Loader/YamlFileLoader.php | 4 ++-- .../Tests/Loader/FileLoaderTest.php | 2 +- .../DomCrawler/FormFieldRegistry.php | 2 +- .../ContainerAwareEventDispatcher.php | 2 +- .../Component/ExpressionLanguage/Lexer.php | 8 ++++---- .../ExpressionLanguage/Node/BinaryNode.php | 4 ++-- .../Component/ExpressionLanguage/Parser.php | 12 +++++------ .../ParserCache/ParserCacheAdapter.php | 14 ++++++------- .../ExpressionLanguage/SyntaxError.php | 2 +- .../ExpressionLanguage/TokenStream.php | 4 ++-- .../Component/Filesystem/Filesystem.php | 4 ++-- .../Component/Form/AbstractExtension.php | 2 +- src/Symfony/Component/Form/Button.php | 4 ++-- .../Component/Form/Command/DebugCommand.php | 2 +- .../ArrayToPartsTransformer.php | 2 +- .../ChoiceToValueTransformer.php | 2 +- .../ChoicesToValuesTransformer.php | 2 +- .../DateIntervalToArrayTransformer.php | 6 +++--- .../DateIntervalToStringTransformer.php | 2 +- .../DateTimeToArrayTransformer.php | 16 +++++++-------- .../NumberToLocalizedStringTransformer.php | 6 +++--- .../PercentToLocalizedStringTransformer.php | 2 +- .../ValueToDuplicatesTransformer.php | 4 ++-- .../ViolationMapper/ViolationPath.php | 8 ++++---- src/Symfony/Component/Form/Form.php | 10 +++++----- src/Symfony/Component/Form/FormView.php | 2 +- .../Component/Form/PreloadedExtension.php | 2 +- .../Test/Traits/ValidatorExtensionTrait.php | 4 ++-- .../Component/Form/Util/OrderedHashMap.php | 2 +- .../Component/HttpFoundation/File/File.php | 6 +++--- .../File/MimeType/MimeTypeGuesser.php | 2 +- .../HttpFoundation/File/UploadedFile.php | 2 +- .../Handler/MemcacheSessionHandler.php | 2 +- .../Handler/MemcachedSessionHandler.php | 2 +- .../Storage/Handler/MongoDbSessionHandler.php | 4 ++-- .../Handler/NativeFileSessionHandler.php | 4 ++-- .../Storage/Handler/PdoSessionHandler.php | 4 ++-- .../Storage/MockArraySessionStorage.php | 2 +- .../Storage/MockFileSessionStorage.php | 4 ++-- .../Session/Storage/NativeSessionStorage.php | 2 +- .../Session/Storage/Proxy/AbstractProxy.php | 4 ++-- .../Controller/ControllerResolver.php | 2 +- .../DataCollector/DumpDataCollector.php | 2 +- .../Fragment/HIncludeFragmentRenderer.php | 2 +- src/Symfony/Component/HttpKernel/Kernel.php | 6 +++--- .../Data/Bundle/Compiler/GenrbCompiler.php | 2 +- .../Data/Bundle/Reader/JsonBundleReader.php | 2 +- .../Data/Generator/LocaleDataGenerator.php | 2 +- .../DateFormat/FullTransformer.php | 2 +- .../Component/Intl/Globals/IntlGlobals.php | 2 +- .../Intl/NumberFormatter/NumberFormatter.php | 2 +- src/Symfony/Component/Ldap/Ldap.php | 2 +- .../Component/Lock/Store/MemcachedStore.php | 2 +- .../Component/Lock/Store/RedisStore.php | 4 ++-- .../Component/Lock/Store/SemaphoreStore.php | 2 +- src/Symfony/Component/Process/InputStream.php | 2 +- .../Component/Process/Pipes/AbstractPipes.php | 2 +- .../Component/Process/Pipes/WindowsPipes.php | 2 +- src/Symfony/Component/Process/Process.php | 6 +++--- .../PropertyAccess/PropertyAccessor.php | 4 ++-- .../Component/PropertyAccess/PropertyPath.php | 10 +++++----- .../PropertyAccess/PropertyPathBuilder.php | 6 +++--- .../Routing/Loader/ObjectRouteLoader.php | 8 ++++---- .../LdapBindAuthenticationProvider.php | 2 +- .../Security/Core/User/LdapUserProvider.php | 2 +- .../Provider/GuardAuthenticationProvider.php | 2 +- .../SimpleAuthenticationHandler.php | 4 ++-- .../Firewall/DigestAuthenticationListener.php | 6 +++--- .../Http/Firewall/ExceptionListener.php | 2 +- .../RemoteUserAuthenticationListener.php | 2 +- .../SimpleFormAuthenticationListener.php | 2 +- .../SimplePreAuthenticationListener.php | 4 ++-- .../Http/Firewall/SwitchUserListener.php | 2 +- .../Firewall/X509AuthenticationListener.php | 2 +- .../RememberMe/AbstractRememberMeServices.php | 2 +- .../Session/SessionAuthenticationStrategy.php | 2 +- .../Tests/Firewall/ExceptionListenerTest.php | 2 +- .../Serializer/Encoder/XmlEncoder.php | 2 +- .../Mapping/Factory/ClassResolverTrait.php | 2 +- .../Serializer/Mapping/Loader/FileLoader.php | 4 ++-- .../Serializer/Mapping/Loader/LoaderChain.php | 2 +- .../Normalizer/AbstractNormalizer.php | 4 ++-- .../Normalizer/AbstractObjectNormalizer.php | 4 ++-- .../Normalizer/DateTimeNormalizer.php | 2 +- .../Normalizer/JsonSerializableNormalizer.php | 2 +- .../Component/Serializer/Serializer.php | 6 +++--- .../Component/Stopwatch/StopwatchEvent.php | 2 +- .../Templating/Loader/CacheLoader.php | 2 +- .../Component/Templating/PhpEngine.php | 4 ++-- .../Translation/Loader/IcuDatFileLoader.php | 2 +- .../Translation/Loader/IcuResFileLoader.php | 2 +- .../Translation/Loader/JsonFileLoader.php | 2 +- .../Translation/Loader/XliffFileLoader.php | 6 +++--- .../Translation/Loader/YamlFileLoader.php | 2 +- .../Translation/MessageCatalogue.php | 2 +- .../Translation/Writer/TranslationWriter.php | 2 +- .../AbstractComparisonValidator.php | 2 +- .../Constraints/CallbackValidator.php | 4 ++-- .../Validator/Constraints/ChoiceValidator.php | 4 ++-- .../Validator/Constraints/Collection.php | 2 +- .../Validator/Constraints/Composite.php | 4 ++-- .../Component/Validator/Constraints/Count.php | 2 +- .../Validator/Constraints/EmailValidator.php | 2 +- .../Component/Validator/Constraints/File.php | 2 +- .../Validator/Constraints/ImageValidator.php | 14 ++++++------- .../Component/Validator/Constraints/Ip.php | 2 +- .../Validator/Constraints/Length.php | 2 +- .../Component/Validator/Constraints/Range.php | 2 +- .../Validator/Constraints/Traverse.php | 2 +- .../Validator/Constraints/UrlValidator.php | 2 +- .../Validator/Mapping/ClassMetadata.php | 10 +++++----- .../Factory/LazyLoadingMetadataFactory.php | 2 +- .../Validator/Mapping/GetterMetadata.php | 2 +- .../Mapping/Loader/AbstractLoader.php | 2 +- .../Validator/Mapping/Loader/FileLoader.php | 6 +++--- .../Validator/Mapping/Loader/LoaderChain.php | 2 +- .../Mapping/Loader/StaticMethodLoader.php | 2 +- .../Validator/Mapping/MemberMetadata.php | 2 +- .../Validator/Mapping/PropertyMetadata.php | 2 +- .../Component/VarDumper/Cloner/Data.php | 2 +- src/Symfony/Component/Yaml/Parser.php | 4 ++-- 182 files changed, 335 insertions(+), 335 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php index d6b9d0a9a238a..4dccb29765940 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php @@ -68,7 +68,7 @@ private function addTaggedSubscribers(ContainerBuilder $container) $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections); foreach ($connections as $con) { if (!isset($this->connections[$con])) { - throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections)))); + throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s.', $con, $id, implode(', ', array_keys($this->connections)))); } $this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', [new Reference($id)]); @@ -91,7 +91,7 @@ private function addTaggedListeners(ContainerBuilder $container) $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections); foreach ($connections as $con) { if (!isset($this->connections[$con])) { - throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections)))); + throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s.', $con, $id, implode(', ', array_keys($this->connections)))); } if ($lazy = !empty($tag['lazy'])) { diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php index 16ca723223cdc..0999be3445323 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php @@ -125,7 +125,7 @@ public function __construct($driver, array $namespaces, array $managerParameters $this->driverPattern = $driverPattern; $this->enabledParameter = $enabledParameter; if (\count($aliasMap) && (!$configurationPattern || !$registerAliasMethodName)) { - throw new \InvalidArgumentException('configurationPattern and registerAliasMethodName are required to register namespace alias'); + throw new \InvalidArgumentException('configurationPattern and registerAliasMethodName are required to register namespace alias.'); } $this->configurationPattern = $configurationPattern; $this->registerAliasMethodName = $registerAliasMethodName; @@ -222,7 +222,7 @@ private function getManagerName(ContainerBuilder $container) } } - throw new InvalidArgumentException(sprintf('Could not find the manager name parameter in the container. Tried the following parameter names: "%s"', implode('", "', $this->managerParameters))); + throw new InvalidArgumentException(sprintf('Could not find the manager name parameter in the container. Tried the following parameter names: "%s".', implode('", "', $this->managerParameters))); } /** diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php index 0079940bd56f6..fc60d12d7b395 100644 --- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php +++ b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php @@ -96,7 +96,7 @@ public function destroy($sessionId) $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR); $stmt->execute(); } catch (\Exception $e) { - throw new \RuntimeException(sprintf('Exception was thrown when trying to delete a session: %s', $e->getMessage()), 0, $e); + throw new \RuntimeException(sprintf('Exception was thrown when trying to delete a session: %s.', $e->getMessage()), 0, $e); } return true; @@ -115,7 +115,7 @@ public function gc($maxlifetime) $stmt->bindValue(':time', time() - $maxlifetime, \PDO::PARAM_INT); $stmt->execute(); } catch (\Exception $e) { - throw new \RuntimeException(sprintf('Exception was thrown when trying to delete expired sessions: %s', $e->getMessage()), 0, $e); + throw new \RuntimeException(sprintf('Exception was thrown when trying to delete expired sessions: %s.', $e->getMessage()), 0, $e); } return true; @@ -142,7 +142,7 @@ public function read($sessionId) return ''; } catch (\Exception $e) { - throw new \RuntimeException(sprintf('Exception was thrown when trying to read the session data: %s', $e->getMessage()), 0, $e); + throw new \RuntimeException(sprintf('Exception was thrown when trying to read the session data: %s.', $e->getMessage()), 0, $e); } } @@ -212,7 +212,7 @@ public function write($sessionId, $data) } } } catch (\Exception $e) { - throw new \RuntimeException(sprintf('Exception was thrown when trying to write the session data: %s', $e->getMessage()), 0, $e); + throw new \RuntimeException(sprintf('Exception was thrown when trying to write the session data: %s.', $e->getMessage()), 0, $e); } return true; diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php index 94b7480930a5e..1fe8a5c53a5ab 100644 --- a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php @@ -92,7 +92,7 @@ public function refreshUser(UserInterface $user) $refreshedUser = $repository->find($id); if (null === $refreshedUser) { - throw new UsernameNotFoundException(sprintf('User with id %s not found', json_encode($id))); + throw new UsernameNotFoundException(sprintf('User with id %s not found.', json_encode($id))); } } diff --git a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php index c912614a2abb9..03cea01352e1b 100644 --- a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php @@ -83,7 +83,7 @@ private function flushMemorySpool() } if (null === $this->transport) { - throw new \Exception('No transport available to flush mail queue'); + throw new \Exception('No transport available to flush mail queue.'); } $spool->flushQueue($this->transport); diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php index 1d9432f622b41..d4ce6825948ba 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php @@ -32,7 +32,7 @@ public function generate(\ReflectionClass $originalClass, ClassGenerator $classG $newBody = preg_replace('/^(\$this->initializer[a-zA-Z0-9]++) && .*;\n\nreturn (\$this->valueHolder)/', '$1 || $2', $body); if ($body === $newBody) { - throw new \UnexpectedValueException(sprintf('Unexpected lazy-proxy format generated for method %s::__destruct()', $originalClass->name)); + throw new \UnexpectedValueException(sprintf('Unexpected lazy-proxy format generated for method %s::__destruct().', $originalClass->name)); } $destructor->setBody($newBody); diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php index 17c62aaf3c607..da06aae9b5a50 100644 --- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php +++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php @@ -239,7 +239,7 @@ private function getMetadata($type, $entity) } elseif (\is_string($cb) && preg_match('{^(.+)::(.+)$}', $cb, $m) && method_exists($m[1], $m[2])) { $refl = new \ReflectionMethod($m[1], $m[2]); } else { - throw new \UnexpectedValueException('Unsupported callback type'); + throw new \UnexpectedValueException('Unsupported callback type.'); } $args = $refl->getParameters(); diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php index dc47dd8cfb381..c4343d60b76d5 100644 --- a/src/Symfony/Bridge/Twig/Command/LintCommand.php +++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php @@ -157,7 +157,7 @@ protected function findFiles($filename) return Finder::create()->files()->in($filename)->name('*.twig'); } - throw new RuntimeException(sprintf('File or directory "%s" is not readable', $filename)); + throw new RuntimeException(sprintf('File or directory "%s" is not readable.', $filename)); } private function validate($template, $file) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php index c038133975302..9f512ae20a5db 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php @@ -112,11 +112,11 @@ protected function findExtension($name) public function validateConfiguration(ExtensionInterface $extension, $configuration) { if (!$configuration) { - throw new \LogicException(sprintf('The extension with alias "%s" does not have its getConfiguration() method setup', $extension->getAlias())); + throw new \LogicException(sprintf('The extension with alias "%s" does not have its getConfiguration() method setup.', $extension->getAlias())); } if (!$configuration instanceof ConfigurationInterface) { - throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable', \get_class($configuration))); + throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable.', \get_class($configuration))); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php index 969ac030bbe97..af1e16cad5567 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -104,7 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $fs->remove($oldCacheDir); if (!is_writable($realCacheDir)) { - throw new RuntimeException(sprintf('Unable to write in the "%s" directory', $realCacheDir)); + throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realCacheDir)); } $io->comment(sprintf('Clearing the cache for the %s environment with debug %s', $kernel->getEnvironment(), var_export($kernel->isDebug(), true))); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php index 9919e4657db5e..adea7dbdbffc7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php @@ -140,7 +140,7 @@ private function getConfigForPath(array $config, $path, $alias) foreach ($steps as $step) { if (!\array_key_exists($step, $config)) { - throw new LogicException(sprintf('Unable to find configuration for "%s.%s"', $alias, $path)); + throw new LogicException(sprintf('Unable to find configuration for "%s.%s".', $alias, $path)); } $config = $config[$step]; diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php index 357c079c4aa0b..d6e61cc605521 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php @@ -39,7 +39,7 @@ public function process(ContainerBuilder $container) if (isset($attributes[0]['template'])) { if (!isset($attributes[0]['id'])) { - throw new InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template', $id)); + throw new InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template.', $id)); } $template = [$attributes[0]['id'], $attributes[0]['template']]; } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 1762112a490f0..afad1629d3718 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1201,7 +1201,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder if ($container->fileExists($dir)) { $dirs[] = $dir; } else { - throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory', $dir)); + throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory.', $dir)); } } @@ -1629,7 +1629,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont $storeDefinition = new Reference($storeDefinitionId); break; default: - throw new InvalidArgumentException(sprintf('Lock store DSN "%s" is not valid in resource "%s"', $storeDsn, $resourceName)); + throw new InvalidArgumentException(sprintf('Lock store DSN "%s" is not valid in resource "%s".', $storeDsn, $resourceName)); } $storeDefinitions[] = $storeDefinition; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php index 2964cd35b5695..8f2a21a681bc4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php @@ -43,6 +43,6 @@ public function __call($method, $arguments = []) return \call_user_func_array([$this->stopwatch, $method], $arguments); } - throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method)); + throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist.', $method)); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php index 74d99194ad9a9..85138560665d1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php @@ -39,7 +39,7 @@ protected static function createClient(array $options = [], array $server = []) 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"'); + 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/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php index ff63db630bbee..07b2eaeed0d16 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php @@ -38,7 +38,7 @@ public function process(ContainerBuilder $container) $voters = $this->findAndSortTaggedServices('security.voter', $container); if (!$voters) { - throw new LogicException('No security voters found. You need to tag at least one with "security.voter"'); + throw new LogicException('No security voters found. You need to tag at least one with "security.voter".'); } foreach ($voters as $voter) { diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php index 8384c42da7e66..3e4c76c8ce231 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php @@ -115,6 +115,6 @@ private function determineEntryPoint($defaultEntryPointId, array $config) } // we have multiple entry points - we must ask them to configure one - throw new \LogicException(sprintf('Because you have multiple guard authenticators, you need to set the "guard.entry_point" key to one of your authenticators (%s)', implode(', ', $authenticatorIds))); + throw new \LogicException(sprintf('Because you have multiple guard authenticators, you need to set the "guard.entry_point" key to one of your authenticators (%s).', implode(', ', $authenticatorIds))); } } diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index 19e9beb1e37e6..fce4bd95382e5 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -387,7 +387,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a } if (isset($this->logoutOnUserChangeByContextKey[$contextKey]) && $this->logoutOnUserChangeByContextKey[$contextKey][1] !== $logoutOnUserChange) { - throw new InvalidConfigurationException(sprintf('Firewalls "%s" and "%s" need to have the same value for option "logout_on_user_change" as they are sharing the context "%s"', $this->logoutOnUserChangeByContextKey[$contextKey][0], $id, $contextKey)); + throw new InvalidConfigurationException(sprintf('Firewalls "%s" and "%s" need to have the same value for option "logout_on_user_change" as they are sharing the context "%s".', $this->logoutOnUserChangeByContextKey[$contextKey][0], $id, $contextKey)); } $this->logoutOnUserChangeByContextKey[$contextKey] = [$id, $logoutOnUserChange]; @@ -701,7 +701,7 @@ private function createUserDaoProvider($name, $provider, ContainerBuilder $conta return $name; } - throw new InvalidConfigurationException(sprintf('Unable to create definition for "%s" user provider', $name)); + throw new InvalidConfigurationException(sprintf('Unable to create definition for "%s" user provider.', $name)); } private function getUserProviderId($name) diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php index 51b6d9b4f022f..bd0c606a86d38 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php @@ -39,7 +39,7 @@ public function process(ContainerBuilder $container) } if (!$found) { - throw new LogicException('No twig loaders found. You need to tag at least one loader with "twig.loader"'); + throw new LogicException('No twig loaders found. You need to tag at least one loader with "twig.loader".'); } if (1 === $found) { diff --git a/src/Symfony/Component/Asset/UrlPackage.php b/src/Symfony/Component/Asset/UrlPackage.php index 23809a55fdf23..e9ea35175d442 100644 --- a/src/Symfony/Component/Asset/UrlPackage.php +++ b/src/Symfony/Component/Asset/UrlPackage.php @@ -130,7 +130,7 @@ private function getSslUrls($urls) if ('https://' === substr($url, 0, 8) || '//' === substr($url, 0, 2)) { $sslUrls[] = $url; } elseif ('http://' !== substr($url, 0, 7)) { - throw new InvalidArgumentException(sprintf('"%s" is not a valid URL', $url)); + throw new InvalidArgumentException(sprintf('"%s" is not a valid URL.', $url)); } } diff --git a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php index 378ad54346d7f..2ab686a561956 100644 --- a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php +++ b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php @@ -59,7 +59,7 @@ private function getManifestPath($path) $this->manifestData = json_decode(file_get_contents($this->manifestPath), true); if (0 < json_last_error()) { - throw new \RuntimeException(sprintf('Error parsing JSON from asset manifest file "%s" - %s', $this->manifestPath, json_last_error_msg())); + throw new \RuntimeException(sprintf('Error parsing JSON from asset manifest file "%s" - %s.', $this->manifestPath, json_last_error_msg())); } } diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php index 4caad676ae0c6..2e641e884ace4 100644 --- a/src/Symfony/Component/BrowserKit/Client.php +++ b/src/Symfony/Component/BrowserKit/Client.php @@ -370,7 +370,7 @@ protected function doRequestInProcess($request) } if (!$process->isSuccessful() || !preg_match('/^O\:\d+\:/', $process->getOutput())) { - throw new \RuntimeException(sprintf('OUTPUT: %s ERROR OUTPUT: %s', $process->getOutput(), $process->getErrorOutput())); + throw new \RuntimeException(sprintf('OUTPUT: %s ERROR OUTPUT: %s.', $process->getOutput(), $process->getErrorOutput())); } return unserialize($process->getOutput()); diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php index 62e102e99304f..f356a92950e27 100644 --- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php @@ -46,7 +46,7 @@ protected function __construct($namespace = '', $defaultLifetime = 0) { $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).static::NS_SEPARATOR; if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) { - throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s")', $this->maxIdLength - 24, \strlen($namespace), $namespace)); + throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace)); } $this->createCacheItem = \Closure::bind( static function ($key, $value, $isHit) use ($defaultLifetime) { diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php index 9ab870534f967..1012148a9663f 100644 --- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php @@ -29,7 +29,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface public function __construct($namespace = '', $defaultLifetime = 0, $directory = null) { if (!static::isSupported()) { - throw new CacheException('OPcache is not enabled'); + throw new CacheException('OPcache is not enabled.'); } parent::__construct('', $defaultLifetime); $this->init($namespace, $directory); diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php index d7edb7f80aca0..b16ad0faf7545 100644 --- a/src/Symfony/Component/Cache/CacheItem.php +++ b/src/Symfony/Component/Cache/CacheItem.php @@ -78,7 +78,7 @@ public function expiresAt($expiration) } elseif ($expiration instanceof \DateTimeInterface) { $this->expiry = (int) $expiration->format('U'); } else { - throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given', \is_object($expiration) ? \get_class($expiration) : \gettype($expiration))); + throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given.', \is_object($expiration) ? \get_class($expiration) : \gettype($expiration))); } return $this; @@ -98,7 +98,7 @@ public function expiresAfter($time) } elseif (\is_int($time)) { $this->expiry = $time + time(); } else { - throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', \is_object($time) ? \get_class($time) : \gettype($time))); + throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($time) ? \get_class($time) : \gettype($time))); } return $this; @@ -120,16 +120,16 @@ public function tag($tags) } foreach ($tags as $tag) { if (!\is_string($tag)) { - throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given', \is_object($tag) ? \get_class($tag) : \gettype($tag))); + throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag))); } if (isset($this->tags[$tag])) { continue; } if ('' === $tag) { - throw new InvalidArgumentException('Cache tag length must be greater than zero'); + throw new InvalidArgumentException('Cache tag length must be greater than zero.'); } if (false !== strpbrk($tag, '{}()/\@:')) { - throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:', $tag)); + throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:.', $tag)); } $this->tags[$tag] = $tag; } @@ -159,13 +159,13 @@ public function getPreviousTags() public static function validateKey($key) { if (!\is_string($key)) { - throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given', \is_object($key) ? \get_class($key) : \gettype($key))); + throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key))); } if ('' === $key) { - throw new InvalidArgumentException('Cache key length must be greater than zero'); + throw new InvalidArgumentException('Cache key length must be greater than zero.'); } if (false !== strpbrk($key, '{}()/\@:')) { - throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key)); + throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:.', $key)); } return $key; diff --git a/src/Symfony/Component/Cache/Simple/AbstractCache.php b/src/Symfony/Component/Cache/Simple/AbstractCache.php index 23b401c54be55..baedb737479a3 100644 --- a/src/Symfony/Component/Cache/Simple/AbstractCache.php +++ b/src/Symfony/Component/Cache/Simple/AbstractCache.php @@ -45,7 +45,7 @@ protected function __construct($namespace = '', $defaultLifetime = 0) $this->defaultLifetime = max(0, (int) $defaultLifetime); $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':'; if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) { - throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s")', $this->maxIdLength - 24, \strlen($namespace), $namespace)); + throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace)); } } @@ -85,7 +85,7 @@ public function getMultiple($keys, $default = null) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } $ids = []; @@ -109,7 +109,7 @@ public function getMultiple($keys, $default = null) public function setMultiple($values, $ttl = null) { if (!\is_array($values) && !$values instanceof \Traversable) { - throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values))); + throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values))); } $valuesById = []; @@ -147,7 +147,7 @@ public function deleteMultiple($keys) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } return $this->deleteItems($keys); @@ -165,7 +165,7 @@ private function normalizeTtl($ttl) return 0 < $ttl ? $ttl : false; } - throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl))); + throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl))); } private function generateValues($values, &$keys, $default) diff --git a/src/Symfony/Component/Cache/Simple/ArrayCache.php b/src/Symfony/Component/Cache/Simple/ArrayCache.php index 9c8f6d8e3c9ee..f0b650107d216 100644 --- a/src/Symfony/Component/Cache/Simple/ArrayCache.php +++ b/src/Symfony/Component/Cache/Simple/ArrayCache.php @@ -58,7 +58,7 @@ public function getMultiple($keys, $default = null) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } foreach ($keys as $key) { CacheItem::validateKey($key); @@ -73,7 +73,7 @@ public function getMultiple($keys, $default = null) public function deleteMultiple($keys) { if (!\is_array($keys) && !$keys instanceof \Traversable) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } foreach ($keys as $key) { $this->delete($key); @@ -98,7 +98,7 @@ public function set($key, $value, $ttl = null) public function setMultiple($values, $ttl = null) { if (!\is_array($values) && !$values instanceof \Traversable) { - throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values))); + throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values))); } $valuesArray = []; @@ -143,6 +143,6 @@ private function normalizeTtl($ttl) return 0 < $ttl ? $ttl : false; } - throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl))); + throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl))); } } diff --git a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php index 5ded7ee741ec7..5c00d91ffb8b9 100644 --- a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php +++ b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php @@ -100,7 +100,7 @@ public function getMultiple($keys, $default = null) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } foreach ($keys as $key) { if (!\is_string($key)) { @@ -150,7 +150,7 @@ public function delete($key) public function deleteMultiple($keys) { if (!\is_array($keys) && !$keys instanceof \Traversable) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } $deleted = true; @@ -199,7 +199,7 @@ public function set($key, $value, $ttl = null) public function setMultiple($values, $ttl = null) { if (!\is_array($values) && !$values instanceof \Traversable) { - throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values))); + throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values))); } $saved = true; diff --git a/src/Symfony/Component/Cache/Simple/PhpFilesCache.php b/src/Symfony/Component/Cache/Simple/PhpFilesCache.php index 9587f17bed4ab..cdbcdd8856f5b 100644 --- a/src/Symfony/Component/Cache/Simple/PhpFilesCache.php +++ b/src/Symfony/Component/Cache/Simple/PhpFilesCache.php @@ -29,7 +29,7 @@ class PhpFilesCache extends AbstractCache implements PruneableInterface public function __construct($namespace = '', $defaultLifetime = 0, $directory = null) { if (!static::isSupported()) { - throw new CacheException('OPcache is not enabled'); + throw new CacheException('OPcache is not enabled.'); } parent::__construct('', $defaultLifetime); $this->init($namespace, $directory); diff --git a/src/Symfony/Component/Cache/Simple/Psr6Cache.php b/src/Symfony/Component/Cache/Simple/Psr6Cache.php index aab41f722db0c..6b3de20599855 100644 --- a/src/Symfony/Component/Cache/Simple/Psr6Cache.php +++ b/src/Symfony/Component/Cache/Simple/Psr6Cache.php @@ -135,7 +135,7 @@ public function getMultiple($keys, $default = null) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } try { @@ -161,7 +161,7 @@ public function setMultiple($values, $ttl = null) { $valuesIsArray = \is_array($values); if (!$valuesIsArray && !$values instanceof \Traversable) { - throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values))); + throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values))); } $items = []; @@ -213,7 +213,7 @@ public function deleteMultiple($keys) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } try { diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php index cd1f204139186..70cdcc89f35d6 100644 --- a/src/Symfony/Component/Cache/Traits/AbstractTrait.php +++ b/src/Symfony/Component/Cache/Traits/AbstractTrait.php @@ -222,7 +222,7 @@ protected static function unserialize($value) if (false !== $value = unserialize($value)) { return $value; } - throw new \DomainException('Failed to unserialize cached value'); + throw new \DomainException('Failed to unserialize cached value.'); } catch (\Error $e) { throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine()); } finally { diff --git a/src/Symfony/Component/Cache/Traits/ApcuTrait.php b/src/Symfony/Component/Cache/Traits/ApcuTrait.php index 88dd22a91e68e..b6c64ec0f3e89 100644 --- a/src/Symfony/Component/Cache/Traits/ApcuTrait.php +++ b/src/Symfony/Component/Cache/Traits/ApcuTrait.php @@ -29,7 +29,7 @@ public static function isSupported() private function init($namespace, $defaultLifetime, $version) { if (!static::isSupported()) { - throw new CacheException('APCu is not enabled'); + throw new CacheException('APCu is not enabled.'); } if ('cli' === \PHP_SAPI) { ini_set('apc.use_request_time', 0); diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php index 5510898b80595..8071a382bbe1e 100644 --- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php +++ b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php @@ -42,7 +42,7 @@ private function init($namespace, $directory) $directory .= \DIRECTORY_SEPARATOR; // On Windows the whole path is limited to 258 chars if ('\\' === \DIRECTORY_SEPARATOR && \strlen($directory) > 234) { - throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory)); + throw new InvalidArgumentException(sprintf('Cache directory too long (%s).', $directory)); } $this->directory = $directory; diff --git a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php index 3e0dc86bd1cfd..9d7f55784a65f 100644 --- a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php +++ b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php @@ -99,7 +99,7 @@ protected function doSave(array $values, $lifetime) } if (!$ok && !is_writable($this->directory)) { - throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory)); + throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory)); } return $ok; diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php index 28046e475bb9d..b62dc53c19556 100644 --- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php +++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php @@ -40,7 +40,7 @@ public static function isSupported() private function init(\Memcached $client, $namespace, $defaultLifetime) { if (!static::isSupported()) { - throw new CacheException('Memcached >= 2.2.0 is required'); + throw new CacheException('Memcached >= 2.2.0 is required.'); } if ('Memcached' === \get_class($client)) { $opt = $client->getOption(\Memcached::OPT_SERIALIZER); @@ -81,7 +81,7 @@ public static function createConnection($servers, array $options = []) throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, %s given.', \gettype($servers))); } if (!static::isSupported()) { - throw new CacheException('Memcached >= 2.2.0 is required'); + throw new CacheException('Memcached >= 2.2.0 is required.'); } set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); }); try { @@ -96,7 +96,7 @@ public static function createConnection($servers, array $options = []) continue; } if (0 !== strpos($dsn, 'memcached://')) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://"', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://".', $dsn)); } $params = preg_replace_callback('#^memcached://(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) { if (!empty($m[1])) { @@ -106,10 +106,10 @@ public static function createConnection($servers, array $options = []) return 'file://'; }, $dsn); if (false === $params = parse_url($params)) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s.', $dsn)); } if (!isset($params['host']) && !isset($params['path'])) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s.', $dsn)); } if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) { $params['weight'] = $m[1]; diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php index b190fef8b56a7..ab9054b38d8c4 100644 --- a/src/Symfony/Component/Cache/Traits/PdoTrait.php +++ b/src/Symfony/Component/Cache/Traits/PdoTrait.php @@ -44,7 +44,7 @@ private function init($connOrDsn, $namespace, $defaultLifetime, array $options) if ($connOrDsn instanceof \PDO) { if (\PDO::ERRMODE_EXCEPTION !== $connOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) { - throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__)); + throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __CLASS__)); } $this->conn = $connOrDsn; diff --git a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php index 3cc02b2428486..5a41afbbcb743 100644 --- a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php +++ b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php @@ -150,7 +150,7 @@ protected function doSave(array $values, $lifetime) } if (!$ok && !is_writable($this->directory)) { - throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory)); + throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory)); } return $ok; diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index c4b12b64bb37b..ef6c4292e04a3 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -48,7 +48,7 @@ private function init($redisClient, $namespace = '', $defaultLifetime = 0) throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0])); } if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) { - throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); + throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); } $this->redis = $redisClient; } @@ -73,7 +73,7 @@ private function init($redisClient, $namespace = '', $defaultLifetime = 0) public static function createConnection($dsn, array $options = []) { if (0 !== strpos($dsn, 'redis://')) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://".', $dsn)); } $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) { if (isset($m[1])) { @@ -83,10 +83,10 @@ public static function createConnection($dsn, array $options = []) return 'file://'; }, $dsn); if (false === $params = parse_url($params)) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s.', $dsn)); } if (!isset($params['host']) && !isset($params['path'])) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s.', $dsn)); } if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) { $params['dbindex'] = $m[1]; @@ -108,7 +108,7 @@ public static function createConnection($dsn, array $options = []) } $params += $options + self::$defaultConnectionOptions; if (null === $params['class'] && !\extension_loaded('redis') && !class_exists(\Predis\Client::class)) { - throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: %s', $dsn)); + throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: %s.', $dsn)); } $class = null === $params['class'] ? (\extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class']; @@ -120,7 +120,7 @@ public static function createConnection($dsn, array $options = []) try { @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']); } catch (\RedisException $e) { - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e->getMessage(), $dsn)); } set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; }); @@ -128,7 +128,7 @@ public static function createConnection($dsn, array $options = []) restore_error_handler(); if (!$isConnected) { $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : ''; - throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $error, $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s.', $error, $dsn)); } if ((null !== $auth && !$redis->auth($auth)) @@ -136,7 +136,7 @@ public static function createConnection($dsn, array $options = []) || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout'])) ) { $e = preg_replace('/^ERR /', '', $redis->getLastError()); - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e, $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e, $dsn)); } return true; @@ -153,9 +153,9 @@ public static function createConnection($dsn, array $options = []) $params['password'] = $auth; $redis = new $class((new Factory())->create($params)); } elseif (class_exists($class, false)) { - throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client"', $class)); + throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client".', $class)); } else { - throw new InvalidArgumentException(sprintf('Class "%s" does not exist', $class)); + throw new InvalidArgumentException(sprintf('Class "%s" does not exist.', $class)); } return $redis; diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php index 5edab01cbd491..61175debd40e9 100644 --- a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php +++ b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php @@ -63,7 +63,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = // cache the core classes if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) { - throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir)); + throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s".', $cacheDir)); } $cacheDir = rtrim(realpath($cacheDir) ?: $cacheDir, '/'.\DIRECTORY_SEPARATOR); $cache = $cacheDir.'/'.$name.$extension; @@ -133,7 +133,7 @@ public static function inline($classes, $cache, array $excluded) // cache the core classes $cacheDir = \dirname($cache); if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) { - throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir)); + throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s".', $cacheDir)); } $spacesRegex = '(?:\s*+(?:(?:\#|//)[^\n]*+\n|/\*(?:(?getPath(), json_encode($value))); + throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value))); } foreach ($this->children as $name => $child) { diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index 2b10bffa78694..bf57a9fa17bc5 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -335,7 +335,7 @@ final public function finalize($value) } catch (Exception $e) { throw $e; } catch (\Exception $e) { - throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s', $this->getPath(), $e->getMessage()), $e->getCode(), $e); + throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s.', $this->getPath(), $e->getMessage()), $e->getCode(), $e); } } diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index 115054a24fb0c..29d1e154fce89 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -472,7 +472,7 @@ protected function validateConcreteNode(ArrayNode $node) $path = $node->getPath(); if (null !== $this->key) { - throw new InvalidDefinitionException(sprintf('->useAttributeAsKey() is not applicable to concrete nodes at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->useAttributeAsKey() is not applicable to concrete nodes at path "%s".', $path)); } if (false === $this->allowEmptyValue) { @@ -480,15 +480,15 @@ protected function validateConcreteNode(ArrayNode $node) } if (true === $this->atLeastOne) { - throw new InvalidDefinitionException(sprintf('->requiresAtLeastOneElement() is not applicable to concrete nodes at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->requiresAtLeastOneElement() is not applicable to concrete nodes at path "%s".', $path)); } if ($this->default) { - throw new InvalidDefinitionException(sprintf('->defaultValue() is not applicable to concrete nodes at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->defaultValue() is not applicable to concrete nodes at path "%s".', $path)); } if (false !== $this->addDefaultChildren) { - throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() is not applicable to concrete nodes at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() is not applicable to concrete nodes at path "%s".', $path)); } } @@ -502,20 +502,20 @@ protected function validatePrototypeNode(PrototypedArrayNode $node) $path = $node->getPath(); if ($this->addDefaults) { - throw new InvalidDefinitionException(sprintf('->addDefaultsIfNotSet() is not applicable to prototype nodes at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->addDefaultsIfNotSet() is not applicable to prototype nodes at path "%s".', $path)); } if (false !== $this->addDefaultChildren) { if ($this->default) { - throw new InvalidDefinitionException(sprintf('A default value and default children might not be used together at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('A default value and default children might not be used together at path "%s".', $path)); } if (null !== $this->key && (null === $this->addDefaultChildren || \is_int($this->addDefaultChildren) && $this->addDefaultChildren > 0)) { - throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() should set default children names as ->useAttributeAsKey() is used at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() should set default children names as ->useAttributeAsKey() is used at path "%s".', $path)); } if (null === $this->key && (\is_string($this->addDefaultChildren) || \is_array($this->addDefaultChildren))) { - throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() might not set default children names as ->useAttributeAsKey() is not used at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() might not set default children names as ->useAttributeAsKey() is not used at path "%s".', $path)); } } } diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php index 05949d2b5a3b1..5db229dccab7f 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php @@ -200,7 +200,7 @@ public function thenInvalid($message) */ public function thenUnset() { - $this->thenPart = function ($v) { throw new UnsetKeyException('Unsetting key'); }; + $this->thenPart = function ($v) { throw new UnsetKeyException('Unsetting key.'); }; return $this; } diff --git a/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php index 0d0207ca4fc79..390b1136567e6 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php @@ -35,7 +35,7 @@ abstract class NumericNodeDefinition extends ScalarNodeDefinition public function max($max) { if (isset($this->min) && $this->min > $max) { - throw new \InvalidArgumentException(sprintf('You cannot define a max(%s) as you already have a min(%s)', $max, $this->min)); + throw new \InvalidArgumentException(sprintf('You cannot define a max(%s) as you already have a min(%s).', $max, $this->min)); } $this->max = $max; @@ -54,7 +54,7 @@ public function max($max) public function min($min) { if (isset($this->max) && $this->max < $min) { - throw new \InvalidArgumentException(sprintf('You cannot define a min(%s) as you already have a max(%s)', $min, $this->max)); + throw new \InvalidArgumentException(sprintf('You cannot define a min(%s) as you already have a max(%s).', $min, $this->max)); } $this->min = $min; diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php index 5b216d897a361..ba355394602f7 100644 --- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php +++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php @@ -39,7 +39,7 @@ public function dumpAtPath(ConfigurationInterface $configuration, $path) foreach (explode('.', $path) as $step) { if (!$node instanceof ArrayNode) { - throw new \UnexpectedValueException(sprintf('Unable to find node at path "%s.%s"', $rootNode->getName(), $path)); + throw new \UnexpectedValueException(sprintf('Unable to find node at path "%s.%s".', $rootNode->getName(), $path)); } /** @var NodeInterface[] $children */ @@ -53,7 +53,7 @@ public function dumpAtPath(ConfigurationInterface $configuration, $path) } } - throw new \UnexpectedValueException(sprintf('Unable to find node at path "%s.%s"', $rootNode->getName(), $path)); + throw new \UnexpectedValueException(sprintf('Unable to find node at path "%s.%s".', $rootNode->getName(), $path)); } return $this->dumpNode($node); diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index 7b64d842aa06b..d36b9a440f334 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -185,7 +185,7 @@ public function addChild(NodeInterface $node) protected function finalizeValue($value) { if (false === $value) { - throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s', $this->getPath(), json_encode($value))); + throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value))); } foreach ($value as $k => $v) { diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index b5637277e88da..c576ec050aa6b 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -576,7 +576,7 @@ public function findNamespace($namespace) $exact = \in_array($namespace, $namespaces, true); if (\count($namespaces) > 1 && !$exact) { - throw new CommandNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces)); + throw new CommandNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces)); } return $exact ? $namespace : reset($namespaces); @@ -681,7 +681,7 @@ public function find($name) }, array_values($commands)); $suggestions = $this->getAbbreviationSuggestions(array_filter($abbrevs)); - throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $name, $suggestions), array_values($commands)); + throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $name, $suggestions), array_values($commands)); } return $this->get($exact ? $name : reset($commands)); diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index 0574cb7388062..311fdb6a144ef 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -563,7 +563,7 @@ public function getProcessedHelp() public function setAliases($aliases) { if (!\is_array($aliases) && !$aliases instanceof \Traversable) { - throw new InvalidArgumentException('$aliases must be an array or an instance of \Traversable'); + throw new InvalidArgumentException('$aliases must be an array or an instance of \Traversable.'); } foreach ($aliases as $alias) { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php index adfcdc8750062..99e0ac1e911c5 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php @@ -119,7 +119,7 @@ public function hasStyle($name) public function getStyle($name) { if (!$this->hasStyle($name)) { - throw new InvalidArgumentException(sprintf('Undefined style: %s', $name)); + throw new InvalidArgumentException(sprintf('Undefined style: %s.', $name)); } return $this->styles[strtolower($name)]; diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php index 477bd87f0c4aa..7075c72110201 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php @@ -86,7 +86,7 @@ public function setForeground($color = null) } if (!isset(static::$availableForegroundColors[$color])) { - throw new InvalidArgumentException(sprintf('Invalid foreground color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableForegroundColors)))); + throw new InvalidArgumentException(sprintf('Invalid foreground color specified: "%s". Expected one of (%s).', $color, implode(', ', array_keys(static::$availableForegroundColors)))); } $this->foreground = static::$availableForegroundColors[$color]; @@ -104,7 +104,7 @@ public function setBackground($color = null) } if (!isset(static::$availableBackgroundColors[$color])) { - throw new InvalidArgumentException(sprintf('Invalid background color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableBackgroundColors)))); + throw new InvalidArgumentException(sprintf('Invalid background color specified: "%s". Expected one of (%s).', $color, implode(', ', array_keys(static::$availableBackgroundColors)))); } $this->background = static::$availableBackgroundColors[$color]; @@ -116,7 +116,7 @@ public function setBackground($color = null) public function setOption($option) { if (!isset(static::$availableOptions[$option])) { - throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions)))); + throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s).', $option, implode(', ', array_keys(static::$availableOptions)))); } if (!\in_array(static::$availableOptions[$option], $this->options)) { @@ -130,7 +130,7 @@ public function setOption($option) public function unsetOption($option) { if (!isset(static::$availableOptions[$option])) { - throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions)))); + throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s).', $option, implode(', ', array_keys(static::$availableOptions)))); } $pos = array_search(static::$availableOptions[$option], $this->options); diff --git a/src/Symfony/Component/Console/Helper/TableStyle.php b/src/Symfony/Component/Console/Helper/TableStyle.php index bc9c7e94dbbd9..4213297f5f482 100644 --- a/src/Symfony/Component/Console/Helper/TableStyle.php +++ b/src/Symfony/Component/Console/Helper/TableStyle.php @@ -42,7 +42,7 @@ class TableStyle public function setPaddingChar($paddingChar) { if (!$paddingChar) { - throw new LogicException('The padding char must not be empty'); + throw new LogicException('The padding char must not be empty.'); } $this->paddingChar = $paddingChar; diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php index 32d270faf1838..5032b340a188d 100644 --- a/src/Symfony/Component/Console/Input/StringInput.php +++ b/src/Symfony/Component/Console/Input/StringInput.php @@ -61,7 +61,7 @@ private function tokenize($input) $tokens[] = stripcslashes($match[1]); } else { // should never happen - throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10))); + throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ...".', substr($input, $cursor, 10))); } $cursor += \strlen($match[0]); diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php index c5c2daed25d99..940818930f29a 100644 --- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php +++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php @@ -199,7 +199,7 @@ public function provideInlineStyleOptionsCases() /** * @group legacy * @dataProvider provideInlineStyleTagsWithUnknownOptions - * @expectedDeprecation Unknown style options are deprecated since Symfony 3.2 and will be removed in 4.0. Exception "Invalid option specified: "%s". Expected one of (bold, underscore, blink, reverse, conceal)". + * @expectedDeprecation Unknown style options are deprecated since Symfony 3.2 and will be removed in 4.0. Exception "Invalid option specified: "%s". Expected one of (bold, underscore, blink, reverse, conceal).". */ public function testInlineStyleOptionsUnknownAreDeprecated($tag, $option) { diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php index 2b8aa6a192a77..103b6a5f9c4c3 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php @@ -58,7 +58,7 @@ public function translateNthChild(XPathExpr $xpath, FunctionNode $function, $las try { list($a, $b) = Parser::parseSeries($function->getArguments()); } catch (SyntaxErrorException $e) { - throw new ExpressionErrorException(sprintf('Invalid series: %s', implode(', ', $function->getArguments())), 0, $e); + throw new ExpressionErrorException(sprintf('Invalid series: %s.', implode(', ', $function->getArguments())), 0, $e); } $xpath->addStarPrefix(); diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php index 1b39fab5ca401..dfd63b85c87b0 100644 --- a/src/Symfony/Component/Debug/ErrorHandler.php +++ b/src/Symfony/Component/Debug/ErrorHandler.php @@ -223,14 +223,14 @@ public function setLoggers(array $loggers) if (!\is_array($log)) { $log = [$log]; } elseif (!\array_key_exists(0, $log)) { - throw new \InvalidArgumentException('No logger provided'); + throw new \InvalidArgumentException('No logger provided.'); } if (null === $log[0]) { $this->loggedErrors &= ~$type; } elseif ($log[0] instanceof LoggerInterface) { $this->loggedErrors |= $type; } else { - throw new \InvalidArgumentException('Invalid logger provided'); + throw new \InvalidArgumentException('Invalid logger provided.'); } $this->loggers[$type] = $log + $prev[$type]; diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index c8250a71cfb76..81d15c977136b 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -213,7 +213,7 @@ public function getExtension($name) return $this->extensionsByNs[$name]; } - throw new LogicException(sprintf('Container extension "%s" is not registered', $name)); + throw new LogicException(sprintf('Container extension "%s" is not registered.', $name)); } /** @@ -866,7 +866,7 @@ public function setAlias($alias, $id) $alias = $this->normalizeId($alias); if ('' === $alias || '\\' === substr($alias, -1) || \strlen($alias) !== strcspn($alias, "\0\r\n'")) { - throw new InvalidArgumentException(sprintf('Invalid alias id: "%s"', $alias)); + throw new InvalidArgumentException(sprintf('Invalid alias id: "%s".', $alias)); } if (\is_string($id)) { @@ -1017,13 +1017,13 @@ public function getDefinitions() public function setDefinition($id, Definition $definition) { if ($this->isCompiled()) { - throw new BadMethodCallException('Adding definition to a compiled container is not allowed'); + throw new BadMethodCallException('Adding definition to a compiled container is not allowed.'); } $id = $this->normalizeId($id); if ('' === $id || '\\' === substr($id, -1) || \strlen($id) !== strcspn($id, "\0\r\n'")) { - throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id)); + throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id)); } unset($this->aliasDefinitions[$id], $this->removedIds[$id]); @@ -1152,7 +1152,7 @@ private function createService(Definition $definition, array &$inlineServices, $ if (\is_array($factory)) { $factory = [$this->doResolveServices($parameterBag->resolveValue($factory[0]), $inlineServices, $isConstructorArgument), $factory[1]]; } elseif (!\is_string($factory)) { - throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id)); + throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory.', $id)); } } diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 4dd4475cbe4cf..cbe3c53ae6f5a 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -895,7 +895,7 @@ private function addNewInstance(Definition $definition, $return, $instantiation, $callable = $definition->getFactory(); if (\is_array($callable)) { if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $callable[1])) { - throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s)', $callable[1] ?: 'n/a')); + throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a')); } if ($callable[0] instanceof Reference @@ -1701,7 +1701,7 @@ private function dumpValue($value, $interpolate = true) if (\is_array($factory)) { if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $factory[1])) { - throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s)', $factory[1] ?: 'n/a')); + throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $factory[1] ?: 'n/a')); } $class = $this->dumpValue($factory[0]); @@ -1722,7 +1722,7 @@ private function dumpValue($value, $interpolate = true) } } - throw new RuntimeException('Cannot dump definition because of invalid factory'); + throw new RuntimeException('Cannot dump definition because of invalid factory.'); } $class = $value->getClass(); @@ -1785,7 +1785,7 @@ private function dumpLiteralClass($class) return sprintf('${($_ = %s) && false ?: "_"}', $class); } if (0 !== strpos($class, "'") || !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) { - throw new RuntimeException(sprintf('Cannot dump definition because of invalid class name (%s)', $class ?: 'n/a')); + throw new RuntimeException(sprintf('Cannot dump definition because of invalid class name (%s).', $class ?: 'n/a')); } $class = substr(str_replace('\\\\', '\\', $class), 1, -1); diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php index 5b3e704c25106..059e3c3a2c153 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php @@ -31,7 +31,7 @@ public function __call($method, $args) return \call_user_func_array([$this, 'set'.$method], $args); } - throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', static::class, $method)); + throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s().', static::class, $method)); } /** diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php index 828d4071dab35..99759f3b2da4e 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php @@ -45,7 +45,7 @@ final public function extension($namespace, array $config) { if (!$this->container->hasExtension($namespace)) { $extensions = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions())); - throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s', $namespace, $this->file, $namespace, $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none')); + throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s.', $namespace, $this->file, $namespace, $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none')); } $this->container->loadFromExtension($namespace, static::processValue($config)); diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php index 0a800f01c3f71..fd86aa87ce88a 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -129,7 +129,7 @@ private function findClasses($namespace, $pattern, $excludePattern) $prefixLen = \strlen($resource->getPrefix()); if ($excludePrefix && 0 !== strpos($excludePrefix, $resource->getPrefix())) { - throw new InvalidArgumentException(sprintf('Invalid "exclude" pattern when importing classes for "%s": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s)', $namespace, $excludePattern, $pattern)); + throw new InvalidArgumentException(sprintf('Invalid "exclude" pattern when importing classes for "%s": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s).', $namespace, $excludePattern, $pattern)); } } diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index bd2902f85681a..b7d3c03a07440 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -378,7 +378,7 @@ private function parseFileToDOM($file) try { $dom = XmlUtils::loadFile($file, [$this, 'validateSchema']); } catch (\InvalidArgumentException $e) { - throw new InvalidArgumentException(sprintf('Unable to parse file "%s": %s', $file, $e->getMessage()), $e->getCode(), $e); + throw new InvalidArgumentException(sprintf('Unable to parse file "%s": %s.', $file, $e->getMessage()), $e->getCode(), $e); } $this->validateExtensions($dom, $file); @@ -577,7 +577,7 @@ public function validateSchema(\DOMDocument $dom) $path = str_replace([$ns, str_replace('http://', 'https://', $ns)], str_replace('\\', '/', $extension->getXsdValidationBasePath()).'/', $items[$i + 1]); if (!is_file($path)) { - throw new RuntimeException(sprintf('Extension "%s" references a non-existent XSD file "%s"', \get_class($extension), $path)); + throw new RuntimeException(sprintf('Extension "%s" references a non-existent XSD file "%s".', \get_class($extension), $path)); } $schemaLocations[$items[$i]] = $path; @@ -668,7 +668,7 @@ private function validateExtensions(\DOMDocument $dom, $file) // can it be handled by an extension? if (!$this->container->hasExtension($node->namespaceURI)) { $extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getNamespace(); }, $this->container->getExtensions())); - throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); + throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s.', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); } } } diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index 891689bc16907..91d8a032aefbf 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -660,7 +660,7 @@ protected function loadFile($file) try { $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS); } catch (ParseException $e) { - throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s', $file, $e->getMessage()), 0, $e); + throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s.', $file, $e->getMessage()), 0, $e); } finally { restore_error_handler(); } @@ -695,7 +695,7 @@ private function validate($content, $file) if (!$this->container->hasExtension($namespace)) { $extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions())); - throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); + throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s.', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); } } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php index cbcc6995170cd..9fe075d8f14cb 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php @@ -219,7 +219,7 @@ public function testRegisterClassesWithIncompatibleExclude($resourcePattern, $ex ); } catch (InvalidArgumentException $e) { $this->assertEquals( - sprintf('Invalid "exclude" pattern when importing classes for "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s)', $excludePattern, $resourcePattern), + sprintf('Invalid "exclude" pattern when importing classes for "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s).', $excludePattern, $resourcePattern), $e->getMessage() ); } diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php index 3bbcfa74734ef..af8bcfbac3dfd 100644 --- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php +++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php @@ -81,7 +81,7 @@ public function &get($name) while ($segments) { $path = array_shift($segments); if (!\is_array($target) || !\array_key_exists($path, $target)) { - throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path)); + throw new \InvalidArgumentException(sprintf('Unreachable field "%s".', $path)); } $target = &$target[$path]; } diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php index 18f1b4f8c317b..8f53a9d06a53c 100644 --- a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php @@ -68,7 +68,7 @@ public function addListenerService($eventName, $callback, $priority = 0) @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED); if (!\is_array($callback) || 2 !== \count($callback)) { - throw new \InvalidArgumentException('Expected an ["service", "method"] argument'); + throw new \InvalidArgumentException('Expected an ["service", "method"] argument.'); } $this->listenerIds[$eventName][] = [$callback[0], $callback[1], $priority]; diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php index 01ca293018365..e534a56ed2441 100644 --- a/src/Symfony/Component/ExpressionLanguage/Lexer.php +++ b/src/Symfony/Component/ExpressionLanguage/Lexer.php @@ -59,12 +59,12 @@ public function tokenize($expression) } elseif (false !== strpos(')]}', $expression[$cursor])) { // closing bracket if (empty($brackets)) { - throw new SyntaxError(sprintf('Unexpected "%s"', $expression[$cursor]), $cursor, $expression); + throw new SyntaxError(sprintf('Unexpected "%s".', $expression[$cursor]), $cursor, $expression); } list($expect, $cur) = array_pop($brackets); if ($expression[$cursor] != strtr($expect, '([{', ')]}')) { - throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression); + throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression); } $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1); @@ -87,7 +87,7 @@ public function tokenize($expression) $cursor += \strlen($match[0]); } else { // unlexable - throw new SyntaxError(sprintf('Unexpected character "%s"', $expression[$cursor]), $cursor, $expression); + throw new SyntaxError(sprintf('Unexpected character "%s".', $expression[$cursor]), $cursor, $expression); } } @@ -95,7 +95,7 @@ public function tokenize($expression) if (!empty($brackets)) { list($expect, $cur) = array_pop($brackets); - throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression); + throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression); } return new TokenStream($tokens, $expression); diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php index bbfe393d0d12a..549161b3724ed 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php @@ -148,13 +148,13 @@ public function evaluate($functions, $values) return $left * $right; case '/': if (0 == $right) { - throw new \DivisionByZeroError('Division by zero'); + throw new \DivisionByZeroError('Division by zero.'); } return $left / $right; case '%': if (0 == $right) { - throw new \DivisionByZeroError('Modulo by zero'); + throw new \DivisionByZeroError('Modulo by zero.'); } return $left % $right; diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php index 0930bac2eff9d..bfc24395e1bd9 100644 --- a/src/Symfony/Component/ExpressionLanguage/Parser.php +++ b/src/Symfony/Component/ExpressionLanguage/Parser.php @@ -99,7 +99,7 @@ public function parse(TokenStream $stream, $names = []) $node = $this->parseExpression(); if (!$stream->isEOF()) { - throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression()); + throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression()); } return $node; @@ -195,13 +195,13 @@ public function parsePrimaryExpression() default: if ('(' === $this->stream->current->value) { if (false === isset($this->functions[$token->value])) { - throw new SyntaxError(sprintf('The function "%s" does not exist', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions)); + throw new SyntaxError(sprintf('The function "%s" does not exist.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions)); } $node = new Node\FunctionNode($token->value, $this->parseArguments()); } else { if (!\in_array($token->value, $this->names, true)) { - throw new SyntaxError(sprintf('Variable "%s" is not valid', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names); + throw new SyntaxError(sprintf('Variable "%s" is not valid.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names); } // is the name used in the compiled code different @@ -227,7 +227,7 @@ public function parsePrimaryExpression() } elseif ($token->test(Token::PUNCTUATION_TYPE, '{')) { $node = $this->parseHashExpression(); } else { - throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $token->type, $token->value), $token->cursor, $this->stream->getExpression()); + throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $token->type, $token->value), $token->cursor, $this->stream->getExpression()); } } @@ -289,7 +289,7 @@ public function parseHashExpression() } else { $current = $this->stream->current; - throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s"', $current->type, $current->value), $current->cursor, $this->stream->getExpression()); + throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', $current->type, $current->value), $current->cursor, $this->stream->getExpression()); } $this->stream->expect(Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)'); @@ -327,7 +327,7 @@ public function parsePostfixExpression($node) // As a result, if $token is NOT an operator OR $token->value is NOT a valid property or method name, an exception shall be thrown. (Token::OPERATOR_TYPE !== $token->type || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value)) ) { - throw new SyntaxError('Expected name', $token->cursor, $this->stream->getExpression()); + throw new SyntaxError('Expected name.', $token->cursor, $this->stream->getExpression()); } $arg = new Node\ConstantNode($token->value, true); diff --git a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php b/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php index 38ce6590b94b4..b9b448dd8e80d 100644 --- a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php +++ b/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php @@ -67,7 +67,7 @@ public function save(CacheItemInterface $item) */ public function getItems(array $keys = []) { - throw new \BadMethodCallException('Not implemented'); + throw new \BadMethodCallException('Not implemented.'); } /** @@ -75,7 +75,7 @@ public function getItems(array $keys = []) */ public function hasItem($key) { - throw new \BadMethodCallException('Not implemented'); + throw new \BadMethodCallException('Not implemented.'); } /** @@ -83,7 +83,7 @@ public function hasItem($key) */ public function clear() { - throw new \BadMethodCallException('Not implemented'); + throw new \BadMethodCallException('Not implemented.'); } /** @@ -91,7 +91,7 @@ public function clear() */ public function deleteItem($key) { - throw new \BadMethodCallException('Not implemented'); + throw new \BadMethodCallException('Not implemented.'); } /** @@ -99,7 +99,7 @@ public function deleteItem($key) */ public function deleteItems(array $keys) { - throw new \BadMethodCallException('Not implemented'); + throw new \BadMethodCallException('Not implemented.'); } /** @@ -107,7 +107,7 @@ public function deleteItems(array $keys) */ public function saveDeferred(CacheItemInterface $item) { - throw new \BadMethodCallException('Not implemented'); + throw new \BadMethodCallException('Not implemented.'); } /** @@ -115,6 +115,6 @@ public function saveDeferred(CacheItemInterface $item) */ public function commit() { - throw new \BadMethodCallException('Not implemented'); + throw new \BadMethodCallException('Not implemented.'); } } diff --git a/src/Symfony/Component/ExpressionLanguage/SyntaxError.php b/src/Symfony/Component/ExpressionLanguage/SyntaxError.php index 12348e6830836..3340042f0a22a 100644 --- a/src/Symfony/Component/ExpressionLanguage/SyntaxError.php +++ b/src/Symfony/Component/ExpressionLanguage/SyntaxError.php @@ -15,7 +15,7 @@ class SyntaxError extends \LogicException { public function __construct($message, $cursor = 0, $expression = '', $subject = null, array $proposals = null) { - $message = sprintf('%s around position %d', $message, $cursor); + $message = sprintf('%s around position %d', rtrim($message, '.'), $cursor); if ($expression) { $message = sprintf('%s for expression `%s`', $message, $expression); } diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php index 9096b183ff378..09d3854e8ead9 100644 --- a/src/Symfony/Component/ExpressionLanguage/TokenStream.php +++ b/src/Symfony/Component/ExpressionLanguage/TokenStream.php @@ -53,7 +53,7 @@ public function next() ++$this->position; if (!isset($this->tokens[$this->position])) { - throw new SyntaxError('Unexpected end of expression', $this->current->cursor, $this->expression); + throw new SyntaxError('Unexpected end of expression.', $this->current->cursor, $this->expression); } $this->current = $this->tokens[$this->position]; @@ -70,7 +70,7 @@ public function expect($type, $value = null, $message = null) { $token = $this->current; if (!$token->test($type, $value)) { - throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s)', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression); + throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression); } $this->next(); } diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index 7d7301c3a199f..d5cb54ae9833f 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -103,7 +103,7 @@ public function mkdir($dirs, $mode = 0777) if (self::$lastError) { throw new IOException(sprintf('Failed to create "%s": %s.', $dir, self::$lastError), 0, null, $dir); } - throw new IOException(sprintf('Failed to create "%s"', $dir), 0, null, $dir); + throw new IOException(sprintf('Failed to create "%s".', $dir), 0, null, $dir); } } } @@ -362,7 +362,7 @@ public function hardlink($originFile, $targetFiles) } if (!is_file($originFile)) { - throw new FileNotFoundException(sprintf('Origin file "%s" is not a file', $originFile)); + throw new FileNotFoundException(sprintf('Origin file "%s" is not a file.', $originFile)); } foreach ($this->toIterable($targetFiles) as $targetFile) { diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php index 22b8ae38547a6..1635bf8020ecc 100644 --- a/src/Symfony/Component/Form/AbstractExtension.php +++ b/src/Symfony/Component/Form/AbstractExtension.php @@ -57,7 +57,7 @@ public function getType($name) } if (!isset($this->types[$name])) { - throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension', $name)); + throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension.', $name)); } return $this->types[$name]; diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php index 50acb8db0c6e8..aa981a0125b3d 100644 --- a/src/Symfony/Component/Form/Button.php +++ b/src/Symfony/Component/Form/Button.php @@ -105,7 +105,7 @@ public function offsetUnset($offset) public function setParent(FormInterface $parent = null) { if ($this->submitted) { - throw new AlreadySubmittedException('You cannot set the parent of a submitted button'); + throw new AlreadySubmittedException('You cannot set the parent of a submitted button.'); } $this->parent = $parent; @@ -381,7 +381,7 @@ public function handleRequest($request = null) public function submit($submittedData, $clearMissing = true) { if ($this->submitted) { - throw new AlreadySubmittedException('A form can only be submitted once'); + throw new AlreadySubmittedException('A form can only be submitted once.'); } $this->submitted = true; diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php index 49b2f1fe12ddc..43ae1d66dea7d 100644 --- a/src/Symfony/Component/Form/Command/DebugCommand.php +++ b/src/Symfony/Component/Form/Command/DebugCommand.php @@ -166,7 +166,7 @@ private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, $shor return $classes[0]; } if (!$input->isInteractive()) { - throw new InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\n\nDid you mean one of these?\n %s", $shortClassName, implode("\n ", $classes))); + throw new InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\n\nDid you mean one of these?\n %s.", $shortClassName, implode("\n ", $classes))); } return $io->choice(sprintf("The type \"%s\" is ambiguous.\n\nSelect one of the following form types to display its information:", $shortClassName), $classes, $classes[0]); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php index b073a123cfd53..f79920971c015 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php @@ -76,7 +76,7 @@ public function reverseTransform($array) return null; } - throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys))); + throw new TransformationFailedException(sprintf('The keys "%s" should not be empty.', implode('", "', $emptyKeys))); } return $result; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php index cad078285fccb..e1feafe62e1d3 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php @@ -45,7 +45,7 @@ public function reverseTransform($value) return null; } - throw new TransformationFailedException(sprintf('The choice "%s" does not exist or is not unique', $value)); + throw new TransformationFailedException(sprintf('The choice "%s" does not exist or is not unique.', $value)); } return current($choices); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php index ac2108f0c43aa..6c9e4fe9dc2b9 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php @@ -65,7 +65,7 @@ public function reverseTransform($array) $choices = $this->choiceList->getChoicesForValues($array); if (\count($choices) !== \count($array)) { - throw new TransformationFailedException('Could not find all matching choices for the given values'); + throw new TransformationFailedException('Could not find all matching choices for the given values.'); } return $choices; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php index 65e535d979f3f..a910cfdda40c9 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php @@ -129,14 +129,14 @@ public function reverseTransform($value) } } if (\count($emptyFields) > 0) { - throw new TransformationFailedException(sprintf('The fields "%s" should not be empty', implode('", "', $emptyFields))); + throw new TransformationFailedException(sprintf('The fields "%s" should not be empty.', implode('", "', $emptyFields))); } if (isset($value['invert']) && !\is_bool($value['invert'])) { - throw new TransformationFailedException('The value of "invert" must be boolean'); + throw new TransformationFailedException('The value of "invert" must be boolean.'); } foreach (self::$availableFields as $field => $char) { if ('invert' !== $field && isset($value[$field]) && !ctype_digit((string) $value[$field])) { - throw new TransformationFailedException(sprintf('This amount of "%s" is invalid', $field)); + throw new TransformationFailedException(sprintf('This amount of "%s" is invalid.', $field)); } } try { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php index aaefdfac9da4e..821761f227270 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php @@ -79,7 +79,7 @@ public function reverseTransform($value) return null; } if (!$this->isISO8601($value)) { - throw new TransformationFailedException('Non ISO 8601 date strings are not supported yet'); + throw new TransformationFailedException('Non ISO 8601 date strings are not supported yet.'); } $valuePattern = '/^'.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?P<$1>\d+)$2', $this->format).'$/'; if (!preg_match($valuePattern, $value)) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php index ca934614cde3e..9c061a86dd773 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php @@ -134,35 +134,35 @@ public function reverseTransform($value) } if (\count($emptyFields) > 0) { - throw new TransformationFailedException(sprintf('The fields "%s" should not be empty', implode('", "', $emptyFields))); + throw new TransformationFailedException(sprintf('The fields "%s" should not be empty.', implode('", "', $emptyFields))); } if (isset($value['month']) && !ctype_digit((string) $value['month'])) { - throw new TransformationFailedException('This month is invalid'); + throw new TransformationFailedException('This month is invalid.'); } if (isset($value['day']) && !ctype_digit((string) $value['day'])) { - throw new TransformationFailedException('This day is invalid'); + throw new TransformationFailedException('This day is invalid.'); } if (isset($value['year']) && !ctype_digit((string) $value['year'])) { - throw new TransformationFailedException('This year is invalid'); + throw new TransformationFailedException('This year is invalid.'); } if (!empty($value['month']) && !empty($value['day']) && !empty($value['year']) && false === checkdate($value['month'], $value['day'], $value['year'])) { - throw new TransformationFailedException('This is an invalid date'); + throw new TransformationFailedException('This is an invalid date.'); } if (isset($value['hour']) && !ctype_digit((string) $value['hour'])) { - throw new TransformationFailedException('This hour is invalid'); + throw new TransformationFailedException('This hour is invalid.'); } if (isset($value['minute']) && !ctype_digit((string) $value['minute'])) { - throw new TransformationFailedException('This minute is invalid'); + throw new TransformationFailedException('This minute is invalid.'); } if (isset($value['second']) && !ctype_digit((string) $value['second'])) { - throw new TransformationFailedException('This second is invalid'); + throw new TransformationFailedException('This second is invalid.'); } try { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php index fe9002fe47f5b..a480b8312ba65 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php @@ -152,7 +152,7 @@ public function reverseTransform($value) } if (\in_array($value, ['NaN', 'NAN', 'nan'], true)) { - throw new TransformationFailedException('"NaN" is not a valid number'); + throw new TransformationFailedException('"NaN" is not a valid number.'); } $position = 0; @@ -183,7 +183,7 @@ public function reverseTransform($value) } if ($result >= PHP_INT_MAX || $result <= -PHP_INT_MAX) { - throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like'); + throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like.'); } $result = $this->castParsedValue($result); @@ -204,7 +204,7 @@ public function reverseTransform($value) $remainder = trim($remainder, " \t\n\r\0\x0b\xc2\xa0"); if ('' !== $remainder) { - throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s"', $remainder)); + throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s".', $remainder)); } } diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php index 7aacb29e0d1c3..5de065616436f 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php @@ -162,7 +162,7 @@ public function reverseTransform($value) $remainder = trim($remainder, " \t\n\r\0\x0b\xc2\xa0"); if ('' !== $remainder) { - throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s"', $remainder)); + throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s".', $remainder)); } } diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php index c1944cb9bfe3c..4f04645eb77d7 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php @@ -64,7 +64,7 @@ public function reverseTransform($array) foreach ($this->keys as $key) { if (isset($array[$key]) && '' !== $array[$key] && false !== $array[$key] && [] !== $array[$key]) { if ($array[$key] !== $result) { - throw new TransformationFailedException('All values in the array should be the same'); + throw new TransformationFailedException('All values in the array should be the same.'); } } else { $emptyKeys[] = $key; @@ -77,7 +77,7 @@ public function reverseTransform($array) return null; } - throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys))); + throw new TransformationFailedException(sprintf('The keys "%s" should not be empty.', implode('", "', $emptyKeys))); } return $result; diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php index 54de667cd17aa..1b67982788f36 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php @@ -163,7 +163,7 @@ public function getElements() public function getElement($index) { if (!isset($this->elements[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index)); + throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); } return $this->elements[$index]; @@ -175,7 +175,7 @@ public function getElement($index) public function isProperty($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index)); + throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); } return !$this->isIndex[$index]; @@ -187,7 +187,7 @@ public function isProperty($index) public function isIndex($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index)); + throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); } return $this->isIndex[$index]; @@ -212,7 +212,7 @@ public function isIndex($index) public function mapsForm($index) { if (!isset($this->mapsForm[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index)); + throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); } return $this->mapsForm[$index]; diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index b25afe3a9e494..0403ba104956f 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -163,7 +163,7 @@ public function __construct(FormConfigInterface $config) // `setData` and `add` will not lead to the correct population of // the child forms. if ($config->getCompound() && !$config->getDataMapper()) { - throw new LogicException('Compound forms need a data mapper'); + throw new LogicException('Compound forms need a data mapper.'); } // If the form inherits the data from its parent, it is not necessary @@ -260,7 +260,7 @@ public function isDisabled() public function setParent(FormInterface $parent = null) { if ($this->submitted) { - throw new AlreadySubmittedException('You cannot set the parent of a submitted form'); + throw new AlreadySubmittedException('You cannot set the parent of a submitted form.'); } if (null !== $parent && '' === $this->name) { @@ -495,7 +495,7 @@ public function handleRequest($request = null) public function submit($submittedData, $clearMissing = true) { if ($this->submitted) { - throw new AlreadySubmittedException('A form can only be submitted once'); + throw new AlreadySubmittedException('A form can only be submitted once.'); } // Initialize errors in the very beginning so we're sure @@ -810,7 +810,7 @@ public function all() public function add($child, $type = null, array $options = []) { if ($this->submitted) { - throw new AlreadySubmittedException('You cannot add children to a submitted form'); + throw new AlreadySubmittedException('You cannot add children to a submitted form.'); } if (!$this->config->getCompound()) { @@ -879,7 +879,7 @@ public function add($child, $type = null, array $options = []) public function remove($name) { if ($this->submitted) { - throw new AlreadySubmittedException('You cannot remove children from a submitted form'); + throw new AlreadySubmittedException('You cannot remove children from a submitted form.'); } if (isset($this->children[$name])) { diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php index 0d1310b22d11c..6393c2d2372a3 100644 --- a/src/Symfony/Component/Form/FormView.php +++ b/src/Symfony/Component/Form/FormView.php @@ -132,7 +132,7 @@ public function offsetExists($name) */ public function offsetSet($name, $value) { - throw new BadMethodCallException('Not supported'); + throw new BadMethodCallException('Not supported.'); } /** diff --git a/src/Symfony/Component/Form/PreloadedExtension.php b/src/Symfony/Component/Form/PreloadedExtension.php index 759ae9ad17b7e..310b70f5969ae 100644 --- a/src/Symfony/Component/Form/PreloadedExtension.php +++ b/src/Symfony/Component/Form/PreloadedExtension.php @@ -47,7 +47,7 @@ public function __construct(array $types, array $typeExtensions, FormTypeGuesser public function getType($name) { if (!isset($this->types[$name])) { - throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension', $name)); + throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension.', $name)); } return $this->types[$name]; diff --git a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php index 46bd8b7e576d4..670382619d715 100644 --- a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php +++ b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php @@ -30,11 +30,11 @@ trait ValidatorExtensionTrait protected function getValidatorExtension() { if (!interface_exists(ValidatorInterface::class)) { - throw new \Exception('In order to use the "ValidatorExtensionTrait", the symfony/validator component must be installed'); + throw new \Exception('In order to use the "ValidatorExtensionTrait", the symfony/validator component must be installed.'); } if (!$this instanceof TypeTestCase) { - throw new \Exception(sprintf('The trait "ValidatorExtensionTrait" can only be added to a class that extends %s', TypeTestCase::class)); + throw new \Exception(sprintf('The trait "ValidatorExtensionTrait" can only be added to a class that extends %s.', TypeTestCase::class)); } $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock(); diff --git a/src/Symfony/Component/Form/Util/OrderedHashMap.php b/src/Symfony/Component/Form/Util/OrderedHashMap.php index 19ec4fc7d2a27..45b9e26c01a64 100644 --- a/src/Symfony/Component/Form/Util/OrderedHashMap.php +++ b/src/Symfony/Component/Form/Util/OrderedHashMap.php @@ -112,7 +112,7 @@ public function offsetExists($key) public function offsetGet($key) { if (!isset($this->elements[$key])) { - throw new \OutOfBoundsException('The offset "'.$key.'" does not exist.'); + throw new \OutOfBoundsException(sprintf('The offset "%s" does not exist.', $key)); } return $this->elements[$key]; diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php index 34220588a4b8e..309339e5cfb09 100644 --- a/src/Symfony/Component/HttpFoundation/File/File.php +++ b/src/Symfony/Component/HttpFoundation/File/File.php @@ -97,7 +97,7 @@ public function move($directory, $name = null) $renamed = rename($this->getPathname(), $target); restore_error_handler(); if (!$renamed) { - throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error))); + throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error))); } @chmod($target, 0666 & ~umask()); @@ -109,10 +109,10 @@ protected function getTargetFile($directory, $name = null) { if (!is_dir($directory)) { if (false === @mkdir($directory, 0777, true) && !is_dir($directory)) { - throw new FileException(sprintf('Unable to create the "%s" directory', $directory)); + throw new FileException(sprintf('Unable to create the "%s" directory.', $directory)); } } elseif (!is_writable($directory)) { - throw new FileException(sprintf('Unable to write in the "%s" directory', $directory)); + throw new FileException(sprintf('Unable to write in the "%s" directory.', $directory)); } $target = rtrim($directory, '/\\').\DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name)); diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php index e05269fc80333..8d971ed677ea2 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php @@ -127,7 +127,7 @@ public function guess($path) } if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) { - throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)'); + throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?).'); } return null; diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php index 86153ed49c96f..5b75dd84fc7b5 100644 --- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -196,7 +196,7 @@ public function move($directory, $name = null) $moved = move_uploaded_file($this->getPathname(), $target); restore_error_handler(); if (!$moved) { - throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error))); + throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error))); } @chmod($target, 0666 & ~umask()); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php index 3abc33caa55c0..d4b68ae8b8379 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php @@ -47,7 +47,7 @@ class MemcacheSessionHandler implements \SessionHandlerInterface public function __construct(\Memcache $memcache, array $options = []) { if ($diff = array_diff(array_keys($options), ['prefix', 'expiretime'])) { - throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff))); + throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff))); } $this->memcache = $memcache; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php index a399be5fd8ee7..6711e0a55f9d7 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php @@ -47,7 +47,7 @@ public function __construct(\Memcached $memcached, array $options = []) $this->memcached = $memcached; if ($diff = array_diff(array_keys($options), ['prefix', 'expiretime'])) { - throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff))); + throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff))); } $this->ttl = isset($options['expiretime']) ? (int) $options['expiretime'] : 86400; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php index 1dd72406699df..d84f2e9d0c777 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php @@ -74,11 +74,11 @@ public function __construct($mongo, array $options) } if (!($mongo instanceof \MongoDB\Client || $mongo instanceof \MongoClient || $mongo instanceof \Mongo)) { - throw new \InvalidArgumentException('MongoClient or Mongo instance required'); + throw new \InvalidArgumentException('MongoClient or Mongo instance required.'); } if (!isset($options['database']) || !isset($options['collection'])) { - throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler'); + throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler.'); } $this->mongo = $mongo; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php index 8b7615ec10e08..f24271fbf5828 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php @@ -38,7 +38,7 @@ public function __construct($savePath = null) if ($count = substr_count($savePath, ';')) { if ($count > 2) { - throw new \InvalidArgumentException(sprintf('Invalid argument $savePath \'%s\'', $savePath)); + throw new \InvalidArgumentException(sprintf('Invalid argument $savePath \'%s\'.', $savePath)); } // characters after last ';' are the path @@ -46,7 +46,7 @@ public function __construct($savePath = null) } if ($baseDir && !is_dir($baseDir) && !@mkdir($baseDir, 0777, true) && !is_dir($baseDir)) { - throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s"', $baseDir)); + throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $baseDir)); } ini_set('session.save_path', $savePath); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php index 653ca6917bbc1..d1cf622bdd118 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php @@ -173,7 +173,7 @@ public function __construct($pdoOrDsn = null, array $options = []) { if ($pdoOrDsn instanceof \PDO) { if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) { - throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__)); + throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __CLASS__)); } $this->pdo = $pdoOrDsn; @@ -465,7 +465,7 @@ private function buildDsnFromUrl($dsnOrUrl) } if (!isset($params['scheme'])) { - throw new \InvalidArgumentException('URLs without scheme are not supported to configure the PdoSessionHandler'); + throw new \InvalidArgumentException('URLs without scheme are not supported to configure the PdoSessionHandler.'); } $driverAliasMap = [ diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php index c1e7523c5e44f..969f272fb3001 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php @@ -152,7 +152,7 @@ public function setName($name) public function save() { if (!$this->started || $this->closed) { - throw new \RuntimeException('Trying to save a session that was not started yet or was already closed'); + throw new \RuntimeException('Trying to save a session that was not started yet or was already closed.'); } // nothing to do since we don't persist the session data $this->closed = false; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php index 9bbd1baf2cd69..c5b1d1a360e72 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php @@ -38,7 +38,7 @@ public function __construct($savePath = null, $name = 'MOCKSESSID', MetadataBag } if (!is_dir($savePath) && !@mkdir($savePath, 0777, true) && !is_dir($savePath)) { - throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s"', $savePath)); + throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $savePath)); } $this->savePath = $savePath; @@ -88,7 +88,7 @@ public function regenerate($destroy = false, $lifetime = null) public function save() { if (!$this->started) { - throw new \RuntimeException('Trying to save a session that was not started yet or was already closed'); + throw new \RuntimeException('Trying to save a session that was not started yet or was already closed.'); } $data = $this->data; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index 7502897a4456b..33a146553f974 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -152,7 +152,7 @@ public function start() // ok to try and start the session if (!session_start()) { - throw new \RuntimeException('Failed to start the session'); + throw new \RuntimeException('Failed to start the session.'); } if (null !== $this->emulateSameSite) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php index cd0635a1684d7..b9c2682b3c299 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php @@ -88,7 +88,7 @@ public function getId() public function setId($id) { if ($this->isActive()) { - throw new \LogicException('Cannot change the ID of an active session'); + throw new \LogicException('Cannot change the ID of an active session.'); } session_id($id); @@ -114,7 +114,7 @@ public function getName() public function setName($name) { if ($this->isActive()) { - throw new \LogicException('Cannot change the name of an active session'); + throw new \LogicException('Cannot change the name of an active session.'); } session_name($name); diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index 619628b5c7a98..4e11ac640bd90 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -88,7 +88,7 @@ public function getController(Request $request) try { $callable = $this->createController($controller); } catch (\InvalidArgumentException $e) { - throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $e->getMessage()), 0, $e); + throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s.', $request->getPathInfo(), $e->getMessage()), 0, $e); } return $callable; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php index 4266b22fec9b9..7c32ec1001d07 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php @@ -217,7 +217,7 @@ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1) $dumper = new HtmlDumper($data, $this->charset); $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]); } else { - throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format)); + throw new \InvalidArgumentException(sprintf('Invalid dump format: %s.', $format)); } $dumps = []; diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php index f94a5c0760368..4850e589dad43 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php @@ -57,7 +57,7 @@ public function __construct($templating = null, UriSigner $signer = null, $globa public function setTemplating($templating) { if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof Environment) { - throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface'); + throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface.'); } $this->templating = $templating; diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 4ef763e4862a8..a73788e1ecc38 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -493,7 +493,7 @@ protected function initializeBundles() foreach ($this->registerBundles() as $bundle) { $name = $bundle->getName(); if (isset($this->bundles[$name])) { - throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s"', $name)); + throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s".', $name)); } $this->bundles[$name] = $bundle; @@ -762,10 +762,10 @@ protected function buildContainer() foreach (['cache' => $this->warmupDir ?: $this->getCacheDir(), 'logs' => $this->getLogDir()] as $name => $dir) { if (!is_dir($dir)) { if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) { - throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir)); + throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n.", $name, $dir)); } } elseif (!is_writable($dir)) { - throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir)); + throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n.", $name, $dir)); } } diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php index 3383a0a76aa4f..7e1fa23ca5a57 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php @@ -37,7 +37,7 @@ public function __construct($genrb = 'genrb', $envVars = '') exec('which '.$genrb, $output, $status); if (0 !== $status) { - throw new RuntimeException(sprintf('The command "%s" is not installed', $genrb)); + throw new RuntimeException(sprintf('The command "%s" is not installed.', $genrb)); } $this->genrb = ($envVars ? $envVars.' ' : '').$genrb; diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php index 5c41c4043918e..a56fd6af1c233 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php @@ -46,7 +46,7 @@ public function read($path, $locale) $data = json_decode(file_get_contents($fileName), true); if (null === $data) { - throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: %s', $fileName, json_last_error_msg())); + throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: %s.', $fileName, json_last_error_msg())); } return $data; diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php index dff4ab18b35dd..0f50617955cc2 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php @@ -160,7 +160,7 @@ private function generateLocaleName(BundleEntryReaderInterface $reader, $tempDir // i.e. in de_AT, "AT" is the region if ($region = \Locale::getRegion($locale)) { if (!RegionDataGenerator::isValidCountryCode($region)) { - throw new MissingResourceException('Skipping "'.$locale.'" due an invalid country.'); + throw new MissingResourceException(sprintf('Skipping "%s" due an invalid country.', $locale)); } $extras[] = str_replace(['(', ')'], ['[', ']'], $reader->readEntry($tempDir.'/region', $displayLocale, ['Countries', $region])); diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php index 696f38fe1d337..a6afb0b2c23cc 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php @@ -121,7 +121,7 @@ public function formatReplace($dateChars, $dateTime) // handle unimplemented characters if (false !== strpos($this->notImplementedChars, $dateChars[0])) { - throw new NotImplementedException(sprintf('Unimplemented date character "%s" in format "%s"', $dateChars[0], $this->pattern)); + throw new NotImplementedException(sprintf('Unimplemented date character "%s" in format "%s".', $dateChars[0], $this->pattern)); } return null; diff --git a/src/Symfony/Component/Intl/Globals/IntlGlobals.php b/src/Symfony/Component/Intl/Globals/IntlGlobals.php index 0dd25382f628b..6268107ec05cc 100644 --- a/src/Symfony/Component/Intl/Globals/IntlGlobals.php +++ b/src/Symfony/Component/Intl/Globals/IntlGlobals.php @@ -118,7 +118,7 @@ public static function getErrorName($code) public static function setError($code, $message = '') { if (!isset(self::$errorCodes[$code])) { - throw new \InvalidArgumentException(sprintf('No such error code: "%s"', $code)); + throw new \InvalidArgumentException(sprintf('No such error code: "%s".', $code)); } self::$errorMessage = $message ? sprintf('%s: %s', $message, self::$errorCodes[$code]) : self::$errorCodes[$code]; diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index 13bffbd45370d..f9ad71eb92dad 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -363,7 +363,7 @@ public function format($value, $type = self::TYPE_DEFAULT) } if (self::CURRENCY === $this->style) { - throw new NotImplementedException(sprintf('%s() method does not support the formatting of currencies (instance with CURRENCY style). %s', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE)); + throw new NotImplementedException(sprintf('%s() method does not support the formatting of currencies (instance with CURRENCY style). %s.', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE)); } // Only the default type is supported. diff --git a/src/Symfony/Component/Ldap/Ldap.php b/src/Symfony/Component/Ldap/Ldap.php index fd4955ef5d791..bc1543e4c1701 100644 --- a/src/Symfony/Component/Ldap/Ldap.php +++ b/src/Symfony/Component/Ldap/Ldap.php @@ -73,7 +73,7 @@ public function escape($subject, $ignore = '', $flags = 0) public static function create($adapter, array $config = []) { if (!isset(self::$adapterMap[$adapter])) { - throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s', $adapter, implode(', ', self::$adapterMap))); + throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s.', $adapter, implode(', ', self::$adapterMap))); } $class = self::$adapterMap[$adapter]; diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php index 7ff893d58f153..ebe6973133858 100644 --- a/src/Symfony/Component/Lock/Store/MemcachedStore.php +++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php @@ -42,7 +42,7 @@ public static function isSupported() public function __construct(\Memcached $memcached, $initialTtl = 300) { if (!static::isSupported()) { - throw new InvalidArgumentException('Memcached extension is required'); + throw new InvalidArgumentException('Memcached extension is required.'); } if ($initialTtl < 1) { diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php index 56a91d7f062fb..d0c8abf119dd9 100644 --- a/src/Symfony/Component/Lock/Store/RedisStore.php +++ b/src/Symfony/Component/Lock/Store/RedisStore.php @@ -37,7 +37,7 @@ class RedisStore implements StoreInterface public function __construct($redisClient, $initialTtl = 300.0) { if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\ClientInterface && !$redisClient instanceof RedisProxy) { - throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); + throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); } if ($initialTtl <= 0) { @@ -143,7 +143,7 @@ private function evaluate($script, $resource, array $args) return \call_user_func_array([$this->redis, 'eval'], array_merge([$script, 1, $resource], $args)); } - throw new InvalidArgumentException(sprintf('%s() expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis))); + throw new InvalidArgumentException(sprintf('%s() expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given.', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis))); } /** diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php index fb72ff828d005..ea13c5fff921c 100644 --- a/src/Symfony/Component/Lock/Store/SemaphoreStore.php +++ b/src/Symfony/Component/Lock/Store/SemaphoreStore.php @@ -49,7 +49,7 @@ public static function isSupported($blocking = null) public function __construct() { if (!static::isSupported()) { - throw new InvalidArgumentException('Semaphore extension (sysvsem) is required'); + throw new InvalidArgumentException('Semaphore extension (sysvsem) is required.'); } } diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php index 757d6294554e5..82dbdb223d0c6 100644 --- a/src/Symfony/Component/Process/InputStream.php +++ b/src/Symfony/Component/Process/InputStream.php @@ -45,7 +45,7 @@ public function write($input) return; } if ($this->isClosed()) { - throw new RuntimeException(sprintf('%s is closed', static::class)); + throw new RuntimeException(sprintf('%s is closed.', static::class)); } $this->input[] = ProcessUtils::validateInput(__METHOD__, $input); } diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php index 9dd415d5c9a9a..b84b4f084c837 100644 --- a/src/Symfony/Component/Process/Pipes/AbstractPipes.php +++ b/src/Symfony/Component/Process/Pipes/AbstractPipes.php @@ -107,7 +107,7 @@ protected function write() } elseif (!isset($this->inputBuffer[0])) { if (!\is_string($input)) { if (!is_scalar($input)) { - throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported', \get_class($this->input), \gettype($input))); + throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported.', \get_class($this->input), \gettype($input))); } $input = (string) $input; } diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php index e8e6f139e55b3..44056d54cf65d 100644 --- a/src/Symfony/Component/Process/Pipes/WindowsPipes.php +++ b/src/Symfony/Component/Process/Pipes/WindowsPipes.php @@ -57,7 +57,7 @@ public function __construct($input, $haveReadSupport) if (!$h = fopen($file.'.lock', 'w')) { restore_error_handler(); - throw new RuntimeException(sprintf('A temporary file could not be opened to write the process output: %s', $lastError)); + throw new RuntimeException(sprintf('A temporary file could not be opened to write the process output: %s.', $lastError)); } if (!flock($h, LOCK_EX | LOCK_NB)) { continue 2; diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index c0c1fdaf69c1a..4b5f27934ac05 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -260,7 +260,7 @@ public function mustRun(callable $callback = null/*, array $env = []*/) public function start(callable $callback = null/*, array $env = [*/) { if ($this->isRunning()) { - throw new RuntimeException('Process is already running'); + throw new RuntimeException('Process is already running.'); } if (2 <= \func_num_args()) { $env = func_get_arg(1); @@ -375,7 +375,7 @@ public function start(callable $callback = null/*, array $env = [*/) public function restart(callable $callback = null/*, array $env = []*/) { if ($this->isRunning()) { - throw new RuntimeException('Process is already running'); + throw new RuntimeException('Process is already running.'); } $env = 1 < \func_num_args() ? func_get_arg(1) : null; @@ -409,7 +409,7 @@ public function wait(callable $callback = null) if (null !== $callback) { if (!$this->processPipes->haveReadSupport()) { $this->stop(0); - throw new \LogicException('Pass the callback to the Process::start method or enableOutput to use a callback with Process::wait'); + throw new \LogicException('Pass the callback to the Process::start method or enableOutput to use a callback with Process::wait.'); } $this->callback = $this->buildCallback($callback); } diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 7aff347134273..371c6c23d57d3 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -267,7 +267,7 @@ private static function throwInvalidArgumentException($message, $trace, $i, $pre $type = substr($message, 2 + $j, strpos($message, ' given', $j) - $j - 2); $message = substr($message, $pos, $j - $pos); - throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given', $message, 'NULL' === $type ? 'null' : $type), 0, $previous); + throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given.', $message, 'NULL' === $type ? 'null' : $type), 0, $previous); } } @@ -591,7 +591,7 @@ private function getReadAccessInfo($class, $property) private function writeIndex($zval, $index, $value) { if (!$zval[self::VALUE] instanceof \ArrayAccess && !\is_array($zval[self::VALUE])) { - throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess', $index, \get_class($zval[self::VALUE]))); + throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess.', $index, \get_class($zval[self::VALUE]))); } $zval[self::REF][$index] = $value; diff --git a/src/Symfony/Component/PropertyAccess/PropertyPath.php b/src/Symfony/Component/PropertyAccess/PropertyPath.php index 899cf55df80e6..ffbd9e1a97a57 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPath.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPath.php @@ -77,7 +77,7 @@ public function __construct($propertyPath) return; } if (!\is_string($propertyPath)) { - throw new InvalidArgumentException(sprintf('The property path constructor needs a string or an instance of "Symfony\Component\PropertyAccess\PropertyPath". Got: "%s"', \is_object($propertyPath) ? \get_class($propertyPath) : \gettype($propertyPath))); + throw new InvalidArgumentException(sprintf('The property path constructor needs a string or an instance of "Symfony\Component\PropertyAccess\PropertyPath". Got: "%s".', \is_object($propertyPath) ? \get_class($propertyPath) : \gettype($propertyPath))); } if ('' === $propertyPath) { @@ -108,7 +108,7 @@ public function __construct($propertyPath) } if ('' !== $remaining) { - throw new InvalidPropertyPathException(sprintf('Could not parse property path "%s". Unexpected token "%s" at position %d', $propertyPath, $remaining[0], $position)); + throw new InvalidPropertyPathException(sprintf('Could not parse property path "%s". Unexpected token "%s" at position %d.', $propertyPath, $remaining[0], $position)); } $this->length = \count($this->elements); @@ -173,7 +173,7 @@ public function getElements() public function getElement($index) { if (!isset($this->elements[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the property path', $index)); + throw new OutOfBoundsException(sprintf('The index %s is not within the property path.', $index)); } return $this->elements[$index]; @@ -185,7 +185,7 @@ public function getElement($index) public function isProperty($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the property path', $index)); + throw new OutOfBoundsException(sprintf('The index %s is not within the property path.', $index)); } return !$this->isIndex[$index]; @@ -197,7 +197,7 @@ public function isProperty($index) public function isIndex($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the property path', $index)); + throw new OutOfBoundsException(sprintf('The index %s is not within the property path.', $index)); } return $this->isIndex[$index]; diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php index d09a14b3fc408..3dbfa7afcc551 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php @@ -94,7 +94,7 @@ public function appendProperty($name) public function remove($offset, $length = 1) { if (!isset($this->elements[$offset])) { - throw new OutOfBoundsException(sprintf('The offset %s is not within the property path', $offset)); + throw new OutOfBoundsException(sprintf('The offset %s is not within the property path.', $offset)); } $this->resize($offset, $length, 0); @@ -149,7 +149,7 @@ public function replace($offset, $length, $path, $pathOffset = 0, $pathLength = public function replaceByIndex($offset, $name = null) { if (!isset($this->elements[$offset])) { - throw new OutOfBoundsException(sprintf('The offset %s is not within the property path', $offset)); + throw new OutOfBoundsException(sprintf('The offset %s is not within the property path.', $offset)); } if (null !== $name) { @@ -170,7 +170,7 @@ public function replaceByIndex($offset, $name = null) public function replaceByProperty($offset, $name = null) { if (!isset($this->elements[$offset])) { - throw new OutOfBoundsException(sprintf('The offset %s is not within the property path', $offset)); + throw new OutOfBoundsException(sprintf('The offset %s is not within the property path.', $offset)); } if (null !== $name) { diff --git a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php b/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php index b5fa1ccede546..e066d6f24f80a 100644 --- a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php +++ b/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php @@ -46,7 +46,7 @@ public function load($resource, $type = null) { $parts = explode(':', $resource); if (2 != \count($parts)) { - throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service_name:methodName"', $resource)); + throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service_name:methodName".', $resource)); } $serviceString = $parts[0]; @@ -55,11 +55,11 @@ public function load($resource, $type = null) $loaderObject = $this->getServiceObject($serviceString); if (!\is_object($loaderObject)) { - throw new \LogicException(sprintf('%s:getServiceObject() must return an object: %s returned', static::class, \gettype($loaderObject))); + throw new \LogicException(sprintf('%s:getServiceObject() must return an object: %s returned.', static::class, \gettype($loaderObject))); } if (!method_exists($loaderObject, $method)) { - throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, \get_class($loaderObject), $resource)); + throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s".', $method, \get_class($loaderObject), $resource)); } $routeCollection = \call_user_func([$loaderObject, $method], $this); @@ -67,7 +67,7 @@ public function load($resource, $type = null) if (!$routeCollection instanceof RouteCollection) { $type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection); - throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned', \get_class($loaderObject), $method, $type)); + throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned.', \get_class($loaderObject), $method, $type)); } // make the service file tracked so that if it changes, the cache rebuilds diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php index b7aa35a8f9bd8..00092c431373c 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php @@ -68,7 +68,7 @@ public function setQueryString($queryString) protected function retrieveUser($username, UsernamePasswordToken $token) { if (AuthenticationProviderInterface::USERNAME_NONE_PROVIDED === $username) { - throw new UsernameNotFoundException('Username can not be null'); + throw new UsernameNotFoundException('Username can not be null.'); } return $this->userProvider->loadUserByUsername($username); diff --git a/src/Symfony/Component/Security/Core/User/LdapUserProvider.php b/src/Symfony/Component/Security/Core/User/LdapUserProvider.php index 18413a7dc92b7..1d3a9804ee941 100644 --- a/src/Symfony/Component/Security/Core/User/LdapUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/LdapUserProvider.php @@ -81,7 +81,7 @@ public function loadUserByUsername($username) } if ($count > 1) { - throw new UsernameNotFoundException('More than one user found'); + throw new UsernameNotFoundException('More than one user found.'); } $entry = $entries[0]; diff --git a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php index ddc8c5029778a..5023c31ecafbd 100644 --- a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php @@ -101,7 +101,7 @@ private function authenticateViaGuard($guardAuthenticator, PreAuthenticationGuar $user = $guardAuthenticator->getUser($token->getCredentials(), $this->userProvider); if (null === $user) { - throw new UsernameNotFoundException(sprintf('Null returned from %s::getUser()', \get_class($guardAuthenticator))); + throw new UsernameNotFoundException(sprintf('Null returned from %s::getUser().', \get_class($guardAuthenticator))); } if (!$user instanceof UserInterface) { diff --git a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php index 1d03e23a85683..4456cff9aba73 100644 --- a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php @@ -64,7 +64,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token) } if (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object.', \get_class($this->simpleAuthenticator))); } } @@ -91,7 +91,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio } if (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object.', \get_class($this->simpleAuthenticator))); } } diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php index 693dbcd586c9c..2308896e85eda 100644 --- a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php @@ -94,7 +94,7 @@ public function handle(GetResponseEvent $event) $user = $this->provider->loadUserByUsername($digestAuth->getUsername()); if (null === $user) { - throw new AuthenticationServiceException('Digest User provider returned null, which is an interface contract violation'); + throw new AuthenticationServiceException('Digest User provider returned null, which is an interface contract violation.'); } $serverDigestMd5 = $digestAuth->calculateServerDigest($user->getPassword(), $request->getMethod()); @@ -199,11 +199,11 @@ public function getUsername() public function validateAndDecode($entryPointKey, $expectedRealm) { if ($keys = array_diff(['username', 'realm', 'nonce', 'uri', 'response'], array_keys($this->elements))) { - throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s" (%s)', $this->header, implode(', ', $keys))); + throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s" (%s).', $this->header, implode(', ', $keys))); } if ('auth' === $this->elements['qop'] && !isset($this->elements['nc'], $this->elements['cnonce'])) { - throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header)); + throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s".', $this->header)); } if ($expectedRealm !== $this->elements['realm']) { diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php index b1259d116f641..21e45516ea9b2 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php @@ -212,7 +212,7 @@ private function startAuthentication(Request $request, AuthenticationException $ if (!$response instanceof Response) { $given = \is_object($response) ? \get_class($response) : \gettype($response); - throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned)', \get_class($this->authenticationEntryPoint), $given)); + throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned).', \get_class($this->authenticationEntryPoint), $given)); } return $response; diff --git a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php index fbba95db702ae..ea18b22d5db2a 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php @@ -41,7 +41,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM protected function getPreAuthenticatedData(Request $request) { if (!$request->server->has($this->userKey)) { - throw new BadCredentialsException(sprintf('User key was not found: %s', $this->userKey)); + throw new BadCredentialsException(sprintf('User key was not found: %s.', $this->userKey)); } return [$request->server->get($this->userKey), null]; diff --git a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php index b21a50d56d5cd..010f057406208 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php @@ -54,7 +54,7 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = [], LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, CsrfTokenManagerInterface $csrfTokenManager = null, SimpleFormAuthenticatorInterface $simpleAuthenticator = null) { if (!$simpleAuthenticator) { - throw new \InvalidArgumentException('Missing simple authenticator'); + throw new \InvalidArgumentException('Missing simple authenticator.'); } $this->simpleAuthenticator = $simpleAuthenticator; diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php index 7e376f5ef0cae..d5163ae0304dd 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php @@ -120,7 +120,7 @@ public function handle(GetResponseEvent $event) if ($response instanceof Response) { $event->setResponse($response); } elseif (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object.', \get_class($this->simpleAuthenticator))); } } @@ -132,7 +132,7 @@ public function handle(GetResponseEvent $event) if ($response instanceof Response) { $event->setResponse($response); } elseif (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object.', \get_class($this->simpleAuthenticator))); } } } diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php index a5d077fb310d8..7fe6b33f23e8b 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php @@ -100,7 +100,7 @@ public function handle(GetResponseEvent $event) try { $this->tokenStorage->setToken($this->attemptSwitchUser($request, $username)); } catch (AuthenticationException $e) { - throw new \LogicException(sprintf('Switch User failed: "%s"', $e->getMessage())); + throw new \LogicException(sprintf('Switch User failed: "%s".', $e->getMessage())); } } diff --git a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php index e3cfb9d80e346..8adf56796efc0 100644 --- a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php @@ -52,7 +52,7 @@ protected function getPreAuthenticatedData(Request $request) } if (null === $user) { - throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s', $this->userKey, $this->credentialKey)); + throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s.', $this->userKey, $this->credentialKey)); } return [$user, $request->server->get($this->credentialKey, '')]; diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index e47e1812212cf..fba79fba874e4 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -265,7 +265,7 @@ protected function encodeCookie(array $cookieParts) { foreach ($cookieParts as $cookiePart) { if (false !== strpos($cookiePart, self::COOKIE_DELIMITER)) { - throw new \InvalidArgumentException(sprintf('$cookieParts should not contain the cookie delimiter "%s"', self::COOKIE_DELIMITER)); + throw new \InvalidArgumentException(sprintf('$cookieParts should not contain the cookie delimiter "%s".', self::COOKIE_DELIMITER)); } } diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php index a04a9afcca508..3a886afc49ee2 100644 --- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php +++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php @@ -59,7 +59,7 @@ public function onAuthentication(Request $request, TokenInterface $token) return; default: - throw new \RuntimeException(sprintf('Invalid session authentication strategy "%s"', $this->strategy)); + throw new \RuntimeException(sprintf('Invalid session authentication strategy "%s".', $this->strategy)); } } } diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php index aff73429ae4ba..10c9b57b92196 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php @@ -86,7 +86,7 @@ public function testExceptionWhenEntryPointReturnsBadValue() $listener->onKernelException($event); // the exception has been replaced by our LogicException $this->assertInstanceOf('LogicException', $event->getException()); - $this->assertStringEndsWith('start() method must return a Response object (string returned)', $event->getException()->getMessage()); + $this->assertStringEndsWith('start() method must return a Response object (string returned).', $event->getException()->getMessage()); } /** diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index dada438e29d73..bd6b8f15653c9 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -431,7 +431,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null) return $this->appendNode($parentNode, $data, 'data'); } - throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data)))); + throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s.', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data)))); } /** diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/ClassResolverTrait.php b/src/Symfony/Component/Serializer/Mapping/Factory/ClassResolverTrait.php index 5c58476383427..9baa969da4d52 100644 --- a/src/Symfony/Component/Serializer/Mapping/Factory/ClassResolverTrait.php +++ b/src/Symfony/Component/Serializer/Mapping/Factory/ClassResolverTrait.php @@ -42,7 +42,7 @@ private function getClass($value) } if (!\is_object($value)) { - throw new InvalidArgumentException(sprintf('Cannot create metadata for non-objects. Got: "%s"', \gettype($value))); + throw new InvalidArgumentException(sprintf('Cannot create metadata for non-objects. Got: "%s".', \gettype($value))); } return \get_class($value); diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php index d1b0dee93e9c0..be3b8984a0582 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php @@ -30,11 +30,11 @@ abstract class FileLoader implements LoaderInterface public function __construct($file) { if (!is_file($file)) { - throw new MappingException(sprintf('The mapping file %s does not exist', $file)); + throw new MappingException(sprintf('The mapping file %s does not exist.', $file)); } if (!is_readable($file)) { - throw new MappingException(sprintf('The mapping file %s is not readable', $file)); + throw new MappingException(sprintf('The mapping file %s is not readable.', $file)); } $this->file = $file; diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php index 1890a9d84c530..7f90c84048b2f 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php @@ -40,7 +40,7 @@ public function __construct(array $loaders) { foreach ($loaders as $loader) { if (!$loader instanceof LoaderInterface) { - throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface', \get_class($loader))); + throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface.', \get_class($loader))); } } diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index b2b4604e35a39..55bf43b0d3f8f 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -185,7 +185,7 @@ protected function handleCircularReference($object) return \call_user_func($this->circularReferenceHandler, $object); } - throw new CircularReferenceException(sprintf('A circular reference has been detected when serializing the object of class "%s" (configured limit: %d)', \get_class($object), $this->circularReferenceLimit)); + throw new CircularReferenceException(sprintf('A circular reference has been detected when serializing the object of class "%s" (configured limit: %d).', \get_class($object), $this->circularReferenceLimit)); } /** @@ -388,7 +388,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara try { if (null !== $parameter->getClass()) { if (!$this->serializer instanceof DenormalizerInterface) { - throw new LogicException(sprintf('Cannot create an instance of %s from serialized data because the serializer inject in "%s" is not a denormalizer', $parameter->getClass(), static::class)); + throw new LogicException(sprintf('Cannot create an instance of %s from serialized data because the serializer inject in "%s" is not a denormalizer.', $parameter->getClass(), static::class)); } $parameterClass = $parameter->getClass()->getName(); diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php index 6cb6ec50133ac..56dc3c590ede3 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php @@ -91,7 +91,7 @@ public function normalize($object, $format = null, array $context = []) foreach ($stack as $attribute => $attributeValue) { if (!$this->serializer instanceof NormalizerInterface) { - throw new LogicException(sprintf('Cannot normalize attribute "%s" because the injected serializer is not a normalizer', $attribute)); + throw new LogicException(sprintf('Cannot normalize attribute "%s" because the injected serializer is not a normalizer.', $attribute)); } $data = $this->updateData($data, $attribute, $this->serializer->normalize($attributeValue, $format, $this->createChildContext($context, $attribute, $format))); @@ -268,7 +268,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma if (Type::BUILTIN_TYPE_OBJECT === $builtinType) { if (!$this->serializer instanceof DenormalizerInterface) { - throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer', $attribute, $class)); + throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class)); } $childContext = $this->createChildContext($context, $attribute, $format); diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php index d9d5a586e123a..3217bc38beaf8 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php @@ -101,7 +101,7 @@ public function denormalize($data, $type, $format = null, array $context = []) $dateTimeErrors = \DateTime::class === $type ? \DateTime::getLastErrors() : \DateTimeImmutable::getLastErrors(); - throw new NotNormalizableValueException(sprintf('Parsing datetime string "%s" using format "%s" resulted in %d errors:'."\n".'%s', $data, $dateTimeFormat, $dateTimeErrors['error_count'], implode("\n", $this->formatDateTimeErrors($dateTimeErrors['errors'])))); + throw new NotNormalizableValueException(sprintf('Parsing datetime string "%s" using format "%s" resulted in %d errors:.'."\n".'%s', $data, $dateTimeFormat, $dateTimeErrors['error_count'], implode("\n", $this->formatDateTimeErrors($dateTimeErrors['errors'])))); } try { diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php index f4080e524c0d8..85e6e1c8b6630 100644 --- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php @@ -35,7 +35,7 @@ public function normalize($object, $format = null, array $context = []) } if (!$this->serializer instanceof NormalizerInterface) { - throw new LogicException('Cannot normalize object because injected serializer is not a normalizer'); + throw new LogicException('Cannot normalize object because injected serializer is not a normalizer.'); } return $this->serializer->normalize($object->jsonSerialize(), $format, $context); diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index 0e2143e93a555..95a2d9613684f 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -109,7 +109,7 @@ public function __construct(array $normalizers = [], array $encoders = []) final public function serialize($data, $format, array $context = []) { if (!$this->supportsEncoding($format, $context)) { - throw new NotEncodableValueException(sprintf('Serialization for the format %s is not supported', $format)); + throw new NotEncodableValueException(sprintf('Serialization for the format %s is not supported.', $format)); } if ($this->encoder->needsNormalization($format, $context)) { @@ -125,7 +125,7 @@ final public function serialize($data, $format, array $context = []) final public function deserialize($data, $type, $format, array $context = []) { if (!$this->supportsDecoding($format, $context)) { - throw new NotEncodableValueException(sprintf('Deserialization for the format %s is not supported', $format)); + throw new NotEncodableValueException(sprintf('Deserialization for the format %s is not supported.', $format)); } $data = $this->decode($data, $format, $context); @@ -164,7 +164,7 @@ public function normalize($data, $format = null, array $context = []) throw new NotNormalizableValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', \get_class($data))); } - throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data)))); + throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s.', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data)))); } /** diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php index e6739469de397..2ef1defc59b29 100644 --- a/src/Symfony/Component/Stopwatch/StopwatchEvent.php +++ b/src/Symfony/Component/Stopwatch/StopwatchEvent.php @@ -238,7 +238,7 @@ protected function getNow() private function formatTime($time) { if (!is_numeric($time)) { - throw new \InvalidArgumentException('The time must be a numerical value'); + throw new \InvalidArgumentException('The time must be a numerical value.'); } return round($time, 1); diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php index 251c3292d3464..9f99f6d1d6084 100644 --- a/src/Symfony/Component/Templating/Loader/CacheLoader.php +++ b/src/Symfony/Component/Templating/Loader/CacheLoader.php @@ -66,7 +66,7 @@ public function load(TemplateReferenceInterface $template) $content = $storage->getContent(); if (!is_dir($dir) && !@mkdir($dir, 0777, true) && !is_dir($dir)) { - throw new \RuntimeException(sprintf('Cache Loader was not able to create directory "%s"', $dir)); + throw new \RuntimeException(sprintf('Cache Loader was not able to create directory "%s".', $dir)); } file_put_contents($path, $content); diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php index 3049212bdcd6e..dd0874fb62c48 100644 --- a/src/Symfony/Component/Templating/PhpEngine.php +++ b/src/Symfony/Component/Templating/PhpEngine.php @@ -134,10 +134,10 @@ protected function evaluate(Storage $template, array $parameters = []) unset($template, $parameters); if (isset($this->evalParameters['this'])) { - throw new \InvalidArgumentException('Invalid parameter (this)'); + throw new \InvalidArgumentException('Invalid parameter (this).'); } if (isset($this->evalParameters['view'])) { - throw new \InvalidArgumentException('Invalid parameter (view)'); + throw new \InvalidArgumentException('Invalid parameter (view).'); } // the view variable is exposed to the require file below diff --git a/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php index 83b5043d35a06..7d15aecb6e0d1 100644 --- a/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php @@ -44,7 +44,7 @@ public function load($resource, $locale, $domain = 'messages') } if (!$rb) { - throw new InvalidResourceException(sprintf('Cannot load resource "%s"', $resource)); + throw new InvalidResourceException(sprintf('Cannot load resource "%s".', $resource)); } elseif (intl_is_failure($rb->getErrorCode())) { throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode()); } diff --git a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php index b59c021469e6e..d5fe99603bfd0 100644 --- a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php @@ -44,7 +44,7 @@ public function load($resource, $locale, $domain = 'messages') } if (!$rb) { - throw new InvalidResourceException(sprintf('Cannot load resource "%s"', $resource)); + throw new InvalidResourceException(sprintf('Cannot load resource "%s".', $resource)); } elseif (intl_is_failure($rb->getErrorCode())) { throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode()); } diff --git a/src/Symfony/Component/Translation/Loader/JsonFileLoader.php b/src/Symfony/Component/Translation/Loader/JsonFileLoader.php index 526721277d76e..5ab2e989e7a76 100644 --- a/src/Symfony/Component/Translation/Loader/JsonFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/JsonFileLoader.php @@ -30,7 +30,7 @@ protected function loadResource($resource) $messages = json_decode($data, true); if (0 < $errorCode = json_last_error()) { - throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode))); + throw new InvalidResourceException(sprintf('Error parsing JSON - %s.', $this->getJSONErrorMessage($errorCode))); } } diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php index 9d7a83ab84c37..b5333f1e4e36b 100644 --- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -53,7 +53,7 @@ private function extract($resource, MessageCatalogue $catalogue, $domain) try { $dom = XmlUtils::loadFile($resource); } catch (\InvalidArgumentException $e) { - throw new InvalidResourceException(sprintf('Unable to load "%s": %s', $resource, $e->getMessage()), $e->getCode(), $e); + throw new InvalidResourceException(sprintf('Unable to load "%s": %s.', $resource, $e->getMessage()), $e->getCode(), $e); } $xliffVersion = $this->getVersionNumber($dom); @@ -194,7 +194,7 @@ private function validateSchema($file, \DOMDocument $dom, $schema) if (!@$dom->schemaValidateSource($schema)) { libxml_disable_entity_loader($disableEntities); - throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $file, implode("\n", $this->getXmlErrors($internalErrors)))); + throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s.', $file, implode("\n", $this->getXmlErrors($internalErrors)))); } libxml_disable_entity_loader($disableEntities); @@ -297,7 +297,7 @@ private function getVersionNumber(\DOMDocument $dom) $namespace = $xliff->attributes->getNamedItem('xmlns'); if ($namespace) { if (0 !== substr_compare('urn:oasis:names:tc:xliff:document:', $namespace->nodeValue, 0, 34)) { - throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s"', $namespace)); + throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s".', $namespace)); } return substr($namespace, 34); diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php index 8d9aa6f72ae5c..41700df24bb4a 100644 --- a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php @@ -47,7 +47,7 @@ protected function loadResource($resource) try { $messages = $this->yamlParser->parseFile($resource); } catch (ParseException $e) { - throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e); + throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s".', $resource), 0, $e); } finally { restore_error_handler(); } diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php index cc4a0bfaba9d3..a9a24b12a25fa 100644 --- a/src/Symfony/Component/Translation/MessageCatalogue.php +++ b/src/Symfony/Component/Translation/MessageCatalogue.php @@ -142,7 +142,7 @@ public function add($messages, $domain = 'messages') public function addCatalogue(MessageCatalogueInterface $catalogue) { if ($catalogue->getLocale() !== $this->locale) { - throw new LogicException(sprintf('Cannot add a catalogue for locale "%s" as the current locale for this catalogue is "%s"', $catalogue->getLocale(), $this->locale)); + throw new LogicException(sprintf('Cannot add a catalogue for locale "%s" as the current locale for this catalogue is "%s".', $catalogue->getLocale(), $this->locale)); } foreach ($catalogue->all() as $domain => $messages) { diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriter.php b/src/Symfony/Component/Translation/Writer/TranslationWriter.php index aad6aad3e88fe..4b56484842a47 100644 --- a/src/Symfony/Component/Translation/Writer/TranslationWriter.php +++ b/src/Symfony/Component/Translation/Writer/TranslationWriter.php @@ -77,7 +77,7 @@ public function write(MessageCatalogue $catalogue, $format, $options = []) $dumper = $this->dumpers[$format]; if (isset($options['path']) && !is_dir($options['path']) && !@mkdir($options['path'], 0777, true) && !is_dir($options['path'])) { - throw new RuntimeException(sprintf('Translation Writer was not able to create directory "%s"', $options['path'])); + throw new RuntimeException(sprintf('Translation Writer was not able to create directory "%s".', $options['path'])); } // save diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php index f04db3cc2d1b9..c0840845480dd 100644 --- a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php +++ b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php @@ -55,7 +55,7 @@ public function validate($value, Constraint $constraint) try { $comparedValue = $this->getPropertyAccessor()->getValue($object, $path); } catch (NoSuchPropertyException $e) { - throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s', $path, \get_class($constraint), $e->getMessage()), 0, $e); + throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s.', $path, \get_class($constraint), $e->getMessage()), 0, $e); } } else { $comparedValue = $constraint->value; diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php index 5b51869ab1246..f919954255e87 100644 --- a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php +++ b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php @@ -40,13 +40,13 @@ public function validate($object, Constraint $constraint) if (isset($method[0]) && \is_object($method[0])) { $method[0] = \get_class($method[0]); } - throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable', json_encode($method))); + throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable.', json_encode($method))); } \call_user_func($method, $object, $this->context, $constraint->payload); } elseif (null !== $object) { if (!method_exists($object, $method)) { - throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s', $method, \get_class($object))); + throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s.', $method, \get_class($object))); } $reflMethod = new \ReflectionMethod($object, $method); diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php index 9ec0fc6703586..4a6114dcb3da5 100644 --- a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php @@ -35,7 +35,7 @@ public function validate($value, Constraint $constraint) } if (!\is_array($constraint->choices) && !$constraint->callback) { - throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice'); + throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice.'); } if (null === $value) { @@ -51,7 +51,7 @@ public function validate($value, Constraint $constraint) && !\is_callable($choices = [$this->context->getClassName(), $constraint->callback]) && !\is_callable($choices = $constraint->callback) ) { - throw new ConstraintDefinitionException('The Choice constraint expects a valid callback'); + throw new ConstraintDefinitionException('The Choice constraint expects a valid callback.'); } $choices = \call_user_func($choices); } else { diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php index 86418690b8d2b..dcd6f35361aac 100644 --- a/src/Symfony/Component/Validator/Constraints/Collection.php +++ b/src/Symfony/Component/Validator/Constraints/Collection.php @@ -57,7 +57,7 @@ protected function initializeNestedConstraints() parent::initializeNestedConstraints(); if (!\is_array($this->fields)) { - throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s', __CLASS__)); + throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s.', __CLASS__)); } foreach ($this->fields as $fieldName => $field) { diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php index 9c423b0dc376a..ead61bb69bc9b 100644 --- a/src/Symfony/Component/Validator/Constraints/Composite.php +++ b/src/Symfony/Component/Validator/Constraints/Composite.php @@ -71,7 +71,7 @@ public function __construct($options = null) $constraint = \get_class($constraint); } - throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, static::class)); + throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s.', $constraint, static::class)); } if ($constraint instanceof Valid) { @@ -99,7 +99,7 @@ public function __construct($options = null) $excessGroups = array_diff($constraint->groups, $this->groups); if (\count($excessGroups) > 0) { - throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s', implode('", "', $excessGroups), \get_class($constraint), static::class)); + throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s.', implode('", "', $excessGroups), \get_class($constraint), static::class)); } } else { $constraint->groups = $this->groups; diff --git a/src/Symfony/Component/Validator/Constraints/Count.php b/src/Symfony/Component/Validator/Constraints/Count.php index b11f994f58b65..227590f9587c4 100644 --- a/src/Symfony/Component/Validator/Constraints/Count.php +++ b/src/Symfony/Component/Validator/Constraints/Count.php @@ -51,7 +51,7 @@ public function __construct($options = null) parent::__construct($options); if (null === $this->min && null === $this->max) { - throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']); + throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']); } } } diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php index 1eb6a98bb89f2..d0eaa45402275 100644 --- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php +++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php @@ -58,7 +58,7 @@ public function validate($value, Constraint $constraint) if ($constraint->strict) { if (!class_exists('\Egulias\EmailValidator\EmailValidator')) { - throw new RuntimeException('Strict email validation requires egulias/email-validator ~1.2|~2.0'); + throw new RuntimeException('Strict email validation requires egulias/email-validator ~1.2|~2.0.'); } $strictValidator = new \Egulias\EmailValidator\EmailValidator(); diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php index c70db0a74c4c1..7a620f6a2a2d1 100644 --- a/src/Symfony/Component/Validator/Constraints/File.php +++ b/src/Symfony/Component/Validator/Constraints/File.php @@ -114,7 +114,7 @@ private function normalizeBinaryFormat($maxSize) $this->maxSize = $matches[1] * $factors[$unit = strtolower($matches[2])]; $this->binaryFormat = null === $this->binaryFormat ? 2 === \strlen($unit) : $this->binaryFormat; } else { - throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $this->maxSize)); + throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $this->maxSize)); } } } diff --git a/src/Symfony/Component/Validator/Constraints/ImageValidator.php b/src/Symfony/Component/Validator/Constraints/ImageValidator.php index 7ca0cd32b3a43..9b4ecfd9736bf 100644 --- a/src/Symfony/Component/Validator/Constraints/ImageValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ImageValidator.php @@ -100,7 +100,7 @@ public function validate($value, Constraint $constraint) if ($constraint->minHeight) { if (!ctype_digit((string) $constraint->minHeight)) { - throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum height', $constraint->minHeight)); + throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum height.', $constraint->minHeight)); } if ($height < $constraint->minHeight) { @@ -116,7 +116,7 @@ public function validate($value, Constraint $constraint) if ($constraint->maxHeight) { if (!ctype_digit((string) $constraint->maxHeight)) { - throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum height', $constraint->maxHeight)); + throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum height.', $constraint->maxHeight)); } if ($height > $constraint->maxHeight) { @@ -132,7 +132,7 @@ public function validate($value, Constraint $constraint) if (null !== $constraint->minPixels) { if (!ctype_digit((string) $constraint->minPixels)) { - throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum amount of pixels', $constraint->minPixels)); + throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum amount of pixels.', $constraint->minPixels)); } if ($pixels < $constraint->minPixels) { @@ -148,7 +148,7 @@ public function validate($value, Constraint $constraint) if (null !== $constraint->maxPixels) { if (!ctype_digit((string) $constraint->maxPixels)) { - throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum amount of pixels', $constraint->maxPixels)); + throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum amount of pixels.', $constraint->maxPixels)); } if ($pixels > $constraint->maxPixels) { @@ -166,7 +166,7 @@ public function validate($value, Constraint $constraint) if (null !== $constraint->minRatio) { if (!is_numeric((string) $constraint->minRatio)) { - throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum ratio', $constraint->minRatio)); + throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum ratio.', $constraint->minRatio)); } if ($ratio < $constraint->minRatio) { @@ -180,7 +180,7 @@ public function validate($value, Constraint $constraint) if (null !== $constraint->maxRatio) { if (!is_numeric((string) $constraint->maxRatio)) { - throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum ratio', $constraint->maxRatio)); + throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum ratio.', $constraint->maxRatio)); } if ($ratio > $constraint->maxRatio) { @@ -218,7 +218,7 @@ public function validate($value, Constraint $constraint) if ($constraint->detectCorrupted) { if (!\function_exists('imagecreatefromstring')) { - throw new RuntimeException('Corrupted images detection requires installed and enabled GD extension'); + throw new RuntimeException('Corrupted images detection requires installed and enabled GD extension.'); } $resource = @imagecreatefromstring(file_get_contents($value)); diff --git a/src/Symfony/Component/Validator/Constraints/Ip.php b/src/Symfony/Component/Validator/Constraints/Ip.php index aff99d4672d77..57c674dc0e595 100644 --- a/src/Symfony/Component/Validator/Constraints/Ip.php +++ b/src/Symfony/Component/Validator/Constraints/Ip.php @@ -80,7 +80,7 @@ public function __construct($options = null) parent::__construct($options); if (!\in_array($this->version, self::$versions)) { - throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s"', implode('", "', self::$versions))); + throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s".', implode('", "', self::$versions))); } } } diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php index 996a1e479f452..ee97a5bc096b2 100644 --- a/src/Symfony/Component/Validator/Constraints/Length.php +++ b/src/Symfony/Component/Validator/Constraints/Length.php @@ -55,7 +55,7 @@ public function __construct($options = null) parent::__construct($options); if (null === $this->min && null === $this->max) { - throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']); + throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']); } } } diff --git a/src/Symfony/Component/Validator/Constraints/Range.php b/src/Symfony/Component/Validator/Constraints/Range.php index 65ece5d832007..56ebd702290ed 100644 --- a/src/Symfony/Component/Validator/Constraints/Range.php +++ b/src/Symfony/Component/Validator/Constraints/Range.php @@ -43,7 +43,7 @@ public function __construct($options = null) parent::__construct($options); if (null === $this->min && null === $this->max) { - throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']); + throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']); } } } diff --git a/src/Symfony/Component/Validator/Constraints/Traverse.php b/src/Symfony/Component/Validator/Constraints/Traverse.php index 78d115fdbbc74..40313e4a8c336 100644 --- a/src/Symfony/Component/Validator/Constraints/Traverse.php +++ b/src/Symfony/Component/Validator/Constraints/Traverse.php @@ -26,7 +26,7 @@ class Traverse extends Constraint public function __construct($options = null) { if (\is_array($options) && \array_key_exists('groups', $options)) { - throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint %s', __CLASS__)); + throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint %s.', __CLASS__)); } parent::__construct($options); diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php index 72affdf7b646c..f5cc25dcb73ed 100644 --- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php +++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php @@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint) Url::CHECK_DNS_TYPE_SRV, Url::CHECK_DNS_TYPE_TXT, ], true)) { - throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s', \get_class($constraint)), ['checkDNS']); + throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s.', \get_class($constraint)), ['checkDNS']); } $host = parse_url($value, PHP_URL_HOST); diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php index aaa30cddd3b47..572bbc6d55316 100644 --- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php @@ -401,7 +401,7 @@ public function getConstrainedProperties() public function setGroupSequence($groupSequence) { if ($this->isGroupSequenceProvider()) { - throw new GroupDefinitionException('Defining a static group sequence is not allowed with a group sequence provider'); + throw new GroupDefinitionException('Defining a static group sequence is not allowed with a group sequence provider.'); } if (\is_array($groupSequence)) { @@ -409,11 +409,11 @@ public function setGroupSequence($groupSequence) } if (\in_array(Constraint::DEFAULT_GROUP, $groupSequence->groups, true)) { - throw new GroupDefinitionException(sprintf('The group "%s" is not allowed in group sequences', Constraint::DEFAULT_GROUP)); + throw new GroupDefinitionException(sprintf('The group "%s" is not allowed in group sequences.', Constraint::DEFAULT_GROUP)); } if (!\in_array($this->getDefaultGroup(), $groupSequence->groups, true)) { - throw new GroupDefinitionException(sprintf('The group "%s" is missing in the group sequence', $this->getDefaultGroup())); + throw new GroupDefinitionException(sprintf('The group "%s" is missing in the group sequence.', $this->getDefaultGroup())); } $this->groupSequence = $groupSequence; @@ -461,11 +461,11 @@ public function getReflectionClass() public function setGroupSequenceProvider($active) { if ($this->hasGroupSequence()) { - throw new GroupDefinitionException('Defining a group sequence provider is not allowed with a static group sequence'); + throw new GroupDefinitionException('Defining a group sequence provider is not allowed with a static group sequence.'); } if (!$this->getReflectionClass()->implementsInterface('Symfony\Component\Validator\GroupSequenceProviderInterface')) { - throw new GroupDefinitionException(sprintf('Class "%s" must implement GroupSequenceProviderInterface', $this->name)); + throw new GroupDefinitionException(sprintf('Class "%s" must implement GroupSequenceProviderInterface.', $this->name)); } $this->groupSequenceProvider = $active; diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php index cf0d08acce7f0..ed7cea690466b 100644 --- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php +++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php @@ -79,7 +79,7 @@ public function __construct(LoaderInterface $loader = null, CacheInterface $cach public function getMetadataFor($value) { if (!\is_object($value) && !\is_string($value)) { - throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: %s', \gettype($value))); + throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: %s.', \gettype($value))); } $class = ltrim(\is_object($value) ? \get_class($value) : $value, '\\'); diff --git a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php index 5a72bd84b7442..63d144c45f8d1 100644 --- a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php @@ -53,7 +53,7 @@ public function __construct($class, $property, $method = null) } elseif (method_exists($class, $hasMethod)) { $method = $hasMethod; } else { - throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s', $class, $getMethod, $isMethod, $hasMethod)); + throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s.', $class, $getMethod, $isMethod, $hasMethod)); } } elseif (!method_exists($class, $method)) { throw new ValidatorException(sprintf('The %s() method does not exist in class %s.', $method, $class)); diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php index ae2e1e04cde2a..1d3d90132b4db 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php @@ -75,7 +75,7 @@ protected function newConstraint($name, $options = null) list($prefix, $className) = explode(':', $name, 2); if (!isset($this->namespaces[$prefix])) { - throw new MappingException(sprintf('Undefined namespace prefix "%s"', $prefix)); + throw new MappingException(sprintf('Undefined namespace prefix "%s".', $prefix)); } $className = $this->namespaces[$prefix].$className; diff --git a/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php index b8f9490379aee..3b1c036e71a10 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php @@ -35,15 +35,15 @@ abstract class FileLoader extends AbstractLoader public function __construct($file) { if (!is_file($file)) { - throw new MappingException(sprintf('The mapping file "%s" does not exist', $file)); + throw new MappingException(sprintf('The mapping file "%s" does not exist.', $file)); } if (!is_readable($file)) { - throw new MappingException(sprintf('The mapping file "%s" is not readable', $file)); + throw new MappingException(sprintf('The mapping file "%s" is not readable.', $file)); } if (!stream_is_local($this->file)) { - throw new MappingException(sprintf('The mapping file "%s" is not a local file', $file)); + throw new MappingException(sprintf('The mapping file "%s" is not a local file.', $file)); } $this->file = $file; diff --git a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php index de80dcd8ad50e..05ef322fde3f3 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php @@ -36,7 +36,7 @@ public function __construct(array $loaders) { foreach ($loaders as $loader) { if (!$loader instanceof LoaderInterface) { - throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface', \get_class($loader))); + throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface.', \get_class($loader))); } } diff --git a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php index 95fc578eb4b5c..6da3d1bf15f93 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php @@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadata $metadata) } if (!$reflMethod->isStatic()) { - throw new MappingException(sprintf('The method %s::%s should be static', $reflClass->name, $this->methodName)); + throw new MappingException(sprintf('The method %s::%s should be static.', $reflClass->name, $this->methodName)); } if ($reflMethod->getDeclaringClass()->name != $reflClass->name) { diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php index 11bd54d33c951..e561a5a85a904 100644 --- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php @@ -72,7 +72,7 @@ public function __construct($class, $name, $property) public function addConstraint(Constraint $constraint) { if (!\in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets())) { - throw new ConstraintDefinitionException(sprintf('The constraint %s cannot be put on properties or getters', \get_class($constraint))); + throw new ConstraintDefinitionException(sprintf('The constraint %s cannot be put on properties or getters.', \get_class($constraint))); } parent::addConstraint($constraint); diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php index 1adad95b80958..5e535dd27f64a 100644 --- a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php @@ -37,7 +37,7 @@ class PropertyMetadata extends MemberMetadata public function __construct($class, $name) { if (!property_exists($class, $name)) { - throw new ValidatorException(sprintf('Property "%s" does not exist in class "%s"', $name, $class)); + throw new ValidatorException(sprintf('Property "%s" does not exist in class "%s".', $name, $class)); } parent::__construct($class, $name, $name); diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php index d14c5aa00ba7a..ff59d964282ee 100644 --- a/src/Symfony/Component/VarDumper/Cloner/Data.php +++ b/src/Symfony/Component/VarDumper/Cloner/Data.php @@ -374,7 +374,7 @@ private function dumpItem($dumper, $cursor, &$refs, $item) break; default: - throw new \RuntimeException(sprintf('Unexpected Stub type: %s', $item->type)); + throw new \RuntimeException(sprintf('Unexpected Stub type: %s.', $item->type)); } } elseif ('array' === $type) { $dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false); diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php index 7d6112e3b9c6f..f1cb6b57aa8d6 100644 --- a/src/Symfony/Component/Yaml/Parser.php +++ b/src/Symfony/Component/Yaml/Parser.php @@ -207,7 +207,7 @@ private function doParse($value, $flags) $isRef = $mergeNode = false; if (self::preg_match('#^\-((?P\s+)(?P.+))?$#u', rtrim($this->currentLine), $values)) { if ($context && 'mapping' == $context) { - throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename); + throw new ParseException('You cannot define a sequence item when in a mapping.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename); } $context = 'sequence'; @@ -253,7 +253,7 @@ private function doParse($value, $flags) && (false === strpos($values['key'], ' #') || \in_array($values['key'][0], ['"', "'"])) ) { if ($context && 'sequence' == $context) { - throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine, $this->filename); + throw new ParseException('You cannot define a mapping item when in a sequence.', $this->currentLineNb + 1, $this->currentLine, $this->filename); } $context = 'mapping'; From a71023ba657581ea1434c9c602fb54925381c135 Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Sat, 14 Mar 2020 16:15:49 +0100 Subject: [PATCH 52/82] [PropertyAccess] Improved errors when reading uninitialized properties --- .../PropertyAccess/PropertyAccessor.php | 60 ++++++++++++------- .../Fixtures/UninitializedPrivateProperty.php | 22 +++++++ .../Tests/Fixtures/UninitializedProperty.php | 17 ++++++ .../Tests/PropertyAccessorTest.php | 24 ++++++++ 4 files changed, 103 insertions(+), 20 deletions(-) create mode 100644 src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedPrivateProperty.php create mode 100644 src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 371c6c23d57d3..8761d4999593c 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -465,30 +465,50 @@ private function readProperty($zval, $property) $object = $zval[self::VALUE]; $access = $this->getReadAccessInfo(\get_class($object), $property); - if (self::ACCESS_TYPE_METHOD === $access[self::ACCESS_TYPE]) { - $result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}(); - } elseif (self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]) { - $result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}; + try { + if (self::ACCESS_TYPE_METHOD === $access[self::ACCESS_TYPE]) { + try { + $result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}(); + } catch (\TypeError $e) { + // handle uninitialized properties in PHP >= 7 + if (preg_match((sprintf('/^Return value of %s::%s\(\) must be of the type (\w+), null returned$/', preg_quote(\get_class($object)), $access[self::ACCESS_NAME])), $e->getMessage(), $matches)) { + throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Have you forgotten to initialize a property or to make the return type nullable using "?%3$s" instead?', \get_class($object), $access[self::ACCESS_NAME], $matches[1]), 0, $e); + } + + throw $e; + } + } elseif (self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]) { + $result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}; - if ($access[self::ACCESS_REF] && isset($zval[self::REF])) { - $result[self::REF] = &$object->{$access[self::ACCESS_NAME]}; + if ($access[self::ACCESS_REF] && isset($zval[self::REF])) { + $result[self::REF] = &$object->{$access[self::ACCESS_NAME]}; + } + } elseif (!$access[self::ACCESS_HAS_PROPERTY] && property_exists($object, $property)) { + // Needed to support \stdClass instances. We need to explicitly + // exclude $access[self::ACCESS_HAS_PROPERTY], otherwise if + // a *protected* property was found on the class, property_exists() + // returns true, consequently the following line will result in a + // fatal error. + + $result[self::VALUE] = $object->$property; + if (isset($zval[self::REF])) { + $result[self::REF] = &$object->$property; + } + } elseif (self::ACCESS_TYPE_MAGIC === $access[self::ACCESS_TYPE]) { + // we call the getter and hope the __call do the job + $result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}(); + } else { + throw new NoSuchPropertyException($access[self::ACCESS_NAME]); } - } elseif (!$access[self::ACCESS_HAS_PROPERTY] && property_exists($object, $property)) { - // Needed to support \stdClass instances. We need to explicitly - // exclude $access[self::ACCESS_HAS_PROPERTY], otherwise if - // a *protected* property was found on the class, property_exists() - // returns true, consequently the following line will result in a - // fatal error. + } catch (\Error $e) { + // handle uninitialized properties in PHP >= 7.4 + if (\PHP_VERSION_ID >= 70400 && preg_match('/^Typed property ([\w\\\]+)::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches)) { + $r = new \ReflectionProperty($matches[1], $matches[2]); - $result[self::VALUE] = $object->$property; - if (isset($zval[self::REF])) { - $result[self::REF] = &$object->$property; + throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%3$s". You should either initialize it or make it nullable using "?%3$s" instead.', $r->getDeclaringClass()->getName(), $r->getName(), $r->getType()->getName()), 0, $e); } - } elseif (self::ACCESS_TYPE_MAGIC === $access[self::ACCESS_TYPE]) { - // we call the getter and hope the __call do the job - $result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}(); - } else { - throw new NoSuchPropertyException($access[self::ACCESS_NAME]); + + throw $e; } // Objects are always passed around by reference diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedPrivateProperty.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedPrivateProperty.php new file mode 100644 index 0000000000000..b7acf8838b75e --- /dev/null +++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedPrivateProperty.php @@ -0,0 +1,22 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\PropertyAccess\Tests\Fixtures; + +class UninitializedPrivateProperty +{ + private $uninitialized; + + public function getUninitialized(): array + { + return $this->uninitialized; + } +} diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php new file mode 100644 index 0000000000000..ac757b4022563 --- /dev/null +++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php @@ -0,0 +1,17 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\PropertyAccess\Tests\Fixtures; + +class UninitializedProperty +{ + public string $uninitialized; +} diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php index 0eb4baacf222d..62a95d68e9304 100644 --- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php +++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php @@ -25,6 +25,8 @@ use Symfony\Component\PropertyAccess\Tests\Fixtures\TestSingularAndPluralProps; use Symfony\Component\PropertyAccess\Tests\Fixtures\Ticket5775Object; use Symfony\Component\PropertyAccess\Tests\Fixtures\TypeHinted; +use Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty; +use Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty; class PropertyAccessorTest extends TestCase { @@ -118,6 +120,28 @@ public function testGetValueThrowsExceptionIfIndexNotFoundAndIndexExceptionsEnab $this->propertyAccessor->getValue($objectOrArray, $path); } + /** + * @requires PHP 7.4 + */ + public function testGetValueThrowsExceptionIfUninitializedProperty() + { + $this->expectException('Symfony\Component\PropertyAccess\Exception\AccessException'); + $this->expectExceptionMessage('The property "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty::$uninitialized" is not readable because it is typed "string". You should either initialize it or make it nullable using "?string" instead.'); + + $this->propertyAccessor->getValue(new UninitializedProperty(), 'uninitialized'); + } + + /** + * @requires PHP 7 + */ + public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter() + { + $this->expectException('Symfony\Component\PropertyAccess\Exception\AccessException'); + $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Have you forgotten to initialize a property or to make the return type nullable using "?array" instead?'); + + $this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized'); + } + public function testGetValueThrowsExceptionIfNotArrayAccess() { $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException'); From 31fe1ef1c8337850db3f3aba2e23cbbfceacb03f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Mar 2020 14:51:58 +0100 Subject: [PATCH 53/82] Fix bad merge --- .../Component/DependencyInjection/ContainerBuilder.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 68a751a20cfdd..c210e03cefd27 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -994,13 +994,8 @@ public function setDefinition($id, Definition $definition) $id = (string) $id; -<<<<<<< HEAD if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) { - throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id)); -======= - if ('' === $id || '\\' === substr($id, -1) || \strlen($id) !== strcspn($id, "\0\r\n'")) { throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id)); ->>>>>>> 3.4 } unset($this->aliasDefinitions[$id], $this->removedIds[$id]); From 18f5b172495c4362c73cef43f7c39e51e8a4191f Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Sun, 15 Mar 2020 13:01:42 +0100 Subject: [PATCH 54/82] [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) --- .../Component/DependencyInjection/ContainerBuilder.php | 5 ----- src/Symfony/Component/Form/Extension/Core/Type/TimeType.php | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 68a751a20cfdd..c210e03cefd27 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -994,13 +994,8 @@ public function setDefinition($id, Definition $definition) $id = (string) $id; -<<<<<<< HEAD if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) { - throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id)); -======= - if ('' === $id || '\\' === substr($id, -1) || \strlen($id) !== strcspn($id, "\0\r\n'")) { throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id)); ->>>>>>> 3.4 } unset($this->aliasDefinitions[$id], $this->removedIds[$id]); diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php index 8dc0341353fdf..092fa31d2133c 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php @@ -60,8 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) } if ('single_text' === $options['widget']) { - $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format)); - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) use ($options) { $data = $e->getData(); if ($data && preg_match('/^(?P\d{2}):(?P\d{2})(?::(?P\d{2})(?:\.\d+)?)?$/', $data, $matches)) { @@ -86,6 +84,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) } }); } + + $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format)); } else { $hourOptions = $minuteOptions = $secondOptions = [ 'error_bubbling' => true, From 6dad402e970949d1fb64c7372813fe8a29cc36ff Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Mar 2020 11:08:38 +0100 Subject: [PATCH 55/82] Add missing dots at the end of exception messages --- .../FingersCrossed/HttpCodeActivationStrategy.php | 4 ++-- .../DeprecationErrorHandler/Configuration.php | 6 +++--- .../DeprecationErrorHandler/Deprecation.php | 8 ++++---- src/Symfony/Bridge/Twig/Command/DebugCommand.php | 2 +- .../Controller/AbstractController.php | 2 +- .../ResolveControllerNameSubscriber.php | 2 +- .../Bundle/FrameworkBundle/Secrets/SodiumVault.php | 4 ++-- .../Cache/Adapter/AbstractTagAwareAdapter.php | 2 +- src/Symfony/Component/Cache/CacheItem.php | 4 ++-- src/Symfony/Component/Cache/Psr16Cache.php | 6 +++--- .../Component/Cache/Traits/MemcachedTrait.php | 2 +- src/Symfony/Component/Cache/Traits/RedisTrait.php | 14 +++++++------- .../Component/Config/Definition/BaseNode.php | 2 +- .../Definition/Builder/ArrayNodeDefinition.php | 2 +- src/Symfony/Component/Console/Application.php | 4 ++-- .../DependencyInjection/EnvVarProcessor.php | 2 +- .../DependencyInjection/Loader/YamlFileLoader.php | 2 +- .../Component/ErrorHandler/ErrorHandler.php | 4 ++-- .../DataTransformer/BooleanToStringTransformer.php | 2 +- src/Symfony/Component/Form/ResolvedFormType.php | 2 +- src/Symfony/Component/HttpFoundation/Request.php | 2 +- .../Storage/Handler/RedisSessionHandler.php | 4 ++-- .../Controller/ContainerControllerResolver.php | 2 +- .../HttpKernel/Controller/ControllerResolver.php | 6 +++--- .../Intl/Data/Generator/LocaleDataGenerator.php | 2 +- .../Component/Ldap/Adapter/ExtLdap/Query.php | 2 +- .../Component/Ldap/Security/LdapUserProvider.php | 2 +- src/Symfony/Component/Lock/Store/PdoStore.php | 2 +- .../Mailer/Transport/AbstractApiTransport.php | 2 +- .../Component/Messenger/RoutableMessageBus.php | 2 +- .../Messenger/Transport/AmqpExt/Connection.php | 2 +- .../Messenger/Transport/Doctrine/Connection.php | 4 ++-- .../Messenger/Transport/RedisExt/Connection.php | 4 ++-- src/Symfony/Component/Mime/Part/DataPart.php | 2 +- .../Component/PropertyAccess/PropertyAccessor.php | 2 +- .../Component/Routing/Loader/ObjectLoader.php | 6 +++--- .../Normalizer/AbstractObjectNormalizer.php | 4 ++-- .../Translation/Loader/XliffFileLoader.php | 2 +- .../Component/Translation/Util/XliffUtils.php | 2 +- .../Validator/Constraints/BicValidator.php | 2 +- .../Validator/Constraints/RangeValidator.php | 2 +- .../Component/VarExporter/Internal/Exporter.php | 2 +- .../HttpClient/Test/HttpClientTestCase.php | 10 +++++----- 43 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php index 062ca2103bb7e..cdda14a386a4c 100644 --- a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php +++ b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php @@ -32,10 +32,10 @@ public function __construct(RequestStack $requestStack, array $exclusions, $acti { foreach ($exclusions as $exclusion) { if (!\array_key_exists('code', $exclusion)) { - throw new \LogicException(sprintf('An exclusion must have a "code" key')); + throw new \LogicException(sprintf('An exclusion must have a "code" key.')); } if (!\array_key_exists('urls', $exclusion)) { - throw new \LogicException(sprintf('An exclusion must have a "urls" key')); + throw new \LogicException(sprintf('An exclusion must have a "urls" key.')); } } diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php index 6b42814bbc906..d26ffc45de692 100644 --- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php +++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php @@ -48,10 +48,10 @@ private function __construct(array $thresholds = [], $regex = '', $verboseOutput foreach ($thresholds as $group => $threshold) { if (!\in_array($group, $groups, true)) { - throw new \InvalidArgumentException(sprintf('Unrecognized threshold "%s", expected one of "%s"', $group, implode('", "', $groups))); + throw new \InvalidArgumentException(sprintf('Unrecognized threshold "%s", expected one of "%s".', $group, implode('", "', $groups))); } if (!is_numeric($threshold)) { - throw new \InvalidArgumentException(sprintf('Threshold for group "%s" has invalid value "%s"', $group, $threshold)); + throw new \InvalidArgumentException(sprintf('Threshold for group "%s" has invalid value "%s".', $group, $threshold)); } $this->thresholds[$group] = (int) $threshold; } @@ -146,7 +146,7 @@ public static function fromUrlEncodedString($serializedConfiguration) parse_str($serializedConfiguration, $normalizedConfiguration); foreach (array_keys($normalizedConfiguration) as $key) { if (!\in_array($key, ['max', 'disabled', 'verbose'], true)) { - throw new \InvalidArgumentException(sprintf('Unknown configuration option "%s"', $key)); + throw new \InvalidArgumentException(sprintf('Unknown configuration option "%s".', $key)); } } diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php index f4e9a8ff97e1d..62e09c461cca5 100644 --- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php +++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php @@ -109,7 +109,7 @@ public function originatesFromAnObject() public function originatingClass() { if (null === $this->originClass) { - throw new \LogicException('Check with originatesFromAnObject() before calling this method'); + throw new \LogicException('Check with originatesFromAnObject() before calling this method.'); } return $this->originClass; @@ -121,7 +121,7 @@ public function originatingClass() public function originatingMethod() { if (null === $this->originMethod) { - throw new \LogicException('Check with originatesFromAnObject() before calling this method'); + throw new \LogicException('Check with originatesFromAnObject() before calling this method.'); } return $this->originMethod; @@ -237,7 +237,7 @@ private function getPackage($path) $relativePath = substr($path, \strlen($vendorRoot) + 1); $vendor = strstr($relativePath, \DIRECTORY_SEPARATOR, true); if (false === $vendor) { - throw new \RuntimeException(sprintf('Could not find directory separator "%s" in path "%s"', \DIRECTORY_SEPARATOR, $relativePath)); + throw new \RuntimeException(sprintf('Could not find directory separator "%s" in path "%s".', \DIRECTORY_SEPARATOR, $relativePath)); } return rtrim($vendor.'/'.strstr(substr( @@ -247,7 +247,7 @@ private function getPackage($path) } } - throw new \RuntimeException(sprintf('No vendors found for path "%s"', $path)); + throw new \RuntimeException(sprintf('No vendors found for path "%s".', $path)); } /** diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php index e380bff4498f6..51995452cdf93 100644 --- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php +++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php @@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $filter = $input->getOption('filter'); if (null !== $name && [] === $this->getFilesystemLoaders()) { - throw new InvalidArgumentException(sprintf('Argument "name" not supported, it requires the Twig loader "%s"', FilesystemLoader::class)); + throw new InvalidArgumentException(sprintf('Argument "name" not supported, it requires the Twig loader "%s".', FilesystemLoader::class)); } switch ($input->getOption('format')) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php index eb70bf2d0e822..066678df2aea6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php @@ -65,7 +65,7 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface protected function getParameter(string $name) { if (!$this->container->has('parameter_bag')) { - throw new ServiceNotFoundException('parameter_bag', null, null, [], sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class)); + throw new ServiceNotFoundException('parameter_bag.', null, null, [], sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class)); } return $this->container->get('parameter_bag')->get($name); diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php index e6f6bfd76592e..e849759a5cd86 100644 --- a/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php +++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php @@ -49,7 +49,7 @@ public function resolveControllerName(...$args) public function __call(string $method, array $args) { if ('onKernelRequest' !== $method && 'onKernelRequest' !== strtolower($method)) { - throw new \Error(sprintf('Error: Call to undefined method %s::%s()', static::class, $method)); + throw new \Error(sprintf('Error: Call to undefined method %s::%s().', static::class, $method)); } $event = $args[0]; diff --git a/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php b/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php index 047d8d5804009..e393b27ed47c3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php +++ b/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php @@ -177,7 +177,7 @@ public function loadEnvVars(): array private function loadKeys(): void { if (!\function_exists('sodium_crypto_box_seal')) { - throw new \LogicException('The "sodium" PHP extension is required to deal with secrets. Alternatively, try running "composer require paragonie/sodium_compat" if you cannot enable the extension."'); + throw new \LogicException('The "sodium" PHP extension is required to deal with secrets. Alternatively, try running "composer require paragonie/sodium_compat" if you cannot enable the extension.".'); } if (null !== $this->encryptionKey || '' !== $this->decryptionKey = (string) $this->decryptionKey) { @@ -214,7 +214,7 @@ private function export(string $file, string $data): void private function createSecretsDir(): void { if ($this->secretsDir && !is_dir($this->secretsDir) && !@mkdir($this->secretsDir, 0777, true) && !is_dir($this->secretsDir)) { - throw new \RuntimeException(sprintf('Unable to create the secrets directory (%s)', $this->secretsDir)); + throw new \RuntimeException(sprintf('Unable to create the secrets directory (%s).', $this->secretsDir)); } $this->secretsDir = null; diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php index 10aca3bdf8db7..5a9f94bb9a6a2 100644 --- a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php @@ -41,7 +41,7 @@ protected function __construct(string $namespace = '', int $defaultLifetime = 0) { $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':'; if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) { - throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s")', $this->maxIdLength - 24, \strlen($namespace), $namespace)); + throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace)); } $this->createCacheItem = \Closure::bind( static function ($key, $value, $isHit) use ($defaultLifetime) { diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php index 93be005e8d97e..bcfec48f0bc3f 100644 --- a/src/Symfony/Component/Cache/CacheItem.php +++ b/src/Symfony/Component/Cache/CacheItem.php @@ -130,7 +130,7 @@ public function tag($tags): ItemInterface throw new InvalidArgumentException('Cache tag length must be greater than zero.'); } if (false !== strpbrk($tag, self::RESERVED_CHARACTERS)) { - throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters %s', $tag, self::RESERVED_CHARACTERS)); + throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters %s.', $tag, self::RESERVED_CHARACTERS)); } $this->newMetadata[self::METADATA_TAGS][$tag] = $tag; } @@ -174,7 +174,7 @@ public static function validateKey($key): string throw new InvalidArgumentException('Cache key length must be greater than zero.'); } if (false !== strpbrk($key, self::RESERVED_CHARACTERS)) { - throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters %s', $key, self::RESERVED_CHARACTERS)); + throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters %s.', $key, self::RESERVED_CHARACTERS)); } return $key; diff --git a/src/Symfony/Component/Cache/Psr16Cache.php b/src/Symfony/Component/Cache/Psr16Cache.php index 65015169b9a8c..7358bf5184f6a 100644 --- a/src/Symfony/Component/Cache/Psr16Cache.php +++ b/src/Symfony/Component/Cache/Psr16Cache.php @@ -144,7 +144,7 @@ public function getMultiple($keys, $default = null) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } try { @@ -193,7 +193,7 @@ public function setMultiple($values, $ttl = null) { $valuesIsArray = \is_array($values); if (!$valuesIsArray && !$values instanceof \Traversable) { - throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values))); + throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values))); } $items = []; @@ -247,7 +247,7 @@ public function deleteMultiple($keys) if ($keys instanceof \Traversable) { $keys = iterator_to_array($keys, false); } elseif (!\is_array($keys)) { - throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys))); + throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys))); } try { diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php index 8bf0a7355e74e..6b2cacbdcb649 100644 --- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php +++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php @@ -117,7 +117,7 @@ public static function createConnection($servers, array $options = []) if (isset($query['host'])) { if (!\is_array($hosts = $query['host'])) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s.', $dsn)); } foreach ($hosts as $host => $weight) { if (false === $port = strrpos($host, ':')) { diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index 023b6ef3e1466..e053fdfc32613 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -97,7 +97,7 @@ public static function createConnection($dsn, array $options = []) } if (!\extension_loaded('redis') && !class_exists(\Predis\Client::class)) { - throw new CacheException(sprintf('Cannot find the "redis" extension nor the "predis/predis" package: %s', $dsn)); + throw new CacheException(sprintf('Cannot find the "redis" extension nor the "predis/predis" package: %s.', $dsn)); } $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) { @@ -119,7 +119,7 @@ public static function createConnection($dsn, array $options = []) if (isset($query['host'])) { if (!\is_array($hosts = $query['host'])) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s.', $dsn)); } foreach ($hosts as $host => $parameters) { if (\is_string($parameters)) { @@ -151,11 +151,11 @@ public static function createConnection($dsn, array $options = []) } if (!$hosts) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s.', $dsn)); } if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class)) { - throw new CacheException(sprintf('Redis Sentinel support requires the "predis/predis" package: %s', $dsn)); + throw new CacheException(sprintf('Redis Sentinel support requires the "predis/predis" package: %s.', $dsn)); } $params += $query + $options + self::$defaultConnectionOptions; @@ -215,7 +215,7 @@ public static function createConnection($dsn, array $options = []) try { $redis = new $class($hosts, $params); } catch (\RedisClusterException $e) { - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e->getMessage(), $dsn)); } if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) { @@ -230,7 +230,7 @@ public static function createConnection($dsn, array $options = []) try { $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent']); } catch (\RedisClusterException $e) { - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e->getMessage(), $dsn)); } if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) { @@ -250,7 +250,7 @@ public static function createConnection($dsn, array $options = []) if ($params['redis_cluster']) { $params['cluster'] = 'redis'; if (isset($params['redis_sentinel'])) { - throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: %s', $dsn)); + throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: %s.', $dsn)); } } elseif (isset($params['redis_sentinel'])) { $params['replication'] = 'sentinel'; diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index 6eda1f8c45a0f..ddf2f1155d6ba 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -48,7 +48,7 @@ abstract class BaseNode implements NodeInterface public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR) { if (false !== strpos($name = (string) $name, $pathSeparator)) { - throw new \InvalidArgumentException('The name must not contain "'.$pathSeparator.'".'); + throw new \InvalidArgumentException('The name must not contain ".'.$pathSeparator.'".'); } $this->name = $name; diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index 809b7779983df..60491e0da32cd 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -472,7 +472,7 @@ protected function validateConcreteNode(ArrayNode $node) } if (false === $this->allowEmptyValue) { - throw new InvalidDefinitionException(sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s"', $path)); + throw new InvalidDefinitionException(sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s".', $path)); } if (true === $this->atLeastOne) { diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index acd32687880c5..4cea086b78e73 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -599,7 +599,7 @@ public function findNamespace($namespace) $exact = \in_array($namespace, $namespaces, true); if (\count($namespaces) > 1 && !$exact) { - throw new NamespaceNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces)); + throw new NamespaceNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces)); } return $exact ? $namespace : reset($namespaces); @@ -707,7 +707,7 @@ public function find($name) if (\count($commands) > 1) { $suggestions = $this->getAbbreviationSuggestions(array_filter($abbrevs)); - throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $name, $suggestions), array_values($commands)); + throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $name, $suggestions), array_values($commands)); } } diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php index b7c828b124eb3..9cd8ed2fdcb7f 100644 --- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php +++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php @@ -241,7 +241,7 @@ public function getEnv($prefix, $name, \Closure $getEnv) $parsedEnv = parse_url($env); if (false === $parsedEnv) { - throw new RuntimeException(sprintf('Invalid URL in env var "%s"', $name)); + throw new RuntimeException(sprintf('Invalid URL in env var "%s".', $name)); } if (!isset($parsedEnv['scheme'], $parsedEnv['host'])) { throw new RuntimeException(sprintf('Invalid URL env var "%s": schema and host expected, %s given.', $name, $env)); diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index edd8aaa9b80f9..abc5fc54f43c7 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -690,7 +690,7 @@ protected function loadFile($file) try { $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS); } catch (ParseException $e) { - throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s', $file, $e->getMessage()), 0, $e); + throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s.', $file, $e->getMessage()), 0, $e); } return $this->validate($configuration, $file); diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php index 2ac16e380d032..c98eea89e5c81 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php +++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php @@ -246,14 +246,14 @@ public function setLoggers(array $loggers): array if (!\is_array($log)) { $log = [$log]; } elseif (!\array_key_exists(0, $log)) { - throw new \InvalidArgumentException('No logger provided'); + throw new \InvalidArgumentException('No logger provided.'); } if (null === $log[0]) { $this->loggedErrors &= ~$type; } elseif ($log[0] instanceof LoggerInterface) { $this->loggedErrors |= $type; } else { - throw new \InvalidArgumentException('Invalid logger provided'); + throw new \InvalidArgumentException('Invalid logger provided.'); } $this->loggers[$type] = $log + $prev[$type]; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php index e1d510b2e0798..f4fd09b627fc9 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php @@ -35,7 +35,7 @@ public function __construct(string $trueValue, array $falseValues = [null]) $this->trueValue = $trueValue; $this->falseValues = $falseValues; if (\in_array($this->trueValue, $this->falseValues, true)) { - throw new InvalidArgumentException('The specified "true" value is contained in the false-values'); + throw new InvalidArgumentException('The specified "true" value is contained in the false-values.'); } } diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php index 6b3fb6837edc6..02a06c85e1161 100644 --- a/src/Symfony/Component/Form/ResolvedFormType.php +++ b/src/Symfony/Component/Form/ResolvedFormType.php @@ -96,7 +96,7 @@ public function createBuilder(FormFactoryInterface $factory, $name, array $optio try { $options = $this->getOptionsResolver()->resolve($options); } catch (ExceptionInterface $e) { - throw new $e(sprintf('An error has occurred resolving the options of the form "%s": %s', \get_class($this->getInnerType()), $e->getMessage()), $e->getCode(), $e); + throw new $e(sprintf('An error has occurred resolving the options of the form "%s": %s.', \get_class($this->getInnerType()), $e->getMessage()), $e->getCode(), $e); } // Should be decoupled from the specific option at some point diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index 6690b9b22165b..bff1c0cbfad7f 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -725,7 +725,7 @@ public function getSession() if (null === $session) { @trigger_error(sprintf('Calling "%s()" when no session has been set is deprecated since Symfony 4.1 and will throw an exception in 5.0. Use "hasSession()" instead.', __METHOD__), E_USER_DEPRECATED); - // throw new \BadMethodCallException('Session has not been set'); + // throw new \BadMethodCallException('Session has not been set.'); } return $session; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php index e5be90d5f3b53..1b83de09b7e1c 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php @@ -54,11 +54,11 @@ public function __construct($redis, array $options = []) !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy ) { - throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis))); + throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given.', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis))); } if ($diff = array_diff(array_keys($options), ['prefix', 'ttl'])) { - throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff))); + throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff))); } $this->redis = $redis; diff --git a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php index 015eea91fa5f0..7eb028de1f198 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php @@ -64,7 +64,7 @@ protected function instantiateController($class) throw new \InvalidArgumentException(sprintf('Controller "%s" has required constructor arguments and does not exist in the container. Did you forget to define the controller as a service?', $class), 0, $e); } - throw new \InvalidArgumentException(sprintf('Controller "%s" does neither exist as service nor as class', $class), 0, $e); + throw new \InvalidArgumentException(sprintf('Controller "%s" does neither exist as service nor as class.', $class), 0, $e); } private function throwExceptionIfControllerWasRemoved(string $controller, \Throwable $previous) diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index fd9a0accaf213..feb69e54ac9fb 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -64,7 +64,7 @@ public function getController(Request $request) } if (!\is_callable($controller)) { - throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($controller))); + throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s.', $request->getPathInfo(), $this->getControllerError($controller))); } return $controller; @@ -72,7 +72,7 @@ public function getController(Request $request) if (\is_object($controller)) { if (!\is_callable($controller)) { - throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($controller))); + throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s.', $request->getPathInfo(), $this->getControllerError($controller))); } return $controller; @@ -89,7 +89,7 @@ public function getController(Request $request) } if (!\is_callable($callable)) { - throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($callable))); + throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s.', $request->getPathInfo(), $this->getControllerError($callable))); } return $callable; diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php index 9584dec23c4d5..f6e9f67779f3e 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php @@ -165,7 +165,7 @@ private function generateLocaleName(BundleEntryReaderInterface $reader, string $ // i.e. in de_AT, "AT" is the region if ($region = \Locale::getRegion($locale)) { if (ctype_alpha($region) && !RegionDataGenerator::isValidCountryCode($region)) { - throw new MissingResourceException('Skipping "'.$locale.'" due an invalid country.'); + throw new MissingResourceException(sprintf('Skipping "%s" due an invalid country.', $locale)); } $extras[] = str_replace(['(', ')'], ['[', ']'], $reader->readEntry($tempDir.'/region', $displayLocale, ['Countries', $region])); diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php index b84991e31b82d..533d0e617618b 100644 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php @@ -123,7 +123,7 @@ public function execute() $this->resetPagination(); } - throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".%s', $this->dn, $this->query, implode(',', $this->options['filter']), $ldapError)); + throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".%s.', $this->dn, $this->query, implode(',', $this->options['filter']), $ldapError)); } $this->results[] = $search; diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php index 7dfab0c839e26..fa37e6d7baa3a 100644 --- a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php +++ b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php @@ -84,7 +84,7 @@ public function loadUserByUsername($username) } if ($count > 1) { - throw new UsernameNotFoundException('More than one user found'); + throw new UsernameNotFoundException('More than one user found.'); } $entry = $entries[0]; diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php index 78d8ab6c9c9d0..3d059f032d697 100644 --- a/src/Symfony/Component/Lock/Store/PdoStore.php +++ b/src/Symfony/Component/Lock/Store/PdoStore.php @@ -87,7 +87,7 @@ public function __construct($connOrDsn, array $options = [], float $gcProbabilit if ($connOrDsn instanceof \PDO) { if (\PDO::ERRMODE_EXCEPTION !== $connOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) { - throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __METHOD__)); + throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __METHOD__)); } $this->conn = $connOrDsn; diff --git a/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php index 03810e51b1de2..e1a2d5eee2ac8 100644 --- a/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php +++ b/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php @@ -31,7 +31,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface try { $email = MessageConverter::toEmail($message->getOriginalMessage()); } catch (\Exception $e) { - throw new RuntimeException(sprintf('Unable to send message with the "%s" transport: %s', __CLASS__, $e->getMessage()), 0, $e); + throw new RuntimeException(sprintf('Unable to send message with the "%s" transport: %s.', __CLASS__, $e->getMessage()), 0, $e); } return $this->doSendApi($message, $email, $message->getEnvelope()); diff --git a/src/Symfony/Component/Messenger/RoutableMessageBus.php b/src/Symfony/Component/Messenger/RoutableMessageBus.php index 6fde1687b5c52..a4a663589f677 100644 --- a/src/Symfony/Component/Messenger/RoutableMessageBus.php +++ b/src/Symfony/Component/Messenger/RoutableMessageBus.php @@ -37,7 +37,7 @@ public function __construct(ContainerInterface $busLocator, MessageBusInterface public function dispatch($envelope, array $stamps = []): Envelope { if (!$envelope instanceof Envelope) { - throw new InvalidArgumentException('Messages passed to RoutableMessageBus::dispatch() must be inside an Envelope'); + throw new InvalidArgumentException('Messages passed to RoutableMessageBus::dispatch() must be inside an Envelope.'); } /** @var BusNameStamp|null $busNameStamp */ diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php index 2540b9d770d0b..7664c53f345e9 100644 --- a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php @@ -384,7 +384,7 @@ public function channel(): \AMQPChannel $credentials['password'] = '********'; unset($credentials['delay']); - throw new \AMQPException(sprintf('Could not connect to the AMQP server. Please verify the provided DSN. (%s)', json_encode($credentials)), 0, $e); + throw new \AMQPException(sprintf('Could not connect to the AMQP server. Please verify the provided DSN. (%s).', json_encode($credentials)), 0, $e); } $this->amqpChannel = $this->amqpFactory->createChannel($connection); diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php index b700ca2f334d3..6004bf360e3b1 100644 --- a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php @@ -92,13 +92,13 @@ public static function buildConfiguration(string $dsn, array $options = []): arr // check for extra keys in options $optionsExtraKeys = array_diff(array_keys($options), array_keys(self::DEFAULT_OPTIONS)); if (0 < \count($optionsExtraKeys)) { - throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS)))); + throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s].', implode(', ', $optionsExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS)))); } // check for extra keys in options $queryExtraKeys = array_diff(array_keys($query), array_keys(self::DEFAULT_OPTIONS)); if (0 < \count($queryExtraKeys)) { - throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS)))); + throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s].', implode(', ', $queryExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS)))); } return $configuration; diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php index e1980221625e3..504fe0a10fa98 100644 --- a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php @@ -56,11 +56,11 @@ public function __construct(array $configuration, array $connectionCredentials = $this->connection->setOption(\Redis::OPT_SERIALIZER, $redisOptions['serializer'] ?? \Redis::SERIALIZER_PHP); if (isset($connectionCredentials['auth']) && !$this->connection->auth($connectionCredentials['auth'])) { - throw new InvalidArgumentException(sprintf('Redis connection failed: %s', $redis->getLastError())); + throw new InvalidArgumentException(sprintf('Redis connection failed: %s.', $redis->getLastError())); } if (($dbIndex = $configuration['dbindex'] ?? self::DEFAULT_OPTIONS['dbindex']) && !$this->connection->select($dbIndex)) { - throw new InvalidArgumentException(sprintf('Redis connection failed: %s', $redis->getLastError())); + throw new InvalidArgumentException(sprintf('Redis connection failed: %s.', $redis->getLastError())); } $this->stream = $configuration['stream'] ?? self::DEFAULT_OPTIONS['stream']; diff --git a/src/Symfony/Component/Mime/Part/DataPart.php b/src/Symfony/Component/Mime/Part/DataPart.php index 423185fef2a92..c6f1cb9742eff 100644 --- a/src/Symfony/Component/Mime/Part/DataPart.php +++ b/src/Symfony/Component/Mime/Part/DataPart.php @@ -57,7 +57,7 @@ public static function fromPath(string $path, string $name = null, string $conte } if (false === $handle = @fopen($path, 'r', false)) { - throw new InvalidArgumentException(sprintf('Unable to open path "%s"', $path)); + throw new InvalidArgumentException(sprintf('Unable to open path "%s".', $path)); } $p = new self($handle, $name ?: basename($path), $contentType); $p->handle = $handle; diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index f2c26ad75e261..4308fb6c9fbf4 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -541,7 +541,7 @@ private function writeProperty(array $zval, string $property, $value) } elseif (self::ACCESS_TYPE_MAGIC === $access[self::ACCESS_TYPE]) { $object->{$access[self::ACCESS_NAME]}($value); } elseif (self::ACCESS_TYPE_NOT_FOUND === $access[self::ACCESS_TYPE]) { - throw new NoSuchPropertyException(sprintf('Could not determine access type for property "%s" in class "%s"%s', $property, \get_class($object), isset($access[self::ACCESS_NAME]) ? ': '.$access[self::ACCESS_NAME] : '.')); + throw new NoSuchPropertyException(sprintf('Could not determine access type for property "%s" in class "%s"%s.', $property, \get_class($object), isset($access[self::ACCESS_NAME]) ? ': '.$access[self::ACCESS_NAME] : '.')); } else { throw new NoSuchPropertyException($access[self::ACCESS_NAME]); } diff --git a/src/Symfony/Component/Routing/Loader/ObjectLoader.php b/src/Symfony/Component/Routing/Loader/ObjectLoader.php index e4bcfc9efa3ea..7916b46e10840 100644 --- a/src/Symfony/Component/Routing/Loader/ObjectLoader.php +++ b/src/Symfony/Component/Routing/Loader/ObjectLoader.php @@ -57,11 +57,11 @@ public function load($resource, $type = null) $loaderObject = $this->getObject($parts[0]); if (!\is_object($loaderObject)) { - throw new \TypeError(sprintf('%s:getObject() must return an object: %s returned', static::class, \gettype($loaderObject))); + throw new \TypeError(sprintf('%s:getObject() must return an object: %s returned.', static::class, \gettype($loaderObject))); } if (!\is_callable([$loaderObject, $method])) { - throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, \get_class($loaderObject), $resource)); + throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s".', $method, \get_class($loaderObject), $resource)); } $routeCollection = $loaderObject->$method($this); @@ -69,7 +69,7 @@ public function load($resource, $type = null) if (!$routeCollection instanceof RouteCollection) { $type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection); - throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned', \get_class($loaderObject), $method, $type)); + throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned.', \get_class($loaderObject), $method, $type)); } // make the object file tracked so that if it changes, the cache rebuilds diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php index 79086cc2e78db..be4f9c47ae729 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php @@ -222,12 +222,12 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref { if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) { if (!isset($data[$mapping->getTypeProperty()])) { - throw new RuntimeException(sprintf('Type property "%s" not found for the abstract object "%s"', $mapping->getTypeProperty(), $class)); + throw new RuntimeException(sprintf('Type property "%s" not found for the abstract object "%s".', $mapping->getTypeProperty(), $class)); } $type = $data[$mapping->getTypeProperty()]; if (null === ($mappedClass = $mapping->getClassForType($type))) { - throw new RuntimeException(sprintf('The type "%s" has no mapped class for the abstract object "%s"', $type, $class)); + throw new RuntimeException(sprintf('The type "%s" has no mapped class for the abstract object "%s".', $type, $class)); } $class = $mappedClass; diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php index 40a6b4e5133af..aa36ebcc483ea 100644 --- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -58,7 +58,7 @@ private function extract($resource, MessageCatalogue $catalogue, string $domain) $xliffVersion = XliffUtils::getVersionNumber($dom); if ($errors = XliffUtils::validateSchema($dom)) { - throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $resource, XliffUtils::getErrorsAsString($errors))); + throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s.', $resource, XliffUtils::getErrorsAsString($errors))); } if ('1.2' === $xliffVersion) { diff --git a/src/Symfony/Component/Translation/Util/XliffUtils.php b/src/Symfony/Component/Translation/Util/XliffUtils.php index 3ace285bfac5f..b5ff4ef4a4eac 100644 --- a/src/Symfony/Component/Translation/Util/XliffUtils.php +++ b/src/Symfony/Component/Translation/Util/XliffUtils.php @@ -41,7 +41,7 @@ public static function getVersionNumber(\DOMDocument $dom): string $namespace = $xliff->attributes->getNamedItem('xmlns'); if ($namespace) { if (0 !== substr_compare('urn:oasis:names:tc:xliff:document:', $namespace->nodeValue, 0, 34)) { - throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s"', $namespace)); + throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s".', $namespace)); } return substr($namespace, 34); diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php index f40923af9780c..c49986561e980 100644 --- a/src/Symfony/Component/Validator/Constraints/BicValidator.php +++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php @@ -138,7 +138,7 @@ public function validate($value, Constraint $constraint) try { $iban = $this->getPropertyAccessor()->getValue($object, $path); } catch (NoSuchPropertyException $e) { - throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s', $path, \get_class($constraint), $e->getMessage()), 0, $e); + throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s.', $path, \get_class($constraint), $e->getMessage()), 0, $e); } } if (!$iban) { diff --git a/src/Symfony/Component/Validator/Constraints/RangeValidator.php b/src/Symfony/Component/Validator/Constraints/RangeValidator.php index e976ff30a76ac..9b7c40ce5ae9a 100644 --- a/src/Symfony/Component/Validator/Constraints/RangeValidator.php +++ b/src/Symfony/Component/Validator/Constraints/RangeValidator.php @@ -157,7 +157,7 @@ private function getLimit($propertyPath, $default, Constraint $constraint) try { return $this->getPropertyAccessor()->getValue($object, $propertyPath); } catch (NoSuchPropertyException $e) { - throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s', $propertyPath, \get_class($constraint), $e->getMessage()), 0, $e); + throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s.', $propertyPath, \get_class($constraint), $e->getMessage()), 0, $e); } } diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php index d1ee9879b76f5..7626a0a35bfb4 100644 --- a/src/Symfony/Component/VarExporter/Internal/Exporter.php +++ b/src/Symfony/Component/VarExporter/Internal/Exporter.php @@ -78,7 +78,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount if ($reflector->hasMethod('__serialize')) { if (!$reflector->getMethod('__serialize')->isPublic()) { - throw new \Error(sprintf('Call to %s method %s::__serialize()', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class)); + throw new \Error(sprintf('Call to %s method %s::__serialize().', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class)); } if (!\is_array($properties = $value->__serialize())) { diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php index 8e61f801aaacd..8ef46a9a90eeb 100644 --- a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php +++ b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php @@ -164,7 +164,7 @@ public function testThrowingBufferCallback() $client = $this->getHttpClient(__FUNCTION__); $response = $client->request('GET', 'http://localhost:8057', ['buffer' => function () { - throw new \Exception('Boo'); + throw new \Exception('Boo.'); }]); $this->assertSame(200, $response->getStatusCode()); @@ -646,7 +646,7 @@ public function testOnProgressCancel() $response = $client->request('GET', 'http://localhost:8057/timeout-body', [ 'on_progress' => function ($dlNow) { if (0 < $dlNow) { - throw new \Exception('Aborting the request'); + throw new \Exception('Aborting the request.'); } }, ]); @@ -656,7 +656,7 @@ public function testOnProgressCancel() } $this->fail(ClientExceptionInterface::class.' expected'); } catch (TransportExceptionInterface $e) { - $this->assertSame('Aborting the request', $e->getPrevious()->getMessage()); + $this->assertSame('Aborting the request.', $e->getPrevious()->getMessage()); } $this->assertNotNull($response->getInfo('error')); @@ -670,7 +670,7 @@ public function testOnProgressError() $response = $client->request('GET', 'http://localhost:8057/timeout-body', [ 'on_progress' => function ($dlNow) { if (0 < $dlNow) { - throw new \Error('BUG'); + throw new \Error('BUG.'); } }, ]); @@ -680,7 +680,7 @@ public function testOnProgressError() } $this->fail('Error expected'); } catch (\Error $e) { - $this->assertSame('BUG', $e->getMessage()); + $this->assertSame('BUG.', $e->getMessage()); } $this->assertNotNull($response->getInfo('error')); From 5688f97bad42bccb96914f27e0d7d041480025bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Bogusz?= Date: Tue, 10 Mar 2020 20:39:57 +0100 Subject: [PATCH 56/82] [Validator] Remove commas in translations --- .../Validator/Resources/translations/validators.es.xlf | 2 +- .../Validator/Resources/translations/validators.pl.xlf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf index 08ec74c05b8f1..24ef5548da44d 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf @@ -192,7 +192,7 @@ No temporary folder was configured in php.ini. - Ninguna carpeta temporal fue configurada en php.ini. + Ninguna carpeta temporal fue configurada en php.ini o la carpeta configurada no existe. Cannot write temporary file to disk. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf index 5c1e472ab5b66..df93abd0b9ee6 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf @@ -192,7 +192,7 @@ No temporary folder was configured in php.ini. - Nie skonfigurowano folderu tymczasowego w php.ini, lub skonfigurowany folder nie istnieje. + Nie skonfigurowano folderu tymczasowego w php.ini lub skonfigurowany folder nie istnieje. Cannot write temporary file to disk. From e8b4d356164ad1eee73460f13914c1448f22bcb2 Mon Sep 17 00:00:00 2001 From: William Arslett Date: Fri, 13 Mar 2020 17:09:22 +0000 Subject: [PATCH 57/82] [FrameworkBundle] start session on flashbag injection --- .../Resources/config/session.xml | 10 +++--- .../InjectedFlashbagSessionController.php | 36 +++++++++++++++++++ .../TestBundle/Resources/config/routing.yml | 4 +++ .../Tests/Functional/SessionTest.php | 23 ++++++++++++ .../Tests/Functional/app/Session/config.yml | 4 +++ 5 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/InjectedFlashbagSessionController.php diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml index 8b68d9e846dd4..9f3a5b78c1e2e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml @@ -13,8 +13,6 @@ - - @@ -37,10 +35,14 @@ - + + + - + + + %kernel.cache_dir%/sessions diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/InjectedFlashbagSessionController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/InjectedFlashbagSessionController.php new file mode 100644 index 0000000000000..20c33a17e4353 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/InjectedFlashbagSessionController.php @@ -0,0 +1,36 @@ +flashBag = $flashBag; + $this->router = $router; + } + + public function setFlashAction(Request $request, $message) + { + $this->flashBag->add('notice', $message); + + return new RedirectResponse($this->router->generate('session_showflash')); + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml index 923204ab0f427..3ae5669c90b3f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml @@ -18,6 +18,10 @@ session_setflash: path: /session_setflash/{message} defaults: { _controller: TestBundle:Session:setFlash} +injected_flashbag_session_setflash: + path: injected_flashbag/session_setflash/{message} + defaults: { _controller: TestBundle:InjectedFlashbagSession:setFlash} + session_showflash: path: /session_showflash defaults: { _controller: TestBundle:Session:showFlash} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php index 3a87f7e4e6e0a..1b1ef9ffc0bf7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php @@ -69,6 +69,29 @@ public function testFlash($config, $insulate) $this->assertStringContainsString('No flash was set.', $crawler->text()); } + /** + * Tests flash messages work when flashbag service is injected to the constructor. + * + * @dataProvider getConfigs + */ + public function testFlashOnInjectedFlashbag($config, $insulate) + { + $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]); + if ($insulate) { + $client->insulate(); + } + + // set flash + $client->request('GET', '/injected_flashbag/session_setflash/Hello%20world.'); + + // check flash displays on redirect + $this->assertStringContainsString('Hello world.', $client->followRedirect()->text()); + + // check flash is gone + $crawler = $client->request('GET', '/session_showflash'); + $this->assertStringContainsString('No flash was set.', $crawler->text()); + } + /** * See if two separate insulated clients can run without * polluting each other's session data. diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml index ad6bdb691ca52..4807c42d1ede8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml @@ -5,3 +5,7 @@ services: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestController: tags: - { name: controller.service_arguments, action: indexAction, argument: handler, id: fragment.handler } + + Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\InjectedFlashbagSessionController: + autowire: true + tags: ['controller.service_arguments'] From 48102d96f3de4ce87d442c71e82c95ca0dca3b4b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 Mar 2020 08:32:23 +0100 Subject: [PATCH 58/82] Fix quotes in exception messages --- .../AbstractDoctrineExtension.php | 2 +- ...gisterEventListenersAndSubscribersPass.php | 4 +- .../PropertyInfo/Fixtures/DoctrineFooType.php | 2 +- .../LazyLoadingValueHolderGenerator.php | 2 +- .../Bridge/Twig/Extension/FormExtension.php | 2 +- .../Bundle/FrameworkBundle/Routing/Router.php | 2 +- .../FrameworkBundle/Test/KernelTestCase.php | 2 +- .../Controller/AbstractControllerTest.php | 4 +- .../Tests/Routing/RouterTest.php | 2 +- .../DataCollector/SecurityDataCollector.php | 2 +- .../Compiler/AddSecurityVotersPass.php | 2 +- .../Security/FirewallContext.php | 2 +- .../Compiler/AddSecurityVotersPassTest.php | 2 +- .../DependencyInjection/TwigExtensionTest.php | 2 +- .../WebServerBundle/WebServerConfig.php | 2 +- .../Cache/Adapter/AbstractAdapter.php | 4 +- .../Component/Cache/Traits/MemcachedTrait.php | 8 +-- .../Component/Cache/Traits/PhpArrayTrait.php | 12 ++--- .../Component/Cache/Traits/PhpFilesTrait.php | 2 +- .../Component/Cache/Traits/RedisTrait.php | 16 +++--- .../Component/Config/Definition/ArrayNode.php | 2 +- .../Config/Definition/PrototypedArrayNode.php | 2 +- src/Symfony/Component/Config/FileLocator.php | 2 +- .../Descriptor/ApplicationDescription.php | 2 +- .../Console/Formatter/OutputFormatter.php | 2 +- .../Component/Console/Helper/Table.php | 2 +- .../Console/Question/ChoiceQuestion.php | 2 +- .../Tests/Helper/QuestionHelperTest.php | 4 +- .../Console/Tests/Helper/TableTest.php | 2 +- .../Parser/Handler/StringHandler.php | 2 +- .../XPath/Extension/FunctionExtension.php | 2 +- .../Compiler/ResolveBindingsPass.php | 2 +- .../Compiler/ResolveNamedArgumentsPass.php | 2 +- .../DependencyInjection/ContainerBuilder.php | 2 +- .../DependencyInjection/Dumper/PhpDumper.php | 2 +- .../DependencyInjection/EnvVarProcessor.php | 6 +-- .../Configurator/AbstractConfigurator.php | 2 +- .../Configurator/ContainerConfigurator.php | 2 +- .../DependencyInjection/Loader/FileLoader.php | 4 +- .../Loader/XmlFileLoader.php | 8 +-- .../Loader/YamlFileLoader.php | 52 +++++++++---------- .../EnvPlaceholderParameterBag.php | 4 +- .../ParameterBag/ParameterBag.php | 2 +- .../Tests/ContainerBuilderTest.php | 2 +- .../Tests/Loader/YamlFileLoaderTest.php | 2 +- .../EnvPlaceholderParameterBagTest.php | 2 +- .../Tests/ParameterBag/ParameterBagTest.php | 2 +- .../DomCrawler/Field/ChoiceFormField.php | 6 +-- .../DomCrawler/Field/FileFormField.php | 4 +- .../ExpressionLanguage/ExpressionLanguage.php | 2 +- .../Tests/ExpressionLanguageTest.php | 2 +- .../Component/Filesystem/Filesystem.php | 4 +- .../BaseDateTimeTransformer.php | 4 +- .../Form/Extension/Core/Type/ChoiceType.php | 2 +- .../ViolationMapper/ViolationPath.php | 8 +-- src/Symfony/Component/Form/Form.php | 8 +-- .../Test/Traits/ValidatorExtensionTrait.php | 2 +- .../Component/HttpFoundation/HeaderBag.php | 2 +- .../Storage/MockArraySessionStorage.php | 2 +- .../Session/Storage/NativeSessionStorage.php | 2 +- .../Component/HttpKernel/Bundle/Bundle.php | 2 +- .../CacheClearer/Psr6CacheClearer.php | 2 +- .../ControllerMetadata/ArgumentMetadata.php | 2 +- .../DataCollector/DumpDataCollector.php | 2 +- .../ResettableServicePass.php | 2 +- .../HttpKernel/Fragment/FragmentHandler.php | 2 +- .../HttpCache/AbstractSurrogate.php | 2 +- src/Symfony/Component/HttpKernel/Kernel.php | 6 +-- .../CacheClearer/Psr6CacheClearerTest.php | 2 +- .../ResettableServicePassTest.php | 2 +- .../Data/Bundle/Compiler/GenrbCompiler.php | 2 +- .../Intl/Data/Util/RecursiveArrayAccess.php | 2 +- .../DateFormat/TimezoneTransformer.php | 2 +- .../Intl/NumberFormatter/NumberFormatter.php | 2 +- src/Symfony/Component/Ldap/Ldap.php | 2 +- .../Component/Lock/Store/RedisStore.php | 6 +-- .../Component/Lock/Store/StoreFactory.php | 2 +- src/Symfony/Component/Process/Process.php | 4 +- .../Component/Process/Tests/ProcessTest.php | 2 +- .../PropertyAccess/PropertyAccessor.php | 2 +- .../Component/PropertyAccess/PropertyPath.php | 6 +-- .../PropertyAccess/PropertyPathBuilder.php | 6 +-- .../Routing/Loader/ObjectRouteLoader.php | 4 +- .../Component/Routing/RouteCompiler.php | 2 +- .../Authentication/Token/AbstractToken.php | 2 +- .../Authorization/AccessDecisionManager.php | 4 +- .../AccessDecisionManagerTest.php | 2 +- .../AbstractFormLoginAuthenticator.php | 2 +- .../Guard/GuardAuthenticatorHandler.php | 4 +- .../Provider/GuardAuthenticationProvider.php | 8 +-- .../SimpleAuthenticationHandler.php | 4 +- .../Http/Firewall/ExceptionListener.php | 2 +- .../RemoteUserAuthenticationListener.php | 2 +- .../SimplePreAuthenticationListener.php | 4 +- .../Firewall/X509AuthenticationListener.php | 2 +- .../SimpleAuthenticationHandlerTest.php | 4 +- .../Tests/Firewall/ExceptionListenerTest.php | 2 +- .../Serializer/Encoder/XmlEncoder.php | 4 +- .../Serializer/Mapping/Loader/FileLoader.php | 4 +- .../Serializer/Mapping/Loader/LoaderChain.php | 2 +- .../Normalizer/AbstractNormalizer.php | 6 +-- .../Normalizer/ArrayDenormalizer.php | 2 +- .../Normalizer/DateIntervalNormalizer.php | 2 +- .../Component/Serializer/Serializer.php | 8 +-- .../Catalogue/AbstractOperation.php | 6 +-- .../Constraints/CallbackValidator.php | 2 +- .../Validator/Constraints/Collection.php | 2 +- .../Validator/Constraints/Composite.php | 6 +-- .../Component/Validator/Constraints/Count.php | 2 +- .../Validator/Constraints/Length.php | 2 +- .../Component/Validator/Constraints/Range.php | 2 +- .../Validator/Constraints/Traverse.php | 2 +- .../Validator/Constraints/UrlValidator.php | 2 +- .../Factory/LazyLoadingMetadataFactory.php | 2 +- .../Validator/Mapping/GetterMetadata.php | 4 +- .../Validator/Mapping/Loader/LoaderChain.php | 2 +- .../Mapping/Loader/StaticMethodLoader.php | 2 +- .../Validator/Mapping/MemberMetadata.php | 2 +- .../Tests/Fixtures/FakeMetadataFactory.php | 2 +- .../Tests/Mapping/GetterMetadataTest.php | 2 +- .../Component/VarDumper/Cloner/Data.php | 2 +- .../Workflow/EventListener/GuardListener.php | 2 +- src/Symfony/Component/Yaml/Inline.php | 8 +-- .../Component/Yaml/Tests/InlineTest.php | 2 +- 124 files changed, 219 insertions(+), 219 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index 8dab9c8a3e071..db15a8d5c7f76 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -465,7 +465,7 @@ private function validateAutoMapping(array $managerConfigs) } if (null !== $autoMappedManager) { - throw new \LogicException(sprintf('You cannot enable "auto_mapping" on more than one manager at the same time (found in "%s" and %s").', $autoMappedManager, $name)); + throw new \LogicException(sprintf('You cannot enable "auto_mapping" on more than one manager at the same time (found in "%s" and "%s"").', $autoMappedManager, $name)); } $autoMappedManager = $name; diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php index 4dccb29765940..786bb9256841d 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php @@ -68,7 +68,7 @@ private function addTaggedSubscribers(ContainerBuilder $container) $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections); foreach ($connections as $con) { if (!isset($this->connections[$con])) { - throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s.', $con, $id, implode(', ', array_keys($this->connections)))); + throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: "%s".', $con, $id, implode('", "', array_keys($this->connections)))); } $this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', [new Reference($id)]); @@ -91,7 +91,7 @@ private function addTaggedListeners(ContainerBuilder $container) $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections); foreach ($connections as $con) { if (!isset($this->connections[$con])) { - throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s.', $con, $id, implode(', ', array_keys($this->connections)))); + throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: "%s".', $con, $id, implode('", "', array_keys($this->connections)))); } if ($lazy = !empty($tag['lazy'])) { diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php index b851aee677e4b..3d86eea506cd5 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php @@ -50,7 +50,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return null; } if (!$value instanceof Foo) { - throw new ConversionException(sprintf('Expected %s, got %s', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', \gettype($value))); + throw new ConversionException(sprintf('Expected "%s", got "%s"', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', \gettype($value))); } return $foo->bar; diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php index d4ce6825948ba..8ec2993f0a1aa 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php @@ -32,7 +32,7 @@ public function generate(\ReflectionClass $originalClass, ClassGenerator $classG $newBody = preg_replace('/^(\$this->initializer[a-zA-Z0-9]++) && .*;\n\nreturn (\$this->valueHolder)/', '$1 || $2', $body); if ($body === $newBody) { - throw new \UnexpectedValueException(sprintf('Unexpected lazy-proxy format generated for method %s::__destruct().', $originalClass->name)); + throw new \UnexpectedValueException(sprintf('Unexpected lazy-proxy format generated for method "%s::__destruct()".', $originalClass->name)); } $destructor->setBody($newBody); diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 1314e6544200f..2df9300943160 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -40,7 +40,7 @@ public function __construct($renderer = null) if ($renderer instanceof TwigRendererInterface) { @trigger_error(sprintf('Passing a Twig Form Renderer to the "%s" constructor is deprecated since Symfony 3.2 and won\'t be possible in 4.0. Pass the Twig\Environment to the TwigRendererEngine constructor instead.', static::class), E_USER_DEPRECATED); } elseif (null !== $renderer && !(\is_array($renderer) && isset($renderer[0], $renderer[1]) && $renderer[0] instanceof ContainerInterface)) { - throw new \InvalidArgumentException(sprintf('Passing any arguments to the constructor of %s is reserved for internal use.', __CLASS__)); + throw new \InvalidArgumentException(sprintf('Passing any arguments to the constructor of "%s" is reserved for internal use.', __CLASS__)); } $this->renderer = $renderer; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index ebb5e145c4b1a..f4cf18ee33a1d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -159,7 +159,7 @@ private function resolve($value) return (string) $this->resolve($resolved); } - throw new RuntimeException(sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type %s.', $match[1], $value, \gettype($resolved))); + throw new RuntimeException(sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type "%s".', $match[1], $value, \gettype($resolved))); }, $value); return str_replace('%%', '%', $escapedValue); diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php index 92e92c0fef54e..f46486e17fd19 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php @@ -125,7 +125,7 @@ protected static function getKernelClass() if (isset($_SERVER['KERNEL_CLASS']) || isset($_ENV['KERNEL_CLASS'])) { $class = isset($_ENV['KERNEL_CLASS']) ? $_ENV['KERNEL_CLASS'] : $_SERVER['KERNEL_CLASS']; if (!class_exists($class)) { - throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the %s::createKernel() method.', $class, static::class)); + throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the "%s::createKernel()" method.', $class, static::class)); } return $class; diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php index 6783ec25c5ab5..d0f1da4f1ce62 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php @@ -46,11 +46,11 @@ public function setContainer(ContainerInterface $container) continue; } if (!isset($expected[$id])) { - throw new \UnexpectedValueException(sprintf('Service "%s" is not expected, as declared by %s::getSubscribedServices()', $id, AbstractController::class)); + throw new \UnexpectedValueException(sprintf('Service "%s" is not expected, as declared by "%s::getSubscribedServices()".', $id, AbstractController::class)); } $type = substr($expected[$id], 1); if (!$container->get($id) instanceof $type) { - throw new \UnexpectedValueException(sprintf('Service "%s" is expected to be an instance of "%s", as declared by %s::getSubscribedServices()', $id, $type, AbstractController::class)); + throw new \UnexpectedValueException(sprintf('Service "%s" is expected to be an instance of "%s", as declared by "%s::getSubscribedServices()".', $id, $type, AbstractController::class)); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php index 414eed17d2c98..57e49e154319c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php @@ -200,7 +200,7 @@ public function testExceptionOnNonExistentParameter() public function testExceptionOnNonStringParameter() { $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException'); - $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type object.'); + $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type "object".'); $routes = new RouteCollection(); $routes->add('foo', new Route('/%object%')); diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php index 8bca2b2c19aa1..925d682c1bded 100644 --- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php +++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php @@ -121,7 +121,7 @@ public function collect(Request $request, Response $response, \Exception $except $extractRoles = function ($role) { if (!$role instanceof RoleInterface && !$role instanceof Role) { - throw new \InvalidArgumentException(sprintf('Roles must be instances of %s or %s (%s given).', RoleInterface::class, Role::class, \is_object($role) ? \get_class($role) : \gettype($role))); + throw new \InvalidArgumentException(sprintf('Roles must be instances of "%s" or "%s" ("%s" given).', RoleInterface::class, Role::class, \is_object($role) ? \get_class($role) : \gettype($role))); } return $role->getRole(); diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php index 07b2eaeed0d16..b0171266bb572 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php @@ -51,7 +51,7 @@ public function process(ContainerBuilder $container) if (!method_exists($class, 'vote')) { // in case the vote method is completely missing, to prevent exceptions when voting - throw new LogicException(sprintf('%s should implement the %s interface when used as voter.', $class, VoterInterface::class)); + throw new LogicException(sprintf('"%s" should implement the "%s" interface when used as voter.', $class, VoterInterface::class)); } } diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php index ecbaf596f9cdf..20fb7d9d1e128 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php @@ -41,7 +41,7 @@ public function __construct($listeners, ExceptionListener $exceptionListener = n $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 \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))); } } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php index 48a03b3a62fc6..c9386dba17a64 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php @@ -97,7 +97,7 @@ public function testVoterMissingInterface() public function testVoterMissingInterfaceAndMethod() { $exception = LogicException::class; - $message = 'stdClass should implement the Symfony\Component\Security\Core\Authorization\Voter\VoterInterface interface when used as voter.'; + $message = '"stdClass" should implement the "Symfony\Component\Security\Core\Authorization\Voter\VoterInterface" interface when used as voter.'; $this->expectException($exception); $this->expectExceptionMessage($message); diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php index 000cad7f930d2..7e14857faaf5e 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php @@ -347,7 +347,7 @@ private function loadFromFile(ContainerBuilder $container, $file, $format) $loader = new YamlFileLoader($container, $locator); break; default: - throw new \InvalidArgumentException(sprintf('Unsupported format: %s', $format)); + throw new \InvalidArgumentException(sprintf('Unsupported format: "%s"', $format)); } $loader->load($file.'.'.$format); diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php index 7548eef576983..41ee763679317 100644 --- a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php +++ b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php @@ -29,7 +29,7 @@ public function __construct($documentRoot, $env, $address = null, $router = null } if (null === $file = $this->findFrontController($documentRoot, $env)) { - throw new \InvalidArgumentException(sprintf('Unable to find the front controller under "%s" (none of these files exist: %s).', $documentRoot, implode(', ', $this->getFrontControllerFileNames($env)))); + throw new \InvalidArgumentException(sprintf('Unable to find the front controller under "%s" (none of these files exist: "%s").', $documentRoot, implode('", "', $this->getFrontControllerFileNames($env)))); } $_ENV['APP_FRONT_CONTROLLER'] = $file; diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php index f356a92950e27..dad0dc8f66f55 100644 --- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php @@ -133,7 +133,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version, public static function createConnection($dsn, array $options = []) { if (!\is_string($dsn)) { - throw new InvalidArgumentException(sprintf('The %s() method expect argument #1 to be string, %s given.', __METHOD__, \gettype($dsn))); + throw new InvalidArgumentException(sprintf('The "%s()" method expect argument #1 to be string, "%s" given.', __METHOD__, \gettype($dsn))); } if (0 === strpos($dsn, 'redis://')) { return RedisAdapter::createConnection($dsn, $options); @@ -142,7 +142,7 @@ public static function createConnection($dsn, array $options = []) return MemcachedAdapter::createConnection($dsn, $options); } - throw new InvalidArgumentException(sprintf('Unsupported DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn)); } /** diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php index b62dc53c19556..3f4fb5243d0e2 100644 --- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php +++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php @@ -78,7 +78,7 @@ public static function createConnection($servers, array $options = []) if (\is_string($servers)) { $servers = [$servers]; } elseif (!\is_array($servers)) { - throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, %s given.', \gettype($servers))); + throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', \gettype($servers))); } if (!static::isSupported()) { throw new CacheException('Memcached >= 2.2.0 is required.'); @@ -96,7 +96,7 @@ public static function createConnection($servers, array $options = []) continue; } if (0 !== strpos($dsn, 'memcached://')) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://".', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s" does not start with "memcached://".', $dsn)); } $params = preg_replace_callback('#^memcached://(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) { if (!empty($m[1])) { @@ -106,10 +106,10 @@ public static function createConnection($servers, array $options = []) return 'file://'; }, $dsn); if (false === $params = parse_url($params)) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn)); } if (!isset($params['host']) && !isset($params['path'])) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn)); } if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) { $params['weight'] = $m[1]; diff --git a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php index 2400486f80557..972c75121d487 100644 --- a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php +++ b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php @@ -39,21 +39,21 @@ public function warmUp(array $values) { if (file_exists($this->file)) { if (!is_file($this->file)) { - throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: %s.', $this->file)); + throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: "%s".', $this->file)); } if (!is_writable($this->file)) { - throw new InvalidArgumentException(sprintf('Cache file is not writable: %s.', $this->file)); + throw new InvalidArgumentException(sprintf('Cache file is not writable: "%s".', $this->file)); } } else { $directory = \dirname($this->file); if (!is_dir($directory) && !@mkdir($directory, 0777, true)) { - throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: %s.', $directory)); + throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: "%s".', $directory)); } if (!is_writable($directory)) { - throw new InvalidArgumentException(sprintf('Cache directory is not writable: %s.', $directory)); + throw new InvalidArgumentException(sprintf('Cache directory is not writable: "%s".', $directory)); } } @@ -74,7 +74,7 @@ public function warmUp(array $values) try { $value = serialize($value); } catch (\Exception $e) { - throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, \get_class($value)), 0, $e); + throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \get_class($value)), 0, $e); } } elseif (\is_array($value)) { try { @@ -93,7 +93,7 @@ public function warmUp(array $values) $value = serialize($value); } } elseif (!is_scalar($value)) { - throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, \gettype($value))); + throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value))); } $dump .= var_export($key, true).' => '.var_export($value, true).",\n"; diff --git a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php index 5a41afbbcb743..d6b9bead5eb33 100644 --- a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php +++ b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php @@ -137,7 +137,7 @@ protected function doSave(array $values, $lifetime) $value = serialize($value); } } elseif (!is_scalar($value)) { - throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, \gettype($value))); + throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value))); } $data[1] = $value; diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index ef6c4292e04a3..c5b60f9e199e5 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -48,7 +48,7 @@ private function init($redisClient, $namespace = '', $defaultLifetime = 0) throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0])); } if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) { - throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); + throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, "%s" given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); } $this->redis = $redisClient; } @@ -73,7 +73,7 @@ private function init($redisClient, $namespace = '', $defaultLifetime = 0) public static function createConnection($dsn, array $options = []) { if (0 !== strpos($dsn, 'redis://')) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://".', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s" does not start with "redis://".', $dsn)); } $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) { if (isset($m[1])) { @@ -83,10 +83,10 @@ public static function createConnection($dsn, array $options = []) return 'file://'; }, $dsn); if (false === $params = parse_url($params)) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn)); } if (!isset($params['host']) && !isset($params['path'])) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn)); } if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) { $params['dbindex'] = $m[1]; @@ -108,7 +108,7 @@ public static function createConnection($dsn, array $options = []) } $params += $options + self::$defaultConnectionOptions; if (null === $params['class'] && !\extension_loaded('redis') && !class_exists(\Predis\Client::class)) { - throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: %s.', $dsn)); + throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: "%s".', $dsn)); } $class = null === $params['class'] ? (\extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class']; @@ -120,7 +120,7 @@ public static function createConnection($dsn, array $options = []) try { @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']); } catch (\RedisException $e) { - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e->getMessage(), $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): "%s".', $e->getMessage(), $dsn)); } set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; }); @@ -128,7 +128,7 @@ public static function createConnection($dsn, array $options = []) restore_error_handler(); if (!$isConnected) { $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : ''; - throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s.', $error, $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed%s: "%s".', $error, $dsn)); } if ((null !== $auth && !$redis->auth($auth)) @@ -136,7 +136,7 @@ public static function createConnection($dsn, array $options = []) || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout'])) ) { $e = preg_replace('/^ERR /', '', $redis->getLastError()); - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e, $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): "%s".', $e, $dsn)); } return true; diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index 18990a2e38c70..83bab205ecfc2 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -215,7 +215,7 @@ public function addChild(NodeInterface $node) protected function finalizeValue($value) { if (false === $value) { - throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value))); + throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: "%s".', $this->getPath(), json_encode($value))); } foreach ($this->children as $name => $child) { diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index d36b9a440f334..d18a109abc6a4 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -185,7 +185,7 @@ public function addChild(NodeInterface $node) protected function finalizeValue($value) { if (false === $value) { - throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value))); + throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: "%s".', $this->getPath(), json_encode($value))); } foreach ($value as $k => $v) { diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php index 1314cc3486e81..c125ba0b13771 100644 --- a/src/Symfony/Component/Config/FileLocator.php +++ b/src/Symfony/Component/Config/FileLocator.php @@ -68,7 +68,7 @@ public function locate($name, $currentPath = null, $first = true) } if (!$filepaths) { - throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist (in: %s).', $name, implode(', ', $paths)), 0, null, $notfound); + throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist (in: "%s").', $name, implode('", "', $paths)), 0, null, $notfound); } return $filepaths; diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php index 7e214712da6f3..65b53084f1b5e 100644 --- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php +++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php @@ -88,7 +88,7 @@ public function getCommands() public function getCommand($name) { if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) { - throw new CommandNotFoundException(sprintf('Command %s does not exist.', $name)); + throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name)); } return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name]; diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php index 99e0ac1e911c5..3202fc176e7e6 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php @@ -119,7 +119,7 @@ public function hasStyle($name) public function getStyle($name) { if (!$this->hasStyle($name)) { - throw new InvalidArgumentException(sprintf('Undefined style: %s.', $name)); + throw new InvalidArgumentException(sprintf('Undefined style: "%s".', $name)); } return $this->styles[strtolower($name)]; diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php index 0f3d673586ac8..e6dc6a8a5c482 100644 --- a/src/Symfony/Component/Console/Helper/Table.php +++ b/src/Symfony/Component/Console/Helper/Table.php @@ -460,7 +460,7 @@ private function fillNextRows(array $rows, $line) $unmergedRows = []; foreach ($rows[$line] as $column => $cell) { if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !(\is_object($cell) && method_exists($cell, '__toString'))) { - throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing __toString, %s given.', \gettype($cell))); + throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', \gettype($cell))); } if ($cell instanceof TableCell && $cell->getRowspan() > 1) { $nbLines = $cell->getRowspan() - 1; diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php index 3dca160049338..62532844b2d4d 100644 --- a/src/Symfony/Component/Console/Question/ChoiceQuestion.php +++ b/src/Symfony/Component/Console/Question/ChoiceQuestion.php @@ -155,7 +155,7 @@ private function getDefaultValidator() } if (\count($results) > 1) { - throw new InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of %s.', implode(' or ', $results))); + throw new InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of "%s".', implode('" or "', $results))); } $result = array_search($value, $choices); diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php index d2afee42ffa26..4303c020a319c 100644 --- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php +++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php @@ -524,7 +524,7 @@ public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue) public function testAmbiguousChoiceFromChoicelist() { $this->expectException('InvalidArgumentException'); - $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of env_2 or env_3.'); + $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of "env_2" or "env_3".'); $possibleChoices = [ 'env_1' => 'My first environment', 'env_2' => 'My environment', @@ -891,7 +891,7 @@ public function testLegacySelectChoiceFromChoiceList($providedAnswer, $expectedV public function testLegacyAmbiguousChoiceFromChoicelist() { $this->expectException('InvalidArgumentException'); - $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of env_2 or env_3.'); + $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of "env_2" or "env_3".'); $possibleChoices = [ 'env_1' => 'My first environment', 'env_2' => 'My environment', diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php index 571cf0a6c43f4..7e2bd810132b7 100644 --- a/src/Symfony/Component/Console/Tests/Helper/TableTest.php +++ b/src/Symfony/Component/Console/Tests/Helper/TableTest.php @@ -729,7 +729,7 @@ public function testColumnStyle() public function testThrowsWhenTheCellInAnArray() { $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException'); - $this->expectExceptionMessage('A cell must be a TableCell, a scalar or an object implementing __toString, array given.'); + $this->expectExceptionMessage('A cell must be a TableCell, a scalar or an object implementing "__toString()", "array" given.'); $table = new Table($output = $this->getOutputStream()); $table ->setHeaders(['ISBN', 'Title', 'Author', 'Price']) diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php index 9869176b39466..72e94c3d5a63e 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php @@ -55,7 +55,7 @@ public function handle(Reader $reader, TokenStream $stream) $match = $reader->findPattern($this->patterns->getQuotedStringPattern($quote)); if (!$match) { - throw new InternalErrorException(sprintf('Should have found at least an empty match at %s.', $reader->getPosition())); + throw new InternalErrorException(sprintf('Should have found at least an empty match at %d.', $reader->getPosition())); } // check unclosed strings diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php index 103b6a5f9c4c3..a121ab8cfd673 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php @@ -58,7 +58,7 @@ public function translateNthChild(XPathExpr $xpath, FunctionNode $function, $las try { list($a, $b) = Parser::parseSeries($function->getArguments()); } catch (SyntaxErrorException $e) { - throw new ExpressionErrorException(sprintf('Invalid series: %s.', implode(', ', $function->getArguments())), 0, $e); + throw new ExpressionErrorException(sprintf('Invalid series: "%s".', implode('", "', $function->getArguments())), 0, $e); } $xpath->addStarPrefix(); diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php index f3c4b593cccc2..065dbb4b40a1b 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php @@ -90,7 +90,7 @@ protected function processValue($value, $isRoot = false) } if (null !== $bindingValue && !$bindingValue instanceof Reference && !$bindingValue instanceof Definition) { - throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, an instance of %s or an instance of %s, %s given.', $key, $this->currentId, Reference::class, Definition::class, \gettype($bindingValue))); + throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, an instance of "%s" or an instance of "%s", "%s" given.', $key, $this->currentId, Reference::class, Definition::class, \gettype($bindingValue))); } } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php index 0b79280110f65..225014f1e4224 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php @@ -66,7 +66,7 @@ protected function processValue($value, $isRoot = false) } if (null !== $argument && !$argument instanceof Reference && !$argument instanceof Definition) { - throw new InvalidArgumentException(sprintf('Invalid service "%s": the value of argument "%s" of method "%s()" must be null, an instance of %s or an instance of %s, %s given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, \gettype($argument))); + throw new InvalidArgumentException(sprintf('Invalid service "%s": the value of argument "%s" of method "%s()" must be null, an instance of "%s" or an instance of "%s", "%s" given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, \gettype($argument))); } $typeFound = false; diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 81d15c977136b..7c9860b4dc47a 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -1439,7 +1439,7 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs $completed = true; } else { if (!\is_string($resolved) && !is_numeric($resolved)) { - throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type %s inside string value "%s".', $env, \gettype($resolved), $this->resolveEnvPlaceholders($value))); + throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type "%s" inside string value "%s".', $env, \gettype($resolved), $this->resolveEnvPlaceholders($value))); } $value = str_ireplace($placeholder, $resolved, $value); } diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index cbe3c53ae6f5a..3bfa0c318891e 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -1306,7 +1306,7 @@ private function addDefaultParametersMethod() foreach ($this->container->getParameterBag()->all() as $key => $value) { if ($key !== $resolvedKey = $this->container->resolveEnvPlaceholders($key)) { - throw new InvalidArgumentException(sprintf('Parameter name cannot use env parameters: %s.', $resolvedKey)); + throw new InvalidArgumentException(sprintf('Parameter name cannot use env parameters: "%s".', $resolvedKey)); } if ($key !== $lcKey = strtolower($key)) { $normalizedParams[] = sprintf(' %s => %s,', $this->export($lcKey), $this->export($key)); diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php index 8854080939997..3410103764e52 100644 --- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php +++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php @@ -57,7 +57,7 @@ public function getEnv($prefix, $name, \Closure $getEnv) throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name)); } if (!file_exists($file)) { - throw new RuntimeException(sprintf('Env "file:%s" not found: %s does not exist.', $name, $file)); + throw new RuntimeException(sprintf('Env "file:%s" not found: "%s" does not exist.', $name, $file)); } return file_get_contents($file); @@ -82,7 +82,7 @@ public function getEnv($prefix, $name, \Closure $getEnv) } if (!is_scalar($env)) { - throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to %s.', $name, $prefix)); + throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix)); } if ('string' === $prefix) { @@ -129,7 +129,7 @@ public function getEnv($prefix, $name, \Closure $getEnv) } if (!\is_array($env)) { - throw new RuntimeException(sprintf('Invalid JSON env var "%s": array expected, %s given.', $name, \gettype($env))); + throw new RuntimeException(sprintf('Invalid JSON env var "%s": array expected, "%s" given.', $name, \gettype($env))); } return $env; diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php index 059e3c3a2c153..428683ef4cec8 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php @@ -31,7 +31,7 @@ public function __call($method, $args) return \call_user_func_array([$this, 'set'.$method], $args); } - throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s().', static::class, $method)); + throw new \BadMethodCallException(sprintf('Call to undefined method "%s::%s()".', static::class, $method)); } /** diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php index 99759f3b2da4e..f2e5ccf8b03b5 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php @@ -45,7 +45,7 @@ final public function extension($namespace, array $config) { if (!$this->container->hasExtension($namespace)) { $extensions = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions())); - throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s.', $namespace, $this->file, $namespace, $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none')); + throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $this->file, $namespace, $extensions ? implode('", "', $extensions) : 'none')); } $this->container->loadFromExtension($namespace, static::processValue($config)); diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php index fd86aa87ce88a..749dd4d06b9f4 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -48,10 +48,10 @@ public function __construct(ContainerBuilder $container, FileLocatorInterface $l public function registerClasses(Definition $prototype, $namespace, $resource, $exclude = null) { if ('\\' !== substr($namespace, -1)) { - throw new InvalidArgumentException(sprintf('Namespace prefix must end with a "\\": %s.', $namespace)); + throw new InvalidArgumentException(sprintf('Namespace prefix must end with a "\\": "%s".', $namespace)); } if (!preg_match('/^(?:[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+\\\\)++$/', $namespace)) { - throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: %s.', $namespace)); + throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: "%s".', $namespace)); } $classes = $this->findClasses($namespace, $resource, $exclude); diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index b7d3c03a07440..6ccb66a421eae 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -170,7 +170,7 @@ private function getServiceDefaults(\DOMDocument $xml, $file) foreach ($defaults['tags'] as $tag) { if ('' === $tag->getAttribute('name')) { - throw new InvalidArgumentException(sprintf('The tag name for tag "" in %s must be a non-empty string.', $file)); + throw new InvalidArgumentException(sprintf('The tag name for tag "" in "%s" must be a non-empty string.', $file)); } } @@ -336,7 +336,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults) } if ('' === $tag->getAttribute('name')) { - throw new InvalidArgumentException(sprintf('The tag name for service "%s" in %s must be a non-empty string.', (string) $service->getAttribute('id'), $file)); + throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', (string) $service->getAttribute('id'), $file)); } $definition->addTag($tag->getAttribute('name'), $parameters); @@ -378,7 +378,7 @@ private function parseFileToDOM($file) try { $dom = XmlUtils::loadFile($file, [$this, 'validateSchema']); } catch (\InvalidArgumentException $e) { - throw new InvalidArgumentException(sprintf('Unable to parse file "%s": %s.', $file, $e->getMessage()), $e->getCode(), $e); + throw new InvalidArgumentException(sprintf('Unable to parse file "%s": "%s".', $file, $e->getMessage()), $e->getCode(), $e); } $this->validateExtensions($dom, $file); @@ -668,7 +668,7 @@ private function validateExtensions(\DOMDocument $dom, $file) // can it be handled by an extension? if (!$this->container->hasExtension($node->namespaceURI)) { $extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getNamespace(); }, $this->container->getExtensions())); - throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s.', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); + throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); } } } diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index 91d8a032aefbf..5a011c04ddaaf 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -129,7 +129,7 @@ public function load($resource, $type = null) // parameters if (isset($content['parameters'])) { if (!\is_array($content['parameters'])) { - throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in %s. Check your YAML syntax.', $path)); + throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in "%s". Check your YAML syntax.', $path)); } foreach ($content['parameters'] as $key => $value) { @@ -179,7 +179,7 @@ private function parseImports(array $content, $file) } if (!\is_array($content['imports'])) { - throw new InvalidArgumentException(sprintf('The "imports" key should contain an array in %s. Check your YAML syntax.', $file)); + throw new InvalidArgumentException(sprintf('The "imports" key should contain an array in "%s". Check your YAML syntax.', $file)); } $defaultDirectory = \dirname($file); @@ -188,7 +188,7 @@ private function parseImports(array $content, $file) $import = ['resource' => $import]; } if (!isset($import['resource'])) { - throw new InvalidArgumentException(sprintf('An import should provide a resource in %s. Check your YAML syntax.', $file)); + throw new InvalidArgumentException(sprintf('An import should provide a resource in "%s". Check your YAML syntax.', $file)); } $this->setCurrentDir($defaultDirectory); @@ -208,7 +208,7 @@ private function parseDefinitions(array $content, $file) } if (!\is_array($content['services'])) { - throw new InvalidArgumentException(sprintf('The "services" key should contain an array in %s. Check your YAML syntax.', $file)); + throw new InvalidArgumentException(sprintf('The "services" key should contain an array in "%s". Check your YAML syntax.', $file)); } if (\array_key_exists('_instanceof', $content['services'])) { @@ -222,10 +222,10 @@ private function parseDefinitions(array $content, $file) $this->isLoadingInstanceof = true; foreach ($instanceof as $id => $service) { if (!$service || !\is_array($service)) { - throw new InvalidArgumentException(sprintf('Type definition "%s" must be a non-empty array within "_instanceof" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('Type definition "%s" must be a non-empty array within "_instanceof" in "%s". Check your YAML syntax.', $id, $file)); } if (\is_string($service) && 0 === strpos($service, '@')) { - throw new InvalidArgumentException(sprintf('Type definition "%s" cannot be an alias within "_instanceof" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('Type definition "%s" cannot be an alias within "_instanceof" in "%s". Check your YAML syntax.', $id, $file)); } $this->parseDefinition($id, $service, $file, []); } @@ -265,7 +265,7 @@ private function parseDefaults(array &$content, $file) if (isset($defaults['tags'])) { if (!\is_array($tags = $defaults['tags'])) { - throw new InvalidArgumentException(sprintf('Parameter "tags" in "_defaults" must be an array in %s. Check your YAML syntax.', $file)); + throw new InvalidArgumentException(sprintf('Parameter "tags" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file)); } foreach ($tags as $tag) { @@ -274,18 +274,18 @@ private function parseDefaults(array &$content, $file) } if (!isset($tag['name'])) { - throw new InvalidArgumentException(sprintf('A "tags" entry in "_defaults" is missing a "name" key in %s.', $file)); + throw new InvalidArgumentException(sprintf('A "tags" entry in "_defaults" is missing a "name" key in "%s".', $file)); } $name = $tag['name']; unset($tag['name']); if (!\is_string($name) || '' === $name) { - throw new InvalidArgumentException(sprintf('The tag name in "_defaults" must be a non-empty string in %s.', $file)); + throw new InvalidArgumentException(sprintf('The tag name in "_defaults" must be a non-empty string in "%s".', $file)); } foreach ($tag as $attribute => $value) { if (!is_scalar($value) && null !== $value) { - throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in %s. Check your YAML syntax.', $name, $attribute, $file)); + throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in "%s". Check your YAML syntax.', $name, $attribute, $file)); } } } @@ -293,7 +293,7 @@ private function parseDefaults(array &$content, $file) if (isset($defaults['bind'])) { if (!\is_array($defaults['bind'])) { - throw new InvalidArgumentException(sprintf('Parameter "bind" in "_defaults" must be an array in %s. Check your YAML syntax.', $file)); + throw new InvalidArgumentException(sprintf('Parameter "bind" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file)); } $defaults['bind'] = array_map(function ($v) { return new BoundArgument($v); }, $this->resolveServices($defaults['bind'], $file)); @@ -348,7 +348,7 @@ private function parseDefinition($id, $service, $file, array $defaults) } if (!\is_array($service)) { - throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but %s found for service "%s" in %s. Check your YAML syntax.', \gettype($service), $id, $file)); + throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but "%s" found for service "%s" in "%s". Check your YAML syntax.', \gettype($service), $id, $file)); } $this->checkDefinition($id, $service, $file); @@ -458,7 +458,7 @@ private function parseDefinition($id, $service, $file, array $defaults) if (isset($service['calls'])) { if (!\is_array($service['calls'])) { - throw new InvalidArgumentException(sprintf('Parameter "calls" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('Parameter "calls" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file)); } foreach ($service['calls'] as $call) { @@ -471,7 +471,7 @@ private function parseDefinition($id, $service, $file, array $defaults) } if (!\is_array($args)) { - throw new InvalidArgumentException(sprintf('The second parameter for function call "%s" must be an array of its arguments for service "%s" in %s. Check your YAML syntax.', $method, $id, $file)); + throw new InvalidArgumentException(sprintf('The second parameter for function call "%s" must be an array of its arguments for service "%s" in "%s". Check your YAML syntax.', $method, $id, $file)); } $definition->addMethodCall($method, $args); } @@ -479,7 +479,7 @@ private function parseDefinition($id, $service, $file, array $defaults) $tags = isset($service['tags']) ? $service['tags'] : []; if (!\is_array($tags)) { - throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file)); } if (isset($defaults['tags'])) { @@ -492,18 +492,18 @@ private function parseDefinition($id, $service, $file, array $defaults) } if (!isset($tag['name'])) { - throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file)); + throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in "%s".', $id, $file)); } $name = $tag['name']; unset($tag['name']); if (!\is_string($name) || '' === $name) { - throw new InvalidArgumentException(sprintf('The tag name for service "%s" in %s must be a non-empty string.', $id, $file)); + throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', $id, $file)); } foreach ($tag as $attribute => $value) { if (!is_scalar($value) && null !== $value) { - throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s. Check your YAML syntax.', $id, $name, $attribute, $file)); + throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in "%s". Check your YAML syntax.', $id, $name, $attribute, $file)); } } @@ -529,12 +529,12 @@ private function parseDefinition($id, $service, $file, array $defaults) $definition->addAutowiringType($service['autowiring_types']); } else { if (!\is_array($service['autowiring_types'])) { - throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in "%s". Check your YAML syntax.', $id, $file)); } foreach ($service['autowiring_types'] as $autowiringType) { if (!\is_string($autowiringType)) { - throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in "%s". Check your YAML syntax.', $id, $file)); } $definition->addAutowiringType($autowiringType); @@ -548,7 +548,7 @@ private function parseDefinition($id, $service, $file, array $defaults) if (isset($service['bind'])) { if (!\is_array($service['bind'])) { - throw new InvalidArgumentException(sprintf('Parameter "bind" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('Parameter "bind" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file)); } $bindings = array_merge($bindings, $this->resolveServices($service['bind'], $file)); @@ -566,12 +566,12 @@ private function parseDefinition($id, $service, $file, array $defaults) } if (\array_key_exists('namespace', $service) && !\array_key_exists('resource', $service)) { - throw new InvalidArgumentException(sprintf('A "resource" attribute must be set when the "namespace" attribute is set for service "%s" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('A "resource" attribute must be set when the "namespace" attribute is set for service "%s" in "%s". Check your YAML syntax.', $id, $file)); } if (\array_key_exists('resource', $service)) { if (!\is_string($service['resource'])) { - throw new InvalidArgumentException(sprintf('A "resource" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file)); + throw new InvalidArgumentException(sprintf('A "resource" attribute must be of type string for service "%s" in "%s". Check your YAML syntax.', $id, $file)); } $exclude = isset($service['exclude']) ? $service['exclude'] : null; $namespace = isset($service['namespace']) ? $service['namespace'] : $id; @@ -618,10 +618,10 @@ private function parseCallable($callable, $parameter, $id, $file) return $callable; } - throw new InvalidArgumentException(sprintf('Parameter "%s" must contain an array with two elements for service "%s" in %s. Check your YAML syntax.', $parameter, $id, $file)); + throw new InvalidArgumentException(sprintf('Parameter "%s" must contain an array with two elements for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file)); } - throw new InvalidArgumentException(sprintf('Parameter "%s" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $parameter, $id, $file)); + throw new InvalidArgumentException(sprintf('Parameter "%s" must be a string or an array for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file)); } /** @@ -695,7 +695,7 @@ private function validate($content, $file) if (!$this->container->hasExtension($namespace)) { $extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions())); - throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s.', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); + throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none')); } } diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php index e453a774e1e66..c4e369b010d83 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php @@ -36,7 +36,7 @@ public function get($name) } } if (!preg_match('/^(?:\w++:)*+\w++$/', $env)) { - throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name)); + throw new InvalidArgumentException(sprintf('Invalid "%s" name: only "word" characters are allowed.', $name)); } if ($this->has($name)) { @@ -116,7 +116,7 @@ public function resolve() if (is_numeric($default = $this->parameters[$name])) { $this->parameters[$name] = (string) $default; } elseif (null !== $default && !is_scalar($default)) { - throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, %s given.', $env, \gettype($default))); + throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, "%s" given.', $env, \gettype($default))); } } } diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php index e13d2824f518c..539d56616d6b4 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php @@ -234,7 +234,7 @@ public function resolveString($value, array $resolving = []) $resolved = $this->get($key); if (!\is_string($resolved) && !is_numeric($resolved)) { - throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "%s" of type %s inside string value "%s".', $key, \gettype($resolved), $value)); + throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "%s" of type "%s" inside string value "%s".', $key, \gettype($resolved), $value)); } $resolved = (string) $resolved; diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php index 75b9305ff32df..4ccab66339d53 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php @@ -719,7 +719,7 @@ public function testCompileWithArrayAndAnotherResolveEnv() public function testCompileWithArrayInStringResolveEnv() { $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException'); - $this->expectExceptionMessage('A string value must be composed of strings and/or numbers, but found parameter "env(json:ARRAY)" of type array inside string value "ABC %env(json:ARRAY)%".'); + $this->expectExceptionMessage('A string value must be composed of strings and/or numbers, but found parameter "env(json:ARRAY)" of type "array" inside string value "ABC %env(json:ARRAY)%".'); putenv('ARRAY={"foo":"bar"}'); $container = new ContainerBuilder(); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php index cce3921853e5d..3059dd4d6cf5d 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php @@ -536,7 +536,7 @@ public function testDecoratedServicesWithWrongSyntaxThrowsException() public function testInvalidTagsWithDefaults() { $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException'); - $this->expectExceptionMessageRegExp('/Parameter "tags" must be an array for service "Foo\\\Bar" in .+services31_invalid_tags\.yml\. Check your YAML syntax./'); + $this->expectExceptionMessageRegExp('/Parameter "tags" must be an array for service "Foo\\\Bar" in ".+services31_invalid_tags\.yml"\. Check your YAML syntax./'); $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml')); $loader->load('services31_invalid_tags.yml'); } diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php index 4fcb2c8405d21..273072f941696 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php @@ -130,7 +130,7 @@ public function testResolveEnvAllowsNull() public function testResolveThrowsOnBadDefaultValue() { $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException'); - $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be scalar or null, array given.'); + $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be scalar or null, "array" given.'); $bag = new EnvPlaceholderParameterBag(); $bag->get('env(ARRAY_VAR)'); $bag->set('env(ARRAY_VAR)', []); diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php index 0a75b445b9e81..9b39458c9de66 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php @@ -170,7 +170,7 @@ public function testResolveValue() $bag->resolveValue('%foo%'); $this->fail('->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter'); } catch (RuntimeException $e) { - $this->assertEquals('A string value must be composed of strings and/or numbers, but found parameter "bar" of type array inside string value "a %bar%".', $e->getMessage(), '->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter'); + $this->assertEquals('A string value must be composed of strings and/or numbers, but found parameter "bar" of type "array" inside string value "a %bar%".', $e->getMessage(), '->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter'); } $bag = new ParameterBag(['foo' => '%bar%', 'bar' => '%foobar%', 'foobar' => '%foo%']); diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php index db1b9de2bf154..a7d2b84751400 100644 --- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php +++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php @@ -133,11 +133,11 @@ public function setValue($value) foreach ($value as $v) { if (!$this->containsOption($v, $this->options)) { - throw new \InvalidArgumentException(sprintf('Input "%s" cannot take "%s" as a value (possible values: %s).', $this->name, $v, implode(', ', $this->availableOptionValues()))); + throw new \InvalidArgumentException(sprintf('Input "%s" cannot take "%s" as a value (possible values: "%s").', $this->name, $v, implode('", "', $this->availableOptionValues()))); } } } elseif (!$this->containsOption($value, $this->options)) { - throw new \InvalidArgumentException(sprintf('Input "%s" cannot take "%s" as a value (possible values: %s).', $this->name, $value, implode(', ', $this->availableOptionValues()))); + throw new \InvalidArgumentException(sprintf('Input "%s" cannot take "%s" as a value (possible values: "%s").', $this->name, $value, implode('", "', $this->availableOptionValues()))); } if ($this->multiple) { @@ -205,7 +205,7 @@ protected function initialize() } if ('input' === $this->node->nodeName && 'checkbox' !== strtolower($this->node->getAttribute('type')) && 'radio' !== strtolower($this->node->getAttribute('type'))) { - throw new \LogicException(sprintf('A ChoiceFormField can only be created from an input tag with a type of checkbox or radio (given type is %s).', $this->node->getAttribute('type'))); + throw new \LogicException(sprintf('A ChoiceFormField can only be created from an input tag with a type of checkbox or radio (given type is "%s").', $this->node->getAttribute('type'))); } $this->value = null; diff --git a/src/Symfony/Component/DomCrawler/Field/FileFormField.php b/src/Symfony/Component/DomCrawler/Field/FileFormField.php index 9abdca8827ef5..61bc7c68ae4c4 100644 --- a/src/Symfony/Component/DomCrawler/Field/FileFormField.php +++ b/src/Symfony/Component/DomCrawler/Field/FileFormField.php @@ -29,7 +29,7 @@ public function setErrorCode($error) { $codes = [UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION]; if (!\in_array($error, $codes)) { - throw new \InvalidArgumentException(sprintf('The error code %s is not valid.', $error)); + throw new \InvalidArgumentException(sprintf('The error code "%s" is not valid.', $error)); } $this->value = ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => $error, 'size' => 0]; @@ -100,7 +100,7 @@ protected function initialize() } if ('file' !== strtolower($this->node->getAttribute('type'))) { - throw new \LogicException(sprintf('A FileFormField can only be created from an input tag with a type of file (given type is %s).', $this->node->getAttribute('type'))); + throw new \LogicException(sprintf('A FileFormField can only be created from an input tag with a type of file (given type is "%s").', $this->node->getAttribute('type'))); } $this->setValue(null); diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php index b6760a55a656c..ad06107086d08 100644 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php @@ -41,7 +41,7 @@ public function __construct($cache = null, array $providers = []) @trigger_error(sprintf('Passing an instance of %s as constructor argument for %s is deprecated as of 3.2 and will be removed in 4.0. Pass an instance of %s instead.', ParserCacheInterface::class, self::class, CacheItemPoolInterface::class), E_USER_DEPRECATED); $cache = new ParserCacheAdapter($cache); } elseif (!$cache instanceof CacheItemPoolInterface) { - throw new \InvalidArgumentException(sprintf('Cache argument has to implement %s.', CacheItemPoolInterface::class)); + throw new \InvalidArgumentException(sprintf('Cache argument has to implement "%s".', CacheItemPoolInterface::class)); } } diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php index fc2f80e17b3aa..6c7a8025b17bd 100644 --- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php +++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php @@ -96,7 +96,7 @@ public function testCachedParseWithDeprecatedParserCacheInterface() public function testWrongCacheImplementation() { $this->expectException('InvalidArgumentException'); - $this->expectExceptionMessage('Cache argument has to implement Psr\Cache\CacheItemPoolInterface.'); + $this->expectExceptionMessage('Cache argument has to implement "Psr\Cache\CacheItemPoolInterface".'); $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock(); new ExpressionLanguage($cacheMock); } diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index d5cb54ae9833f..f3d1fe44622a1 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -388,10 +388,10 @@ private function linkException($origin, $target, $linkType) { if (self::$lastError) { if ('\\' === \DIRECTORY_SEPARATOR && false !== strpos(self::$lastError, 'error code(1314)')) { - throw new IOException(sprintf('Unable to create %s link due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?', $linkType), 0, null, $target); + throw new IOException(sprintf('Unable to create "%s" link due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?', $linkType), 0, null, $target); } } - throw new IOException(sprintf('Failed to create %s link from "%s" to "%s".', $linkType, $origin, $target), 0, null, $target); + throw new IOException(sprintf('Failed to create "%s" link from "%s" to "%s".', $linkType, $origin, $target), 0, null, $target); } /** diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php index 845ba88f04958..f607105c678c8 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php @@ -53,13 +53,13 @@ public function __construct($inputTimezone = null, $outputTimezone = null) try { new \DateTimeZone($this->inputTimezone); } catch (\Exception $e) { - throw new InvalidArgumentException(sprintf('Input timezone is invalid: %s.', $this->inputTimezone), $e->getCode(), $e); + throw new InvalidArgumentException(sprintf('Input timezone is invalid: "%s".', $this->inputTimezone), $e->getCode(), $e); } try { new \DateTimeZone($this->outputTimezone); } catch (\Exception $e) { - throw new InvalidArgumentException(sprintf('Output timezone is invalid: %s.', $this->outputTimezone), $e->getCode(), $e); + throw new InvalidArgumentException(sprintf('Output timezone is invalid: "%s".', $this->outputTimezone), $e->getCode(), $e); } } } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php index 2bfc87dd80fe3..1e506bf168564 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php @@ -273,7 +273,7 @@ public function configureOptions(OptionsResolver $resolver) // Set by the user if (true !== $choicesAsValues) { - throw new \RuntimeException(sprintf('The "choices_as_values" option of the %s should not be used. Remove it and flip the contents of the "choices" option instead.', static::class)); + throw new \RuntimeException(sprintf('The "choices_as_values" option of the "%s" should not be used. Remove it and flip the contents of the "choices" option instead.', static::class)); } @trigger_error('The "choices_as_values" option is deprecated since Symfony 3.1 and will be removed in 4.0. You should not use it anymore.', E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php index 1b67982788f36..73ce1d2e5ae55 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php @@ -163,7 +163,7 @@ public function getElements() public function getElement($index) { if (!isset($this->elements[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" is not within the violation path.', $index)); } return $this->elements[$index]; @@ -175,7 +175,7 @@ public function getElement($index) public function isProperty($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" is not within the violation path.', $index)); } return !$this->isIndex[$index]; @@ -187,7 +187,7 @@ public function isProperty($index) public function isIndex($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" is not within the violation path.', $index)); } return $this->isIndex[$index]; @@ -212,7 +212,7 @@ public function isIndex($index) public function mapsForm($index) { if (!isset($this->mapsForm[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the violation path.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" is not within the violation path.', $index)); } return $this->mapsForm[$index]; diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 0403ba104956f..53ac447d3d8bd 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -1031,7 +1031,7 @@ private function modelToNorm($value) $value = $transformer->transform($value); } } catch (TransformationFailedException $exception) { - throw new TransformationFailedException('Unable to transform data for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception); + throw new TransformationFailedException(sprintf('Unable to transform data for property path "%s": %s', $this->getPropertyPath(), $exception->getMessage()), $exception->getCode(), $exception); } return $value; @@ -1055,7 +1055,7 @@ private function normToModel($value) $value = $transformers[$i]->reverseTransform($value); } } catch (TransformationFailedException $exception) { - throw new TransformationFailedException('Unable to reverse value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception); + throw new TransformationFailedException(sprintf('Unable to reverse value for property path "%s": %s', $this->getPropertyPath(), $exception->getMessage()), $exception->getCode(), $exception); } return $value; @@ -1086,7 +1086,7 @@ private function normToView($value) $value = $transformer->transform($value); } } catch (TransformationFailedException $exception) { - throw new TransformationFailedException('Unable to transform value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception); + throw new TransformationFailedException(sprintf('Unable to transform value for property path "%s": %s', $this->getPropertyPath(), $exception->getMessage()), $exception->getCode(), $exception); } return $value; @@ -1112,7 +1112,7 @@ private function viewToNorm($value) $value = $transformers[$i]->reverseTransform($value); } } catch (TransformationFailedException $exception) { - throw new TransformationFailedException('Unable to reverse value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception); + throw new TransformationFailedException(sprintf('Unable to reverse value for property path "%s": %s', $this->getPropertyPath(), $exception->getMessage()), $exception->getCode(), $exception); } return $value; diff --git a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php index 670382619d715..e7f7d0e0c4113 100644 --- a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php +++ b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php @@ -34,7 +34,7 @@ protected function getValidatorExtension() } if (!$this instanceof TypeTestCase) { - throw new \Exception(sprintf('The trait "ValidatorExtensionTrait" can only be added to a class that extends %s.', TypeTestCase::class)); + throw new \Exception(sprintf('The trait "ValidatorExtensionTrait" can only be added to a class that extends "%s".', TypeTestCase::class)); } $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock(); diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php index 35bd6ad8fd704..0b19faec5181b 100644 --- a/src/Symfony/Component/HttpFoundation/HeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php @@ -225,7 +225,7 @@ public function getDate($key, \DateTime $default = null) } if (false === $date = \DateTime::createFromFormat(DATE_RFC2822, $value)) { - throw new \RuntimeException(sprintf('The %s HTTP header is not parseable (%s).', $key, $value)); + throw new \RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value)); } return $date; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php index 969f272fb3001..5474d92e36fe3 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php @@ -190,7 +190,7 @@ public function registerBag(SessionBagInterface $bag) public function getBag($name) { if (!isset($this->bags[$name])) { - throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name)); + throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name)); } if (!$this->started) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index 33a146553f974..5165b5d0d882f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -314,7 +314,7 @@ public function registerBag(SessionBagInterface $bag) public function getBag($name) { if (!isset($this->bags[$name])) { - throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name)); + throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name)); } if (!$this->started && $this->saveHandler->isActive()) { diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php index 5bbed6bef1bd0..530a2749d1be9 100644 --- a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php +++ b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php @@ -70,7 +70,7 @@ public function getContainerExtension() if (null !== $extension) { if (!$extension instanceof ExtensionInterface) { - throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', \get_class($extension))); + throw new \LogicException(sprintf('Extension "%s" must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', \get_class($extension))); } // check naming convention diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php index 42add5a686f93..4b4aafa16301c 100644 --- a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php +++ b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php @@ -40,7 +40,7 @@ public function hasPool($name) public function clearPool($name) { if (!isset($this->pools[$name])) { - throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name)); + throw new \InvalidArgumentException(sprintf('Cache pool not found: "%s".', $name)); } return $this->pools[$name]->clear(); diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php index 520e83b5fe727..6df388d83ae11 100644 --- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php +++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php @@ -107,7 +107,7 @@ public function isNullable() public function getDefaultValue() { if (!$this->hasDefaultValue) { - throw new \LogicException(sprintf('Argument $%s does not have a default value. Use %s::hasDefaultValue() to avoid this exception.', $this->name, __CLASS__)); + throw new \LogicException(sprintf('Argument $%s does not have a default value. Use "%s::hasDefaultValue()" to avoid this exception.', $this->name, __CLASS__)); } return $this->defaultValue; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php index 7c32ec1001d07..280e1ddd086b6 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php @@ -217,7 +217,7 @@ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1) $dumper = new HtmlDumper($data, $this->charset); $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]); } else { - throw new \InvalidArgumentException(sprintf('Invalid dump format: %s.', $format)); + throw new \InvalidArgumentException(sprintf('Invalid dump format: "%s".', $format)); } $dumps = []; diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php index 28136be625427..51a518dc28775 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php @@ -46,7 +46,7 @@ public function process(ContainerBuilder $container) $attributes = $tags[0]; if (!isset($attributes['method'])) { - throw new RuntimeException(sprintf('Tag %s requires the "method" attribute to be set.', $this->tagName)); + throw new RuntimeException(sprintf('Tag "%s" requires the "method" attribute to be set.', $this->tagName)); } $methods[$id] = $attributes['method']; diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php index 9629cf706669c..b98b1779ad2bc 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php +++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php @@ -100,7 +100,7 @@ public function render($uri, $renderer = 'inline', array $options = []) protected function deliver(Response $response) { if (!$response->isSuccessful()) { - throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $this->requestStack->getCurrentRequest()->getUri(), $response->getStatusCode())); + throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $this->requestStack->getCurrentRequest()->getUri(), $response->getStatusCode())); } if (!$response instanceof StreamedResponse) { diff --git a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php index 9b4541793f05f..472d87e483372 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php @@ -96,7 +96,7 @@ public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors) $response = $cache->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true); if (!$response->isSuccessful()) { - throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $subRequest->getUri(), $response->getStatusCode())); + throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $subRequest->getUri(), $response->getStatusCode())); } return $response->getContent(); diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index a73788e1ecc38..9d1d42eb19c20 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -236,7 +236,7 @@ public function getBundle($name, $first = true/*, $noDeprecation = false */) } if (!isset($this->bundleMap[$name])) { - throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, static::class)); + throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your "%s.php" file?', $name, static::class)); } if (true === $first) { @@ -762,10 +762,10 @@ protected function buildContainer() foreach (['cache' => $this->warmupDir ?: $this->getCacheDir(), 'logs' => $this->getLogDir()] as $name => $dir) { if (!is_dir($dir)) { if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) { - throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n.", $name, $dir)); + throw new \RuntimeException(sprintf('Unable to create the "%s" directory (%s).', $name, $dir)); } } elseif (!is_writable($dir)) { - throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n.", $name, $dir)); + throw new \RuntimeException(sprintf('Unable to write in the "%s" directory (%s).', $name, $dir)); } } diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php index 2fbce41d1c08f..4d46c917625a1 100644 --- a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php @@ -40,7 +40,7 @@ public function testClearPool() public function testClearPoolThrowsExceptionOnUnreferencedPool() { $this->expectException('InvalidArgumentException'); - $this->expectExceptionMessage('Cache pool not found: unknown'); + $this->expectExceptionMessage('Cache pool not found: "unknown"'); (new Psr6CacheClearer())->clearPool('unknown'); } diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php index d3c6869320910..7ebe5dfb91232 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php @@ -51,7 +51,7 @@ public function testCompilerPass() public function testMissingMethod() { $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException'); - $this->expectExceptionMessage('Tag kernel.reset requires the "method" attribute to be set.'); + $this->expectExceptionMessage('Tag "kernel.reset" requires the "method" attribute to be set.'); $container = new ContainerBuilder(); $container->register(ResettableService::class) ->addTag('kernel.reset'); diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php index 7e1fa23ca5a57..accfde79221b5 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php @@ -55,7 +55,7 @@ public function compile($sourcePath, $targetDir) exec($this->genrb.' --quiet -e UTF-8 -d '.$targetDir.' '.$sourcePath, $output, $status); if (0 !== $status) { - throw new RuntimeException(sprintf('genrb failed with status %d while compiling %s to %s.', $status, $sourcePath, $targetDir)); + throw new RuntimeException(sprintf('genrb failed with status %d while compiling "%s" to "%s".', $status, $sourcePath, $targetDir)); } } } diff --git a/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php b/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php index 09dd551dafa5e..afc2e09713821 100644 --- a/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php +++ b/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php @@ -36,7 +36,7 @@ public static function get($array, array $indices) } } - throw new OutOfBoundsException(sprintf('The index %s does not exist.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $index)); } return $array; diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php index e024951cb328c..2f47a28bd542d 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php @@ -105,7 +105,7 @@ public static function getEtcTimeZoneId($formattedTimeZone) $signal = '-' === $matches['signal'] ? '+' : '-'; if (0 < $minutes) { - throw new NotImplementedException(sprintf('It is not possible to use a GMT time zone with minutes offset different than zero (0). GMT time zone tried: %s.', $formattedTimeZone)); + throw new NotImplementedException(sprintf('It is not possible to use a GMT time zone with minutes offset different than zero (0). GMT time zone tried: "%s".', $formattedTimeZone)); } return 'Etc/GMT'.(0 !== $hours ? $signal.$hours : ''); diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index f9ad71eb92dad..72e1ca5b4e592 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -363,7 +363,7 @@ public function format($value, $type = self::TYPE_DEFAULT) } if (self::CURRENCY === $this->style) { - throw new NotImplementedException(sprintf('%s() method does not support the formatting of currencies (instance with CURRENCY style). %s.', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE)); + throw new NotImplementedException(sprintf('%s() method does not support the formatting of currencies (instance with CURRENCY style). "%s".', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE)); } // Only the default type is supported. diff --git a/src/Symfony/Component/Ldap/Ldap.php b/src/Symfony/Component/Ldap/Ldap.php index bc1543e4c1701..f39e5b5bb16ba 100644 --- a/src/Symfony/Component/Ldap/Ldap.php +++ b/src/Symfony/Component/Ldap/Ldap.php @@ -73,7 +73,7 @@ public function escape($subject, $ignore = '', $flags = 0) public static function create($adapter, array $config = []) { if (!isset(self::$adapterMap[$adapter])) { - throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s.', $adapter, implode(', ', self::$adapterMap))); + throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: "%s".', $adapter, implode('", "', self::$adapterMap))); } $class = self::$adapterMap[$adapter]; diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php index d0c8abf119dd9..55213742a196b 100644 --- a/src/Symfony/Component/Lock/Store/RedisStore.php +++ b/src/Symfony/Component/Lock/Store/RedisStore.php @@ -37,11 +37,11 @@ class RedisStore implements StoreInterface public function __construct($redisClient, $initialTtl = 300.0) { if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\ClientInterface && !$redisClient instanceof RedisProxy) { - throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); + throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); } if ($initialTtl <= 0) { - throw new InvalidArgumentException(sprintf('%s() expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl)); + throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl)); } $this->redis = $redisClient; @@ -143,7 +143,7 @@ private function evaluate($script, $resource, array $args) return \call_user_func_array([$this->redis, 'eval'], array_merge([$script, 1, $resource], $args)); } - throw new InvalidArgumentException(sprintf('%s() expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given.', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis))); + throw new InvalidArgumentException(sprintf('%s() expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis))); } /** diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php index 2edcc1d32704f..fecc2ce0634c2 100644 --- a/src/Symfony/Component/Lock/Store/StoreFactory.php +++ b/src/Symfony/Component/Lock/Store/StoreFactory.php @@ -35,6 +35,6 @@ public static function createStore($connection) return new MemcachedStore($connection); } - throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', \get_class($connection))); + throw new InvalidArgumentException(sprintf('Unsupported Connection: "%s".', \get_class($connection))); } } diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 4b5f27934ac05..6672e61253f42 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -1681,7 +1681,7 @@ function ($m) use (&$env, &$varCache, &$varCount, $uid) { private function requireProcessIsStarted($functionName) { if (!$this->isStarted()) { - throw new LogicException(sprintf('Process must be started before calling %s.', $functionName)); + throw new LogicException(sprintf('Process must be started before calling "%s()".', $functionName)); } } @@ -1695,7 +1695,7 @@ private function requireProcessIsStarted($functionName) private function requireProcessIsTerminated($functionName) { if (!$this->isTerminated()) { - throw new LogicException(sprintf('Process must be terminated before calling %s.', $functionName)); + throw new LogicException(sprintf('Process must be terminated before calling "%s()".', $functionName)); } } diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php index 9a7c515e8a5ec..9bc3dedbf2905 100644 --- a/src/Symfony/Component/Process/Tests/ProcessTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessTest.php @@ -936,7 +936,7 @@ public function testMethodsThatNeedARunningProcess($method) $process = $this->getProcess('foo'); $this->expectException('Symfony\Component\Process\Exception\LogicException'); - $this->expectExceptionMessage(sprintf('Process must be started before calling %s.', $method)); + $this->expectExceptionMessage(sprintf('Process must be started before calling "%s()".', $method)); $process->{$method}(); } diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 371c6c23d57d3..aa2e9e18a1bd8 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -917,7 +917,7 @@ private function getPropertyPath($propertyPath) public static function createCache($namespace, $defaultLifetime, $version, LoggerInterface $logger = null) { if (!class_exists('Symfony\Component\Cache\Adapter\ApcuAdapter')) { - throw new \RuntimeException(sprintf('The Symfony Cache component must be installed to use %s().', __METHOD__)); + throw new \RuntimeException(sprintf('The Symfony Cache component must be installed to use "%s()".', __METHOD__)); } if (!ApcuAdapter::isSupported()) { diff --git a/src/Symfony/Component/PropertyAccess/PropertyPath.php b/src/Symfony/Component/PropertyAccess/PropertyPath.php index ffbd9e1a97a57..7f3d256741bf0 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPath.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPath.php @@ -173,7 +173,7 @@ public function getElements() public function getElement($index) { if (!isset($this->elements[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the property path.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" is not within the property path.', $index)); } return $this->elements[$index]; @@ -185,7 +185,7 @@ public function getElement($index) public function isProperty($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the property path.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" is not within the property path.', $index)); } return !$this->isIndex[$index]; @@ -197,7 +197,7 @@ public function isProperty($index) public function isIndex($index) { if (!isset($this->isIndex[$index])) { - throw new OutOfBoundsException(sprintf('The index %s is not within the property path.', $index)); + throw new OutOfBoundsException(sprintf('The index "%s" is not within the property path.', $index)); } return $this->isIndex[$index]; diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php index 3dbfa7afcc551..b67bbd89c59a5 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php @@ -94,7 +94,7 @@ public function appendProperty($name) public function remove($offset, $length = 1) { if (!isset($this->elements[$offset])) { - throw new OutOfBoundsException(sprintf('The offset %s is not within the property path.', $offset)); + throw new OutOfBoundsException(sprintf('The offset "%s" is not within the property path.', $offset)); } $this->resize($offset, $length, 0); @@ -149,7 +149,7 @@ public function replace($offset, $length, $path, $pathOffset = 0, $pathLength = public function replaceByIndex($offset, $name = null) { if (!isset($this->elements[$offset])) { - throw new OutOfBoundsException(sprintf('The offset %s is not within the property path.', $offset)); + throw new OutOfBoundsException(sprintf('The offset "%s" is not within the property path.', $offset)); } if (null !== $name) { @@ -170,7 +170,7 @@ public function replaceByIndex($offset, $name = null) public function replaceByProperty($offset, $name = null) { if (!isset($this->elements[$offset])) { - throw new OutOfBoundsException(sprintf('The offset %s is not within the property path.', $offset)); + throw new OutOfBoundsException(sprintf('The offset "%s" is not within the property path.', $offset)); } if (null !== $name) { diff --git a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php b/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php index e066d6f24f80a..33cfcacc9f9c2 100644 --- a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php +++ b/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php @@ -55,7 +55,7 @@ public function load($resource, $type = null) $loaderObject = $this->getServiceObject($serviceString); if (!\is_object($loaderObject)) { - throw new \LogicException(sprintf('%s:getServiceObject() must return an object: %s returned.', static::class, \gettype($loaderObject))); + throw new \LogicException(sprintf('%s:getServiceObject() must return an object: "%s" returned.', static::class, \gettype($loaderObject))); } if (!method_exists($loaderObject, $method)) { @@ -67,7 +67,7 @@ public function load($resource, $type = null) if (!$routeCollection instanceof RouteCollection) { $type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection); - throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned.', \get_class($loaderObject), $method, $type)); + throw new \LogicException(sprintf('The "%s"::%s method must return a RouteCollection: "%s" returned.', \get_class($loaderObject), $method, $type)); } // make the service file tracked so that if it changes, the cache rebuilds diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php index 391fa8290353e..40fc6d9fef05f 100644 --- a/src/Symfony/Component/Routing/RouteCompiler.php +++ b/src/Symfony/Component/Routing/RouteCompiler.php @@ -139,7 +139,7 @@ private static function compilePattern(Route $route, $pattern, $isHost) } if (\strlen($varName) > self::VARIABLE_MAXIMUM_LENGTH) { - throw new \DomainException(sprintf('Variable name "%s" cannot be longer than %s characters in route pattern "%s". Please use a shorter name.', $varName, self::VARIABLE_MAXIMUM_LENGTH, $pattern)); + throw new \DomainException(sprintf('Variable name "%s" cannot be longer than %d characters in route pattern "%s". Please use a shorter name.', $varName, self::VARIABLE_MAXIMUM_LENGTH, $pattern)); } if ($isSeparator && $precedingText !== $precedingChar) { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 99bc3d6d8f9c0..20f99da9bc97c 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -41,7 +41,7 @@ public function __construct(array $roles = []) if (\is_string($role)) { $role = new Role($role); } elseif (!$role instanceof RoleInterface) { - throw new \InvalidArgumentException(sprintf('$roles must be an array of strings or Role instances, but got %s.', \gettype($role))); + throw new \InvalidArgumentException(sprintf('$roles must be an array of strings or Role instances, but got "%s".', \gettype($role))); } $this->roles[] = $role; diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php index aefd111b296aa..95627ca4a674f 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php +++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php @@ -62,7 +62,7 @@ public function __construct($voters = [], $strategy = self::STRATEGY_AFFIRMATIVE */ public function setVoters(array $voters) { - @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Pass the voters to the constructor instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Pass the voters to the constructor instead.', __METHOD__), E_USER_DEPRECATED); $this->voters = $voters; } @@ -197,6 +197,6 @@ private function vote($voter, TokenInterface $token, $subject, $attributes) return $voter->vote($token, $subject, $attributes); } - throw new LogicException(sprintf('%s should implement the %s interface when used as voter.', \get_class($voter), VoterInterface::class)); + throw new LogicException(sprintf('"%s" should implement the "%s" interface when used as voter.', \get_class($voter), VoterInterface::class)); } } diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php index c4bff4d63bd7d..e24935d83f059 100644 --- a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php +++ b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php @@ -143,7 +143,7 @@ protected function getVoter($vote) public function testVotingWrongTypeNoVoteMethod() { $exception = LogicException::class; - $message = sprintf('stdClass should implement the %s interface when used as voter.', VoterInterface::class); + $message = sprintf('"stdClass" should implement the "%s" interface when used as voter.', VoterInterface::class); $this->expectException($exception); $this->expectExceptionMessage($message); diff --git a/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php b/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php index 2c633b30a05e1..60f5a36797985 100644 --- a/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php @@ -64,7 +64,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token, @trigger_error(sprintf('The AbstractFormLoginAuthenticator::onAuthenticationSuccess() implementation was deprecated in Symfony 3.1 and will be removed in Symfony 4.0. You should implement this method yourself in %s and remove getDefaultSuccessRedirectUrl().', static::class), E_USER_DEPRECATED); if (!method_exists($this, 'getDefaultSuccessRedirectUrl')) { - throw new \Exception(sprintf('You must implement onAuthenticationSuccess() or getDefaultSuccessRedirectUrl() in %s.', static::class)); + throw new \Exception(sprintf('You must implement onAuthenticationSuccess() or getDefaultSuccessRedirectUrl() in "%s".', static::class)); } $targetPath = null; diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php index e2ffb240504d7..977442aa931b5 100644 --- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php +++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php @@ -81,7 +81,7 @@ public function handleAuthenticationSuccess(TokenInterface $token, Request $requ return $response; } - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object. You returned %s.', \get_class($guardAuthenticator), \is_object($response) ? \get_class($response) : \gettype($response))); + throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationSuccess()" method must return null or a Response object. You returned "%s".', \get_class($guardAuthenticator), \is_object($response) ? \get_class($response) : \gettype($response))); } /** @@ -119,7 +119,7 @@ public function handleAuthenticationFailure(AuthenticationException $authenticat return $response; } - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object. You returned %s.', \get_class($guardAuthenticator), \is_object($response) ? \get_class($response) : \gettype($response))); + throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationFailure()" method must return null or a Response object. You returned "%s".', \get_class($guardAuthenticator), \is_object($response) ? \get_class($response) : \gettype($response))); } /** diff --git a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php index 5023c31ecafbd..744a6c649d64c 100644 --- a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php @@ -101,23 +101,23 @@ private function authenticateViaGuard($guardAuthenticator, PreAuthenticationGuar $user = $guardAuthenticator->getUser($token->getCredentials(), $this->userProvider); if (null === $user) { - throw new UsernameNotFoundException(sprintf('Null returned from %s::getUser().', \get_class($guardAuthenticator))); + throw new UsernameNotFoundException(sprintf('Null returned from "%s::getUser()".', \get_class($guardAuthenticator))); } if (!$user instanceof UserInterface) { - throw new \UnexpectedValueException(sprintf('The %s::getUser() method must return a UserInterface. You returned %s.', \get_class($guardAuthenticator), \is_object($user) ? \get_class($user) : \gettype($user))); + throw new \UnexpectedValueException(sprintf('The "%s::getUser()" method must return a UserInterface. You returned "%s".', \get_class($guardAuthenticator), \is_object($user) ? \get_class($user) : \gettype($user))); } $this->userChecker->checkPreAuth($user); if (true !== $guardAuthenticator->checkCredentials($token->getCredentials(), $user)) { - throw new BadCredentialsException(sprintf('Authentication failed because %s::checkCredentials() did not return true.', \get_class($guardAuthenticator))); + throw new BadCredentialsException(sprintf('Authentication failed because "%s"::checkCredentials() did not return true.', \get_class($guardAuthenticator))); } $this->userChecker->checkPostAuth($user); // turn the UserInterface into a TokenInterface $authenticatedToken = $guardAuthenticator->createAuthenticatedToken($user, $this->providerKey); if (!$authenticatedToken instanceof TokenInterface) { - throw new \UnexpectedValueException(sprintf('The %s::createAuthenticatedToken() method must return a TokenInterface. You returned %s.', \get_class($guardAuthenticator), \is_object($authenticatedToken) ? \get_class($authenticatedToken) : \gettype($authenticatedToken))); + throw new \UnexpectedValueException(sprintf('The "%s::createAuthenticatedToken()" method must return a TokenInterface. You returned "%s".', \get_class($guardAuthenticator), \is_object($authenticatedToken) ? \get_class($authenticatedToken) : \gettype($authenticatedToken))); } return $authenticatedToken; diff --git a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php index 4456cff9aba73..8e24ff741ef82 100644 --- a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php @@ -64,7 +64,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token) } if (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object.', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationSuccess()" method must return null to use the default success handler, or a Response object.', \get_class($this->simpleAuthenticator))); } } @@ -91,7 +91,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio } if (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object.', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationFailure()" method must return null to use the default failure handler, or a Response object.', \get_class($this->simpleAuthenticator))); } } diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php index 21e45516ea9b2..0232917687670 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php @@ -212,7 +212,7 @@ private function startAuthentication(Request $request, AuthenticationException $ if (!$response instanceof Response) { $given = \is_object($response) ? \get_class($response) : \gettype($response); - throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned).', \get_class($this->authenticationEntryPoint), $given)); + throw new \LogicException(sprintf('The "%s::start()" method must return a Response object ("%s" returned).', \get_class($this->authenticationEntryPoint), $given)); } return $response; diff --git a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php index ea18b22d5db2a..d456d85295d4f 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php @@ -41,7 +41,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM protected function getPreAuthenticatedData(Request $request) { if (!$request->server->has($this->userKey)) { - throw new BadCredentialsException(sprintf('User key was not found: %s.', $this->userKey)); + throw new BadCredentialsException(sprintf('User key was not found: "%s".', $this->userKey)); } return [$request->server->get($this->userKey), null]; diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php index d5163ae0304dd..2b25333e4bc0c 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php @@ -120,7 +120,7 @@ public function handle(GetResponseEvent $event) if ($response instanceof Response) { $event->setResponse($response); } elseif (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object.', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationFailure()" method must return null or a Response object.', \get_class($this->simpleAuthenticator))); } } @@ -132,7 +132,7 @@ public function handle(GetResponseEvent $event) if ($response instanceof Response) { $event->setResponse($response); } elseif (null !== $response) { - throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object.', \get_class($this->simpleAuthenticator))); + throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationSuccess()" method must return null or a Response object.', \get_class($this->simpleAuthenticator))); } } } diff --git a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php index 8adf56796efc0..8b9da1de5ba5e 100644 --- a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php @@ -52,7 +52,7 @@ protected function getPreAuthenticatedData(Request $request) } if (null === $user) { - throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s.', $this->userKey, $this->credentialKey)); + throw new BadCredentialsException(sprintf('SSL credentials not found: "%s", "%s".', $this->userKey, $this->credentialKey)); } return [$user, $request->server->get($this->credentialKey, '')]; diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php index cd28c52d288e9..cbdfec1361155 100644 --- a/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php @@ -81,7 +81,7 @@ public function testOnAuthenticationSuccessCallsSimpleAuthenticator() public function testOnAuthenticationSuccessThrowsAnExceptionIfNonResponseIsReturned() { $this->expectException('UnexpectedValueException'); - $this->expectExceptionMessage('onAuthenticationSuccess method must return null to use the default success handler, or a Response object'); + $this->expectExceptionMessage('onAuthenticationSuccess()" method must return null to use the default success handler, or a Response object'); $this->successHandler->expects($this->never()) ->method('onAuthenticationSuccess'); @@ -149,7 +149,7 @@ public function testOnAuthenticationFailureCallsSimpleAuthenticator() public function testOnAuthenticationFailureThrowsAnExceptionIfNonResponseIsReturned() { $this->expectException('UnexpectedValueException'); - $this->expectExceptionMessage('onAuthenticationFailure method must return null to use the default failure handler, or a Response object'); + $this->expectExceptionMessage('onAuthenticationFailure()" method must return null to use the default failure handler, or a Response object'); $this->failureHandler->expects($this->never()) ->method('onAuthenticationFailure'); diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php index 10c9b57b92196..29899de11f957 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php @@ -86,7 +86,7 @@ public function testExceptionWhenEntryPointReturnsBadValue() $listener->onKernelException($event); // the exception has been replaced by our LogicException $this->assertInstanceOf('LogicException', $event->getException()); - $this->assertStringEndsWith('start() method must return a Response object (string returned).', $event->getException()->getMessage()); + $this->assertStringEndsWith('start()" method must return a Response object ("string" returned).', $event->getException()->getMessage()); } /** diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index bd6b8f15653c9..d7551183ddff2 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -412,7 +412,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null) if (\is_object($data)) { if (null === $this->serializer) { - throw new BadMethodCallException(sprintf('The serializer needs to be set to allow %s() to be used with object data.', __METHOD__)); + throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__)); } $data = $this->serializer->normalize($data, $this->format, $this->context); @@ -490,7 +490,7 @@ private function selectNodeType(\DOMNode $node, $val) $this->buildXml($node, $val); } elseif (\is_object($val)) { if (null === $this->serializer) { - throw new BadMethodCallException(sprintf('The serializer needs to be set to allow %s() to be used with object data.', __METHOD__)); + throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__)); } return $this->selectNodeType($node, $this->serializer->normalize($val, $this->format, $this->context)); diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php index be3b8984a0582..20f9e4886ace3 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php @@ -30,11 +30,11 @@ abstract class FileLoader implements LoaderInterface public function __construct($file) { if (!is_file($file)) { - throw new MappingException(sprintf('The mapping file %s does not exist.', $file)); + throw new MappingException(sprintf('The mapping file "%s" does not exist.', $file)); } if (!is_readable($file)) { - throw new MappingException(sprintf('The mapping file %s is not readable.', $file)); + throw new MappingException(sprintf('The mapping file "%s" is not readable.', $file)); } $this->file = $file; diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php index 7f90c84048b2f..f422f11c7d328 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php @@ -40,7 +40,7 @@ public function __construct(array $loaders) { foreach ($loaders as $loader) { if (!$loader instanceof LoaderInterface) { - throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface.', \get_class($loader))); + throw new MappingException(sprintf('Class "%s" is expected to implement LoaderInterface.', \get_class($loader))); } } diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index 55bf43b0d3f8f..a360dc2fc3b68 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -340,7 +340,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref if (method_exists($constructorParameter, 'isVariadic') && $constructorParameter->isVariadic()) { if ($allowed && !$ignored && (isset($data[$key]) || \array_key_exists($key, $data))) { if (!\is_array($data[$paramName])) { - throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because the variadic parameter %s can only accept an array.', $class, $constructorParameter->name)); + throw new RuntimeException(sprintf('Cannot create an instance of "%s" from serialized data because the variadic parameter "%s" can only accept an array.', $class, $constructorParameter->name)); } $variadicParameters = []; @@ -366,7 +366,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref } elseif ($constructorParameter->isDefaultValueAvailable()) { $params[] = $constructorParameter->getDefaultValue(); } else { - throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because its constructor requires parameter "%s" to be present.', $class, $constructorParameter->name)); + throw new RuntimeException(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires parameter "%s" to be present.', $class, $constructorParameter->name)); } } @@ -388,7 +388,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara try { if (null !== $parameter->getClass()) { if (!$this->serializer instanceof DenormalizerInterface) { - throw new LogicException(sprintf('Cannot create an instance of %s from serialized data because the serializer inject in "%s" is not a denormalizer.', $parameter->getClass(), static::class)); + throw new LogicException(sprintf('Cannot create an instance of "%s" from serialized data because the serializer inject in "%s" is not a denormalizer.', $parameter->getClass(), static::class)); } $parameterClass = $parameter->getClass()->getName(); diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php index 702b8bfecdfa6..af331d30f77a9 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php @@ -69,7 +69,7 @@ public function denormalize($data, $type, $format = null, array $context = []) public function supportsDenormalization($data, $type, $format = null/*, array $context = []*/) { if (null === $this->serializer) { - throw new BadMethodCallException(sprintf('The serializer needs to be set to allow %s() to be used.', __METHOD__)); + throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used.', __METHOD__)); } $context = \func_num_args() > 3 ? func_get_arg(3) : []; diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php index 83d9312b01377..8b5cde30f5328 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php @@ -67,7 +67,7 @@ public function supportsNormalization($data, $format = null) public function denormalize($data, $type, $format = null, array $context = []) { if (!\is_string($data)) { - throw new InvalidArgumentException(sprintf('Data expected to be a string, %s given.', \gettype($data))); + throw new InvalidArgumentException(sprintf('Data expected to be a string, "%s" given.', \gettype($data))); } if (!$this->isISO8601($data)) { diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index 95a2d9613684f..1c125bc935df4 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -109,7 +109,7 @@ public function __construct(array $normalizers = [], array $encoders = []) final public function serialize($data, $format, array $context = []) { if (!$this->supportsEncoding($format, $context)) { - throw new NotEncodableValueException(sprintf('Serialization for the format %s is not supported.', $format)); + throw new NotEncodableValueException(sprintf('Serialization for the format "%s" is not supported.', $format)); } if ($this->encoder->needsNormalization($format, $context)) { @@ -125,7 +125,7 @@ final public function serialize($data, $format, array $context = []) final public function deserialize($data, $type, $format, array $context = []) { if (!$this->supportsDecoding($format, $context)) { - throw new NotEncodableValueException(sprintf('Deserialization for the format %s is not supported.', $format)); + throw new NotEncodableValueException(sprintf('Deserialization for the format "%s" is not supported.', $format)); } $data = $this->decode($data, $format, $context); @@ -161,7 +161,7 @@ public function normalize($data, $format = null, array $context = []) throw new LogicException('You must register at least one normalizer to be able to normalize objects.'); } - throw new NotNormalizableValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', \get_class($data))); + throw new NotNormalizableValueException(sprintf('Could not normalize object of type "%s", no supporting normalizer found.', \get_class($data))); } throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s.', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data)))); @@ -182,7 +182,7 @@ public function denormalize($data, $type, $format = null, array $context = []) return $normalizer->denormalize($data, $type, $format, $context); } - throw new NotNormalizableValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $type)); + throw new NotNormalizableValueException(sprintf('Could not denormalize object of type "%s", no supporting normalizer found.', $type)); } /** diff --git a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php index 919bab8fff97f..4953563dbb6cb 100644 --- a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php +++ b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php @@ -91,7 +91,7 @@ public function getDomains() public function getMessages($domain) { if (!\in_array($domain, $this->getDomains())) { - throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain)); + throw new InvalidArgumentException(sprintf('Invalid domain: "%s".', $domain)); } if (!isset($this->messages[$domain]['all'])) { @@ -107,7 +107,7 @@ public function getMessages($domain) public function getNewMessages($domain) { if (!\in_array($domain, $this->getDomains())) { - throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain)); + throw new InvalidArgumentException(sprintf('Invalid domain: "%s".', $domain)); } if (!isset($this->messages[$domain]['new'])) { @@ -123,7 +123,7 @@ public function getNewMessages($domain) public function getObsoleteMessages($domain) { if (!\in_array($domain, $this->getDomains())) { - throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain)); + throw new InvalidArgumentException(sprintf('Invalid domain: "%s".', $domain)); } if (!isset($this->messages[$domain]['obsolete'])) { diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php index f919954255e87..84f2c3295ceae 100644 --- a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php +++ b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php @@ -46,7 +46,7 @@ public function validate($object, Constraint $constraint) \call_user_func($method, $object, $this->context, $constraint->payload); } elseif (null !== $object) { if (!method_exists($object, $method)) { - throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s.', $method, \get_class($object))); + throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class "%s".', $method, \get_class($object))); } $reflMethod = new \ReflectionMethod($object, $method); diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php index dcd6f35361aac..605d4b9dbb89a 100644 --- a/src/Symfony/Component/Validator/Constraints/Collection.php +++ b/src/Symfony/Component/Validator/Constraints/Collection.php @@ -57,7 +57,7 @@ protected function initializeNestedConstraints() parent::initializeNestedConstraints(); if (!\is_array($this->fields)) { - throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s.', __CLASS__)); + throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint "%s".', __CLASS__)); } foreach ($this->fields as $fieldName => $field) { diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php index ead61bb69bc9b..bd7030ee27a44 100644 --- a/src/Symfony/Component/Validator/Constraints/Composite.php +++ b/src/Symfony/Component/Validator/Constraints/Composite.php @@ -71,11 +71,11 @@ public function __construct($options = null) $constraint = \get_class($constraint); } - throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s.', $constraint, static::class)); + throw new ConstraintDefinitionException(sprintf('The value "%s" is not an instance of Constraint in constraint "%s".', $constraint, static::class)); } if ($constraint instanceof Valid) { - throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', static::class)); + throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint "%s". You can only declare the Valid constraint directly on a field or method.', static::class)); } } @@ -99,7 +99,7 @@ public function __construct($options = null) $excessGroups = array_diff($constraint->groups, $this->groups); if (\count($excessGroups) > 0) { - throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s.', implode('", "', $excessGroups), \get_class($constraint), static::class)); + throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint "%s" should also be passed to its containing constraint "%s".', implode('", "', $excessGroups), \get_class($constraint), static::class)); } } else { $constraint->groups = $this->groups; diff --git a/src/Symfony/Component/Validator/Constraints/Count.php b/src/Symfony/Component/Validator/Constraints/Count.php index 227590f9587c4..11ea0eca11020 100644 --- a/src/Symfony/Component/Validator/Constraints/Count.php +++ b/src/Symfony/Component/Validator/Constraints/Count.php @@ -51,7 +51,7 @@ public function __construct($options = null) parent::__construct($options); if (null === $this->min && null === $this->max) { - throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']); + throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']); } } } diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php index ee97a5bc096b2..cca6b8c3150b6 100644 --- a/src/Symfony/Component/Validator/Constraints/Length.php +++ b/src/Symfony/Component/Validator/Constraints/Length.php @@ -55,7 +55,7 @@ public function __construct($options = null) parent::__construct($options); if (null === $this->min && null === $this->max) { - throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']); + throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']); } } } diff --git a/src/Symfony/Component/Validator/Constraints/Range.php b/src/Symfony/Component/Validator/Constraints/Range.php index 56ebd702290ed..c67a6daa8e8f3 100644 --- a/src/Symfony/Component/Validator/Constraints/Range.php +++ b/src/Symfony/Component/Validator/Constraints/Range.php @@ -43,7 +43,7 @@ public function __construct($options = null) parent::__construct($options); if (null === $this->min && null === $this->max) { - throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']); + throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']); } } } diff --git a/src/Symfony/Component/Validator/Constraints/Traverse.php b/src/Symfony/Component/Validator/Constraints/Traverse.php index 40313e4a8c336..f5f66f53ffa07 100644 --- a/src/Symfony/Component/Validator/Constraints/Traverse.php +++ b/src/Symfony/Component/Validator/Constraints/Traverse.php @@ -26,7 +26,7 @@ class Traverse extends Constraint public function __construct($options = null) { if (\is_array($options) && \array_key_exists('groups', $options)) { - throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint %s.', __CLASS__)); + throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint "%s".', __CLASS__)); } parent::__construct($options); diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php index f5cc25dcb73ed..d934162eeefc3 100644 --- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php +++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php @@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint) Url::CHECK_DNS_TYPE_SRV, Url::CHECK_DNS_TYPE_TXT, ], true)) { - throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s.', \get_class($constraint)), ['checkDNS']); + throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint "%s".', \get_class($constraint)), ['checkDNS']); } $host = parse_url($value, PHP_URL_HOST); diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php index ed7cea690466b..6bd16c1c7dcae 100644 --- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php +++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php @@ -79,7 +79,7 @@ public function __construct(LoaderInterface $loader = null, CacheInterface $cach public function getMetadataFor($value) { if (!\is_object($value) && !\is_string($value)) { - throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: %s.', \gettype($value))); + throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: "%s".', \gettype($value))); } $class = ltrim(\is_object($value) ? \get_class($value) : $value, '\\'); diff --git a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php index 63d144c45f8d1..6ab88b05bd505 100644 --- a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php @@ -53,10 +53,10 @@ public function __construct($class, $property, $method = null) } elseif (method_exists($class, $hasMethod)) { $method = $hasMethod; } else { - throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s.', $class, $getMethod, $isMethod, $hasMethod)); + throw new ValidatorException(sprintf('Neither of these methods exist in class "%s": "%s", "%s", "%s".', $class, $getMethod, $isMethod, $hasMethod)); } } elseif (!method_exists($class, $method)) { - throw new ValidatorException(sprintf('The %s() method does not exist in class %s.', $method, $class)); + throw new ValidatorException(sprintf('The "%s()" method does not exist in class "%s".', $method, $class)); } parent::__construct($class, $method, $property); diff --git a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php index 05ef322fde3f3..5eb17ee3754ea 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php @@ -36,7 +36,7 @@ public function __construct(array $loaders) { foreach ($loaders as $loader) { if (!$loader instanceof LoaderInterface) { - throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface.', \get_class($loader))); + throw new MappingException(sprintf('Class "%s" is expected to implement LoaderInterface.', \get_class($loader))); } } diff --git a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php index 6da3d1bf15f93..5ed1f993e87f9 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php @@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadata $metadata) } if (!$reflMethod->isStatic()) { - throw new MappingException(sprintf('The method %s::%s should be static.', $reflClass->name, $this->methodName)); + throw new MappingException(sprintf('The method "%s::%s()" should be static.', $reflClass->name, $this->methodName)); } if ($reflMethod->getDeclaringClass()->name != $reflClass->name) { diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php index e561a5a85a904..fb2fcb439fd94 100644 --- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php @@ -72,7 +72,7 @@ public function __construct($class, $name, $property) public function addConstraint(Constraint $constraint) { if (!\in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets())) { - throw new ConstraintDefinitionException(sprintf('The constraint %s cannot be put on properties or getters.', \get_class($constraint))); + throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on properties or getters.', \get_class($constraint))); } parent::addConstraint($constraint); diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php b/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php index 5e34929be35e6..953e979f56fe3 100644 --- a/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php +++ b/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php @@ -29,7 +29,7 @@ public function getMetadataFor($class) } if (!\is_string($class)) { - throw new NoSuchMetadataException(sprintf('No metadata for type %s', \gettype($class))); + throw new NoSuchMetadataException(sprintf('No metadata for type "%s".', \gettype($class))); } if (!isset($this->metadatas[$class])) { diff --git a/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php index 63d127c67aa13..127bd5a164b47 100644 --- a/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php +++ b/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php @@ -64,7 +64,7 @@ public function testGetPropertyValueFromHasser() public function testUndefinedMethodNameThrowsException() { $this->expectException('Symfony\Component\Validator\Exception\ValidatorException'); - $this->expectExceptionMessage('The hasLastName() method does not exist in class Symfony\Component\Validator\Tests\Fixtures\Entity.'); + $this->expectExceptionMessage('The "hasLastName()" method does not exist in class "Symfony\Component\Validator\Tests\Fixtures\Entity".'); new GetterMetadata(self::CLASSNAME, 'lastName', 'hasLastName'); } } diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php index ff59d964282ee..a279f9a69eab2 100644 --- a/src/Symfony/Component/VarDumper/Cloner/Data.php +++ b/src/Symfony/Component/VarDumper/Cloner/Data.php @@ -374,7 +374,7 @@ private function dumpItem($dumper, $cursor, &$refs, $item) break; default: - throw new \RuntimeException(sprintf('Unexpected Stub type: %s.', $item->type)); + throw new \RuntimeException(sprintf('Unexpected Stub type: "%s".', $item->type)); } } elseif ('array' === $type) { $dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false); diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php index c8f00d9e11d6a..03c779d20670c 100644 --- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php +++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php @@ -75,7 +75,7 @@ private function getVariables(GuardEvent $event) $token = $this->tokenStorage->getToken(); if (null === $token) { - throw new InvalidTokenConfigurationException(sprintf('There are no tokens available for workflow %s.', $event->getWorkflowName())); + throw new InvalidTokenConfigurationException(sprintf('There are no tokens available for workflow "%s".', $event->getWorkflowName())); } if (null !== $this->roleHierarchy) { diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 7ad4a64ead967..7198d077980c2 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -347,7 +347,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i $output = $match[1]; $i += \strlen($output); } else { - throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename); + throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename); } // a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >) @@ -380,7 +380,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i private static function parseQuotedScalar($scalar, &$i) { if (!Parser::preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) { - throw new ParseException(sprintf('Malformed inline YAML string: %s.', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename); + throw new ParseException(sprintf('Malformed inline YAML string: "%s".', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename); } $output = substr($match[0], 1, \strlen($match[0]) - 2); @@ -463,7 +463,7 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references = ++$i; } - throw new ParseException(sprintf('Malformed inline YAML string: %s.', $sequence), self::$parsedLineNumber + 1, null, self::$parsedFilename); + throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $sequence), self::$parsedLineNumber + 1, null, self::$parsedFilename); } /** @@ -612,7 +612,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = [] } } - throw new ParseException(sprintf('Malformed inline YAML string: %s.', $mapping), self::$parsedLineNumber + 1, null, self::$parsedFilename); + throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $mapping), self::$parsedLineNumber + 1, null, self::$parsedFilename); } /** diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php index 5b55451e19eb3..b28d472b334b6 100644 --- a/src/Symfony/Component/Yaml/Tests/InlineTest.php +++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php @@ -693,7 +693,7 @@ public function getInvalidBinaryData() public function testNotSupportedMissingValue() { $this->expectException('Symfony\Component\Yaml\Exception\ParseException'); - $this->expectExceptionMessage('Malformed inline YAML string: {this, is not, supported} at line 1.'); + $this->expectExceptionMessage('Malformed inline YAML string: "{this, is not, supported}" at line 1.'); Inline::parse('{this, is not, supported}'); } From 1ae2da01ffecec5509bc5fdee22488ea1fae70fe Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 Mar 2020 10:45:04 +0100 Subject: [PATCH 59/82] Fix quotes in exception messages --- src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php | 2 +- .../DependencyInjection/Compiler/AddSecurityVotersPass.php | 2 +- .../Guard/Tests/Provider/GuardAuthenticationProviderTest.php | 2 +- .../Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php index 47f1fbbb24b05..f7971cb733144 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php @@ -405,7 +405,7 @@ public function testExceptionOnNonStringParameter() public function testExceptionOnNonStringParameterWithSfContainer() { $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException'); - $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type object.'); + $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type "object".'); $routes = new RouteCollection(); $routes->add('foo', new Route('/%object%')); diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php index 87103c37a30c0..c3c7b86ab2f72 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php @@ -52,7 +52,7 @@ public function process(ContainerBuilder $container) $class = $container->getParameterBag()->resolveValue($definition->getClass()); if (!is_a($class, VoterInterface::class, true)) { - throw new LogicException(sprintf('%s must implement the %s when used as a voter.', $class, VoterInterface::class)); + throw new LogicException(sprintf('"%s" must implement the "%s" when used as a voter.', $class, VoterInterface::class)); } if ($debug) { diff --git a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php index de1212978eb99..816bd097309e8 100644 --- a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php +++ b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php @@ -121,7 +121,7 @@ public function testCheckCredentialsReturningFalseFailsAuthentication() /** * @group legacy - * @expectedDeprecation %s::checkCredentials() must return a boolean value. You returned NULL. This behavior is deprecated in Symfony 4.4 and will trigger a TypeError in Symfony 5. + * @expectedDeprecation "%s::checkCredentials()" must return a boolean value. You returned "NULL". This behavior is deprecated in Symfony 4.4 and will trigger a TypeError in Symfony 5. */ public function testCheckCredentialsReturningNonTrueFailsAuthentication() { diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php index 40cd02f19cca8..3d4ce269370bc 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php @@ -55,7 +55,7 @@ public function testConstructorWithMissingData() $normalizer = $this->getDenormalizerForConstructArguments(); $this->expectException(MissingConstructorArgumentsException::class); - $this->expectExceptionMessage('Cannot create an instance of '.ConstructorArgumentsObject::class.' from serialized data because its constructor requires parameter "bar" to be present.'); + $this->expectExceptionMessage('Cannot create an instance of "'.ConstructorArgumentsObject::class.'" from serialized data because its constructor requires parameter "bar" to be present.'); $normalizer->denormalize($data, ConstructorArgumentsObject::class); } } From 019350022ce6ce9d07152e05278cc2cb1482d68a Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Fri, 13 Mar 2020 14:33:39 +0100 Subject: [PATCH 60/82] [3.4] Minor fixes --- .../SecurityBundle/DependencyInjection/MainConfiguration.php | 2 +- src/Symfony/Component/Security/Core/User/UserInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php index 251c7bb6a905b..df96cf2db78f5 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php @@ -296,7 +296,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto ->scalarNode('provider')->end() ->scalarNode('parameter')->defaultValue('_switch_user')->end() ->scalarNode('role')->defaultValue('ROLE_ALLOWED_TO_SWITCH')->end() - ->booleanNode('stateless')->defaultValue(false)->end() + ->booleanNode('stateless')->defaultFalse()->end() ->end() ->end() ; diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php index fdad6b055b32d..3b26da30550d5 100644 --- a/src/Symfony/Component/Security/Core/User/UserInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserInterface.php @@ -23,7 +23,7 @@ * * Regardless of how your users are loaded or where they come from (a database, * configuration, web service, etc.), you will have a class that implements - * this interface. Objects that implement this interface are created and + * this interface. Objects that implement this interface are created and * loaded by different objects that implement UserProviderInterface. * * @see UserProviderInterface From aab0e40cd2250b847ffbaf2e1f5a0fb99c701707 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 Mar 2020 11:25:47 +0100 Subject: [PATCH 61/82] Fix quotes in exception messages --- .../Bridge/Doctrine/Form/Type/EntityType.php | 4 ++-- .../Handler/ElasticsearchLogstashHandler.php | 2 +- .../Twig/ErrorRenderer/TwigErrorRenderer.php | 2 +- .../Twig/Extension/TranslationExtension.php | 2 +- .../Bridge/Twig/Mime/NotificationEmail.php | 2 +- .../CacheWarmer/ValidatorCacheWarmer.php | 2 +- .../Command/TranslationDebugCommand.php | 2 +- .../ResolveControllerNameSubscriber.php | 2 +- .../FrameworkBundle/Secrets/SodiumVault.php | 2 +- .../Templating/Helper/TranslatorHelper.php | 2 +- src/Symfony/Component/Cache/CacheItem.php | 4 ++-- .../Component/Cache/Traits/MemcachedTrait.php | 2 +- .../Component/Cache/Traits/PhpFilesTrait.php | 2 +- .../Component/Cache/Traits/RedisTrait.php | 10 ++++---- .../Config/Definition/Builder/TreeBuilder.php | 2 +- .../Argument/ReferenceSetArgumentTrait.php | 2 +- .../Compiler/AbstractRecursivePass.php | 2 +- .../Compiler/PriorityTaggedServiceTrait.php | 4 ++-- .../Compiler/ResolveBindingsPass.php | 2 +- .../DependencyInjection/EnvVarProcessor.php | 2 +- .../Loader/XmlFileLoader.php | 2 +- .../Loader/YamlFileLoader.php | 10 ++++---- .../EnvPlaceholderParameterBag.php | 2 +- .../DomCrawler/AbstractUriElement.php | 2 +- .../ErrorRenderer/HtmlErrorRenderer.php | 4 ++-- .../ErrorRenderer/SerializerErrorRenderer.php | 4 ++-- .../Debug/TraceableEventDispatcher.php | 2 +- .../EventDispatcher/EventDispatcher.php | 2 +- .../LegacyEventDispatcherProxy.php | 2 +- .../Component/Form/AbstractTypeExtension.php | 2 +- .../Form/Extension/Core/CoreExtension.php | 2 +- .../TransformationFailureListener.php | 2 +- .../Form/Extension/Core/Type/DateTimeType.php | 8 +++---- .../Form/Extension/Core/Type/DateType.php | 2 +- .../Form/Extension/Core/Type/FileType.php | 2 +- .../Type/TransformationFailureExtension.php | 2 +- .../Form/Extension/Core/Type/WeekType.php | 2 +- .../Form/Extension/Csrf/CsrfExtension.php | 2 +- .../EventListener/CsrfValidationListener.php | 2 +- .../Csrf/Type/FormTypeCsrfExtension.php | 2 +- .../DataCollector/FormDataCollector.php | 2 +- .../Type/UploadValidatorExtension.php | 2 +- .../Form/Tests/AbstractTypeExtensionTest.php | 2 +- .../HttpClient/CachingHttpClient.php | 2 +- .../Component/HttpClient/CurlHttpClient.php | 8 +++---- .../Component/HttpClient/HttpClientTrait.php | 24 +++++++++---------- .../Component/HttpClient/HttplugClient.php | 2 +- .../Component/HttpClient/MockHttpClient.php | 2 +- .../Component/HttpClient/NativeHttpClient.php | 4 ++-- .../HttpClient/Response/MockResponse.php | 4 ++-- .../HttpClient/Response/ResponseTrait.php | 2 +- .../HttpClient/Tests/HttpClientTraitTest.php | 4 ++-- .../Tests/Response/MockResponseTest.php | 4 ++-- .../Storage/Handler/RedisSessionHandler.php | 2 +- .../Storage/Handler/SessionHandlerFactory.php | 6 ++--- .../CacheClearer/Psr6CacheClearer.php | 2 +- .../EventListener/TranslatorListener.php | 2 +- .../Component/Lock/Store/StoreFactory.php | 4 ++-- .../Component/Lock/Store/ZookeeperStore.php | 4 ++-- .../Component/Mailer/Tests/TransportTest.php | 2 +- src/Symfony/Component/Mailer/Transport.php | 2 +- .../Messenger/Command/DebugCommand.php | 4 ++-- .../DependencyInjection/MessengerPass.php | 2 +- src/Symfony/Component/Messenger/Envelope.php | 2 +- .../Component/Messenger/MessageBus.php | 2 +- .../Messenger/Middleware/StackMiddleware.php | 2 +- .../Tests/Command/DebugCommandTest.php | 2 +- .../DependencyInjection/MessengerPassTest.php | 2 +- .../Messenger/Tests/MessageBusTest.php | 2 +- .../Transport/AmqpExt/Connection.php | 2 +- .../Doctrine/DoctrineTransportFactory.php | 2 +- src/Symfony/Component/Mime/Crypto/SMime.php | 2 +- .../Mime/Tests/Crypto/SMimeTestCase.php | 2 +- .../Component/Routing/Loader/ObjectLoader.php | 4 ++-- .../Authorization/Voter/ExpressionVoter.php | 2 +- .../Normalizer/DataUriNormalizer.php | 2 +- .../Translation/DataCollectorTranslator.php | 2 +- .../Formatter/MessageFormatter.php | 2 +- .../Translation/LoggingTranslator.php | 2 +- .../Validator/Constraints/EmailValidator.php | 2 +- .../Constraints/ExpressionValidator.php | 2 +- .../Validator/Context/ExecutionContext.php | 2 +- .../Context/ExecutionContextFactory.php | 2 +- .../Factory/LazyLoadingMetadataFactory.php | 2 +- .../Tests/Constraints/EmailValidatorTest.php | 2 +- .../Violation/ConstraintViolationBuilder.php | 2 +- .../VarExporter/Internal/Exporter.php | 2 +- .../Validator/StateMachineValidator.php | 2 +- .../Workflow/Validator/WorkflowValidator.php | 2 +- 89 files changed, 129 insertions(+), 129 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php index e462d5692ca77..69c92c0b08389 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php @@ -54,7 +54,7 @@ public function configureOptions(OptionsResolver $resolver) public function getLoader(ObjectManager $manager, $queryBuilder, $class) { if (!$queryBuilder instanceof QueryBuilder) { - throw new \TypeError(sprintf('Expected an instance of %s, but got %s.', QueryBuilder::class, \is_object($queryBuilder) ? \get_class($queryBuilder) : \gettype($queryBuilder))); + throw new \TypeError(sprintf('Expected an instance of "%s", but got "%s".', QueryBuilder::class, \is_object($queryBuilder) ? \get_class($queryBuilder) : \gettype($queryBuilder))); } return new ORMQueryBuilderLoader($queryBuilder); @@ -80,7 +80,7 @@ public function getBlockPrefix() public function getQueryBuilderPartsForCachingHash($queryBuilder): ?array { if (!$queryBuilder instanceof QueryBuilder) { - throw new \TypeError(sprintf('Expected an instance of %s, but got %s.', QueryBuilder::class, \is_object($queryBuilder) ? \get_class($queryBuilder) : \gettype($queryBuilder))); + throw new \TypeError(sprintf('Expected an instance of "%s", but got "%s".', QueryBuilder::class, \is_object($queryBuilder) ? \get_class($queryBuilder) : \gettype($queryBuilder))); } return [ diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php index 458472c6e0cbe..b8b0f7b9e99cb 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php @@ -52,7 +52,7 @@ class ElasticsearchLogstashHandler extends AbstractHandler public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', HttpClientInterface $client = null, int $level = Logger::DEBUG, bool $bubble = true) { if (!interface_exists(HttpClientInterface::class)) { - throw new \LogicException(sprintf('The %s handler needs an HTTP client. Try running "composer require symfony/http-client".', __CLASS__)); + throw new \LogicException(sprintf('The "%s" handler needs an HTTP client. Try running "composer require symfony/http-client".', __CLASS__)); } parent::__construct($level, $bubble); diff --git a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php index 7224c5f34a219..1f5caee4ee5c7 100644 --- a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php +++ b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php @@ -37,7 +37,7 @@ class TwigErrorRenderer implements ErrorRendererInterface public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorRenderer = null, $debug = false) { if (!\is_bool($debug) && !\is_callable($debug)) { - throw new \TypeError(sprintf('Argument 3 passed to %s() must be a boolean or a callable, %s given.', __METHOD__, \is_object($debug) ? \get_class($debug) : \gettype($debug))); + throw new \TypeError(sprintf('Argument 3 passed to "%s()" must be a boolean or a callable, "%s" given.', __METHOD__, \is_object($debug) ? \get_class($debug) : \gettype($debug))); } $this->twig = $twig; diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php index bd3c2eb8932d1..70cb05341c758 100644 --- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php @@ -42,7 +42,7 @@ class TranslationExtension extends AbstractExtension public function __construct($translator = null, NodeVisitorInterface $translationNodeVisitor = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; $this->translationNodeVisitor = $translationNodeVisitor; diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php index 7329163e17bcf..6d9bffcfcc47e 100644 --- a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php +++ b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php @@ -51,7 +51,7 @@ public function __construct(Headers $headers = null, AbstractPart $body = null) } if ($missingPackages) { - throw new \LogicException(sprintf('You cannot use "%s" if the %s Twig extension%s not available; try running "composer require %s".', static::class, implode(' and ', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', implode(' ', array_keys($missingPackages)))); + throw new \LogicException(sprintf('You cannot use "%s" if the "%s" Twig extension%s not available; try running "composer require "%s"".', static::class, implode('" and "', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', implode(' ', array_keys($missingPackages)))); } parent::__construct($headers, $body); diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php index aa893ea70a409..9cb837a45e35c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php @@ -39,7 +39,7 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer public function __construct($validatorBuilder, string $phpArrayFile) { if (!$validatorBuilder instanceof ValidatorBuilder && !$validatorBuilder instanceof ValidatorBuilderInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, ValidatorBuilder::class, \is_object($validatorBuilder) ? \get_class($validatorBuilder) : \gettype($validatorBuilder))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, ValidatorBuilder::class, \is_object($validatorBuilder) ? \get_class($validatorBuilder) : \gettype($validatorBuilder))); } if (2 < \func_num_args() && func_get_arg(2) instanceof CacheItemPoolInterface) { @trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php index 124274d47427a..8f24dd30a6e48 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php @@ -59,7 +59,7 @@ class TranslationDebugCommand extends Command public function __construct($translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultTransPath = null, string $defaultViewsPath = null, array $transPaths = [], array $viewsPaths = []) { if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } parent::__construct(); diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php index e849759a5cd86..9f13082314306 100644 --- a/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php +++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php @@ -49,7 +49,7 @@ public function resolveControllerName(...$args) public function __call(string $method, array $args) { if ('onKernelRequest' !== $method && 'onKernelRequest' !== strtolower($method)) { - throw new \Error(sprintf('Error: Call to undefined method %s::%s().', static::class, $method)); + throw new \Error(sprintf('Error: Call to undefined method "%s::%s()".', static::class, $method)); } $event = $args[0]; diff --git a/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php b/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php index e393b27ed47c3..0bbfa080803ee 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php +++ b/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php @@ -34,7 +34,7 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface public function __construct(string $secretsDir, $decryptionKey = null) { if (null !== $decryptionKey && !\is_string($decryptionKey) && !(\is_object($decryptionKey) && method_exists($decryptionKey, '__toString'))) { - throw new \TypeError(sprintf('Decryption key should be a string or an object that implements the __toString() method, %s given.', \gettype($decryptionKey))); + throw new \TypeError(sprintf('Decryption key should be a string or an object that implements the __toString() method, "%s" given.', \gettype($decryptionKey))); } $this->pathPrefix = rtrim(strtr($secretsDir, '/', \DIRECTORY_SEPARATOR), \DIRECTORY_SEPARATOR).\DIRECTORY_SEPARATOR.basename($secretsDir).'.'; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php index b86c0da666aa2..beeeeb8da6a6a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php @@ -39,7 +39,7 @@ class TranslatorHelper extends Helper public function __construct($translator = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; } diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php index bcfec48f0bc3f..00661e09fdf1a 100644 --- a/src/Symfony/Component/Cache/CacheItem.php +++ b/src/Symfony/Component/Cache/CacheItem.php @@ -130,7 +130,7 @@ public function tag($tags): ItemInterface throw new InvalidArgumentException('Cache tag length must be greater than zero.'); } if (false !== strpbrk($tag, self::RESERVED_CHARACTERS)) { - throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters %s.', $tag, self::RESERVED_CHARACTERS)); + throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters "%s".', $tag, self::RESERVED_CHARACTERS)); } $this->newMetadata[self::METADATA_TAGS][$tag] = $tag; } @@ -174,7 +174,7 @@ public static function validateKey($key): string throw new InvalidArgumentException('Cache key length must be greater than zero.'); } if (false !== strpbrk($key, self::RESERVED_CHARACTERS)) { - throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters %s.', $key, self::RESERVED_CHARACTERS)); + throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters "%s".', $key, self::RESERVED_CHARACTERS)); } return $key; diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php index 9b7d9f8be2660..507bc1fbfb123 100644 --- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php +++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php @@ -117,7 +117,7 @@ public static function createConnection($servers, array $options = []) if (isset($query['host'])) { if (!\is_array($hosts = $query['host'])) { - throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn)); } foreach ($hosts as $host => $weight) { if (false === $port = strrpos($host, ':')) { diff --git a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php index 9f085dc5dad28..6f8c45ee513b8 100644 --- a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php +++ b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php @@ -209,7 +209,7 @@ protected function doSave(array $values, $lifetime) try { $value = VarExporter::export($value, $isStaticValue); } catch (\Exception $e) { - throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, \is_object($value) ? \get_class($value) : 'array'), 0, $e); + throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \is_object($value) ? \get_class($value) : 'array'), 0, $e); } } elseif (\is_string($value)) { // Wrap "N;" in a closure to not confuse it with an encoded `null` diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index 1ab3a4a7cb088..3f144d2e35ac1 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -151,11 +151,11 @@ public static function createConnection($dsn, array $options = []) } if (!$hosts) { - throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn)); } if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class)) { - throw new CacheException(sprintf('Redis Sentinel support requires the "predis/predis" package: %s.', $dsn)); + throw new CacheException(sprintf('Redis Sentinel support requires the "predis/predis" package: "%s".', $dsn)); } $params += $query + $options + self::$defaultConnectionOptions; @@ -215,7 +215,7 @@ public static function createConnection($dsn, array $options = []) try { $redis = new $class($hosts, $params); } catch (\RedisClusterException $e) { - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e->getMessage(), $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): "%s".', $e->getMessage(), $dsn)); } if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) { @@ -230,7 +230,7 @@ public static function createConnection($dsn, array $options = []) try { $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent']); } catch (\RedisClusterException $e) { - throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s.', $e->getMessage(), $dsn)); + throw new InvalidArgumentException(sprintf('Redis connection failed (%s): "%s".', $e->getMessage(), $dsn)); } if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) { @@ -250,7 +250,7 @@ public static function createConnection($dsn, array $options = []) if ($params['redis_cluster']) { $params['cluster'] = 'redis'; if (isset($params['redis_sentinel'])) { - throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: "%s".', $dsn)); } } elseif (isset($params['redis_sentinel'])) { $params['replication'] = 'sentinel'; diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php index 83f2c5991e4de..4298d444a3303 100644 --- a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php @@ -61,7 +61,7 @@ public function root($name, $type = 'array', NodeBuilder $builder = null) public function getRootNode(): NodeDefinition { if (null === $this->root) { - throw new \RuntimeException(sprintf('Calling %s() before creating the root node is not supported, migrate to the new constructor signature instead.', __METHOD__)); + throw new \RuntimeException(sprintf('Calling "%s()" before creating the root node is not supported, migrate to the new constructor signature instead.', __METHOD__)); } return $this->root; diff --git a/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php b/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php index 6f8d5d97e508f..e3946ab394e7a 100644 --- a/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php +++ b/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php @@ -45,7 +45,7 @@ public function setValues(array $values) { foreach ($values as $k => $v) { if (null !== $v && !$v instanceof Reference) { - throw new InvalidArgumentException(sprintf('A %s must hold only Reference instances, "%s" given.', __CLASS__, \is_object($v) ? \get_class($v) : \gettype($v))); + throw new InvalidArgumentException(sprintf('A "%s" must hold only Reference instances, "%s" given.', __CLASS__, \is_object($v) ? \get_class($v) : \gettype($v))); } } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php index 02a18b6cf09ca..c56feafbcfb03 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php @@ -214,7 +214,7 @@ private function getExpressionLanguage(): ExpressionLanguage $arg = $this->processValue(new Reference($id)); $this->inExpression = false; if (!$arg instanceof Reference) { - throw new RuntimeException(sprintf('"%s::processValue()" must return a Reference when processing an expression, %s returned for service("%s").', static::class, \is_object($arg) ? \get_class($arg) : \gettype($arg), $id)); + throw new RuntimeException(sprintf('"%s::processValue()" must return a Reference when processing an expression, "%s" returned for service("%s").', static::class, \is_object($arg) ? \get_class($arg) : \gettype($arg), $id)); } $arg = sprintf('"%s"', $arg); } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php index 121b1dc716025..c24d5976b3ccb 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php @@ -125,7 +125,7 @@ public static function getDefaultIndex(ContainerBuilder $container, string $serv $defaultIndex = $rm->invoke(null); if (!\is_string($defaultIndex)) { - throw new InvalidArgumentException(sprintf('Either method "%s::%s()" should return a string (got %s) or tag "%s" on service "%s" is missing attribute "%s".', $class, $defaultIndexMethod, \gettype($defaultIndex), $tagName, $serviceId, $indexAttribute)); + throw new InvalidArgumentException(sprintf('Either method "%s::%s()" should return a string (got "%s") or tag "%s" on service "%s" is missing attribute "%s".', $class, $defaultIndexMethod, \gettype($defaultIndex), $tagName, $serviceId, $indexAttribute)); } return $defaultIndex; @@ -154,7 +154,7 @@ public static function getDefaultPriority(ContainerBuilder $container, string $s $defaultPriority = $rm->invoke(null); if (!\is_int($defaultPriority)) { - throw new InvalidArgumentException(sprintf('Method "%s::%s()" should return an integer (got %s) or tag "%s" on service "%s" is missing attribute "priority".', $class, $defaultPriorityMethod, \gettype($defaultPriority), $tagName, $serviceId)); + throw new InvalidArgumentException(sprintf('Method "%s::%s()" should return an integer (got "%s") or tag "%s" on service "%s" is missing attribute "priority".', $class, $defaultPriorityMethod, \gettype($defaultPriority), $tagName, $serviceId)); } return $defaultPriority; diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php index e4b440e814608..82f222f23acc0 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php @@ -134,7 +134,7 @@ protected function processValue($value, $isRoot = false) } if (null !== $bindingValue && !$bindingValue instanceof Reference && !$bindingValue instanceof Definition && !$bindingValue instanceof TaggedIteratorArgument && !$bindingValue instanceof ServiceLocatorArgument) { - throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, %s, %s, %s or ServiceLocatorArgument, "%s" given.', $key, $this->currentId, Reference::class, Definition::class, TaggedIteratorArgument::class, \gettype($bindingValue))); + throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, "%s", "%s", "%s" or ServiceLocatorArgument, "%s" given.', $key, $this->currentId, Reference::class, Definition::class, TaggedIteratorArgument::class, \gettype($bindingValue))); } } diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php index 5b97879cf98c5..87a4e53e7bb46 100644 --- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php +++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php @@ -244,7 +244,7 @@ public function getEnv($prefix, $name, \Closure $getEnv) throw new RuntimeException(sprintf('Invalid URL in env var "%s".', $name)); } if (!isset($parsedEnv['scheme'], $parsedEnv['host'])) { - throw new RuntimeException(sprintf('Invalid URL env var "%s": schema and host expected, %s given.', $name, $env)); + throw new RuntimeException(sprintf('Invalid URL env var "%s": schema and host expected, "%s" given.', $name, $env)); } $parsedEnv += [ 'port' => null, diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 2d0666fec5deb..cf7c516024c3e 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -437,7 +437,7 @@ private function processAnonymousServices(\DOMDocument $xml, string $file) // anonymous services "in the wild" if (false !== $nodes = $xpath->query('//container:services/container:service[not(@id)]')) { foreach ($nodes as $node) { - throw new InvalidArgumentException(sprintf('Top-level services must have "id" attribute, none found in %s at line %d.', $file, $node->getLineNo())); + throw new InvalidArgumentException(sprintf('Top-level services must have "id" attribute, none found in "%s" at line %d.', $file, $node->getLineNo())); } } diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index 98d2ea64df38b..a31959e456552 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -464,11 +464,11 @@ private function parseDefinition(string $id, $service, string $file, array $defa foreach ($service['calls'] as $k => $call) { if (!\is_array($call) && (!\is_string($k) || !$call instanceof TaggedValue)) { - throw new InvalidArgumentException(sprintf('Invalid method call for service "%s": expected map or array, %s given in %s.', $id, $call instanceof TaggedValue ? '!'.$call->getTag() : \gettype($call), $file)); + throw new InvalidArgumentException(sprintf('Invalid method call for service "%s": expected map or array, "%s" given in "%s".', $id, $call instanceof TaggedValue ? '!'.$call->getTag() : \gettype($call), $file)); } if (\is_string($k)) { - throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in %s?', $id, $k, $file)); + throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in "%s"?', $id, $k, $file)); } if (isset($call['method'])) { @@ -482,7 +482,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa if ($args instanceof TaggedValue) { if ('returns_clone' !== $args->getTag()) { - throw new InvalidArgumentException(sprintf('Unsupported tag "!%s", did you mean "!returns_clone" for service "%s" in %s?', $args->getTag(), $id, $file)); + throw new InvalidArgumentException(sprintf('Unsupported tag "!%s", did you mean "!returns_clone" for service "%s" in "%s"?', $args->getTag(), $id, $file)); } $returnsClone = true; @@ -491,7 +491,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa $returnsClone = false; } } elseif (empty($call[0])) { - throw new InvalidArgumentException(sprintf('Invalid call for service "%s": the method must be defined as the first index of an array or as the only key of a map in %s.', $id, $file)); + throw new InvalidArgumentException(sprintf('Invalid call for service "%s": the method must be defined as the first index of an array or as the only key of a map in "%s".', $id, $file)); } else { $method = $call[0]; $args = $call[1] ?? []; @@ -690,7 +690,7 @@ protected function loadFile($file) try { $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS); } catch (ParseException $e) { - throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s.', $file, $e->getMessage()), 0, $e); + throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: "%s".', $file, $e->getMessage()), 0, $e); } return $this->validate($configuration, $file); diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php index d52d990e18efa..ee0a30b68bc8b 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php @@ -163,7 +163,7 @@ public function resolve() } $this->parameters[$name] = (string) $default; } elseif (null !== $default && !is_scalar($default)) { // !is_string in 5.0 - //throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, %s given.', $env, \gettype($default))); + //throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, "%s" given.', $env, \gettype($default))); throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, "%s" given.', $env, \gettype($default))); } elseif (is_scalar($default) && !\is_string($default)) { @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DomCrawler/AbstractUriElement.php b/src/Symfony/Component/DomCrawler/AbstractUriElement.php index ead9dca25bacb..53bb6b6fca6ef 100644 --- a/src/Symfony/Component/DomCrawler/AbstractUriElement.php +++ b/src/Symfony/Component/DomCrawler/AbstractUriElement.php @@ -49,7 +49,7 @@ public function __construct(\DOMElement $node, string $currentUri = null, ?strin $elementUriIsRelative = null === parse_url(trim($this->getRawUri()), PHP_URL_SCHEME); $baseUriIsAbsolute = \in_array(strtolower(substr($this->currentUri, 0, 4)), ['http', 'file']); if ($elementUriIsRelative && !$baseUriIsAbsolute) { - throw new \InvalidArgumentException(sprintf('The URL of the element is relative, so you must define its base URI passing an absolute URL to the constructor of the %s class ("%s" was passed).', __CLASS__, $this->currentUri)); + throw new \InvalidArgumentException(sprintf('The URL of the element is relative, so you must define its base URI passing an absolute URL to the constructor of the "%s" class ("%s" was passed).', __CLASS__, $this->currentUri)); } } diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php index 883a94f68968f..ce8cab6d65217 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php @@ -46,11 +46,11 @@ class HtmlErrorRenderer implements ErrorRendererInterface public function __construct($debug = false, string $charset = null, $fileLinkFormat = null, string $projectDir = null, $outputBuffer = '', LoggerInterface $logger = null) { if (!\is_bool($debug) && !\is_callable($debug)) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be a boolean or a callable, %s given.', __METHOD__, \is_object($debug) ? \get_class($debug) : \gettype($debug))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be a boolean or a callable, "%s" given.', __METHOD__, \is_object($debug) ? \get_class($debug) : \gettype($debug))); } if (!\is_string($outputBuffer) && !\is_callable($outputBuffer)) { - throw new \TypeError(sprintf('Argument 5 passed to %s() must be a string or a callable, %s given.', __METHOD__, \is_object($outputBuffer) ? \get_class($outputBuffer) : \gettype($outputBuffer))); + throw new \TypeError(sprintf('Argument 5 passed to "%s()" must be a string or a callable, "%s" given.', __METHOD__, \is_object($outputBuffer) ? \get_class($outputBuffer) : \gettype($outputBuffer))); } $this->debug = $debug; diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php index 6cc363d0d9f1e..d1dd652a64973 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php @@ -35,11 +35,11 @@ class SerializerErrorRenderer implements ErrorRendererInterface public function __construct(SerializerInterface $serializer, $format, ErrorRendererInterface $fallbackErrorRenderer = null, $debug = false) { if (!\is_string($format) && !\is_callable($format)) { - throw new \TypeError(sprintf('Argument 2 passed to %s() must be a string or a callable, %s given.', __METHOD__, \is_object($format) ? \get_class($format) : \gettype($format))); + throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be a string or a callable, "%s" given.', __METHOD__, \is_object($format) ? \get_class($format) : \gettype($format))); } if (!\is_bool($debug) && !\is_callable($debug)) { - throw new \TypeError(sprintf('Argument 4 passed to %s() must be a boolean or a callable, %s given.', __METHOD__, \is_object($debug) ? \get_class($debug) : \gettype($debug))); + throw new \TypeError(sprintf('Argument 4 passed to "%s()" must be a boolean or a callable, "%s" given.', __METHOD__, \is_object($debug) ? \get_class($debug) : \gettype($debug))); } $this->serializer = $serializer; diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php index fdc65fd31280b..4c556c8a4e04a 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php @@ -151,7 +151,7 @@ public function dispatch($event/*, string $eventName = null*/) $eventName = $swap; if (!$event instanceof Event) { - throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an instance of %s, %s given.', EventDispatcherInterface::class, Event::class, \is_object($event) ? \get_class($event) : \gettype($event))); + throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an instance of "%s", "%s" given.', EventDispatcherInterface::class, Event::class, \is_object($event) ? \get_class($event) : \gettype($event))); } } diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php index bd2874ba6c484..9f523dca3d8ff 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php @@ -60,7 +60,7 @@ public function dispatch($event/*, string $eventName = null*/) $event = $eventName ?? new Event(); $eventName = $swap; } else { - throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an object, %s given.', EventDispatcherInterface::class, \is_object($event) ? \get_class($event) : \gettype($event))); + throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an object, "%s" given.', EventDispatcherInterface::class, \is_object($event) ? \get_class($event) : \gettype($event))); } if (null !== $this->optimized && null !== $eventName) { diff --git a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php index 513e260e98106..0a8fa16d33cb6 100644 --- a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php +++ b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php @@ -65,7 +65,7 @@ public function dispatch($event/*, string $eventName = null*/) $event = $eventName ?? new Event(); $eventName = $swap; } else { - throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an object, %s given.', ContractsEventDispatcherInterface::class, \is_object($event) ? \get_class($event) : \gettype($event))); + throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an object, "%s" given.', ContractsEventDispatcherInterface::class, \is_object($event) ? \get_class($event) : \gettype($event))); } $listeners = $this->getListeners($eventName); diff --git a/src/Symfony/Component/Form/AbstractTypeExtension.php b/src/Symfony/Component/Form/AbstractTypeExtension.php index 0388f7c012919..f14e1276e1f3b 100644 --- a/src/Symfony/Component/Form/AbstractTypeExtension.php +++ b/src/Symfony/Component/Form/AbstractTypeExtension.php @@ -55,7 +55,7 @@ public function configureOptions(OptionsResolver $resolver) public function getExtendedType() { if (!method_exists($this, 'getExtendedTypes')) { - throw new LogicException(sprintf('You need to implement the static getExtendedTypes() method when implementing the %s in %s.', FormTypeExtensionInterface::class, static::class)); + throw new LogicException(sprintf('You need to implement the static getExtendedTypes() method when implementing the "%s" in "%s".', FormTypeExtensionInterface::class, static::class)); } @trigger_error(sprintf('The %s::getExtendedType() method is deprecated since Symfony 4.2 and will be removed in 5.0. Use getExtendedTypes() instead.', static::class), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index 1f3431cb49ea7..a59ba2108c120 100644 --- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php @@ -39,7 +39,7 @@ class CoreExtension extends AbstractExtension public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, $translator = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 3 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 3 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor(); $this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(new PropertyAccessDecorator(new DefaultChoiceListFactory(), $this->propertyAccessor)); diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php index f5e73849b3700..b452d60784e27 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php @@ -31,7 +31,7 @@ class TransformationFailureListener implements EventSubscriberInterface public function __construct($translator = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php index 0959ee7d321f3..5d936ffb6b6e3 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php @@ -315,7 +315,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDeprecated('date_format', function (Options $options, $dateFormat) { if (null !== $dateFormat && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) { return sprintf('Using the "date_format" option of %s with an HTML5 date widget is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class); - //throw new LogicException(sprintf('Cannot use the "date_format" option of the %s with an HTML5 date.', self::class)); + //throw new LogicException(sprintf('Cannot use the "date_format" option of the "%s" with an HTML5 date.', self::class)); } return ''; @@ -323,7 +323,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDeprecated('date_widget', function (Options $options, $dateWidget) { if (null !== $dateWidget && 'single_text' === $options['widget']) { return sprintf('Using the "date_widget" option of %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class); - //throw new LogicException(sprintf('Cannot use the "date_widget" option of the %s when the "widget" option is set to "single_text".', self::class)); + //throw new LogicException(sprintf('Cannot use the "date_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class)); } return ''; @@ -331,7 +331,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDeprecated('time_widget', function (Options $options, $timeWidget) { if (null !== $timeWidget && 'single_text' === $options['widget']) { return sprintf('Using the "time_widget" option of %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class); - //throw new LogicException(sprintf('Cannot use the "time_widget" option of the %s when the "widget" option is set to "single_text".', self::class)); + //throw new LogicException(sprintf('Cannot use the "time_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class)); } return ''; @@ -339,7 +339,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDeprecated('html5', function (Options $options, $html5) { if ($html5 && self::HTML5_FORMAT !== $options['format']) { return sprintf('Using a custom format when the "html5" option of %s is enabled is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class); - //throw new LogicException(sprintf('Cannot use the "format" option of %s when the "html5" option is disabled.', self::class)); + //throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is disabled.', self::class)); } return ''; diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index 58c4bbcf339d9..57ceb7a075f6b 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -325,7 +325,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setDeprecated('html5', function (Options $options, $html5) { if ($html5 && 'single_text' === $options['widget'] && self::HTML5_FORMAT !== $options['format']) { return sprintf('Using a custom format when the "html5" option of %s is enabled is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class); - //throw new LogicException(sprintf('Cannot use the "format" option of %s when the "html5" option is disabled.', self::class)); + //throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is disabled.', self::class)); } return ''; diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php index 52368293f45d1..555e61e5c6a6f 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php @@ -42,7 +42,7 @@ class FileType extends AbstractType public function __construct($translator = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php index 8cdca71b65ba1..41b857d29dbd4 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php @@ -30,7 +30,7 @@ class TransformationFailureExtension extends AbstractTypeExtension public function __construct($translator = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php index 70e0000ad9912..bae115756afca 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php @@ -161,7 +161,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setNormalizer('choice_translation_domain', $choiceTranslationDomainNormalizer); $resolver->setNormalizer('html5', function (Options $options, $html5) { if ($html5 && 'single_text' !== $options['widget']) { - throw new LogicException(sprintf('The "widget" option of %s must be set to "single_text" when the "html5" option is enabled.', self::class)); + throw new LogicException(sprintf('The "widget" option of "%s" must be set to "single_text" when the "html5" option is enabled.', self::class)); } return $html5; diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php index efd403ca9f689..dfee596cc6de7 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php @@ -34,7 +34,7 @@ class CsrfExtension extends AbstractExtension public function __construct(CsrfTokenManagerInterface $tokenManager, $translator = null, string $translationDomain = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 2 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->tokenManager = $tokenManager; $this->translator = $translator; diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php index 7c5181e17d9b8..12668f0ed3ee6 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php +++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php @@ -47,7 +47,7 @@ public static function getSubscribedEvents() public function __construct(string $fieldName, CsrfTokenManagerInterface $tokenManager, string $tokenId, string $errorMessage, $translator = null, string $translationDomain = null, ServerParams $serverParams = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 5 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 5 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->fieldName = $fieldName; $this->tokenManager = $tokenManager; diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php index 2f3fa437f6dda..bcb8792a091d4 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php @@ -41,7 +41,7 @@ class FormTypeCsrfExtension extends AbstractTypeExtension public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool $defaultEnabled = true, string $defaultFieldName = '_token', $translator = null, string $translationDomain = null, ServerParams $serverParams = null) { if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 4 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 4 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->defaultTokenManager = $defaultTokenManager; $this->defaultEnabled = $defaultEnabled; diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php index 4d4a7b125189a..a342ba5fcb527 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php @@ -70,7 +70,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf public function __construct(FormDataExtractorInterface $dataExtractor) { if (!class_exists(ClassStub::class)) { - throw new \LogicException(sprintf('The VarDumper component is needed for using the %s class. Install symfony/var-dumper version 3.4 or above.', __CLASS__)); + throw new \LogicException(sprintf('The VarDumper component is needed for using the "%s" class. Install symfony/var-dumper version 3.4 or above.', __CLASS__)); } $this->dataExtractor = $dataExtractor; diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php index c5b71f903c16d..a50eecaa647ff 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php @@ -33,7 +33,7 @@ class UploadValidatorExtension extends AbstractTypeExtension public function __construct($translator, string $translationDomain = null) { if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; $this->translationDomain = $translationDomain; diff --git a/src/Symfony/Component/Form/Tests/AbstractTypeExtensionTest.php b/src/Symfony/Component/Form/Tests/AbstractTypeExtensionTest.php index b50812ffa1785..83019f488ad64 100644 --- a/src/Symfony/Component/Form/Tests/AbstractTypeExtensionTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractTypeExtensionTest.php @@ -22,7 +22,7 @@ class AbstractTypeExtensionTest extends TestCase public function testImplementingNeitherGetExtendedTypeNorExtendsTypeThrowsException() { $this->expectException('Symfony\Component\Form\Exception\LogicException'); - $this->expectExceptionMessage('You need to implement the static getExtendedTypes() method when implementing the Symfony\Component\Form\FormTypeExtensionInterface in Symfony\Component\Form\Tests\TypeExtensionWithoutExtendedTypes.'); + $this->expectExceptionMessage('You need to implement the static getExtendedTypes() method when implementing the "Symfony\Component\Form\FormTypeExtensionInterface" in "Symfony\Component\Form\Tests\TypeExtensionWithoutExtendedTypes".'); $extension = new TypeExtensionWithoutExtendedTypes(); $extension->getExtendedType(); } diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php index a6af1b5f2d5f1..0327791193bf0 100644 --- a/src/Symfony/Component/HttpClient/CachingHttpClient.php +++ b/src/Symfony/Component/HttpClient/CachingHttpClient.php @@ -114,7 +114,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa if ($responses instanceof ResponseInterface) { $responses = [$responses]; } elseif (!is_iterable($responses)) { - throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of ResponseInterface objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); + throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of ResponseInterface objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); } $mockResponses = []; diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index d20d8b6f328c6..9f9fbd0a8ac8e 100644 --- a/src/Symfony/Component/HttpClient/CurlHttpClient.php +++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php @@ -156,14 +156,14 @@ public function request(string $method, string $url, array $options = []): Respo if (\is_array($options['auth_ntlm'])) { $count = \count($options['auth_ntlm']); if ($count <= 0 || $count > 2) { - throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must contain 1 or 2 elements, %s given.', $count)); + throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must contain 1 or 2 elements, %d given.', $count)); } $options['auth_ntlm'] = implode(':', $options['auth_ntlm']); } if (!\is_string($options['auth_ntlm'])) { - throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must be a string or an array, %s given.', \gettype($options['auth_ntlm']))); + throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must be a string or an array, "%s" given.', \gettype($options['auth_ntlm']))); } $curlopts[CURLOPT_USERPWD] = $options['auth_ntlm']; @@ -319,7 +319,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa if ($responses instanceof CurlResponse) { $responses = [$responses]; } elseif (!is_iterable($responses)) { - throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); + throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); } $active = 0; @@ -439,7 +439,7 @@ private static function readRequestBody(int $length, \Closure $body, string &$bu { if (!$eof && \strlen($buffer) < $length) { if (!\is_string($data = $body($length))) { - throw new TransportException(sprintf('The return value of the "body" option callback must be a string, %s returned.', \gettype($data))); + throw new TransportException(sprintf('The return value of the "body" option callback must be a string, "%s" returned.', \gettype($data))); } $buffer .= $data; diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php index bace40a117dad..e150e56a0c9c0 100644 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php @@ -48,7 +48,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt $options['buffer'] = static function (array $headers) use ($buffer) { if (!\is_bool($buffer = $buffer($headers))) { if (!\is_array($bufferInfo = @stream_get_meta_data($buffer))) { - throw new \LogicException(sprintf('The closure passed as option "buffer" must return bool or stream resource, got %s.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer))); + throw new \LogicException(sprintf('The closure passed as option "buffer" must return bool or stream resource, got "%s".', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer))); } if (false === strpbrk($bufferInfo['mode'], 'acew+')) { @@ -60,7 +60,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt }; } elseif (!\is_bool($buffer)) { if (!\is_array($bufferInfo = @stream_get_meta_data($buffer))) { - throw new InvalidArgumentException(sprintf('Option "buffer" must be bool, stream resource or Closure, %s given.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer))); + throw new InvalidArgumentException(sprintf('Option "buffer" must be bool, stream resource or Closure, "%s" given.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer))); } if (false === strpbrk($bufferInfo['mode'], 'acew+')) { @@ -94,24 +94,24 @@ private static function prepareRequest(?string $method, ?string $url, array $opt // Validate on_progress if (!\is_callable($onProgress = $options['on_progress'] ?? 'var_dump')) { - throw new InvalidArgumentException(sprintf('Option "on_progress" must be callable, %s given.', \is_object($onProgress) ? \get_class($onProgress) : \gettype($onProgress))); + throw new InvalidArgumentException(sprintf('Option "on_progress" must be callable, "%s" given.', \is_object($onProgress) ? \get_class($onProgress) : \gettype($onProgress))); } if (\is_array($options['auth_basic'] ?? null)) { $count = \count($options['auth_basic']); if ($count <= 0 || $count > 2) { - throw new InvalidArgumentException(sprintf('Option "auth_basic" must contain 1 or 2 elements, %s given.', $count)); + throw new InvalidArgumentException(sprintf('Option "auth_basic" must contain 1 or 2 elements, "%s" given.', $count)); } $options['auth_basic'] = implode(':', $options['auth_basic']); } if (!\is_string($options['auth_basic'] ?? '')) { - throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, %s given.', \gettype($options['auth_basic']))); + throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, "%s" given.', \gettype($options['auth_basic']))); } if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) || !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) { - throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : \gettype($options['auth_bearer']))); + throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : '"'.\gettype($options['auth_bearer']).'"')); } if (isset($options['auth_basic'], $options['auth_bearer'])) { @@ -206,10 +206,10 @@ private static function mergeDefaultOptions(array $options, array $defaultOption } if ('auth_ntlm' === $name) { - throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by %s, try using CurlHttpClient instead.', __CLASS__)); + throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", try using CurlHttpClient instead.', __CLASS__)); } - throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to %s, did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions)))); + throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to "%s", did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions)))); } return $options; @@ -231,13 +231,13 @@ private static function normalizeHeaders(array $headers): array if (\is_int($name)) { if (!\is_string($values)) { - throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \gettype($values))); + throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, "%s" given.', $name, \gettype($values))); } [$name, $values] = explode(':', $values, 2); $values = [ltrim($values)]; } elseif (!is_iterable($values)) { if (\is_object($values)) { - throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \get_class($values))); + throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, "%s" given.', $name, \get_class($values))); } $values = (array) $values; @@ -299,7 +299,7 @@ private static function normalizeBody($body) } if (!\is_string($body) && !\is_array(@stream_get_meta_data($body))) { - throw new InvalidArgumentException(sprintf('Option "body" must be string, stream resource, iterable or callable, %s given.', \is_resource($body) ? get_resource_type($body) : \gettype($body))); + throw new InvalidArgumentException(sprintf('Option "body" must be string, stream resource, iterable or callable, "%s" given.', \is_resource($body) ? get_resource_type($body) : \gettype($body))); } return $body; @@ -325,7 +325,7 @@ private static function normalizePeerFingerprint($fingerprint): array $fingerprint[$algo] = 'pin-sha256' === $algo ? (array) $hash : str_replace(':', '', $hash); } } else { - throw new InvalidArgumentException(sprintf('Option "peer_fingerprint" must be string or array, %s given.', \gettype($fingerprint))); + throw new InvalidArgumentException(sprintf('Option "peer_fingerprint" must be string or array, "%s" given.', \gettype($fingerprint))); } return $fingerprint; diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php index 08023b9c42718..ec00b3234a037 100644 --- a/src/Symfony/Component/HttpClient/HttplugClient.php +++ b/src/Symfony/Component/HttpClient/HttplugClient.php @@ -184,7 +184,7 @@ public function createStream($body = null): StreamInterface } elseif (\is_resource($body)) { $stream = $this->streamFactory->createStreamFromResource($body); } else { - throw new \InvalidArgumentException(sprintf('%s() expects string, resource or StreamInterface, %s given.', __METHOD__, \gettype($body))); + throw new \InvalidArgumentException(sprintf('"%s()" expects string, resource or StreamInterface, "%s" given.', __METHOD__, \gettype($body))); } if ($stream->isSeekable()) { diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php index cb3cb969b06ba..7e09e35089ae5 100644 --- a/src/Symfony/Component/HttpClient/MockHttpClient.php +++ b/src/Symfony/Component/HttpClient/MockHttpClient.php @@ -79,7 +79,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa if ($responses instanceof ResponseInterface) { $responses = [$responses]; } elseif (!is_iterable($responses)) { - throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); + throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); } return new ResponseStream(MockResponse::stream($responses, $timeout)); diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php index 90524db1ae4e6..ea78d84388276 100644 --- a/src/Symfony/Component/HttpClient/NativeHttpClient.php +++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php @@ -238,7 +238,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa if ($responses instanceof NativeResponse) { $responses = [$responses]; } elseif (!is_iterable($responses)) { - throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); + throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); } return new ResponseStream(NativeResponse::stream($responses, $timeout)); @@ -258,7 +258,7 @@ private static function getBodyAsString($body): string while ('' !== $data = $body(self::$CHUNK_SIZE)) { if (!\is_string($data)) { - throw new TransportException(sprintf('Return value of the "body" option callback must be string, %s returned.', \gettype($data))); + throw new TransportException(sprintf('Return value of the "body" option callback must be string, "%s" returned.', \gettype($data))); } $result .= $data; diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php index b458665d44edd..0f359f30b3265 100644 --- a/src/Symfony/Component/HttpClient/Response/MockResponse.php +++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php @@ -228,7 +228,7 @@ private static function writeRequest(self $response, array $options, ResponseInt } elseif ($body instanceof \Closure) { while ('' !== $data = $body(16372)) { if (!\is_string($data)) { - throw new TransportException(sprintf('Return value of the "body" option callback must be string, %s returned.', \gettype($data))); + throw new TransportException(sprintf('Return value of the "body" option callback must be string, "%s" returned.', \gettype($data))); } // "notify" upload progress @@ -295,7 +295,7 @@ private static function readResponse(self $response, array $options, ResponseInt $onProgress($offset, $dlSize, $response->info); if ($dlSize && $offset !== $dlSize) { - throw new TransportException(sprintf('Transfer closed with %s bytes remaining to read.', $dlSize - $offset)); + throw new TransportException(sprintf('Transfer closed with %d bytes remaining to read.', $dlSize - $offset)); } } } diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php index 595ac9737c072..f49ca68338408 100644 --- a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php +++ b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php @@ -161,7 +161,7 @@ public function toArray(bool $throw = true): array } if (!\is_array($content)) { - throw new JsonException(sprintf('JSON content was expected to decode to an array, %s returned for "%s".', \gettype($content), $this->getInfo('url'))); + throw new JsonException(sprintf('JSON content was expected to decode to an array, "%s" returned for "%s".', \gettype($content), $this->getInfo('url'))); } if (null !== $this->content) { diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php index 2952fd4f62ea0..477c33d924293 100644 --- a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php +++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php @@ -179,7 +179,7 @@ public function testAuthBearerOption() public function testInvalidAuthBearerOption() { $this->expectException('Symfony\Component\HttpClient\Exception\InvalidArgumentException'); - $this->expectExceptionMessage('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, object given.'); + $this->expectExceptionMessage('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, "object" given.'); self::prepareRequest('POST', 'http://example.com', ['auth_bearer' => new \stdClass()], HttpClientInterface::OPTIONS_DEFAULTS); } @@ -249,7 +249,7 @@ public function testNormalizePeerFingerprintException() public function testNormalizePeerFingerprintTypeException() { $this->expectException('Symfony\Component\HttpClient\Exception\InvalidArgumentException'); - $this->expectExceptionMessage('Option "peer_fingerprint" must be string or array, object given.'); + $this->expectExceptionMessage('Option "peer_fingerprint" must be string or array, "object" given.'); $fingerprint = new \stdClass(); $this->normalizePeerFingerprint($fingerprint); diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php index 61ceb913a93e0..1b3ab16a843aa 100644 --- a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php +++ b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php @@ -56,13 +56,13 @@ public function toArrayErrors() yield [ 'content' => '"not an array"', 'responseHeaders' => [], - 'message' => 'JSON content was expected to decode to an array, string returned for "https://example.com/file.json".', + 'message' => 'JSON content was expected to decode to an array, "string" returned for "https://example.com/file.json".', ]; yield [ 'content' => '8', 'responseHeaders' => [], - 'message' => 'JSON content was expected to decode to an array, integer returned for "https://example.com/file.json".', + 'message' => 'JSON content was expected to decode to an array, "integer" returned for "https://example.com/file.json".', ]; } } diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php index 1b83de09b7e1c..8fc19c6bc4b60 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php @@ -54,7 +54,7 @@ public function __construct($redis, array $options = []) !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy ) { - throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given.', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis))); + throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis))); } if ($diff = array_diff(array_keys($options), ['prefix', 'ttl'])) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php index b92bd0ffde3b3..a5ebd29ebaa73 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php @@ -27,7 +27,7 @@ class SessionHandlerFactory public static function createHandler($connection): AbstractSessionHandler { if (!\is_string($connection) && !\is_object($connection)) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be a string or a connection object, %s given.', __METHOD__, \gettype($connection))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be a string or a connection object, "%s" given.', __METHOD__, \gettype($connection))); } switch (true) { @@ -46,7 +46,7 @@ public static function createHandler($connection): AbstractSessionHandler return new PdoSessionHandler($connection); case !\is_string($connection): - throw new \InvalidArgumentException(sprintf('Unsupported Connection: %s.', \get_class($connection))); + throw new \InvalidArgumentException(sprintf('Unsupported Connection: "%s".', \get_class($connection))); case 0 === strpos($connection, 'file://'): return new StrictSessionHandler(new NativeFileSessionHandler(substr($connection, 7))); @@ -80,6 +80,6 @@ public static function createHandler($connection): AbstractSessionHandler return new PdoSessionHandler($connection); } - throw new \InvalidArgumentException(sprintf('Unsupported Connection: %s.', $connection)); + throw new \InvalidArgumentException(sprintf('Unsupported Connection: "%s".', $connection)); } } diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php index f69740440e0eb..f5670f1b97a40 100644 --- a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php +++ b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php @@ -31,7 +31,7 @@ public function hasPool($name) public function getPool($name) { if (!$this->hasPool($name)) { - throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name)); + throw new \InvalidArgumentException(sprintf('Cache pool not found: "%s".', $name)); } return $this->pools[$name]; diff --git a/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php b/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php index d28eee2b1ad21..e276b3bd71ddf 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php @@ -40,7 +40,7 @@ class TranslatorListener implements EventSubscriberInterface public function __construct($translator, RequestStack $requestStack) { if (!$translator instanceof TranslatorInterface && !$translator instanceof LocaleAwareInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, LocaleAwareInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, LocaleAwareInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; $this->requestStack = $requestStack; diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php index bc12c27890d19..b9a5c1e5ca921 100644 --- a/src/Symfony/Component/Lock/Store/StoreFactory.php +++ b/src/Symfony/Component/Lock/Store/StoreFactory.php @@ -33,7 +33,7 @@ class StoreFactory public static function createStore($connection) { if (!\is_string($connection) && !\is_object($connection)) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be a string or a connection object, %s given.', __METHOD__, \gettype($connection))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be a string or a connection object, "%s" given.', __METHOD__, \gettype($connection))); } switch (true) { @@ -56,7 +56,7 @@ public static function createStore($connection) return new ZookeeperStore($connection); case !\is_string($connection): - throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', \get_class($connection))); + throw new InvalidArgumentException(sprintf('Unsupported Connection: "%s".', \get_class($connection))); case 'flock' === $connection: return new FlockStore(); diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php index cc46db1ff5db9..90d5296799c99 100644 --- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php +++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php @@ -38,11 +38,11 @@ public function __construct(\Zookeeper $zookeeper) public static function createConnection(string $dsn): \Zookeeper { if (0 !== strpos($dsn, 'zookeeper:')) { - throw new InvalidArgumentException(sprintf('Unsupported DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn)); } if (false === $params = parse_url($dsn)) { - throw new InvalidArgumentException(sprintf('Invalid Zookeeper DSN: %s.', $dsn)); + throw new InvalidArgumentException(sprintf('Invalid Zookeeper DSN: "%s".', $dsn)); } $host = $params['host'] ?? ''; diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php index d9121a55906ee..95eb5b6ebf03a 100644 --- a/src/Symfony/Component/Mailer/Tests/TransportTest.php +++ b/src/Symfony/Component/Mailer/Tests/TransportTest.php @@ -74,7 +74,7 @@ public function testFromWrongString(string $dsn, string $error): void public function fromWrongStringProvider(): iterable { - yield 'garbage at the end' => ['dummy://a some garbage here', 'The DSN has some garbage at the end: some garbage here.']; + yield 'garbage at the end' => ['dummy://a some garbage here', 'The DSN has some garbage at the end: " some garbage here".']; yield 'not a valid DSN' => ['something not a dsn', 'The "something" mailer DSN must contain a scheme.']; diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php index 45dfc8b9ba2e7..a8f159dc7c491 100644 --- a/src/Symfony/Component/Mailer/Transport.php +++ b/src/Symfony/Component/Mailer/Transport.php @@ -85,7 +85,7 @@ public function fromString(string $dsn): TransportInterface { list($transport, $offset) = $this->parseDsn($dsn); if ($offset !== \strlen($dsn)) { - throw new InvalidArgumentException(sprintf('The DSN has some garbage at the end: %s.', substr($dsn, $offset))); + throw new InvalidArgumentException(sprintf('The DSN has some garbage at the end: "%s".', substr($dsn, $offset))); } return $transport; diff --git a/src/Symfony/Component/Messenger/Command/DebugCommand.php b/src/Symfony/Component/Messenger/Command/DebugCommand.php index b86dc4b547d87..6e9fc617755ab 100644 --- a/src/Symfony/Component/Messenger/Command/DebugCommand.php +++ b/src/Symfony/Component/Messenger/Command/DebugCommand.php @@ -42,7 +42,7 @@ public function __construct(array $mapping) protected function configure() { $this - ->addArgument('bus', InputArgument::OPTIONAL, sprintf('The bus id (one of %s)', implode(', ', array_keys($this->mapping)))) + ->addArgument('bus', InputArgument::OPTIONAL, sprintf('The bus id (one of "%s")', implode('", "', array_keys($this->mapping)))) ->setDescription('Lists messages you can dispatch using the message buses') ->setHelp(<<<'EOF' The %command.name% command displays all messages that can be @@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $mapping = $this->mapping; if ($bus = $input->getArgument('bus')) { if (!isset($mapping[$bus])) { - throw new RuntimeException(sprintf('Bus "%s" does not exist. Known buses are %s.', $bus, implode(', ', array_keys($this->mapping)))); + throw new RuntimeException(sprintf('Bus "%s" does not exist. Known buses are "%s".', $bus, implode('", "', array_keys($this->mapping)))); } $mapping = [$bus => $mapping[$bus]]; } diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php index 4ab31e840444f..bf62b4c87e953 100644 --- a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php +++ b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php @@ -75,7 +75,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds) foreach ($container->findTaggedServiceIds($this->handlerTag, true) as $serviceId => $tags) { foreach ($tags as $tag) { if (isset($tag['bus']) && !\in_array($tag['bus'], $busIds, true)) { - throw new RuntimeException(sprintf('Invalid handler service "%s": bus "%s" specified on the tag "%s" does not exist (known ones are: %s).', $serviceId, $tag['bus'], $this->handlerTag, implode(', ', $busIds))); + throw new RuntimeException(sprintf('Invalid handler service "%s": bus "%s" specified on the tag "%s" does not exist (known ones are: "%s").', $serviceId, $tag['bus'], $this->handlerTag, implode('", "', $busIds))); } $className = $container->getDefinition($serviceId)->getClass(); diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php index 833088b613470..bf590cbe7f846 100644 --- a/src/Symfony/Component/Messenger/Envelope.php +++ b/src/Symfony/Component/Messenger/Envelope.php @@ -30,7 +30,7 @@ final class Envelope public function __construct($message, array $stamps = []) { if (!\is_object($message)) { - throw new \TypeError(sprintf('Invalid argument provided to "%s()": expected object but got %s.', __METHOD__, \gettype($message))); + throw new \TypeError(sprintf('Invalid argument provided to "%s()": expected object but got "%s".', __METHOD__, \gettype($message))); } $this->message = $message; diff --git a/src/Symfony/Component/Messenger/MessageBus.php b/src/Symfony/Component/Messenger/MessageBus.php index e860457bcbff7..d8146070a8106 100644 --- a/src/Symfony/Component/Messenger/MessageBus.php +++ b/src/Symfony/Component/Messenger/MessageBus.php @@ -62,7 +62,7 @@ public function getIterator(): \Traversable public function dispatch($message, array $stamps = []): Envelope { if (!\is_object($message)) { - throw new \TypeError(sprintf('Invalid argument provided to "%s()": expected object, but got %s.', __METHOD__, \gettype($message))); + throw new \TypeError(sprintf('Invalid argument provided to "%s()": expected object, but got "%s".', __METHOD__, \gettype($message))); } $envelope = Envelope::wrap($message, $stamps); $middlewareIterator = $this->middlewareAggregate->getIterator(); diff --git a/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php b/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php index 4debfd1260b18..42aef7ee128ba 100644 --- a/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php @@ -37,7 +37,7 @@ public function __construct($middlewareIterator = null) } elseif ($middlewareIterator instanceof MiddlewareInterface) { $this->stack->stack[] = $middlewareIterator; } elseif (!is_iterable($middlewareIterator)) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be iterable of %s, %s given.', __METHOD__, MiddlewareInterface::class, \is_object($middlewareIterator) ? \get_class($middlewareIterator) : \gettype($middlewareIterator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be iterable of "%s", "%s" given.', __METHOD__, MiddlewareInterface::class, \is_object($middlewareIterator) ? \get_class($middlewareIterator) : \gettype($middlewareIterator))); } else { $this->stack->iterator = (function () use ($middlewareIterator) { yield from $middlewareIterator; diff --git a/src/Symfony/Component/Messenger/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/DebugCommandTest.php index e637d51dd3126..83b1deff334d3 100644 --- a/src/Symfony/Component/Messenger/Tests/Command/DebugCommandTest.php +++ b/src/Symfony/Component/Messenger/Tests/Command/DebugCommandTest.php @@ -142,7 +142,7 @@ public function testOutputWithoutMessages() public function testExceptionOnUnknownBusArgument() { $this->expectException('Symfony\Component\Console\Exception\RuntimeException'); - $this->expectExceptionMessage('Bus "unknown_bus" does not exist. Known buses are command_bus, query_bus.'); + $this->expectExceptionMessage('Bus "unknown_bus" does not exist. Known buses are "command_bus", "query_bus".'); $command = new DebugCommand(['command_bus' => [], 'query_bus' => []]); $tester = new CommandTester($command); diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php index e87cbf18b5232..3ec352970a502 100644 --- a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php +++ b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php @@ -156,7 +156,7 @@ public function testProcessHandlersByBus() public function testProcessTagWithUnknownBus() { $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException'); - $this->expectExceptionMessage('Invalid handler service "Symfony\Component\Messenger\Tests\Fixtures\DummyCommandHandler": bus "unknown_bus" specified on the tag "messenger.message_handler" does not exist (known ones are: command_bus).'); + $this->expectExceptionMessage('Invalid handler service "Symfony\Component\Messenger\Tests\Fixtures\DummyCommandHandler": bus "unknown_bus" specified on the tag "messenger.message_handler" does not exist (known ones are: "command_bus").'); $container = $this->getContainerBuilder($commandBusId = 'command_bus'); $container->register(DummyCommandHandler::class)->addTag('messenger.message_handler', ['bus' => 'unknown_bus']); diff --git a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php index 4e1c2f6982d2e..531643bd56ae0 100644 --- a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php +++ b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php @@ -35,7 +35,7 @@ public function testItHasTheRightInterface() public function testItDispatchInvalidMessageType() { $this->expectException('TypeError'); - $this->expectExceptionMessage('Invalid argument provided to "Symfony\Component\Messenger\MessageBus::dispatch()": expected object, but got string.'); + $this->expectExceptionMessage('Invalid argument provided to "Symfony\Component\Messenger\MessageBus::dispatch()": expected object, but got "string".'); (new MessageBus())->dispatch('wrong'); } diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php index 7664c53f345e9..b2799af03ca1b 100644 --- a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php @@ -163,7 +163,7 @@ private static function normalizeQueueArguments(array $arguments): array } if (!is_numeric($arguments[$key])) { - throw new InvalidArgumentException(sprintf('Integer expected for queue argument "%s", %s given.', $key, \gettype($arguments[$key]))); + throw new InvalidArgumentException(sprintf('Integer expected for queue argument "%s", "%s" given.', $key, \gettype($arguments[$key]))); } $arguments[$key] = (int) $arguments[$key]; diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php index b4455e04f1f8a..6c4fa47b216a9 100644 --- a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php +++ b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php @@ -28,7 +28,7 @@ class DoctrineTransportFactory implements TransportFactoryInterface public function __construct($registry) { if (!$registry instanceof RegistryInterface && !$registry instanceof ConnectionRegistry) { - throw new \TypeError(sprintf('Expected an instance of %s or %s, but got %s.', RegistryInterface::class, ConnectionRegistry::class, \is_object($registry) ? \get_class($registry) : \gettype($registry))); + throw new \TypeError(sprintf('Expected an instance of "%s" or "%s", but got "%s".', RegistryInterface::class, ConnectionRegistry::class, \is_object($registry) ? \get_class($registry) : \gettype($registry))); } $this->registry = $registry; diff --git a/src/Symfony/Component/Mime/Crypto/SMime.php b/src/Symfony/Component/Mime/Crypto/SMime.php index 55941be9f4f29..c6317a6bb11f2 100644 --- a/src/Symfony/Component/Mime/Crypto/SMime.php +++ b/src/Symfony/Component/Mime/Crypto/SMime.php @@ -24,7 +24,7 @@ abstract class SMime protected function normalizeFilePath(string $path): string { if (!file_exists($path)) { - throw new RuntimeException(sprintf('File does not exist: %s.', $path)); + throw new RuntimeException(sprintf('File does not exist: "%s".', $path)); } return 'file://'.str_replace('\\', '/', realpath($path)); diff --git a/src/Symfony/Component/Mime/Tests/Crypto/SMimeTestCase.php b/src/Symfony/Component/Mime/Tests/Crypto/SMimeTestCase.php index 0bd3c139c42af..b400f47e513dd 100644 --- a/src/Symfony/Component/Mime/Tests/Crypto/SMimeTestCase.php +++ b/src/Symfony/Component/Mime/Tests/Crypto/SMimeTestCase.php @@ -33,7 +33,7 @@ protected function generateTmpFilename(): string protected function normalizeFilePath(string $path): string { if (!file_exists($path)) { - throw new RuntimeException(sprintf('File does not exist: %s', $path)); + throw new RuntimeException(sprintf('File does not exist: "%s"', $path)); } return str_replace('\\', '/', realpath($path)); diff --git a/src/Symfony/Component/Routing/Loader/ObjectLoader.php b/src/Symfony/Component/Routing/Loader/ObjectLoader.php index 7916b46e10840..b700929bdfb06 100644 --- a/src/Symfony/Component/Routing/Loader/ObjectLoader.php +++ b/src/Symfony/Component/Routing/Loader/ObjectLoader.php @@ -57,7 +57,7 @@ public function load($resource, $type = null) $loaderObject = $this->getObject($parts[0]); if (!\is_object($loaderObject)) { - throw new \TypeError(sprintf('%s:getObject() must return an object: %s returned.', static::class, \gettype($loaderObject))); + throw new \TypeError(sprintf('"%s:getObject()" must return an object: "%s" returned.', static::class, \gettype($loaderObject))); } if (!\is_callable([$loaderObject, $method])) { @@ -69,7 +69,7 @@ public function load($resource, $type = null) if (!$routeCollection instanceof RouteCollection) { $type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection); - throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned.', \get_class($loaderObject), $method, $type)); + throw new \LogicException(sprintf('The "%s::%s()" method must return a RouteCollection: "%s" returned.', \get_class($loaderObject), $method, $type)); } // make the object file tracked so that if it changes, the cache rebuilds diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php index 66867af96a786..224566d2c68ab 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php @@ -49,7 +49,7 @@ public function __construct(ExpressionLanguage $expressionLanguage, Authenticati } elseif (null === $authChecker) { @trigger_error(sprintf('Argument 3 passed to "%s()" should be an instance of AuthorizationCheckerInterface, not passing it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED); } elseif (!$authChecker instanceof AuthorizationCheckerInterface) { - throw new \TypeError(sprintf('Argument 3 passed to %s() must be an instance of %s or null, %s given.', __METHOD__, AuthorizationCheckerInterface::class, \is_object($authChecker) ? \get_class($authChecker) : \gettype($authChecker))); + throw new \TypeError(sprintf('Argument 3 passed to "%s()" must be an instance of "%s" or null, "%s" given.', __METHOD__, AuthorizationCheckerInterface::class, \is_object($authChecker) ? \get_class($authChecker) : \gettype($authChecker))); } $this->expressionLanguage = $expressionLanguage; diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php index a26d0bb57bef1..072a618933edc 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php @@ -53,7 +53,7 @@ public function __construct($mimeTypeGuesser = null) $mimeTypeGuesser = MimeTypeGuesser::getInstance(); } } elseif (!$mimeTypeGuesser instanceof MimeTypes) { - throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s" or null, %s given.', __METHOD__, MimeTypes::class, \is_object($mimeTypeGuesser) ? \get_class($mimeTypeGuesser) : \gettype($mimeTypeGuesser))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s" or null, "%s" given.', __METHOD__, MimeTypes::class, \is_object($mimeTypeGuesser) ? \get_class($mimeTypeGuesser) : \gettype($mimeTypeGuesser))); } $this->mimeTypeGuesser = $mimeTypeGuesser; diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php index 1c672b7f4fb07..94b9e3e5cd3f4 100644 --- a/src/Symfony/Component/Translation/DataCollectorTranslator.php +++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php @@ -39,7 +39,7 @@ class DataCollectorTranslator implements LegacyTranslatorInterface, TranslatorIn public function __construct($translator) { if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } if (!$translator instanceof TranslatorBagInterface || !$translator instanceof LocaleAwareInterface) { throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface, TranslatorBagInterface and LocaleAwareInterface.', \get_class($translator))); diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php index 030d7a5c3e8ec..a0ebde842b64b 100644 --- a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php +++ b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php @@ -32,7 +32,7 @@ public function __construct($translator = null, IntlFormatterInterface $intlForm if ($translator instanceof MessageSelector) { $translator = new IdentityTranslator($translator); } elseif (null !== $translator && !$translator instanceof TranslatorInterface && !$translator instanceof LegacyTranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator ?? new IdentityTranslator(); diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php index 812136fcd1971..a00119295b53e 100644 --- a/src/Symfony/Component/Translation/LoggingTranslator.php +++ b/src/Symfony/Component/Translation/LoggingTranslator.php @@ -35,7 +35,7 @@ class LoggingTranslator implements TranslatorInterface, LegacyTranslatorInterfac public function __construct($translator, LoggerInterface $logger) { if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } if (!$translator instanceof TranslatorBagInterface || !$translator instanceof LocaleAwareInterface) { throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface, TranslatorBagInterface and LocaleAwareInterface.', \get_class($translator))); diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php index 66dda4bbdf46c..ef4760ffc92fa 100644 --- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php +++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php @@ -100,7 +100,7 @@ public function validate($value, Constraint $constraint) } if (!\in_array($constraint->mode, Email::$validationModes, true)) { - throw new \InvalidArgumentException(sprintf('The %s::$mode parameter value is not valid.', \get_class($constraint))); + throw new \InvalidArgumentException(sprintf('The "%s::$mode" parameter value is not valid.', \get_class($constraint))); } if (Email::VALIDATION_MODE_STRICT === $constraint->mode) { diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php index cf87957be9d31..194e667268bd1 100644 --- a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php @@ -33,7 +33,7 @@ public function __construct(/*ExpressionLanguage */$expressionLanguage = null) $expressionLanguage = func_get_arg(1); if (null !== $expressionLanguage && !$expressionLanguage instanceof ExpressionLanguage) { - throw new \TypeError(sprintf('Argument 2 passed to %s() must be an instance of %s or null, %s given. Since 4.4, passing it as the second argument is deprecated and will trigger a deprecation. Pass it as the first argument instead.', __METHOD__, ExpressionLanguage::class, \is_object($expressionLanguage) ? \get_class($expressionLanguage) : \gettype($expressionLanguage))); + throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be an instance of "%s" or null, "%s" given. Since 4.4, passing it as the second argument is deprecated and will trigger a deprecation. Pass it as the first argument instead.', __METHOD__, ExpressionLanguage::class, \is_object($expressionLanguage) ? \get_class($expressionLanguage) : \gettype($expressionLanguage))); } } elseif (null !== $expressionLanguage && !$expressionLanguage instanceof ExpressionLanguage) { @trigger_error(sprintf('The "%s" first argument must be an instance of "%s" or null since 4.4. "%s" given', __METHOD__, ExpressionLanguage::class, \is_object($expressionLanguage) ? \get_class($expressionLanguage) : \gettype($expressionLanguage)), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php index d9461fe53a6c8..c18cc0212e491 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContext.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContext.php @@ -145,7 +145,7 @@ class ExecutionContext implements ExecutionContextInterface public function __construct(ValidatorInterface $validator, $root, $translator, string $translationDomain = null) { if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 3 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 3 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->validator = $validator; $this->root = $root; diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php index b8d56eee9a968..7c96c67396453 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php @@ -38,7 +38,7 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface public function __construct($translator, string $translationDomain = null) { if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->translator = $translator; diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php index efde61df5bc45..38df595f5516c 100644 --- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php +++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php @@ -60,7 +60,7 @@ public function __construct(LoaderInterface $loader = null, $cache = null) if ($cache instanceof CacheInterface) { @trigger_error(sprintf('Passing a "%s" to "%s" is deprecated in Symfony 4.4 and will trigger a TypeError in 5.0. Please pass an implementation of "%s" instead.', \get_class($cache), __METHOD__, CacheItemPoolInterface::class), E_USER_DEPRECATED); } elseif (!$cache instanceof CacheItemPoolInterface && null !== $cache) { - throw new \TypeError(sprintf('Expected an instance of %s, got %s.', CacheItemPoolInterface::class, \is_object($cache) ? \get_class($cache) : \gettype($cache))); + throw new \TypeError(sprintf('Expected an instance of "%s", got "%s".', CacheItemPoolInterface::class, \is_object($cache) ? \get_class($cache) : \gettype($cache))); } $this->loader = $loader; diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php index bca13c34b06ad..f201f38a8478a 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php @@ -232,7 +232,7 @@ public function testModeLoose() public function testUnknownModesOnValidateTriggerException() { $this->expectException('InvalidArgumentException'); - $this->expectExceptionMessage('The Symfony\Component\Validator\Constraints\Email::$mode parameter value is not valid.'); + $this->expectExceptionMessage('The "Symfony\Component\Validator\Constraints\Email::$mode" parameter value is not valid.'); $constraint = new Email(); $constraint->mode = 'Unknown Mode'; diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php index 8d5b49b33bedf..92b1025b55701 100644 --- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php +++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php @@ -55,7 +55,7 @@ public function __construct(ConstraintViolationList $violations, Constraint $con $message = ''; } if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) { - throw new \TypeError(sprintf('Argument 8 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); + throw new \TypeError(sprintf('Argument 8 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator))); } $this->violations = $violations; $this->message = $message; diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php index 7626a0a35bfb4..a737012d15b6b 100644 --- a/src/Symfony/Component/VarExporter/Internal/Exporter.php +++ b/src/Symfony/Component/VarExporter/Internal/Exporter.php @@ -78,7 +78,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount if ($reflector->hasMethod('__serialize')) { if (!$reflector->getMethod('__serialize')->isPublic()) { - throw new \Error(sprintf('Call to %s method %s::__serialize().', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class)); + throw new \Error(sprintf('Call to %s method "%s::__serialize()".', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class)); } if (!\is_array($properties = $value->__serialize())) { diff --git a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php index 0971622737225..e17f9a4663690 100644 --- a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php +++ b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php @@ -45,7 +45,7 @@ public function validate(Definition $definition, $name) $initialPlaces = $definition->getInitialPlaces(); if (2 <= \count($initialPlaces)) { - throw new InvalidDefinitionException(sprintf('The state machine "%s" can not store many places. But the definition has %s initial places. Only one is supported.', $name, \count($initialPlaces))); + throw new InvalidDefinitionException(sprintf('The state machine "%s" can not store many places. But the definition has %d initial places. Only one is supported.', $name, \count($initialPlaces))); } } } diff --git a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php index 5e6df2dd24468..7114e99e50f2b 100644 --- a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php +++ b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php @@ -52,7 +52,7 @@ public function validate(Definition $definition, $name) $initialPlaces = $definition->getInitialPlaces(); if (2 <= \count($initialPlaces)) { - throw new InvalidDefinitionException(sprintf('The marking store of workflow "%s" can not store many places. But the definition has %s initial places. Only one is supported.', $name, \count($initialPlaces))); + throw new InvalidDefinitionException(sprintf('The marking store of workflow "%s" can not store many places. But the definition has %d initial places. Only one is supported.', $name, \count($initialPlaces))); } } } From 4ab6156c5a26f3a4568e803eda95266ca6f7cc1e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 Mar 2020 16:39:23 +0100 Subject: [PATCH 62/82] Fix more quotes in exception messages --- .../Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php | 2 +- .../FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php | 2 +- .../DependencyInjection/FrameworkExtension.php | 2 +- .../Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php | 2 +- src/Symfony/Component/Cache/Traits/RedisTrait.php | 2 +- .../Component/HttpKernel/Controller/ArgumentResolver.php | 2 +- .../Component/Intl/NumberFormatter/NumberFormatter.php | 2 +- src/Symfony/Component/Lock/Store/MemcachedStore.php | 4 ++-- src/Symfony/Component/Lock/Store/RedisStore.php | 2 +- src/Symfony/Component/Process/InputStream.php | 2 +- src/Symfony/Component/Process/Pipes/AbstractPipes.php | 2 +- src/Symfony/Component/Process/ProcessUtils.php | 2 +- src/Symfony/Component/Process/Tests/ProcessBuilderTest.php | 2 +- src/Symfony/Component/Process/Tests/ProcessTest.php | 2 +- src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php | 2 +- .../Security/Guard/Firewall/GuardAuthenticationListener.php | 2 +- src/Symfony/Component/VarDumper/Cloner/Data.php | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php index e3ef1f0553eb7..1e033e3eae6a7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php @@ -40,7 +40,7 @@ public function __construct($container) $this->router = $container; @trigger_error(sprintf('Using a "%s" as first argument of %s is deprecated since Symfony 3.4 and will be unsupported in version 4.0. Use a %s instead.', RouterInterface::class, __CLASS__, ContainerInterface::class), E_USER_DEPRECATED); } else { - throw new \InvalidArgumentException(sprintf('%s only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__)); + throw new \InvalidArgumentException(sprintf('"%s" only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__)); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php index b4439eff48d82..4c0387bdc600e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php @@ -41,7 +41,7 @@ public function __construct($container) $this->translator = $container; @trigger_error(sprintf('Using a "%s" as first argument of %s is deprecated since Symfony 3.4 and will be unsupported in version 4.0. Use a %s instead.', TranslatorInterface::class, __CLASS__, ContainerInterface::class), E_USER_DEPRECATED); } else { - throw new \InvalidArgumentException(sprintf('%s only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__)); + throw new \InvalidArgumentException(sprintf('"%s" only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__)); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index afad1629d3718..09d06e41456b0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1201,7 +1201,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder if ($container->fileExists($dir)) { $dirs[] = $dir; } else { - throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory.', $dir)); + throw new \UnexpectedValueException(sprintf('"%s" defined in translator.paths does not exist or is not a directory.', $dir)); } } diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php index 23abdbf992aa0..a51037dcb9f6a 100644 --- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php +++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php @@ -42,7 +42,7 @@ public function __construct($container, \Traversable $iterator) $this->twig = $container; @trigger_error(sprintf('Using a "%s" as first argument of %s is deprecated since Symfony 3.4 and will be unsupported in version 4.0. Use a %s instead.', Environment::class, __CLASS__, ContainerInterface::class), E_USER_DEPRECATED); } else { - throw new \InvalidArgumentException(sprintf('%s only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__)); + throw new \InvalidArgumentException(sprintf('"%s" only accepts instance of Psr\Container\ContainerInterface as first argument.', __CLASS__)); } $this->iterator = $iterator; diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index c5b60f9e199e5..315e426dde7d8 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -48,7 +48,7 @@ private function init($redisClient, $namespace = '', $defaultLifetime = 0) throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0])); } if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) { - throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, "%s" given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); + throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, "%s" given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient))); } $this->redis = $redisClient; } diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php index fc6f969a9eae5..9d5f96ed2cf63 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php @@ -56,7 +56,7 @@ public function getArguments(Request $request, $controller) $resolved = $resolver->resolve($request, $metadata); if (!$resolved instanceof \Generator) { - throw new \InvalidArgumentException(sprintf('%s::resolve() must yield at least one value.', \get_class($resolver))); + throw new \InvalidArgumentException(sprintf('"%s::resolve()" must yield at least one value.', \get_class($resolver))); } foreach ($resolved as $append) { diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index 72e1ca5b4e592..7792a1e757541 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -363,7 +363,7 @@ public function format($value, $type = self::TYPE_DEFAULT) } if (self::CURRENCY === $this->style) { - throw new NotImplementedException(sprintf('%s() method does not support the formatting of currencies (instance with CURRENCY style). "%s".', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE)); + throw new NotImplementedException(sprintf('"%s()" method does not support the formatting of currencies (instance with CURRENCY style). "%s".', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE)); } // Only the default type is supported. diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php index ebe6973133858..52eff0a31c475 100644 --- a/src/Symfony/Component/Lock/Store/MemcachedStore.php +++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php @@ -46,7 +46,7 @@ public function __construct(\Memcached $memcached, $initialTtl = 300) } if ($initialTtl < 1) { - throw new InvalidArgumentException(sprintf('%s() expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl)); + throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl)); } $this->memcached = $memcached; @@ -79,7 +79,7 @@ public function waitAndSave(Key $key) public function putOffExpiration(Key $key, $ttl) { if ($ttl < 1) { - throw new InvalidArgumentException(sprintf('%s() expects a TTL greater or equals to 1. Got %s.', __METHOD__, $ttl)); + throw new InvalidArgumentException(sprintf('"%s()" expects a TTL greater or equals to 1. Got %s.', __METHOD__, $ttl)); } // Interface defines a float value but Store required an integer. diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php index 55213742a196b..da076c0145b1e 100644 --- a/src/Symfony/Component/Lock/Store/RedisStore.php +++ b/src/Symfony/Component/Lock/Store/RedisStore.php @@ -143,7 +143,7 @@ private function evaluate($script, $resource, array $args) return \call_user_func_array([$this->redis, 'eval'], array_merge([$script, 1, $resource], $args)); } - throw new InvalidArgumentException(sprintf('%s() expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis))); + throw new InvalidArgumentException(sprintf('"%s()" expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis))); } /** diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php index 82dbdb223d0c6..ef38dd7bfd41c 100644 --- a/src/Symfony/Component/Process/InputStream.php +++ b/src/Symfony/Component/Process/InputStream.php @@ -45,7 +45,7 @@ public function write($input) return; } if ($this->isClosed()) { - throw new RuntimeException(sprintf('%s is closed.', static::class)); + throw new RuntimeException(sprintf('"%s" is closed.', static::class)); } $this->input[] = ProcessUtils::validateInput(__METHOD__, $input); } diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php index b84b4f084c837..cdffaaffe4aee 100644 --- a/src/Symfony/Component/Process/Pipes/AbstractPipes.php +++ b/src/Symfony/Component/Process/Pipes/AbstractPipes.php @@ -107,7 +107,7 @@ protected function write() } elseif (!isset($this->inputBuffer[0])) { if (!\is_string($input)) { if (!is_scalar($input)) { - throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported.', \get_class($this->input), \gettype($input))); + throw new InvalidArgumentException(sprintf('"%s" yielded a value of type "%s", but only scalars and stream resources are supported.', \get_class($this->input), \gettype($input))); } $input = (string) $input; } diff --git a/src/Symfony/Component/Process/ProcessUtils.php b/src/Symfony/Component/Process/ProcessUtils.php index 00acde0a196e0..74f2d8654a5a8 100644 --- a/src/Symfony/Component/Process/ProcessUtils.php +++ b/src/Symfony/Component/Process/ProcessUtils.php @@ -110,7 +110,7 @@ public static function validateInput($caller, $input) return new \IteratorIterator($input); } - throw new InvalidArgumentException(sprintf('%s only accepts strings, Traversable objects or stream resources.', $caller)); + throw new InvalidArgumentException(sprintf('"%s" only accepts strings, Traversable objects or stream resources.', $caller)); } return $input; diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php index 7ab74402ac688..c2851357d7d40 100644 --- a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php @@ -200,7 +200,7 @@ public function testShouldReturnProcessWithEnabledOutput() public function testInvalidInput() { $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException'); - $this->expectExceptionMessage('Symfony\Component\Process\ProcessBuilder::setInput only accepts strings, Traversable objects or stream resources.'); + $this->expectExceptionMessage('"Symfony\Component\Process\ProcessBuilder::setInput" only accepts strings, Traversable objects or stream resources.'); $builder = ProcessBuilder::create(); $builder->setInput([]); } diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php index 9bc3dedbf2905..e5335282ca4e3 100644 --- a/src/Symfony/Component/Process/Tests/ProcessTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessTest.php @@ -263,7 +263,7 @@ public function testSetInputWhileRunningThrowsAnException() public function testInvalidInput($value) { $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException'); - $this->expectExceptionMessage('Symfony\Component\Process\Process::setInput only accepts strings, Traversable objects or stream resources.'); + $this->expectExceptionMessage('"Symfony\Component\Process\Process::setInput" only accepts strings, Traversable objects or stream resources.'); $process = $this->getProcess('foo'); $process->setInput($value); } diff --git a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php b/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php index 33cfcacc9f9c2..3920fc4bef9f6 100644 --- a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php +++ b/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php @@ -55,7 +55,7 @@ public function load($resource, $type = null) $loaderObject = $this->getServiceObject($serviceString); if (!\is_object($loaderObject)) { - throw new \LogicException(sprintf('%s:getServiceObject() must return an object: "%s" returned.', static::class, \gettype($loaderObject))); + throw new \LogicException(sprintf('"%s:getServiceObject()" must return an object: "%s" returned.', static::class, \gettype($loaderObject))); } if (!method_exists($loaderObject, $method)) { diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php index ed21e9974e0fe..dc0da956a4bc1 100644 --- a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php +++ b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php @@ -221,7 +221,7 @@ private function triggerRememberMe(GuardAuthenticatorInterface $guardAuthenticat } if (!$response instanceof Response) { - throw new \LogicException(sprintf('%s::onAuthenticationSuccess *must* return a Response if you want to use the remember me functionality. Return a Response, or set remember_me to false under the guard configuration.', \get_class($guardAuthenticator))); + throw new \LogicException(sprintf('"%s::onAuthenticationSuccess()" *must* return a Response if you want to use the remember me functionality. Return a Response, or set remember_me to false under the guard configuration.', \get_class($guardAuthenticator))); } $this->rememberMeServices->loginSuccess($request, $response, $token); diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php index a279f9a69eab2..42742d852dd3c 100644 --- a/src/Symfony/Component/VarDumper/Cloner/Data.php +++ b/src/Symfony/Component/VarDumper/Cloner/Data.php @@ -114,7 +114,7 @@ public function count() public function getIterator() { if (!\is_array($value = $this->getValue())) { - throw new \LogicException(sprintf('%s object holds non-iterable type "%s".', self::class, \gettype($value))); + throw new \LogicException(sprintf('"%s" object holds non-iterable type "%s".', self::class, \gettype($value))); } foreach ($value as $k => $v) { From c79fe029e75ccd5dad3766ca8c1f3a81b6308713 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 Mar 2020 17:13:17 +0100 Subject: [PATCH 63/82] Fix more quotes in exception messages --- src/Symfony/Component/HttpClient/CurlHttpClient.php | 2 +- src/Symfony/Component/HttpClient/MockHttpClient.php | 2 +- src/Symfony/Component/HttpClient/NativeHttpClient.php | 2 +- .../Session/Storage/Handler/RedisSessionHandler.php | 2 +- src/Symfony/Component/Lock/Store/PdoStore.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index 9f9fbd0a8ac8e..ddc7f9d9f351c 100644 --- a/src/Symfony/Component/HttpClient/CurlHttpClient.php +++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php @@ -319,7 +319,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa if ($responses instanceof CurlResponse) { $responses = [$responses]; } elseif (!is_iterable($responses)) { - throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); + throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of CurlResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); } $active = 0; diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php index 7e09e35089ae5..07d53cc1495a0 100644 --- a/src/Symfony/Component/HttpClient/MockHttpClient.php +++ b/src/Symfony/Component/HttpClient/MockHttpClient.php @@ -79,7 +79,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa if ($responses instanceof ResponseInterface) { $responses = [$responses]; } elseif (!is_iterable($responses)) { - throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); + throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of MockResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); } return new ResponseStream(MockResponse::stream($responses, $timeout)); diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php index ea78d84388276..055227c3f3c71 100644 --- a/src/Symfony/Component/HttpClient/NativeHttpClient.php +++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php @@ -238,7 +238,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa if ($responses instanceof NativeResponse) { $responses = [$responses]; } elseif (!is_iterable($responses)) { - throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); + throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of NativeResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses))); } return new ResponseStream(NativeResponse::stream($responses, $timeout)); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php index 8fc19c6bc4b60..699d6da6f65ef 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php @@ -54,7 +54,7 @@ public function __construct($redis, array $options = []) !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy ) { - throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis))); + throw new \InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis))); } if ($diff = array_diff(array_keys($options), ['prefix', 'ttl'])) { diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php index 3d059f032d697..5e2f01caa408e 100644 --- a/src/Symfony/Component/Lock/Store/PdoStore.php +++ b/src/Symfony/Component/Lock/Store/PdoStore.php @@ -82,7 +82,7 @@ public function __construct($connOrDsn, array $options = [], float $gcProbabilit throw new InvalidArgumentException(sprintf('"%s" requires gcProbability between 0 and 1, "%f" given.', __METHOD__, $gcProbability)); } if ($initialTtl < 1) { - throw new InvalidTtlException(sprintf('%s() expects a strictly positive TTL, "%d" given.', __METHOD__, $initialTtl)); + throw new InvalidTtlException(sprintf('"%s()" expects a strictly positive TTL, "%d" given.', __METHOD__, $initialTtl)); } if ($connOrDsn instanceof \PDO) { @@ -156,7 +156,7 @@ public function waitAndSave(Key $key) public function putOffExpiration(Key $key, $ttl) { if ($ttl < 1) { - throw new InvalidTtlException(sprintf('%s() expects a TTL greater or equals to 1 second. Got %s.', __METHOD__, $ttl)); + throw new InvalidTtlException(sprintf('"%s()" expects a TTL greater or equals to 1 second. Got %s.', __METHOD__, $ttl)); } $key->reduceLifetime($ttl); From 3ae3244b8cf7693a1998a6cc4d114b48a1e40244 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 17 Mar 2020 10:54:35 +0100 Subject: [PATCH 64/82] fix merge --- .../Functional/Bundle/TestBundle/Resources/config/routing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml index d9c7986f42042..155871fc278ec 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml @@ -20,7 +20,7 @@ session_setflash: injected_flashbag_session_setflash: path: injected_flashbag/session_setflash/{message} - defaults: { _controller: TestBundle:InjectedFlashbagSession:setFlash} + defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\InjectedFlashbagSessionController::setFlashAction} session_showflash: path: /session_showflash From a0a6243a21e0bcae2cbcfbe80fa9a65a080040fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= Date: Tue, 17 Mar 2020 07:26:07 +0100 Subject: [PATCH 65/82] Fix deprecation messages --- src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php | 2 +- .../Security/Factory/FormLoginLdapFactory.php | 2 +- .../Security/Factory/HttpBasicLdapFactory.php | 2 +- .../Security/Factory/JsonLoginLdapFactory.php | 2 +- .../Authentication/Provider/LdapBindAuthenticationProvider.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php index e35d691fc36b2..b99a5fb13e3bf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php @@ -42,7 +42,7 @@ private function doTearDown() protected static function createClient(array $options = [], array $server = []) { if (static::$booted) { - @trigger_error(sprintf('Calling "%s()" while a kernel has been booted is deprecated since Symfony 4.4 and will throw in 5.0, ensure the kernel is shut down before calling the method.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('Calling "%s()" while a kernel has been booted is deprecated since Symfony 4.4 and will throw an exception in 5.0, ensure the kernel is shut down before calling the method.', __METHOD__), E_USER_DEPRECATED); } $kernel = static::bootKernel($options); diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php index d7b53e5cf4c10..a0cb0227ae98a 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php @@ -40,7 +40,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config, if (!empty($config['query_string'])) { if ('' === $config['search_dn'] || '' === $config['search_password']) { - @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED); + @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED); } $definition->addMethodCall('setQueryString', [$config['query_string']]); } diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php index 09933a9db931b..b14a4f67ac0d8 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php @@ -44,7 +44,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider, if (!empty($config['query_string'])) { if ('' === $config['search_dn'] || '' === $config['search_password']) { - @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED); + @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED); } $definition->addMethodCall('setQueryString', [$config['query_string']]); } diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php index 95f3f558585ee..17c60e12bd680 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php @@ -42,7 +42,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config, if (!empty($config['query_string'])) { if ('' === $config['search_dn'] || '' === $config['search_password']) { - @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED); + @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED); } $definition->addMethodCall('setQueryString', [$config['query_string']]); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php index 79276847f6c80..2c9dc44a17735 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php @@ -89,7 +89,7 @@ protected function checkAuthentication(UserInterface $user, UsernamePasswordToke if ('' !== $this->searchDn && '' !== $this->searchPassword) { $this->ldap->bind($this->searchDn, $this->searchPassword); } else { - @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED); + @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED); } $query = str_replace('{username}', $username, $this->queryString); $result = $this->ldap->query($this->dnString, $query)->execute(); From a10fc4da5dccc2fbbfafb80c11918893169ee317 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 24 Sep 2019 13:01:54 +0200 Subject: [PATCH 66/82] [DI] fix preloading script generation --- .../Twig/Extension/TranslationExtension.php | 3 + .../FrameworkBundle/FrameworkBundle.php | 19 +++++ .../Bundle/FrameworkBundle/Routing/Router.php | 5 ++ src/Symfony/Bundle/TwigBundle/TwigBundle.php | 14 ++++ .../Cache/Adapter/AdapterInterface.php | 3 + .../DependencyInjection/Container.php | 6 ++ .../DependencyInjection/Dumper/PhpDumper.php | 81 +++++++++++++++---- .../Tests/Fixtures/php/services9_as_files.txt | 18 +++++ .../php/services9_inlined_factories.txt | 10 +++ .../php/services9_lazy_inlined_factories.txt | 10 +++ .../php/services_non_shared_lazy_as_files.txt | 9 +++ .../ErrorRenderer/CliErrorRenderer.php | 3 + .../Component/HttpFoundation/AcceptHeader.php | 3 + .../Component/HttpFoundation/Request.php | 8 ++ .../Component/HttpFoundation/Response.php | 3 + .../HttpFoundation/Session/Session.php | 5 ++ .../Session/Storage/NativeSessionStorage.php | 5 ++ .../Component/HttpKernel/HttpClientKernel.php | 3 + .../Component/HttpKernel/HttpKernel.php | 12 +++ src/Symfony/Component/HttpKernel/Kernel.php | 4 + .../AuthenticationProviderManager.php | 5 ++ .../Core/Authorization/ExpressionLanguage.php | 3 + .../AnonymousAuthenticationListener.php | 3 + .../Http/Firewall/LegacyListenerTrait.php | 3 + src/Symfony/Component/Stopwatch/Stopwatch.php | 3 + .../Formatter/MessageFormatter.php | 3 + .../Component/Validator/ValidatorBuilder.php | 5 ++ .../EventListener/AddLinkHeaderListener.php | 3 + src/Symfony/Contracts/Cache/CacheTrait.php | 3 + .../Contracts/Service/ServiceLocatorTrait.php | 4 + 30 files changed, 245 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php index 70cb05341c758..0204df05be7fa 100644 --- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php @@ -24,6 +24,9 @@ use Twig\TokenParser\AbstractTokenParser; use Twig\TwigFilter; +// Help opcache.preload discover always-needed symbols +class_exists(TranslatorInterface::class); + /** * Provides integration of the Translation component with Twig. * diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php index ed85fa2ea7586..931ca33285f14 100644 --- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php +++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php @@ -23,6 +23,11 @@ use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerWeakRefPass; use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass; use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass; +use Symfony\Component\Cache\Adapter\ApcuAdapter; +use Symfony\Component\Cache\Adapter\ArrayAdapter; +use Symfony\Component\Cache\Adapter\ChainAdapter; +use Symfony\Component\Cache\Adapter\PhpArrayAdapter; +use Symfony\Component\Cache\Adapter\PhpFilesAdapter; use Symfony\Component\Cache\DependencyInjection\CacheCollectorPass; use Symfony\Component\Cache\DependencyInjection\CachePoolClearerPass; use Symfony\Component\Cache\DependencyInjection\CachePoolPass; @@ -32,6 +37,7 @@ use Symfony\Component\DependencyInjection\Compiler\PassConfig; use Symfony\Component\DependencyInjection\Compiler\RegisterReverseContainerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\Dotenv\Dotenv; use Symfony\Component\ErrorHandler\ErrorHandler; use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass; use Symfony\Component\Form\DependencyInjection\FormPass; @@ -58,6 +64,19 @@ use Symfony\Component\Validator\DependencyInjection\AddAutoMappingConfigurationPass; use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass; use Symfony\Component\Validator\DependencyInjection\AddValidatorInitializersPass; +use Symfony\Component\VarExporter\Internal\Hydrator; +use Symfony\Component\VarExporter\Internal\Registry; + +// Help opcache.preload discover always-needed symbols +class_exists(ApcuAdapter::class); +class_exists(ArrayAdapter::class); +class_exists(ChainAdapter::class); +class_exists(PhpArrayAdapter::class); +class_exists(PhpFilesAdapter::class); +class_exists(Dotenv::class); +class_exists(ErrorHandler::class); +class_exists(Hydrator::class); +class_exists(Registry::class); /** * Bundle. diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index 08628f4060d1f..8971e5330b000 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -20,10 +20,15 @@ use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException; use Symfony\Component\DependencyInjection\Exception\RuntimeException; use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface; +use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\Router as BaseRouter; +// Help opcache.preload discover always-needed symbols +class_exists(RedirectableCompiledUrlMatcher::class); +class_exists(Route::class); + /** * This Router creates the Loader only when the cache is empty. * diff --git a/src/Symfony/Bundle/TwigBundle/TwigBundle.php b/src/Symfony/Bundle/TwigBundle/TwigBundle.php index 5a353833eb27c..8b214bcf8e346 100644 --- a/src/Symfony/Bundle/TwigBundle/TwigBundle.php +++ b/src/Symfony/Bundle/TwigBundle/TwigBundle.php @@ -20,6 +20,20 @@ use Symfony\Component\DependencyInjection\Compiler\PassConfig; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; +use Twig\Cache\FilesystemCache; +use Twig\Extension\CoreExtension; +use Twig\Extension\EscaperExtension; +use Twig\Extension\OptimizerExtension; +use Twig\Extension\StagingExtension; +use Twig\ExtensionSet; + +// Help opcache.preload discover always-needed symbols +class_exists(FilesystemCache::class); +class_exists(CoreExtension::class); +class_exists(EscaperExtension::class); +class_exists(OptimizerExtension::class); +class_exists(StagingExtension::class); +class_exists(ExtensionSet::class); /** * Bundle. diff --git a/src/Symfony/Component/Cache/Adapter/AdapterInterface.php b/src/Symfony/Component/Cache/Adapter/AdapterInterface.php index c40ae42b55fa9..fbc74cae79014 100644 --- a/src/Symfony/Component/Cache/Adapter/AdapterInterface.php +++ b/src/Symfony/Component/Cache/Adapter/AdapterInterface.php @@ -14,6 +14,9 @@ use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\CacheItem; +// Help opcache.preload discover always-needed symbols +class_exists(CacheItem::class); + /** * Interface for adapters managing instances of Symfony's CacheItem. * diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index 00bacd2ac6ded..d098d614fff47 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -11,6 +11,8 @@ namespace Symfony\Component\DependencyInjection; +use Symfony\Component\DependencyInjection\Argument\RewindableGenerator; +use Symfony\Component\DependencyInjection\Argument\ServiceLocator as ArgumentServiceLocator; use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException; @@ -22,6 +24,10 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Contracts\Service\ResetInterface; +// Help opcache.preload discover always-needed symbols +class_exists(RewindableGenerator::class); +class_exists(ArgumentServiceLocator::class); + /** * Container is a dependency injection container. * diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 6915579893e1e..982472f5adf07 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -81,6 +81,7 @@ class PhpDumper extends Dumper private $inlinedRequires = []; private $circularReferences = []; private $singleUsePrivateIds = []; + private $preload = []; private $addThrow = false; private $addGetService = false; private $locatedIds = []; @@ -142,6 +143,7 @@ public function dump(array $options = []) 'hot_path_tag' => 'container.hot_path', 'inline_factories_parameter' => 'container.dumper.inline_factories', 'inline_class_loader_parameter' => 'container.dumper.inline_class_loader', + 'preload_classes' => [], 'service_locator_tag' => 'container.service_locator', 'build_time' => time(), ], $options); @@ -226,8 +228,12 @@ public function dump(array $options = []) $proxyClasses = $this->inlineFactories ? $this->generateProxyClasses() : null; + if ($options['preload_classes']) { + $this->preload = array_combine($options['preload_classes'], $options['preload_classes']); + } + $code = - $this->startClass($options['class'], $baseClass, $preload). + $this->startClass($options['class'], $baseClass). $this->addServices($services). $this->addDeprecatedAliases(). $this->addDefaultParametersMethod() @@ -302,7 +308,7 @@ public function dump(array $options = []) $id = hash('crc32', $hash.$time); $this->asFiles = false; - if ($preload && null !== $autoloadFile = $this->getAutoloadFile()) { + if ($this->preload && null !== $autoloadFile = $this->getAutoloadFile()) { $autoloadFile = substr($this->export($autoloadFile), 2, -1); $code[$options['class'].'.preload.php'] = <<preload as $class) { + if (!$class || false !== strpos($class, '$')) { + continue; + } + if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || (new \ReflectionClass($class))->isUserDefined()) { + $code[$options['class'].'.preload.php'] .= sprintf("\$classes[] = '%s';\n", $class); + } } $code[$options['class'].'.preload.php'] .= <<<'EOF' @@ -367,6 +378,7 @@ public function dump(array $options = []) $this->circularReferences = []; $this->locatedIds = []; $this->exportedVariables = []; + $this->preload = []; $unusedEnvs = []; foreach ($this->container->getEnvCounters() as $env => $use) { @@ -542,8 +554,10 @@ private function addServiceInclude(string $cId, Definition $definition): string if ($this->inlineRequires && (!$this->isHotPath($definition) || $this->getProxyDumper()->isProxyCandidate($definition))) { $lineage = []; foreach ($this->inlinedDefinitions as $def) { - if (!$def->isDeprecated() && \is_string($class = \is_array($factory = $def->getFactory()) && \is_string($factory[0]) ? $factory[0] : $def->getClass())) { - $this->collectLineage($class, $lineage); + if (!$def->isDeprecated()) { + foreach ($this->getClasses($def) as $class) { + $this->collectLineage($class, $lineage); + } } } @@ -552,9 +566,10 @@ private function addServiceInclude(string $cId, Definition $definition): string && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE !== $behavior && $this->container->has($id) && $this->isTrivialInstance($def = $this->container->findDefinition($id)) - && \is_string($class = \is_array($factory = $def->getFactory()) && \is_string($factory[0]) ? $factory[0] : $def->getClass()) ) { - $this->collectLineage($class, $lineage); + foreach ($this->getClasses($def) as $class) { + $this->collectLineage($class, $lineage); + } } } @@ -804,6 +819,12 @@ protected function {$methodName}($lazyInitialization) if ($definition->isDeprecated()) { $code .= sprintf(" @trigger_error(%s, E_USER_DEPRECATED);\n\n", $this->export($definition->getDeprecationMessage($id))); + } else { + foreach ($this->inlinedDefinitions as $def) { + foreach ($this->getClasses($def) as $class) { + $this->preload[$class] = $class; + } + } } if ($this->getProxyDumper()->isProxyCandidate($definition)) { @@ -960,7 +981,15 @@ private function addServices(array &$services = null): string $definitions = $this->container->getDefinitions(); ksort($definitions); foreach ($definitions as $id => $definition) { - $services[$id] = $definition->isSynthetic() ? null : $this->addService($id, $definition); + if (!$definition->isSynthetic()) { + $services[$id] = $this->addService($id, $definition); + } else { + $services[$id] = null; + + foreach ($this->getClasses($definition) as $class) { + $this->preload[$class] = $class; + } + } } foreach ($definitions as $id => $definition) { @@ -1061,7 +1090,7 @@ private function addNewInstance(Definition $definition, string $return = '', str return $return.sprintf('new %s(%s)', $this->dumpLiteralClass($this->dumpValue($class)), implode(', ', $arguments)).$tail; } - private function startClass(string $class, string $baseClass, ?array &$preload): string + private function startClass(string $class, string $baseClass): string { $namespaceLine = !$this->asFiles && $this->namespace ? "\nnamespace {$this->namespace};\n" : ''; @@ -1124,7 +1153,7 @@ public function __construct() $code .= $this->addMethodMap(); $code .= $this->asFiles && !$this->inlineFactories ? $this->addFileMap() : ''; $code .= $this->addAliases(); - $code .= $this->addInlineRequires($preload); + $code .= $this->addInlineRequires(); $code .= <<hotPathTag || !$this->inlineRequires) { return ''; @@ -1342,8 +1371,7 @@ private function addInlineRequires(?array &$preload): string $inlinedDefinitions = $this->getDefinitionsFromArguments([$definition]); foreach ($inlinedDefinitions as $def) { - if (\is_string($class = \is_array($factory = $def->getFactory()) && \is_string($factory[0]) ? $factory[0] : $def->getClass())) { - $preload[$class] = $class; + foreach ($this->getClasses($def) as $class) { $this->collectLineage($class, $lineage); } } @@ -2065,4 +2093,29 @@ private function getAutoloadFile(): ?string return null; } + + private function getClasses(Definition $definition): array + { + $classes = []; + + while ($definition instanceof Definition) { + $classes[] = trim($definition->getClass(), '\\'); + $factory = $definition->getFactory(); + + if (!\is_array($factory)) { + $factory = [$factory]; + } + + if (\is_string($factory[0])) { + if (false !== $i = strrpos($factory[0], '::')) { + $factory[0] = substr($factory[0], 0, $i); + } + $classes[] = trim($factory[0], '\\'); + } + + $definition = $factory[0]; + } + + return array_filter($classes); + } } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt index 2bbf46c906b95..1845785fb5447 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt @@ -531,6 +531,24 @@ class ProjectServiceContainer extends Container } } + [ProjectServiceContainer.preload.php] => */ diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php index bbbd62a6d28ab..c3c8d0c3560e1 100644 --- a/src/Symfony/Component/HttpFoundation/AcceptHeader.php +++ b/src/Symfony/Component/HttpFoundation/AcceptHeader.php @@ -11,6 +11,9 @@ namespace Symfony\Component\HttpFoundation; +// Help opcache.preload discover always-needed symbols +class_exists(AcceptHeaderItem::class); + /** * Represents an Accept-* header. * diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index bff1c0cbfad7f..a5e50eb795a5f 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -15,6 +15,14 @@ use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException; use Symfony\Component\HttpFoundation\Session\SessionInterface; +// Help opcache.preload discover always-needed symbols +class_exists(AcceptHeader::class); +class_exists(FileBag::class); +class_exists(HeaderBag::class); +class_exists(HeaderUtils::class); +class_exists(ParameterBag::class); +class_exists(ServerBag::class); + /** * Request represents an HTTP request. * diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index b267cd8ceb57b..714109d53669b 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -11,6 +11,9 @@ namespace Symfony\Component\HttpFoundation; +// Help opcache.preload discover always-needed symbols +class_exists(ResponseHeaderBag::class); + /** * Response represents an HTTP response. * diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php index 2192c629e8963..b6973aaabb989 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Session.php +++ b/src/Symfony/Component/HttpFoundation/Session/Session.php @@ -18,6 +18,11 @@ use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface; +// Help opcache.preload discover always-needed symbols +class_exists(AttributeBag::class); +class_exists(FlashBag::class); +class_exists(SessionBagProxy::class); + /** * @author Fabien Potencier * @author Drak diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index 93a5d54e4dd28..54933d953af3a 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -17,6 +17,11 @@ use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy; use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy; +// Help opcache.preload discover always-needed symbols +class_exists(MetadataBag::class); +class_exists(StrictSessionHandler::class); +class_exists(SessionHandlerProxy::class); + /** * This provides a base class for session attribute storage. * diff --git a/src/Symfony/Component/HttpKernel/HttpClientKernel.php b/src/Symfony/Component/HttpKernel/HttpClientKernel.php index c8421a4b10415..912ce313f8321 100644 --- a/src/Symfony/Component/HttpKernel/HttpClientKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpClientKernel.php @@ -21,6 +21,9 @@ use Symfony\Component\Mime\Part\TextPart; use Symfony\Contracts\HttpClient\HttpClientInterface; +// Help opcache.preload discover always-needed symbols +class_exists(ResponseHeaderBag::class); + /** * An implementation of a Symfony HTTP kernel using a "real" HTTP client. * diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index f1b601361e794..681e96321d038 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -33,6 +33,18 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +// Help opcache.preload discover always-needed symbols +class_exists(LegacyEventDispatcherProxy::class); +class_exists(ControllerArgumentsEvent::class); +class_exists(ControllerEvent::class); +class_exists(ExceptionEvent::class); +class_exists(FinishRequestEvent::class); +class_exists(RequestEvent::class); +class_exists(ResponseEvent::class); +class_exists(TerminateEvent::class); +class_exists(ViewEvent::class); +class_exists(KernelEvents::class); + /** * HttpKernel notifies events to convert a Request object to a Response one. * diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 6c8f019c6e991..d6f5a462d6e9b 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -38,6 +38,9 @@ use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass; use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass; +// Help opcache.preload discover always-needed symbols +class_exists(ConfigCache::class); + /** * The Kernel is the heart of the Symfony system. * @@ -805,6 +808,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container 'as_files' => true, 'debug' => $this->debug, 'build_time' => $container->hasParameter('kernel.container_build_time') ? $container->getParameter('kernel.container_build_time') : time(), + 'preload_classes' => array_map('get_class', $this->bundles), ]); $rootCode = array_pop($content); diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php index 9a64565c523a0..6248090820bbf 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php +++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php @@ -22,6 +22,11 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Exception\ProviderNotFoundException; +// Help opcache.preload discover always-needed symbols +class_exists(AuthenticationEvents::class); +class_exists(AuthenticationFailureEvent::class); +class_exists(AuthenticationSuccessEvent::class); + /** * AuthenticationProviderManager uses a list of AuthenticationProviderInterface * instances to authenticate a Token. diff --git a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php index ca15a40425176..0deff425b798f 100644 --- a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php +++ b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php @@ -14,6 +14,9 @@ use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage; +// Help opcache.preload discover always-needed symbols +class_exists(ExpressionLanguageProvider::class); + if (!class_exists(BaseExpressionLanguage::class)) { throw new \LogicException(sprintf('The "%s" class requires the "ExpressionLanguage" component. Try running "composer require symfony/expression-language".', ExpressionLanguage::class)); } else { diff --git a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php index 0f1da391e6dff..999796d368036 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php @@ -19,6 +19,9 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; +// Help opcache.preload discover always-needed symbols +class_exists(AnonymousToken::class); + /** * AnonymousAuthenticationListener automatically adds a Token if none is * already present. diff --git a/src/Symfony/Component/Security/Http/Firewall/LegacyListenerTrait.php b/src/Symfony/Component/Security/Http/Firewall/LegacyListenerTrait.php index 260cb680e0baf..6f2bc2236356d 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LegacyListenerTrait.php +++ b/src/Symfony/Component/Security/Http/Firewall/LegacyListenerTrait.php @@ -15,6 +15,9 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\RequestEvent; +// Help opcache.preload discover always-needed symbols +class_exists(RequestEvent::class); + /** * @deprecated * diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php index a9f8862f523f0..12c25f0aa4a4f 100644 --- a/src/Symfony/Component/Stopwatch/Stopwatch.php +++ b/src/Symfony/Component/Stopwatch/Stopwatch.php @@ -13,6 +13,9 @@ use Symfony\Contracts\Service\ResetInterface; +// Help opcache.preload discover always-needed symbols +class_exists(Section::class); + /** * Stopwatch provides a way to profile code. * diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php index a0ebde842b64b..a16764069f8c4 100644 --- a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php +++ b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php @@ -16,6 +16,9 @@ use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface; +// Help opcache.preload discover always-needed symbols +class_exists(IntlFormatter::class); + /** * @author Abdellatif Ait boudad */ diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php index 42fcdc0fc101e..808fbc7f43d03 100644 --- a/src/Symfony/Component/Validator/ValidatorBuilder.php +++ b/src/Symfony/Component/Validator/ValidatorBuilder.php @@ -35,6 +35,11 @@ use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorTrait; +// Help opcache.preload discover always-needed symbols +class_exists(TranslatorInterface::class); +class_exists(LocaleAwareInterface::class); +class_exists(TranslatorTrait::class); + /** * The default implementation of {@link ValidatorBuilderInterface}. * diff --git a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php index 3027529a84554..25faf15bebc5d 100644 --- a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php +++ b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php @@ -17,6 +17,9 @@ use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\WebLink\HttpHeaderSerializer; +// Help opcache.preload discover always-needed symbols +class_exists(HttpHeaderSerializer::class); + /** * Adds the Link HTTP header to the response. * diff --git a/src/Symfony/Contracts/Cache/CacheTrait.php b/src/Symfony/Contracts/Cache/CacheTrait.php index eda3d4931a158..1cc3841e2ac49 100644 --- a/src/Symfony/Contracts/Cache/CacheTrait.php +++ b/src/Symfony/Contracts/Cache/CacheTrait.php @@ -15,6 +15,9 @@ use Psr\Cache\InvalidArgumentException; use Psr\Log\LoggerInterface; +// Help opcache.preload discover always-needed symbols +class_exists(InvalidArgumentException::class); + /** * An implementation of CacheInterface for PSR-6 CacheItemPoolInterface classes. * diff --git a/src/Symfony/Contracts/Service/ServiceLocatorTrait.php b/src/Symfony/Contracts/Service/ServiceLocatorTrait.php index 4ec6eb4276cf1..0b4d60affa5e1 100644 --- a/src/Symfony/Contracts/Service/ServiceLocatorTrait.php +++ b/src/Symfony/Contracts/Service/ServiceLocatorTrait.php @@ -14,6 +14,10 @@ use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; +// Help opcache.preload discover always-needed symbols +class_exists(ContainerExceptionInterface::class); +class_exists(NotFoundExceptionInterface::class); + /** * A trait to help implement ServiceProviderInterface. * From c39188a7ccbcf2be19b1bb9397f91f1ec2dc4a31 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 17 Mar 2020 19:02:13 +0100 Subject: [PATCH 67/82] [Security/Http] don't require the session to be started when tracking its id --- .../Http/Firewall/ContextListener.php | 4 ++-- .../Tests/Firewall/ContextListenerTest.php | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index 9243119acb1cf..1201e161736bc 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -115,10 +115,10 @@ public function authenticate(RequestEvent $event) if (null !== $session) { $usageIndexValue = method_exists(Request::class, 'getPreferredFormat') && $session instanceof Session ? $usageIndexReference = &$session->getUsageIndex() : 0; - $sessionId = $session->getId(); + $sessionId = $request->cookies->get($session->getName()); $token = $session->get($this->sessionKey); - if ($this->sessionTrackerEnabler && $session->getId() === $sessionId) { + if ($this->sessionTrackerEnabler && \in_array($sessionId, [true, $session->getId()], true)) { $usageIndexReference = $usageIndexValue; } } diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php index 0d05319068cea..82a5f917d98ee 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php @@ -344,6 +344,26 @@ public function testDeauthenticatedEvent() $this->assertNull($tokenStorage->getToken()); } + /** + * @requires function \Symfony\Component\HttpFoundation\Request::getPreferredFormat + */ + public function testWithPreviousNotStartedSession() + { + $session = new Session(new MockArraySessionStorage()); + + $request = new Request(); + $request->setSession($session); + $request->cookies->set('MOCKSESSID', true); + + $usageIndex = $session->getUsageIndex(); + + $tokenStorage = new TokenStorage(); + $listener = new ContextListener($tokenStorage, [], 'context_key', null, null, null, [$tokenStorage, 'getToken']); + $listener(new RequestEvent($this->getMockBuilder(HttpKernelInterface::class)->getMock(), $request, HttpKernelInterface::MASTER_REQUEST)); + + $this->assertSame($usageIndex, $session->getUsageIndex()); + } + protected function runSessionOnKernelResponse($newToken, $original = null) { $session = new Session(new MockArraySessionStorage()); From 8c85f91b9c3af7670bfa049f49fe62771b22e210 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 17 Mar 2020 23:27:36 +0100 Subject: [PATCH 68/82] [VarDumper] fix side-effect by not using mt_rand() --- src/Symfony/Component/VarDumper/Cloner/VarCloner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php index ab44a8d76bfe4..07e6b4ca2ec8a 100644 --- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php @@ -48,8 +48,8 @@ protected function doClone($var) // or null if the original value is used directly if (!self::$hashMask) { - self::$gid = uniqid(mt_rand(), true); // Unique string used to detect the special $GLOBALS variable self::initHashMask(); + self::$gid = md5(dechex(self::$hashMask)); // Unique string used to detect the special $GLOBALS variable } $gid = self::$gid; $hashMask = self::$hashMask; From cbf4dfd10f88f2ed923c3db2aa3799cd89232cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20P=C3=A9delagrabe?= Date: Mon, 16 Mar 2020 18:59:24 +0100 Subject: [PATCH 69/82] [DI] Fix CheckTypeDeclarationPass --- .../Compiler/CheckTypeDeclarationsPass.php | 9 +++-- .../CheckTypeDeclarationsPassTest.php | 36 +++++++++++++++++++ .../CheckTypeDeclarationsPass/Foo.php | 10 ++++++ 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php index 2d69fe6eb6655..bad2624529138 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php @@ -17,7 +17,6 @@ use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Exception\InvalidParameterTypeException; use Symfony\Component\DependencyInjection\Exception\RuntimeException; @@ -207,7 +206,7 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar if ('' === preg_replace('/'.$envPlaceholderUniquePrefix.'_\w+_[a-f0-9]{32}/U', '', $value, -1, $c) && 1 === $c) { try { $value = $this->container->resolveEnvPlaceholders($value, true); - } catch (EnvNotFoundException | RuntimeException $e) { + } catch (\Exception $e) { // If an env placeholder cannot be resolved, we skip the validation. return; } @@ -250,7 +249,11 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar return; } - if ('iterable' === $type && (\is_array($value) || is_subclass_of($class, \Traversable::class))) { + if ('iterable' === $type && (\is_array($value) || 'array' === $class || is_subclass_of($class, \Traversable::class))) { + return; + } + + if ($type === $class) { return; } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php index 081db17468b16..9524c7a4f61bd 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php @@ -536,6 +536,42 @@ public function testProcessFactoryDoesNotLoadCodeByDefault() $this->addToAssertionCount(1); } + public function testProcessFactoryForTypeSameAsClass() + { + $container = new ContainerBuilder(); + + $container->register('foo', Foo::class); + $container->register('bar', 'callable') + ->setFactory([ + new Reference('foo'), + 'createCallable', + ]); + $container->register('bar_call', BarMethodCall::class) + ->addMethodCall('setCallable', [new Reference('bar')]); + + (new CheckTypeDeclarationsPass(true))->process($container); + + $this->addToAssertionCount(1); + } + + public function testProcessFactoryForIterableTypeAndArrayClass() + { + $container = new ContainerBuilder(); + + $container->register('foo', Foo::class); + $container->register('bar', 'array') + ->setFactory([ + new Reference('foo'), + 'createArray', + ]); + $container->register('bar_call', BarMethodCall::class) + ->addMethodCall('setIterable', [new Reference('bar')]); + + (new CheckTypeDeclarationsPass(true))->process($container); + + $this->addToAssertionCount(1); + } + public function testProcessPassingBuiltinTypeDoesNotLoadCodeByDefault() { $container = new ContainerBuilder(); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php index dde7afce91fd7..34998824c5de7 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php @@ -13,4 +13,14 @@ public static function createBarArguments(\stdClass $stdClass, \stdClass $stdCla { return new Bar($stdClass); } + + public static function createCallable(): callable + { + return function() {}; + } + + public static function createArray(): array + { + return []; + } } From c6ace13e3439e26a5d7394f2aa0a873859b112c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20P=C3=A9delagrabe?= Date: Thu, 19 Mar 2020 14:13:39 +0100 Subject: [PATCH 70/82] [FrameworkBundle] Fix Router Cache --- .../Bundle/FrameworkBundle/Routing/Router.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index 8971e5330b000..cf2eadbd51cbd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -15,6 +15,8 @@ use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\DependencyInjection\CompatibilityServiceSubscriberInterface as ServiceSubscriberInterface; use Symfony\Component\Config\Loader\LoaderInterface; +use Symfony\Component\Config\Resource\FileExistenceResource; +use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\Config\ContainerParametersResource; use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface; use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException; @@ -71,6 +73,16 @@ public function getRouteCollection() $this->collection = $this->container->get('routing.loader')->load($this->resource, $this->options['resource_type']); $this->resolveParameters($this->collection); $this->collection->addResource(new ContainerParametersResource($this->collectedParameters)); + + try { + $containerFile = ($this->paramFetcher)('kernel.cache_dir').'/'.($this->paramFetcher)('kernel.container_class').'.php'; + if (file_exists($containerFile)) { + $this->collection->addResource(new FileResource($containerFile)); + } else { + $this->collection->addResource(new FileExistenceResource($containerFile)); + } + } catch (ParameterNotFoundException $exception) { + } } return $this->collection; From d43833a8218311b780e4da777a84aa5ea129eefe Mon Sep 17 00:00:00 2001 From: Benjamin Morel Date: Thu, 19 Mar 2020 13:25:45 +0100 Subject: [PATCH 71/82] Prevent warning in proc_open() --- src/Symfony/Component/Process/Process.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 6672e61253f42..68d52512ed76d 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -336,7 +336,7 @@ public function start(callable $callback = null/*, array $env = [*/) @trigger_error('The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED); } - $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options); + $this->process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options); if (!\is_resource($this->process)) { throw new RuntimeException('Unable to launch a new process.'); From 677429479df3433f45e2bebcef80c0b465800318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Fri, 20 Mar 2020 16:02:37 +0100 Subject: [PATCH 72/82] [Security] Fixed hardcoded value of SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE --- .../Component/Security/Core/Encoder/SodiumPasswordEncoder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php index 0d552d165bbfb..0aa39be80be33 100644 --- a/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php @@ -35,7 +35,7 @@ public function __construct(int $opsLimit = null, int $memLimit = null) } $this->opsLimit = $opsLimit ?? max(4, \defined('SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE') ? SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE : 4); - $this->memLimit = $memLimit ?? max(64 * 1024 * 1024, \defined('SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE') ? SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE : 64 * 1024 * 2014); + $this->memLimit = $memLimit ?? max(64 * 1024 * 1024, \defined('SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE') ? SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE : 64 * 1024 * 1024); if (3 > $this->opsLimit) { throw new \InvalidArgumentException('$opsLimit must be 3 or greater.'); From f618b98b6cbf27ca604ffa7782e75ececee430a1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 22 Mar 2020 21:08:25 +0100 Subject: [PATCH 73/82] [HttpKernel] fix locking for PHP 7.4+ --- src/Symfony/Component/HttpKernel/Kernel.php | 56 ++++++--------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index d6f5a462d6e9b..958e049bf06e7 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -38,9 +38,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass; use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass; -// Help opcache.preload discover always-needed symbols -class_exists(ConfigCache::class); - /** * The Kernel is the heart of the Symfony system. * @@ -533,47 +530,20 @@ protected function initializeContainer() try { is_dir($cacheDir) ?: mkdir($cacheDir, 0777, true); - if ($lock = fopen($cachePath, 'w')) { - chmod($cachePath, 0666 & ~umask()); + if ($lock = fopen($cachePath.'.lock', 'w')) { flock($lock, LOCK_EX | LOCK_NB, $wouldBlock); if (!flock($lock, $wouldBlock ? LOCK_SH : LOCK_EX)) { fclose($lock); - } else { - $cache = new class($cachePath, $this->debug) extends ConfigCache { - public $lock; - - public function write($content, array $metadata = null) - { - rewind($this->lock); - ftruncate($this->lock, 0); - fwrite($this->lock, $content); - - if (null !== $metadata) { - file_put_contents($this->getPath().'.meta', serialize($metadata)); - @chmod($this->getPath().'.meta', 0666 & ~umask()); - } - - if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) { - @opcache_invalidate($this->getPath(), true); - } - } - - public function release() - { - flock($this->lock, LOCK_UN); - fclose($this->lock); - } - }; - $cache->lock = $lock; - - if (!\is_object($this->container = include $cachePath)) { - $this->container = null; - } elseif (!$oldContainer || \get_class($this->container) !== $oldContainer->name) { - $this->container->set('kernel', $this); - - return; - } + $lock = null; + } elseif (!\is_object($this->container = include $cachePath)) { + $this->container = null; + } elseif (!$oldContainer || \get_class($this->container) !== $oldContainer->name) { + flock($lock, LOCK_UN); + fclose($lock); + $this->container->set('kernel', $this); + + return; } } } catch (\Throwable $e) { @@ -637,8 +607,10 @@ public function release() } $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass()); - if (method_exists($cache, 'release')) { - $cache->release(); + + if ($lock) { + flock($lock, LOCK_UN); + fclose($lock); } $this->container = require $cachePath; From 9c3951ed6956becee176248aac0bde09c81a0310 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Mar 2020 09:19:50 +0100 Subject: [PATCH 74/82] [Mailer] Use %d instead of %s for error code in error messages --- .../Mailer/Bridge/Amazon/Transport/SesApiTransport.php | 2 +- .../Mailer/Bridge/Amazon/Transport/SesHttpTransport.php | 2 +- .../Bridge/Mailchimp/Transport/MandrillApiTransport.php | 4 ++-- .../Bridge/Mailchimp/Transport/MandrillHttpTransport.php | 4 ++-- .../Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php | 4 ++-- .../Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php | 4 ++-- .../Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php | 2 +- .../Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php index 22ef23e84ba52..c9cd0ad8cc6f6 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php @@ -65,7 +65,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e $result = new \SimpleXMLElement($response->getContent(false)); if (200 !== $response->getStatusCode()) { - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result->Error->Message, $result->Error->Code), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $result->Error->Message, $result->Error->Code), $response); } $property = $payload['Action'].'Result'; diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php index 1bb6c5486e291..9cedbdf4c7f7c 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php @@ -65,7 +65,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface $result = new \SimpleXMLElement($response->getContent(false)); if (200 !== $response->getStatusCode()) { - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result->Error->Message, $result->Error->Code), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $result->Error->Message, $result->Error->Code), $response); } $message->setMessageId($result->SendRawEmailResult->MessageId); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php index af221ca66e4fb..9b7c181b2943d 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php @@ -51,10 +51,10 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e $result = $response->toArray(false); if (200 !== $response->getStatusCode()) { if ('error' === ($result['status'] ?? false)) { - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $result['code']), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $result['message'], $result['code']), $response); } - throw new HttpTransportException(sprintf('Unable to send an email (code %s).', $result['code']), $response); + throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response); } $firstRecipient = reset($result); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php index 6ead15490671f..92f90b8563fa5 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php @@ -58,10 +58,10 @@ protected function doSendHttp(SentMessage $message): ResponseInterface $result = $response->toArray(false); if (200 !== $response->getStatusCode()) { if ('error' === ($result['status'] ?? false)) { - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $result['code']), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $result['message'], $result['code']), $response); } - throw new HttpTransportException(sprintf('Unable to send an email (code %s).', $result['code']), $response); + throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response); } $message->setMessageId($result[0]['_id']); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php index cf40a8cf1eaa6..c8ed383fcc66b 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php @@ -65,10 +65,10 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e $result = $response->toArray(false); if (200 !== $response->getStatusCode()) { if ('application/json' === $response->getHeaders(false)['content-type'][0]) { - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $response->getStatusCode()), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $result['message'], $response->getStatusCode()), $response); } - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $response->getContent(false), $response->getStatusCode()), $response); } $sentMessage->setMessageId($result['id']); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php index a42598a0b54ce..3ed6f73369fc8 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php @@ -67,10 +67,10 @@ protected function doSendHttp(SentMessage $message): ResponseInterface $result = $response->toArray(false); if (200 !== $response->getStatusCode()) { if ('application/json' === $response->getHeaders(false)['content-type'][0]) { - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $response->getStatusCode()), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $result['message'], $response->getStatusCode()), $response); } - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $response->getContent(false), $response->getStatusCode()), $response); } $message->setMessageId($result['id']); diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php index 610f858260549..352b2eded1568 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php @@ -54,7 +54,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e $result = $response->toArray(false); if (200 !== $response->getStatusCode()) { - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['Message'], $result['ErrorCode']), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', $result['Message'], $result['ErrorCode']), $response); } $sentMessage->setMessageId($result['MessageID']); diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php index df90d2147277a..550fd4bf331a5 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php @@ -53,7 +53,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e if (202 !== $response->getStatusCode()) { $errors = $response->toArray(false); - throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', implode('; ', array_column($errors['errors'], 'message')), $response->getStatusCode()), $response); + throw new HttpTransportException(sprintf('Unable to send an email: %s (code %d).', implode('; ', array_column($errors['errors'], 'message')), $response->getStatusCode()), $response); } $sentMessage->setMessageId($response->getHeaders(false)['x-message-id'][0]); From 69d03400665c98dbf5685b22556d486c2868e647 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Mar 2020 09:29:43 +0100 Subject: [PATCH 75/82] [Validator] Backport translations --- .../Validator/Resources/translations/validators.en.xlf | 8 ++++++++ .../Validator/Resources/translations/validators.es.xlf | 8 ++++++++ .../Validator/Resources/translations/validators.pl.xlf | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf index 8f8d2d0a0fe98..674ccf5c30ea6 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf @@ -374,6 +374,14 @@ The number of elements in this collection should be a multiple of {{ compared_value }}. The number of elements in this collection should be a multiple of {{ compared_value }}. + + This value should satisfy at least one of the following constraints: + This value should satisfy at least one of the following constraints: + + + Each element of this collection should satisfy its own set of constraints. + Each element of this collection should satisfy its own set of constraints. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf index 24ef5548da44d..57b07b2b5546a 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf @@ -374,6 +374,14 @@ The number of elements in this collection should be a multiple of {{ compared_value }}. El número de elementos en esta colección debería ser múltiplo de {{ compared_value }}. + + This value should satisfy at least one of the following constraints: + Este valor debería satisfacer al menos una de las siguientes restricciones: + + + Each element of this collection should satisfy its own set of constraints. + Cada elemento de esta colección debería satisfacer su propio conjunto de restricciones. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf index df93abd0b9ee6..afd3f73263c7b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf @@ -374,6 +374,14 @@ The number of elements in this collection should be a multiple of {{ compared_value }}. Liczba elementów w tym zbiorze powinna być wielokrotnością {{ compared_value }}. + + This value should satisfy at least one of the following constraints: + Ta wartość powinna spełniać co najmniej jedną z następujących reguł: + + + Each element of this collection should satisfy its own set of constraints. + Każdy element w tym zbiorze powinien spełniać własny zestaw reguł. + From b3d9a8ac300d6ade6697fbdb7cdd614832f3fef0 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 23 Mar 2020 11:22:40 +0100 Subject: [PATCH 76/82] [Debug] fix for PHP 7.3.16+/7.4.4+ --- src/Symfony/Component/Debug/ErrorHandler.php | 4 ++-- src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php index dfd63b85c87b0..40a4b1758ce7c 100644 --- a/src/Symfony/Component/Debug/ErrorHandler.php +++ b/src/Symfony/Component/Debug/ErrorHandler.php @@ -521,7 +521,7 @@ public function handleError($type, $message, $file, $line) $errorAsException ? ['exception' => $errorAsException] : [], ]; } else { - if (!\defined('HHVM_VERSION')) { + if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) { $currentErrorHandler = set_error_handler('var_dump'); restore_error_handler(); } @@ -533,7 +533,7 @@ public function handleError($type, $message, $file, $line) } finally { $this->isRecursive = false; - if (!\defined('HHVM_VERSION')) { + if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) { set_error_handler($currentErrorHandler); } } diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php index 2cf75a0e8e322..01c63aea88e38 100644 --- a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php +++ b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php @@ -327,8 +327,6 @@ public function testHandleDeprecation() $handler = new ErrorHandler(); $handler->setDefaultLogger($logger); @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []); - - restore_error_handler(); } /** From f0ceb7339786f39edaae6429e435fc2f941d56a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Tue, 17 Jul 2018 14:51:24 +0200 Subject: [PATCH 77/82] [Security] Remember me: allow to set the samesite cookie flag --- .../Security/Factory/RememberMeFactory.php | 1 + .../Http/RememberMe/AbstractRememberMeServices.php | 3 ++- .../RememberMe/PersistentTokenBasedRememberMeServices.php | 8 ++++++-- .../Http/RememberMe/TokenBasedRememberMeServices.php | 4 +++- .../PersistentTokenBasedRememberMeServicesTest.php | 4 +++- .../Tests/RememberMe/TokenBasedRememberMeServicesTest.php | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php index 89953502ba764..624deb0283fd7 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php @@ -25,6 +25,7 @@ class RememberMeFactory implements SecurityFactoryInterface 'domain' => null, 'secure' => false, 'httponly' => true, + 'samesite' => null, 'always_remember_me' => false, 'remember_me_parameter' => '_remember_me', ]; diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index fba79fba874e4..53b63689739ee 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -38,6 +38,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface protected $options = [ 'secure' => false, 'httponly' => true, + 'samesite' => null, ]; private $providerKey; private $secret; @@ -281,7 +282,7 @@ protected function cancelCookie(Request $request) $this->logger->debug('Clearing remember-me cookie.', ['name' => $this->options['name']]); } - $request->attributes->set(self::COOKIE_ATTR_NAME, new Cookie($this->options['name'], null, 1, $this->options['path'], $this->options['domain'], $this->options['secure'], $this->options['httponly'])); + $request->attributes->set(self::COOKIE_ATTR_NAME, new Cookie($this->options['name'], null, 1, $this->options['path'], $this->options['domain'], $this->options['secure'], $this->options['httponly'], false, $this->options['samesite'])); } /** diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 272a5cc2db1c7..94ec0eae53ddc 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -84,7 +84,9 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request) $this->options['path'], $this->options['domain'], $this->options['secure'], - $this->options['httponly'] + $this->options['httponly'], + false, + $this->options['samesite'] ) ); @@ -117,7 +119,9 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt $this->options['path'], $this->options['domain'], $this->options['secure'], - $this->options['httponly'] + $this->options['httponly'], + false, + $this->options['samesite'] ) ); } diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php index 3df2ced6223fa..32e65f3cf0b00 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php @@ -81,7 +81,9 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt $this->options['path'], $this->options['domain'], $this->options['secure'], - $this->options['httponly'] + $this->options['httponly'], + false, + $this->options['samesite'] ) ); } diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php index 599a7e81c303b..7afa48edc950c 100644 --- a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php +++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Http\Tests\RememberMe; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\ResponseHeaderBag; @@ -268,7 +269,7 @@ public function testLoginFail() public function testLoginSuccessSetsCookieWhenLoggedInWithNonRememberMeTokenInterfaceImplementation() { - $service = $this->getService(null, ['name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'lifetime' => 3600, 'always_remember_me' => true]); + $service = $this->getService(null, ['name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'samesite' => Cookie::SAMESITE_STRICT, 'lifetime' => 3600, 'always_remember_me' => true]); $request = new Request(); $response = new Response(); @@ -305,6 +306,7 @@ public function testLoginSuccessSetsCookieWhenLoggedInWithNonRememberMeTokenInte $this->assertTrue($cookie->getExpiresTime() > time() + 3590 && $cookie->getExpiresTime() < time() + 3610); $this->assertEquals('myfoodomain.foo', $cookie->getDomain()); $this->assertEquals('/foo/path', $cookie->getPath()); + $this->assertSame(Cookie::SAMESITE_STRICT, $cookie->getSameSite()); } protected function encodeCookie(array $parts) diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php index f24e4fff80805..4a34d614213f2 100644 --- a/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php +++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Http\Tests\RememberMe; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\ResponseHeaderBag; @@ -205,7 +206,7 @@ public function testLoginSuccessIgnoresTokensWhichDoNotContainAnUserInterfaceImp public function testLoginSuccess() { - $service = $this->getService(null, ['name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'lifetime' => 3600, 'always_remember_me' => true]); + $service = $this->getService(null, ['name' => 'foo', 'domain' => 'myfoodomain.foo', 'path' => '/foo/path', 'secure' => true, 'httponly' => true, 'samesite' => Cookie::SAMESITE_STRICT, 'lifetime' => 3600, 'always_remember_me' => true]); $request = new Request(); $response = new Response(); @@ -240,6 +241,7 @@ public function testLoginSuccess() $this->assertTrue($cookie->getExpiresTime() > time() + 3590 && $cookie->getExpiresTime() < time() + 3610); $this->assertEquals('myfoodomain.foo', $cookie->getDomain()); $this->assertEquals('/foo/path', $cookie->getPath()); + $this->assertSame(Cookie::SAMESITE_STRICT, $cookie->getSameSite()); } protected function getCookie($class, $username, $expires, $password) From 61025d1d1b7fa1675b15e20129ea9c7fa86981d7 Mon Sep 17 00:00:00 2001 From: Jorrit Schippers Date: Fri, 20 Mar 2020 13:10:52 +0100 Subject: [PATCH 78/82] [Form] Support customized intl php.ini settings `IntlDateParser->parse()` behaves differently when `intl.error_level` and/or `intl.use_exceptions` are not 0. This change makes sure `\IntlException` is caught when `intl.use_exceptions` is 1 and warnings thrown when `intl.error_level` is not 0 are ignored. --- .../DateTimeToLocalizedStringTransformer.php | 9 +++- ...teTimeToLocalizedStringTransformerTest.php | 46 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php index af2dad7c9e327..e47b03d32d4a8 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php @@ -117,11 +117,16 @@ public function reverseTransform($value) // date-only patterns require parsing to be done in UTC, as midnight might not exist in the local timezone due // to DST changes $dateOnly = $this->isPatternDateOnly(); + $dateFormatter = $this->getIntlDateFormatter($dateOnly); - $timestamp = $this->getIntlDateFormatter($dateOnly)->parse($value); + try { + $timestamp = @$dateFormatter->parse($value); + } catch (\IntlException $e) { + throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e); + } if (0 != intl_get_error_code()) { - throw new TransformationFailedException(intl_get_error_message()); + throw new TransformationFailedException(intl_get_error_message(), intl_get_error_code()); } elseif ($timestamp > 253402214400) { // This timestamp represents UTC midnight of 9999-12-31 to prevent 5+ digit years throw new TransformationFailedException('Years beyond 9999 are not supported.'); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php index ce91d05ff4b6c..ad9e099909121 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php @@ -27,6 +27,12 @@ protected function setUp() { parent::setUp(); + // Normalize intl. configuration settings. + if (\extension_loaded('intl')) { + $this->iniSet('intl.use_exceptions', 0); + $this->iniSet('intl.error_level', 0); + } + // Since we test against "de_AT", we need the full implementation IntlTestHelper::requireFullIntl($this, '57.1'); @@ -334,4 +340,44 @@ public function testReverseTransformFiveDigitYearsWithTimestamp() $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, null, \IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'); $transformer->reverseTransform('20107-03-21 12:34:56'); } + + public function testReverseTransformWrapsIntlErrorsWithErrorLevel() + { + if (!\extension_loaded('intl')) { + $this->markTestSkipped('intl extension is not loaded'); + } + + $this->iniSet('intl.error_level', E_WARNING); + + $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException'); + $transformer = new DateTimeToLocalizedStringTransformer(); + $transformer->reverseTransform('12345'); + } + + public function testReverseTransformWrapsIntlErrorsWithExceptions() + { + if (!\extension_loaded('intl')) { + $this->markTestSkipped('intl extension is not loaded'); + } + + $this->iniSet('intl.use_exceptions', 1); + + $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException'); + $transformer = new DateTimeToLocalizedStringTransformer(); + $transformer->reverseTransform('12345'); + } + + public function testReverseTransformWrapsIntlErrorsWithExceptionsAndErrorLevel() + { + if (!\extension_loaded('intl')) { + $this->markTestSkipped('intl extension is not loaded'); + } + + $this->iniSet('intl.use_exceptions', 1); + $this->iniSet('intl.error_level', E_WARNING); + + $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException'); + $transformer = new DateTimeToLocalizedStringTransformer(); + $transformer->reverseTransform('12345'); + } } From 9bb1230525b32fa20ed8abce429f931c90a1776c Mon Sep 17 00:00:00 2001 From: Koen Reiniers Date: Mon, 23 Mar 2020 11:51:31 +0100 Subject: [PATCH 79/82] [Security] Check if firewall is stateless before checking for session/previous session --- .../Guard/GuardAuthenticatorHandler.php | 2 +- .../Tests/GuardAuthenticatorHandlerTest.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php index 977442aa931b5..356547df2b30b 100644 --- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php +++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php @@ -134,7 +134,7 @@ public function setSessionAuthenticationStrategy(SessionAuthenticationStrategyIn private function migrateSession(Request $request, TokenInterface $token, $providerKey) { - if (!$this->sessionStrategy || !$request->hasSession() || !$request->hasPreviousSession() || \in_array($providerKey, $this->statelessProviderKeys, true)) { + if (\in_array($providerKey, $this->statelessProviderKeys, true) || !$this->sessionStrategy || !$request->hasSession() || !$request->hasPreviousSession()) { return; } diff --git a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php index 7fe29cacc0fc5..74227e37c1b32 100644 --- a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php +++ b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php @@ -149,6 +149,25 @@ public function testSessionStrategyIsNotCalledWhenStateless() $handler->authenticateWithToken($this->token, $this->request, 'some_provider_key'); } + /** + * @requires function \Symfony\Component\HttpFoundation\Request::setSessionFactory + */ + public function testSessionIsNotInstantiatedOnStatelessFirewall() + { + $sessionFactory = $this->getMockBuilder(\stdClass::class) + ->setMethods(['__invoke']) + ->getMock(); + + $sessionFactory->expects($this->never()) + ->method('__invoke'); + + $this->request->setSessionFactory($sessionFactory); + + $handler = new GuardAuthenticatorHandler($this->tokenStorage, $this->dispatcher, ['stateless_provider_key']); + $handler->setSessionAuthenticationStrategy($this->sessionStrategy); + $handler->authenticateWithToken($this->token, $this->request, 'stateless_provider_key'); + } + protected function setUp() { $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(); From 4bdea1f2e77935c37362c31630accacf781cb0bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20P=C3=A9delagrabe?= Date: Mon, 23 Mar 2020 11:02:50 +0100 Subject: [PATCH 80/82] [Http Foundation] Fix clear cookie samesite --- .../Component/HttpFoundation/ResponseHeaderBag.php | 7 +++++-- .../HttpFoundation/Tests/ResponseHeaderBagTest.php | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index e11b98a10f65b..9a6f87648fa1a 100644 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -244,10 +244,13 @@ public function getCookies($format = self::COOKIES_FLAT) * @param string $domain * @param bool $secure * @param bool $httpOnly + * @param string $sameSite */ - public function clearCookie($name, $path = '/', $domain = null, $secure = false, $httpOnly = true) + public function clearCookie($name, $path = '/', $domain = null, $secure = false, $httpOnly = true/*, $sameSite = null*/) { - $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly)); + $sameSite = \func_num_args() > 5 ? func_get_arg(5) : null; + + $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly, false, $sameSite)); } /** diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php index 4e3a6c82b5513..632c96df5278b 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php @@ -128,6 +128,14 @@ public function testClearCookieSecureNotHttpOnly() $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; secure', $bag); } + public function testClearCookieSamesite() + { + $bag = new ResponseHeaderBag([]); + + $bag->clearCookie('foo', '/', null, true, false, 'none'); + $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; secure; samesite=none', $bag); + } + public function testReplace() { $bag = new ResponseHeaderBag([]); From b1fbff1a5b14611d9546e28a3469e3f707e34997 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 27 Mar 2020 09:32:13 +0100 Subject: [PATCH 81/82] Update CHANGELOG for 4.4.6 --- CHANGELOG-4.4.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/CHANGELOG-4.4.md b/CHANGELOG-4.4.md index 4de4989aabb01..70feb9ba3cab7 100644 --- a/CHANGELOG-4.4.md +++ b/CHANGELOG-4.4.md @@ -7,6 +7,44 @@ in 4.4 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.4.0...v4.4.1 +* 4.4.6 (2020-03-27) + + * bug #36169 [HttpKernel] fix locking for PHP 7.4+ (nicolas-grekas) + * bug #36175 [Security/Http] Remember me: allow to set the samesite cookie flag (dunglas) + * bug #36173 [Http Foundation] Fix clear cookie samesite (guillbdx) + * bug #36176 [Security] Check if firewall is stateless before checking for session/previous session (koenreiniers) + * bug #36149 [Form] Support customized intl php.ini settings (jorrit) + * bug #36172 [Debug] fix for PHP 7.3.16+/7.4.4+ (nicolas-grekas) + * bug #36151 [Security] Fixed hardcoded value of SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE (lyrixx) + * bug #36141 Prevent warning in proc_open() (BenMorel) + * bug #36143 [FrameworkBundle] Fix Router Cache (guillbdx) + * bug #36103 [DI] fix preloading script generation (nicolas-grekas) + * bug #36118 [Security/Http] don't require the session to be started when tracking its id (nicolas-grekas) + * bug #36108 [DI] Fix CheckTypeDeclarationPass (guillbdx) + * bug #36121 [VarDumper] fix side-effect by not using mt_rand() (nicolas-grekas) + * bug #36073 [PropertyAccess][DX] Improved errors when reading uninitialized properties (HeahDude) + * bug #36063 [FrameworkBundle] start session on flashbag injection (William Arslett) + * bug #36031 [Console] Fallback to default answers when unable to read input (ostrolucky) + * bug #36083 [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) (wouterj) + * bug #36026 [Mime] Fix boundary header (guillbdx) + * bug #36020 [Form] ignore microseconds submitted by Edge (xabbuh) + * bug #36038 [HttpClient] disable debug log with curl 7.64.0 (nicolas-grekas) + * bug #36041 fix import from config file using type: glob (Tobion) + * bug #35987 [DoctrineBridge][DoctrineExtractor] Fix wrong guessed type for "json" type (fancyweb) + * bug #35949 [DI] Fix container lint command when a synthetic service is used in an expression (HypeMC) + * bug #36023 [HttpClient] fix requests to hosts that idn_to_ascii() cannot handle (nicolas-grekas) + * bug #35938 [Form] Handle false as empty value on expanded choices (fancyweb) + * bug #36030 [SecurityBundle] Minor fix in LDAP config tree builder (HeahDude) + * bug #35993 Remove int return type from FlattenException::getCode (wucdbm) + * bug #36004 [Yaml] fix dumping strings containing CRs (xabbuh) + * bug #35982 [DI] Fix XmlFileLoader bad error message (przemyslaw-bogusz) + * bug #35957 [DI] ignore extra tags added by autoconfiguration in PriorityTaggedServiceTrait (nicolas-grekas) + * bug #35937 Revert "bug symfony#28179 [DomCrawler] Skip disabled fields processing in Form" (dmaicher) + * bug #35928 [Routing] Prevent localized routes _locale default & requirement from being overridden (fancyweb) + * bug #35912 [FrameworkBundle] register only existing transport factories (xabbuh) + * bug #35899 [DomCrawler] prevent deprecation being triggered from assertion (xabbuh) + * bug #35910 [SecurityBundle] Minor fixes in configuration tree builder (HeahDude) + * 4.4.5 (2020-02-29) * bug #35781 [Form] NumberToLocalizedStringTransformer return int if scale = 0 (VincentLanglet) From f43ceee1df790d76fc8f6ae91507869ee7dcfe61 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 27 Mar 2020 09:32:28 +0100 Subject: [PATCH 82/82] Update VERSION for 4.4.6 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 958e049bf06e7..a559f0728894d 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - const VERSION = '4.4.6-DEV'; + const VERSION = '4.4.6'; const VERSION_ID = 40406; const MAJOR_VERSION = 4; const MINOR_VERSION = 4; const RELEASE_VERSION = 6; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '11/2022'; const END_OF_LIFE = '11/2023';