diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000000..44dffddaf9677 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value +f4118e110a46de3ffb799e7d79bf15128d1646ea diff --git a/.github/sync-translations.php b/.github/sync-translations.php new file mode 100644 index 0000000000000..eb3f8e840ab4a --- /dev/null +++ b/.github/sync-translations.php @@ -0,0 +1,100 @@ +formatOutput = true; + + $xliff = $dom->appendChild($dom->createElement('xliff')); + $xliff->setAttribute('version', '1.2'); + $xliff->setAttribute('xmlns', 'urn:oasis:names:tc:xliff:document:1.2'); + + $xliffFile = $xliff->appendChild($dom->createElement('file')); + $xliffFile->setAttribute('source-language', str_replace('_', '-', $defaultLocale)); + $xliffFile->setAttribute('target-language', 'no' === $messages->getLocale() ? 'nb' : str_replace('_', '-', $messages->getLocale())); + $xliffFile->setAttribute('datatype', 'plaintext'); + $xliffFile->setAttribute('original', 'file.ext'); + + $xliffBody = $xliffFile->appendChild($dom->createElement('body')); + foreach ($messages->all($domain) as $source => $target) { + $translation = $dom->createElement('trans-unit'); + $metadata = $messages->getMetadata($source, $domain); + + $translation->setAttribute('id', $metadata['id']); + if (isset($metadata['resname'])) { + $translation->setAttribute('resname', $metadata['resname']); + } + + $s = $translation->appendChild($dom->createElement('source')); + $s->appendChild($dom->createTextNode($source)); + + $text = 1 === preg_match('/[&<>]/', $target) ? $dom->createCDATASection($target) : $dom->createTextNode($target); + + $targetElement = $dom->createElement('target'); + + if ('en' !== $messages->getLocale() && $target === $source && 'Error' !== $source) { + $targetElement->setAttribute('state', 'needs-translation'); + } + if (isset($metadata['target-attributes'])) { + foreach ($metadata['target-attributes'] as $key => $value) { + $targetElement->setAttribute($key, $value); + } + } + + $t = $translation->appendChild($targetElement); + $t->appendChild($text); + + $xliffBody->appendChild($translation); + } + + return preg_replace('/^ +/m', '$0$0', $dom->saveXML()); +} + + +foreach (['Security/Core' => 'security', 'Form' => 'validators', 'Validator' => 'validators'] as $component => $domain) { + $dir = __DIR__.'/../src/Symfony/Component/'.$component.'/Resources/translations'; + + $enCatalogue = (new XliffFileLoader())->load($dir.'/'.$domain.'.en.xlf', 'en', $domain); + file_put_contents($dir.'/'.$domain.'.en.xlf', dumpXliff1('en', $enCatalogue, $domain)); + + $finder = new Finder(); + + foreach ($finder->files()->in($dir)->name('*.xlf') as $file) { + $locale = substr($file->getBasename(), 1 + strlen($domain), -4); + + if ('en' === $locale) { + continue; + } + + $catalogue = (new XliffFileLoader())->load($file, $locale, $domain); + $localeCatalogue = new MessageCatalogue($locale); + + foreach ($enCatalogue->all($domain) as $resname => $source) { + $metadata = []; + if ($catalogue->defines($resname, $domain)) { + $translation = $catalogue->get($resname, $domain); + $metadata = $catalogue->getMetadata($resname, $domain); + } + $metadata['id'] = $enCatalogue->getMetadata($resname, $domain)['id']; + if ($resname !== $source) { + $metadata['resname'] = $resname; + } + $localeCatalogue->set($source, $translation, $domain); + $localeCatalogue->setMetadata($source, $metadata, $domain); + } + + file_put_contents($file, dumpXliff1('en', $localeCatalogue, $domain)); + } +} diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 1b72f86a75159..a0216526e0e80 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -95,9 +95,9 @@ jobs: - 8094:8094 - 11210:11210 sqs: - image: asyncaws/testing-sqs + image: localstack/localstack:3.0.2 ports: - - 9494:9494 + - 4566:4566 zookeeper: image: wurstmeister/zookeeper:3.4.6 kafka: @@ -184,8 +184,8 @@ jobs: REDIS_SENTINEL_SERVICE: redis_sentinel MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages - MESSENGER_SQS_DSN: "sqs://localhost:9494/messages?sslmode=disable&poll_timeout=0.01" - MESSENGER_SQS_FIFO_QUEUE_DSN: "sqs://localhost:9494/messages.fifo?sslmode=disable&poll_timeout=0.01" + MESSENGER_SQS_DSN: "sqs://localhost:4566/messages?sslmode=disable&poll_timeout=0.01" + MESSENGER_SQS_FIFO_QUEUE_DSN: "sqs://localhost:4566/messages.fifo?sslmode=disable&poll_timeout=0.01" KAFKA_BROKER: 127.0.0.1:9092 POSTGRES_HOST: localhost diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 8333789ec831b..853399385adc0 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -30,6 +30,7 @@ '@Symfony:risky' => true, 'protected_to_private' => false, 'native_constant_invocation' => ['strict' => false], + 'nullable_type_declaration_for_default_null_value' => true, 'header_comment' => ['header' => $fileHeaderComment], ]) ->setRiskyAllowed(true) diff --git a/CHANGELOG-5.4.md b/CHANGELOG-5.4.md index 97a5f10254eef..c6fa311ebc53c 100644 --- a/CHANGELOG-5.4.md +++ b/CHANGELOG-5.4.md @@ -7,6 +7,42 @@ in 5.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/v5.4.0...v5.4.1 +* 5.4.35 (2024-01-30) + + * bug #52913 [Routing] Fixed priority getting lost when setting localized prefix (pritasil) + * bug #53183 [Messenger] PhpSerializer: TypeError should throw `MessageDecodingFailedException` (B-Galati) + * bug #53678 [Mime] Fix serializing uninitialized `RawMessage::$message` to null (nicolas-grekas) + * bug #53634 [Notifer][Smsapi] Set messageId of SentMessage (tomasz-kusy) + * bug #53501 [DependencyInjection] support lazy evaluated exception messages with Xdebug 3 (xabbuh) + * bug #53671 [HttpClient] Fix pausing responses before they start when using curl (nicolas-grekas) + * bug #53663 [TwigBridge] separate child and parent context in NotificationEmail on writes (xabbuh) + * bug #53157 [Mailer] Throw `TransportException` when unable to read from socket (xdanik) + * bug #53361 [Serializer] Take unnamed variadic parameters into account when denormalizing (thijsBreker) + * bug #53530 [Serializer] Rewrite `AbstractObjectNormalizer::createChildContext()` to use the provided `cache_key` from original context when creating child contexts (amne) + * bug #53506 [HttpClient] Fix error chunk creation in passthru (rmikalkenas) + * bug #53357 [Translation] Fix `TranslationNodeVisitor` with constant domain (VincentLanglet) + * bug #53525 [Messenger] [AMQP] Throw exception on `nack` callback (kvrushifa) + * bug #53432 [HttpFoundation] Request without content-type or content-length header should result in null values, not empty strings (priyadi) + * bug #53593 [Cache] Fix possible infinite loop in `CachePoolPass` (HypeMC) + * bug #53588 [Translation] fix multi-byte code area to convert (xabbuh) + * bug #53565 [Mime] Fix undefined array key 0 when empty sender (0x346e3730) + * bug #53516 [Console] Allow '0' as a $shortcut in InputOption.php (lawsonjl-ornl) + * bug #53576 [Console] Only execute additional checks for color support if the output (theofidry) + * bug #53582 [TwigBundle] Fix configuration when "paths" is null (smnandre) + * bug #53581 [String] fix aircraft inflection (renanbr) + * bug #53509 [Security] Fix `AuthenticationUtils::getLastUsername()` returning null (alexandre-daubois) + * bug #53567 [String] Correct inflection of axis (Vladislav Iurciuc) + * bug #53537 [VarDumper] Fix missing colors initialization in `CliDumper` (nicolas-grekas) + * bug #53481 [Process] Fix executable finder when the command starts with a dash (kayw-geek) + * bug #53006 [ErrorHandler] Don't format binary strings (aleho) + * bug #53441 [Messenger] Amazon SQS Delay has a max of 15 minutes (alamirault) + * bug #53383 [Validator] re-allow an empty list of fields (xabbuh) + * bug #53418 [FrameworkBundle][Notifier] Fix service registration (MessageBird + TurboSms) (smnandre) + * bug #53350 [Validator] fix the exception being thrown (xabbuh) + * bug #53341 [FrameworkBundle] append instead of replacing potentially non-existent named-arguments (xabbuh) + * bug #53320 [Cache][DependencyInjection][Lock][Mailer][Messenger][Notifier][Translation] Url decode username and passwords from `parse_url()` results (alexandre-daubois) + * bug #53108 [Serializer] Fix using deserialization path 5.4 (HypeMC) + * 5.4.34 (2023-12-30) * bug #52406 [Validator] Fix `Constraints\Email::ERROR_NAMES` (mathroc) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ca870dd304464..8ae25e554297b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -15,9 +15,9 @@ The Symfony Connect username in parenthesis allows to get more information - Thomas Calvet (fancyweb) - Christophe Coevoet (stof) - Wouter de Jong (wouterj) + - Alexandre Daubois (alexandre-daubois) - Jordi Boggiano (seldaek) - Maxime Steinhausser (ogizanagi) - - Alexandre Daubois (alexandre-daubois) - Kévin Dunglas (dunglas) - Victor Berchet (victor) - Ryan Weaver (weaverryan) @@ -26,9 +26,9 @@ The Symfony Connect username in parenthesis allows to get more information - Jules Pietri (heah) - Roland Franssen - Johannes S (johannes) + - Oskar Stark (oskarstark) - Kris Wallsmith (kriswallsmith) - Jakub Zalas (jakubzalas) - - Oskar Stark (oskarstark) - Yonel Ceruto (yonelceruto) - Hugo Hamon (hhamon) - Tobias Nyholm (tobias) @@ -38,11 +38,11 @@ The Symfony Connect username in parenthesis allows to get more information - Romain Neutron - Antoine Lamirault (alamirault) - Joseph Bielawski (stloyd) + - HypeMC (hypemc) - Drak (drak) - Abdellatif Ait boudad (aitboudad) - - HypeMC (hypemc) - - Lukas Kahwe Smith (lsmith) - Kevin Bond (kbond) + - Lukas Kahwe Smith (lsmith) - Hamza Amrouche (simperfit) - Martin Hasoň (hason) - Jeremy Mikola (jmikola) @@ -64,25 +64,26 @@ The Symfony Connect username in parenthesis allows to get more information - Diego Saint Esteben (dosten) - stealth35 ‏ (stealth35) - Alexander Mols (asm89) + - Gábor Egyed (1ed) - Francis Besset (francisbesset) - Titouan Galopin (tgalopin) - Pierre du Plessis (pierredup) - - Gábor Egyed (1ed) - David Maicher (dmaicher) - Bulat Shakirzyanov (avalanche123) - - Iltar van der Berg - Vincent Langlet (deviling) + - Iltar van der Berg - Miha Vrhovnik (mvrhov) - Gary PEGEOT (gary-p) - Saša Stamenković (umpirsky) - Allison Guilhem (a_guilhem) - Mathieu Piot (mpiot) + - Mathieu Santostefano (welcomattic) - Alexander Schranz (alexander-schranz) - Vasilij Duško (staff) - - Mathieu Santostefano (welcomattic) - Sarah Khalil (saro0h) - Laurent VOULLEMIER (lvo) - Konstantin Kudryashov (everzet) + - Tomasz Kowalczyk (thunderer) - Guilhem N (guilhemn) - Bilal Amarni (bamarni) - Eriksen Costa @@ -91,10 +92,11 @@ The Symfony Connect username in parenthesis allows to get more information - Peter Rehm (rpet) - Henrik Bjørnskov (henrikbjorn) - Mathias Arlaud (mtarld) + - Dariusz Ruminski - Andrej Hudec (pulzarraider) - Jáchym Toušek (enumag) + - Simon André (simonandre) - David Buchmann (dbu) - - Dariusz Ruminski - Christian Raue - Eric Clemmons (ericclemmons) - Denis (yethee) @@ -103,36 +105,36 @@ The Symfony Connect username in parenthesis allows to get more information - Douglas Greenshields (shieldo) - Frank A. Fiebig (fafiebig) - Baldini + - Ruud Kamphuis (ruudk) - Alex Pott - Fran Moreno (franmomu) - Arnout Boks (aboks) - - Simon André (simonandre) - Charles Sarrazin (csarrazi) - - Ruud Kamphuis (ruudk) - Henrik Westphal (snc) - Dariusz Górecki (canni) - Ener-Getick - Graham Campbell (graham) + - Tomas Norkūnas (norkunas) - Tugdual Saunier (tucksaun) - Lee McDermott - Brandon Turner + - Massimiliano Arione (garak) - Luis Cordova (cordoval) - Antoine Makdessi (amakdessi) - Konstantin Myakshin (koc) - Hubert Lenoir (hubert_lenoir) - Daniel Holmes (dholmes) - Julien Falque (julienfalque) - - Tomas Norkūnas (norkunas) - Toni Uebernickel (havvg) - Bart van den Burg (burgov) - Vasilij Dusko | CREATION - Jordan Alliot (jalliot) - - Massimiliano Arione (garak) - John Wards (johnwards) - Phil E. Taylor (philetaylor) - Antoine Hérault (herzult) - Konstantin.Myakshin - Yanick Witschi (toflar) + - Théo FIDRY - Arnaud Le Blanc (arnaud-lb) - Joel Wurtz (brouznouf) - Sebastiaan Stok (sstok) @@ -140,15 +142,14 @@ The Symfony Connect username in parenthesis allows to get more information - gnito-org - Jeroen Spee (jeroens) - Tim Nagel (merk) - - Théo FIDRY - Chris Wilkinson (thewilkybarkid) - Jérôme Vasseur (jvasseur) + - Rokas Mikalkėnas (rokasm) - Peter Kokot (peterkokot) - Brice BERNARD (brikou) - Tac Tacelosky (tacman1123) - Michal Piotrowski - marc.weistroff - - Rokas Mikalkėnas (rokasm) - Lars Strojny (lstrojny) - lenar - Vladimir Tsykun (vtsykun) @@ -178,6 +179,7 @@ The Symfony Connect username in parenthesis allows to get more information - François-Xavier de Guillebon (de-gui_f) - noniagriconomie - Eric GELOEN (gelo) + - Nicolas Philippe (nikophil) - Gabriel Caruso - Stefano Sala (stefano.sala) - Ion Bazan (ionbazan) @@ -187,7 +189,6 @@ The Symfony Connect username in parenthesis allows to get more information - Gregor Harlan (gharlan) - Michael Babker (mbabker) - Anthony MARTIN - - Nicolas Philippe (nikophil) - Sebastian Hörl (blogsh) - Tigran Azatyan (tigranazatyan) - Christopher Hertel (chertel) @@ -207,17 +208,19 @@ The Symfony Connect username in parenthesis allows to get more information - Andreas Braun - Hugo Alliaume (kocal) - Pablo Godel (pgodel) + - Florent Mata (fmata) - Alessandro Chitolina (alekitto) - - Tomasz Kowalczyk (thunderer) + - Dāvis Zālītis (k0d3r1s) - Rafael Dohms (rdohms) - jwdeitch + - David Prévot (taffit) - Jérôme Parmentier (lctrs) - Ahmed TAILOULOUTE (ahmedtai) - Simon Berger - Jérémy Derussé + - Valtteri R (valtzu) - Matthieu Napoli (mnapoli) - Tomas Votruba (tomas_votruba) - - Florent Mata (fmata) - Arman Hosseini (arman) - Sokolov Evgeniy (ewgraf) - Andréia Bohner (andreia) @@ -227,15 +230,15 @@ The Symfony Connect username in parenthesis allows to get more information - George Mponos (gmponos) - Roman Martinuk (a2a4) - Richard Shank (iampersistent) - - David Prévot (taffit) + - Thomas Landauer (thomas-landauer) - Romain Monteil (ker0x) - Sergey (upyx) - Marco Pivetta (ocramius) - Antonio Pauletich (x-coder264) - Vincent Touzet (vincenttouzet) + - Fabien Bourigault (fbourigault) - Olivier Dolbeau (odolbeau) - Rouven Weßling (realityking) - - Valtteri R (valtzu) - Ben Davies (bendavies) - YaFou - Clemens Tolboom @@ -248,7 +251,6 @@ The Symfony Connect username in parenthesis allows to get more information - Matthieu Ouellette-Vachon (maoueh) - Michał Pipa (michal.pipa) - Dawid Nowak - - Dāvis Zālītis (k0d3r1s) - Jannik Zschiesche - Amal Raghav (kertz) - Jonathan Ingram @@ -259,7 +261,6 @@ The Symfony Connect username in parenthesis allows to get more information - GDIBass - Samuel NELA (snela) - Vincent AUBERT (vincent) - - Fabien Bourigault (fbourigault) - Michael Voříšek - zairig imad (zairigimad) - Colin O'Dell (colinodell) @@ -282,6 +283,7 @@ The Symfony Connect username in parenthesis allows to get more information - Martin Hujer (martinhujer) - Sergey Linnik (linniksa) - Richard Miller + - Aleksandar Jakovljevic (ajakov) - Mario A. Alvarez Garcia (nomack84) - Thomas Rabaix (rande) - D (denderello) @@ -310,11 +312,9 @@ The Symfony Connect username in parenthesis allows to get more information - sun (sun) - Larry Garfield (crell) - Leo Feyer - - Thomas Landauer (thomas-landauer) - Philipp Wahala (hifi) - Victor Bocharsky (bocharsky_bw) - Nikolay Labinskiy (e-moe) - - Aleksandar Jakovljevic (ajakov) - Martin Schuhfuß (usefulthink) - apetitpa - Guilliam Xavier @@ -366,6 +366,7 @@ The Symfony Connect username in parenthesis allows to get more information - Florent Morselli (spomky_) - dFayet - Rob Frawley 2nd (robfrawley) + - Renan (renanbr) - Nikita Konstantinov (unkind) - Dariusz - Francois Zaninotto @@ -402,6 +403,7 @@ The Symfony Connect username in parenthesis allows to get more information - Sullivan SENECHAL (soullivaneuh) - Loick Piera (pyrech) - Uwe Jäger (uwej711) + - W0rma - Lynn van der Berg (kjarli) - Michaël Perrin (michael.perrin) - Eugene Leonovich (rybakit) @@ -425,7 +427,6 @@ The Symfony Connect username in parenthesis allows to get more information - Frank de Jonge - Andrii Bodnar - Dane Powell - - Renan (renanbr) - Sebastien Morel (plopix) - Christopher Davis (chrisguitarguy) - Karoly Gossler (connorhu) @@ -473,7 +474,6 @@ The Symfony Connect username in parenthesis allows to get more information - Chris Smith (cs278) - Thomas Bisignani (toma) - Florian Klein (docteurklein) - - W0rma - Damien Alexandre (damienalexandre) - Manuel Kießling (manuelkiessling) - Alexey Kopytko (sanmai) @@ -544,6 +544,7 @@ The Symfony Connect username in parenthesis allows to get more information - Pavel Kirpitsov (pavel-kirpichyov) - Robert Meijers - Artur Eshenbrener + - Priyadi Iman Nurcahyo (priyadi) - Harm van Tilborg (hvt) - Thomas Perez (scullwm) - Cédric Anne @@ -588,6 +589,7 @@ The Symfony Connect username in parenthesis allows to get more information - Greg Thornton (xdissent) - Alex Bowers - Michel Roca (mroca) + - Asis Pattisahusiwa - Costin Bereveanu (schniper) - Andrii Dembitskyi - Gasan Guseynov (gassan) @@ -604,9 +606,11 @@ The Symfony Connect username in parenthesis allows to get more information - Saif Eddin G - Endre Fejes - Tobias Naumann (tna) + - Mathieu Rochette (mathroc) - Daniel Beyer - flack (flack) - Shein Alexey + - Joppe De Cuyper (joppedc) - Joe Lencioni - Daniel Tschinder - Diego Agulló (aeoris) @@ -683,6 +687,7 @@ The Symfony Connect username in parenthesis allows to get more information - vagrant - Matthias Krauser (mkrauser) - Benjamin Cremer (bcremer) + - Alex Hofbauer (alexhofbauer) - Maarten de Boer (mdeboer) - Asier Illarramendi (doup) - AKeeman (akeeman) @@ -690,7 +695,6 @@ The Symfony Connect username in parenthesis allows to get more information - Restless-ET - Vlad Gregurco (vgregurco) - Artem Stepin (astepin) - - Priyadi Iman Nurcahyo (priyadi) - Boris Vujicic (boris.vujicic) - Dries Vints - Judicaël RUFFIEUX (axanagor) @@ -709,6 +713,7 @@ The Symfony Connect username in parenthesis allows to get more information - Vitaliy Tverdokhlib (vitaliytv) - Ariel Ferrandini (aferrandini) - BASAK Semih (itsemih) + - Kai Dederichs - Dirk Pahl (dirkaholic) - Cédric Lombardot (cedriclombardot) - Jérémy REYNAUD (babeuloula) @@ -779,7 +784,6 @@ The Symfony Connect username in parenthesis allows to get more information - Eduardo Oliveira (entering) - Oleksii Zhurbytskyi - Bilge - - Asis Pattisahusiwa - Anatoly Pashin (b1rdex) - Jonathan Johnson (jrjohnson) - Eugene Wissner @@ -787,6 +791,7 @@ The Symfony Connect username in parenthesis allows to get more information - Roy Van Ginneken (rvanginneken) - ondrowan - Barry vd. Heuvel (barryvdh) + - Antonin CLAUZIER (0x346e3730) - Chad Sikorra (chadsikorra) - Evan S Kaufman (evanskaufman) - mcben @@ -803,7 +808,6 @@ The Symfony Connect username in parenthesis allows to get more information - Leevi Graham (leevigraham) - Anthony Ferrara - tim - - Mathieu Rochette (mathroc) - Ioan Negulescu - Greg ORIOL - Jakub Škvára (jskvara) @@ -813,7 +817,6 @@ The Symfony Connect username in parenthesis allows to get more information - alexpods - Adam Szaraniec - Dariusz Ruminski - - Joppe De Cuyper (joppedc) - Romain Gautier (mykiwi) - Matthieu Bontemps - Erik Trapman @@ -905,6 +908,7 @@ The Symfony Connect username in parenthesis allows to get more information - julien57 - Mátyás Somfai (smatyas) - Bastien DURAND (deamon) + - Nicolas Rigaud - Dmitry Simushev - alcaeus - Ahmed Ghanem (ahmedghanem00) @@ -976,7 +980,6 @@ The Symfony Connect username in parenthesis allows to get more information - Dustin Dobervich (dustin10) - Luis Tacón (lutacon) - Dmitrii Tarasov (dtarasov) - - Alex Hofbauer (alexhofbauer) - dantleech - Philipp Kolesnikov - Jack Worman (jworman) @@ -1086,7 +1089,6 @@ The Symfony Connect username in parenthesis allows to get more information - Tiago Brito (blackmx) - Gintautas Miselis (naktibalda) - Richard van den Brand (ricbra) - - Kai Dederichs - Toon Verwerft (veewee) - develop - flip111 @@ -1100,6 +1102,7 @@ The Symfony Connect username in parenthesis allows to get more information - Mark Sonnabaum - Chris Jones (magikid) - Massimiliano Braglia (massimilianobraglia) + - Thijs-jan Veldhuizen (tjveldhuizen) - Richard Quadling - James Hudson (mrthehud) - Raphaëll Roussel @@ -1123,6 +1126,7 @@ The Symfony Connect username in parenthesis allows to get more information - Wybren Koelmans (wybren_koelmans) - Roberto Nygaard - victor-prdh + - Kev - Davide Borsatto (davide.borsatto) - Florian Hermann (fhermann) - zenas1210 @@ -1156,6 +1160,7 @@ The Symfony Connect username in parenthesis allows to get more information - Tarjei Huse (tarjei) - Besnik Br - Issam Raouf (iraouf) + - Simon Mönch - Jose Gonzalez - Jonathan (jlslew) - Claudio Zizza @@ -1222,6 +1227,7 @@ The Symfony Connect username in parenthesis allows to get more information - Evan C - buffcode - Glodzienski + - Natsuki Ikeguchi - Krzysztof Łabuś (crozin) - Xavier Lacot (xavier) - Jon Dufresne @@ -1229,7 +1235,6 @@ The Symfony Connect username in parenthesis allows to get more information - Denis Zunke (donalberto) - Adrien Roches (neirda24) - _sir_kane (waly) - - Antonin CLAUZIER (0x346e3730) - Olivier Maisonneuve - Andrei C. (moldman) - Mike Meier (mykon) @@ -1309,6 +1314,7 @@ The Symfony Connect username in parenthesis allows to get more information - Maksim Kotlyar (makasim) - Neil Ferreira - Julie Hourcade (juliehde) + - Marc Biorklund (mbiork) - Dmitry Parnas (parnas) - Loïc Beurlet - Ana Raro @@ -1412,6 +1418,7 @@ The Symfony Connect username in parenthesis allows to get more information - Daniel Cestari - Matt Janssen - Stéphane Delprat + - Mior Muhammad Zaki (crynobone) - Elan Ruusamäe (glen) - Brunet Laurent (lbrunet) - Florent Viel (luxifer) @@ -1487,6 +1494,7 @@ The Symfony Connect username in parenthesis allows to get more information - Jules Matsounga (hyoa) - Yewhen Khoptynskyi (khoptynskyi) - Jérôme Nadaud (jnadaud) + - Frank Naegler - Sam Malone - Ha Phan (haphan) - Chris Jones (leek) @@ -1495,6 +1503,7 @@ The Symfony Connect username in parenthesis allows to get more information - xaav - Jean-Christophe Cuvelier [Artack] - Mahmoud Mostafa (mahmoud) + - Ninos - Alexandre Tranchant (alexandre_t) - Anthony Moutte - Ahmed Abdou @@ -1514,6 +1523,7 @@ The Symfony Connect username in parenthesis allows to get more information - Grégoire Hébert (gregoirehebert) - Franz Wilding (killerpoke) - Ferenczi Krisztian (fchris82) + - Ioan Ovidiu Enache (ionutenache) - Artyum Petrov - Oleg Golovakhin (doc_tr) - Guillaume Smolders (guillaumesmo) @@ -1839,7 +1849,6 @@ The Symfony Connect username in parenthesis allows to get more information - Gustavo Adrian - Jorrit Schippers (jorrit) - Matthias Neid - - Kev - Yannick - Kuzia - Vladimir Luchaninov (luchaninov) @@ -2055,6 +2064,7 @@ The Symfony Connect username in parenthesis allows to get more information - Maxime THIRY - Norman Soetbeer - Ludek Stepan + - Frederik Schwan - Mark van den Berg - Aaron Stephens (astephens) - Craig Menning (cmenning) @@ -2181,6 +2191,7 @@ The Symfony Connect username in parenthesis allows to get more information - Aurélien Fontaine - ncou - Ian Carroll + - Dennis Fehr - caponica - jdcook - Daniel Kay (danielkay-cp) @@ -2197,6 +2208,7 @@ The Symfony Connect username in parenthesis allows to get more information - Martin Pärtel - Daniel Rotter (danrot) - Frédéric Bouchery (fbouchery) + - Jacek Kobus (jackks) - Patrick Daley (padrig) - Phillip Look (plook) - Foxprodev @@ -2215,6 +2227,7 @@ The Symfony Connect username in parenthesis allows to get more information - mfettig - Oleksii Bulba - Ramon Cuñat + - mboultoureau - Raphaëll Roussel - Vitalii - Tadcka @@ -2231,7 +2244,6 @@ The Symfony Connect username in parenthesis allows to get more information - parinz1234 - Romain Geissler - Adrien Moiruad - - Natsuki Ikeguchi - Viktoriia Zolotova - Tomaz Ahlin - Nasim @@ -2298,6 +2310,7 @@ The Symfony Connect username in parenthesis allows to get more information - Jos Elstgeest - Kirill Lazarev - Thomas Counsell + - Joe - BilgeXA - mmokhi - Serhii Smirnov @@ -2401,6 +2414,7 @@ The Symfony Connect username in parenthesis allows to get more information - izenin - Mephistofeles - Oleh Korneliuk + - Evgeny Ruban - Hoffmann András - LubenZA - Victor Garcia @@ -2481,7 +2495,6 @@ The Symfony Connect username in parenthesis allows to get more information - Anton Sukhachev (mrsuh) - Pavlo Pelekh (pelekh) - Stefan Kleff (stefanxl) - - Thijs-jan Veldhuizen (tjveldhuizen) - Vitaliy Zhuk (zhukv) - Marcel Siegert - ryunosuke @@ -2635,7 +2648,6 @@ The Symfony Connect username in parenthesis allows to get more information - Grayson Koonce - Ruben Jansen - Wissame MEKHILEF - - Marc Biorklund - shreypuranik - NanoSector - Thibaut Salanon @@ -2686,6 +2698,7 @@ The Symfony Connect username in parenthesis allows to get more information - downace - Aarón Nieves Fernández - Mikolaj Czajkowski + - Ahto Türkson - Ph3nol - Kirill Saksin - Shiro @@ -2737,6 +2750,7 @@ The Symfony Connect username in parenthesis allows to get more information - Mohammad Ali Sarbanha (sarbanha) - Sergii Dolgushev (sergii-swds) - Steeve Titeca (stiteca) + - Thomas Citharel (tcit) - Artem Lopata (bumz) - alex - evgkord @@ -2804,6 +2818,7 @@ The Symfony Connect username in parenthesis allows to get more information - Shamimul Alam - Cyril HERRERA - dropfen + - RAHUL K JHA - Andrey Chernykh - Edvinas Klovas - Drew Butler @@ -2901,6 +2916,7 @@ The Symfony Connect username in parenthesis allows to get more information - John Nickell (jrnickell) - Martin Mayer (martin) - Grzegorz Łukaszewicz (newicz) + - Nico Müller (nicomllr) - Omar Yepez (oyepez003) - Jonny Schmid (schmidjon) - Toby Griffiths (tog) @@ -2912,6 +2928,7 @@ The Symfony Connect username in parenthesis allows to get more information - Ernest Hymel - Andrea Civita - Nicolás Alonso + - Roman Tyshyk - LoginovIlya - andreyserdjuk - Nick Chiu @@ -2975,6 +2992,7 @@ The Symfony Connect username in parenthesis allows to get more information - NothingWeAre - Storkeus - goabonga + - Vladislav Iurciuc - Alan Chen - Anton Zagorskii - ging-dev @@ -2995,7 +3013,6 @@ The Symfony Connect username in parenthesis allows to get more information - Matheus Gontijo - Gerrit Drost - Linnaea Von Lavia - - Simon Mönch - Javan Eskander - Lenar Lõhmus - Cristian Gonzalez @@ -3169,6 +3186,7 @@ The Symfony Connect username in parenthesis allows to get more information - helmi - Michael Steininger - Nardberjean + - Dylan - ghazy ben ahmed - Karolis - Myke79 @@ -3190,6 +3208,7 @@ The Symfony Connect username in parenthesis allows to get more information - Steffen Keuper - Kai Eichinger - Antonio Angelino + - Kay Wei - Jens Schulze - Tema Yud - Matt Fields @@ -3424,6 +3443,7 @@ The Symfony Connect username in parenthesis allows to get more information - Andreas Forsblom (aforsblo) - Alex Olmos (alexolmos) - Cedric BERTOLINI (alsciende) + - Cornel Cruceru (amne) - Robin Kanters (anddarerobin) - Antoine (antoinela_adveris) - Juan Ases García (ases) @@ -3443,7 +3463,6 @@ The Symfony Connect username in parenthesis allows to get more information - Bermon Clément (chou666) - Kousuke Ebihara (co3k) - Loïc Vernet (coil) - - Mior Muhammad Zaki (crynobone) - Christoph Vincent Schaefer (cvschaefer) - Kamil Piwowarski (cyklista) - Damon Jones (damon__jones) diff --git a/README.md b/README.md index d02bbd835b32b..7c4f1a85899bb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- + Symfony Logo

[Symfony][1] is a **PHP framework** for web and console applications and a set diff --git a/composer.json b/composer.json index 469c30715f775..f9bc553e63b86 100644 --- a/composer.json +++ b/composer.json @@ -121,7 +121,7 @@ "amphp/http-client": "^4.2.1", "amphp/http-tunnel": "^1.0", "async-aws/ses": "^1.0", - "async-aws/sqs": "^1.0", + "async-aws/sqs": "^1.0|^2.0", "async-aws/sns": "^1.0", "cache/integration-tests": "dev-master", "doctrine/annotations": "^1.13.1|^2", diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index be31c7218af5b..884185d0f8031 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -50,7 +50,7 @@ public function __construct(ContainerInterface $container, array $subscriberIds * * @return void */ - public function dispatchEvent($eventName, EventArgs $eventArgs = null) + public function dispatchEvent($eventName, ?EventArgs $eventArgs = null) { if (!$this->initializedSubscribers) { $this->initializeSubscribers(); diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php index 8e500b56c1fe3..6283d66cc2b81 100644 --- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php +++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php @@ -39,7 +39,7 @@ class DoctrineDataCollector extends DataCollector */ private $loggers = []; - public function __construct(ManagerRegistry $registry, DebugDataHolder $debugDataHolder = null) + public function __construct(ManagerRegistry $registry, ?DebugDataHolder $debugDataHolder = null) { $this->registry = $registry; $this->connections = $registry->getConnectionNames(); @@ -58,7 +58,7 @@ public function addLogger(string $name, DebugStack $logger) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->data = [ 'queries' => $this->collectQueries(), diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php index 5e3cb301ccfdf..627d5f6c5122f 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php @@ -35,7 +35,7 @@ class DoctrineChoiceLoader extends AbstractChoiceLoader * * @param string $class The class name of the loaded objects */ - public function __construct(ObjectManager $manager, string $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null) + public function __construct(ObjectManager $manager, string $class, ?IdReader $idReader = null, ?EntityLoaderInterface $objectLoader = null) { $classMetadata = $manager->getClassMetadata($class); diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php index 5a6e23d963946..29b10a14f4119 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php @@ -78,7 +78,7 @@ public function isIntId(): bool * * This method assumes that the object has a single-column ID. */ - public function getIdValue(object $object = null): string + public function getIdValue(?object $object = null): string { if (!$object) { return ''; diff --git a/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php b/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php index 74dc9ec250f2b..8026ea873137b 100644 --- a/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php +++ b/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php @@ -21,7 +21,7 @@ final class UlidGenerator extends AbstractIdGenerator { private $factory; - public function __construct(UlidFactory $factory = null) + public function __construct(?UlidFactory $factory = null) { $this->factory = $factory; } diff --git a/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php b/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php index af31f109fe66e..773722d5ff9cb 100644 --- a/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php +++ b/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php @@ -23,7 +23,7 @@ final class UuidGenerator extends AbstractIdGenerator private $factory; private $entityGetter; - public function __construct(UuidFactory $factory = null) + public function __construct(?UuidFactory $factory = null) { $this->protoFactory = $this->factory = $factory ?? new UuidFactory(); } diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php index 4c385ef070a6c..87a234961b44f 100644 --- a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php +++ b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php @@ -26,7 +26,7 @@ class DbalLogger implements SQLLogger protected $logger; protected $stopwatch; - public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null) + public function __construct(?LoggerInterface $logger = null, ?Stopwatch $stopwatch = null) { $this->logger = $logger; $this->stopwatch = $stopwatch; @@ -37,7 +37,7 @@ public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch * * @return void */ - public function startQuery($sql, array $params = null, array $types = null) + public function startQuery($sql, ?array $params = null, ?array $types = null) { if (null !== $this->stopwatch) { $this->stopwatch->start('doctrine', 'doctrine'); diff --git a/src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php index 9fbf2deb963e3..83413c37871f6 100644 --- a/src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php +++ b/src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php @@ -28,7 +28,7 @@ abstract class AbstractDoctrineMiddleware implements MiddlewareInterface protected $managerRegistry; protected $entityManagerName; - public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null) + public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null) { $this->managerRegistry = $managerRegistry; $this->entityManagerName = $entityManagerName; diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php index 40adcbabae59f..2ef3bbbb92815 100644 --- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php +++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php @@ -29,7 +29,7 @@ class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware /** @var bool */ private $isHandling = false; - public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null, LoggerInterface $logger = null) + public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null, ?LoggerInterface $logger = null) { parent::__construct($managerRegistry, $entityManagerName); diff --git a/src/Symfony/Bridge/Doctrine/Middleware/Debug/DBAL3/Statement.php b/src/Symfony/Bridge/Doctrine/Middleware/Debug/DBAL3/Statement.php index 16217c2f46a51..9705a77a459f0 100644 --- a/src/Symfony/Bridge/Doctrine/Middleware/Debug/DBAL3/Statement.php +++ b/src/Symfony/Bridge/Doctrine/Middleware/Debug/DBAL3/Statement.php @@ -36,7 +36,7 @@ public function __construct( DebugDataHolder $debugDataHolder, string $connectionName, string $sql, - Stopwatch $stopwatch = null + ?Stopwatch $stopwatch = null ) { $this->stopwatch = $stopwatch; $this->connectionName = $connectionName; diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php index a1043d8213f33..faf0a2948cabd 100644 --- a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php @@ -39,7 +39,7 @@ class EntityUserProvider implements UserProviderInterface, PasswordUpgraderInter private $class; private $property; - public function __construct(ManagerRegistry $registry, string $classOrAlias, string $property = null, string $managerName = null) + public function __construct(ManagerRegistry $registry, string $classOrAlias, ?string $property = null, ?string $managerName = null) { $this->registry = $registry; $this->managerName = $managerName; diff --git a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php index 0de248b1efdf0..c29ccc49d767e 100644 --- a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php +++ b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php @@ -40,7 +40,7 @@ class DoctrineTestHelper * * @return EntityManager */ - public static function createTestEntityManager(Configuration $config = null) + public static function createTestEntityManager(?Configuration $config = null) { if (!\extension_loaded('pdo_sqlite')) { TestCase::markTestSkipped('Extension pdo_sqlite is required.'); diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php index 75102ee331410..cde5c8f5bcda7 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php @@ -783,7 +783,7 @@ public function testOverrideChoicesValuesWithCallable() 'em' => 'default', 'class' => self::ITEM_GROUP_CLASS, 'choice_label' => 'name', - 'choice_value' => function (GroupableEntity $entity = null) { + 'choice_value' => function (?GroupableEntity $entity = null) { if (null === $entity) { return ''; } diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php index e4e67eb663557..757813f017af9 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php @@ -123,7 +123,7 @@ public function testTestGetPropertiesWithEmbedded() /** * @dataProvider typesProvider */ - public function testExtract(string $property, array $type = null) + public function testExtract(string $property, ?array $type = null) { $this->assertEquals($type, $this->createExtractor()->getTypes(DoctrineDummy::class, $property, [])); } diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php index 9aa8d6ef61230..d9f21b04c29f6 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php @@ -211,7 +211,7 @@ public function testFieldMappingsConfiguration() /** * @dataProvider regexpProvider */ - public function testClassValidator(bool $expected, string $classValidatorRegexp = null) + public function testClassValidator(bool $expected, ?string $classValidatorRegexp = null) { $doctrineLoader = new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), $classValidatorRegexp, false); diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php index dc848c143ca9e..3a238e0b8ab22 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php +++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php @@ -46,14 +46,14 @@ class UniqueEntity extends Constraint */ public function __construct( $fields, - string $message = null, - string $service = null, - string $em = null, - string $entityClass = null, - string $repositoryMethod = null, - string $errorPath = null, - bool $ignoreNull = null, - array $groups = null, + ?string $message = null, + ?string $service = null, + ?string $em = null, + ?string $entityClass = null, + ?string $repositoryMethod = null, + ?string $errorPath = null, + ?bool $ignoreNull = null, + ?array $groups = null, $payload = null, array $options = [] ) { diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php index 9fcb0d3486ada..601ef0f2b5fa6 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php +++ b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php @@ -36,7 +36,7 @@ final class DoctrineLoader implements LoaderInterface private $entityManager; private $classValidatorRegexp; - public function __construct(EntityManagerInterface $entityManager, string $classValidatorRegexp = null) + public function __construct(EntityManagerInterface $entityManager, ?string $classValidatorRegexp = null) { $this->entityManager = $entityManager; $this->classValidatorRegexp = $classValidatorRegexp; diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php index 4b87c264e4d5a..0c212e162c4af 100644 --- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php +++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php @@ -182,7 +182,7 @@ private function replacePlaceHolder(array $record): array return $record; } - private function dumpData($data, bool $colors = null): string + private function dumpData($data, ?bool $colors = null): string { if (null === $this->dumper) { return ''; diff --git a/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php index 54988766c3a2d..62c2117ab5eec 100644 --- a/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php +++ b/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php @@ -21,7 +21,7 @@ class VarDumperFormatter implements FormatterInterface { private $cloner; - public function __construct(VarCloner $cloner = null) + public function __construct(?VarCloner $cloner = null) { $this->cloner = $cloner ?? new VarCloner(); } diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php index 17d3c2f28d227..c3b34c5c17b66 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php @@ -60,7 +60,7 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe * @param array $verbosityLevelMap Array that maps the OutputInterface verbosity to a minimum logging * level (leave empty to use the default mapping) */ - public function __construct(OutputInterface $output = null, bool $bubble = true, array $verbosityLevelMap = [], array $consoleFormatterOptions = []) + public function __construct(?OutputInterface $output = null, bool $bubble = true, array $verbosityLevelMap = [], array $consoleFormatterOptions = []) { parent::__construct(Logger::DEBUG, $bubble); $this->output = $output; diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php index fb01daddcc777..e0c10d265e3a9 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php @@ -58,7 +58,7 @@ class ElasticsearchLogstashHandler extends AbstractHandler /** * @param string|int $level The minimum logging level at which this handler will be triggered */ - public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', HttpClientInterface $client = null, $level = Logger::DEBUG, bool $bubble = true, string $elasticsearchVersion = '1.0.0') + public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', ?HttpClientInterface $client = null, $level = Logger::DEBUG, bool $bubble = true, string $elasticsearchVersion = '1.0.0') { if (!interface_exists(HttpClientInterface::class)) { throw new \LogicException(sprintf('The "%s" handler needs an HTTP client. Try running "composer require symfony/http-client".', __CLASS__)); diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php index 4643f5b6d7598..a3431a21404cd 100644 --- a/src/Symfony/Bridge/Monolog/Logger.php +++ b/src/Symfony/Bridge/Monolog/Logger.php @@ -25,7 +25,7 @@ class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface /** * {@inheritdoc} */ - public function getLogs(Request $request = null) + public function getLogs(?Request $request = null) { if ($logger = $this->getDebugLogger()) { return $logger->getLogs($request); @@ -37,7 +37,7 @@ public function getLogs(Request $request = null) /** * {@inheritdoc} */ - public function countErrors(Request $request = null) + public function countErrors(?Request $request = null) { if ($logger = $this->getDebugLogger()) { return $logger->countErrors($request); diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php index 98b1d229220fe..31c19bf828d9b 100644 --- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php +++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php @@ -23,7 +23,7 @@ class DebugProcessor implements DebugLoggerInterface, ResetInterface private $errorCount = []; private $requestStack; - public function __construct(RequestStack $requestStack = null) + public function __construct(?RequestStack $requestStack = null) { $this->requestStack = $requestStack; } @@ -68,7 +68,7 @@ public function __invoke(array $record) /** * {@inheritdoc} */ - public function getLogs(Request $request = null) + public function getLogs(?Request $request = null) { if (null !== $request) { return $this->records[spl_object_hash($request)] ?? []; @@ -84,7 +84,7 @@ public function getLogs(Request $request = null) /** * {@inheritdoc} */ - public function countErrors(Request $request = null) + public function countErrors(?Request $request = null) { if (null !== $request) { return $this->errorCount[spl_object_hash($request)] ?? 0; diff --git a/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php b/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php index f72023cdfdac4..805e598f06e00 100644 --- a/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php +++ b/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php @@ -25,7 +25,7 @@ */ class WebProcessor extends BaseWebProcessor implements EventSubscriberInterface { - public function __construct(array $extraFields = null) + public function __construct(?array $extraFields = null) { // Pass an empty array as the default null value would access $_SERVER parent::__construct([], $extraFields); diff --git a/src/Symfony/Bridge/Monolog/Tests/ClassThatInheritLogger.php b/src/Symfony/Bridge/Monolog/Tests/ClassThatInheritLogger.php index e258c7942a20a..ff5ab0023295c 100644 --- a/src/Symfony/Bridge/Monolog/Tests/ClassThatInheritLogger.php +++ b/src/Symfony/Bridge/Monolog/Tests/ClassThatInheritLogger.php @@ -16,12 +16,12 @@ class ClassThatInheritLogger extends Logger { - public function getLogs(Request $request = null): array + public function getLogs(?Request $request = null): array { return parent::getLogs($request); } - public function countErrors(Request $request = null): int + public function countErrors(?Request $request = null): int { return parent::countErrors($request); } diff --git a/src/Symfony/Bridge/Monolog/Tests/Processor/ClassThatInheritDebugProcessor.php b/src/Symfony/Bridge/Monolog/Tests/Processor/ClassThatInheritDebugProcessor.php index bc87c724c9d31..697b5872cb579 100644 --- a/src/Symfony/Bridge/Monolog/Tests/Processor/ClassThatInheritDebugProcessor.php +++ b/src/Symfony/Bridge/Monolog/Tests/Processor/ClassThatInheritDebugProcessor.php @@ -16,12 +16,12 @@ class ClassThatInheritDebugProcessor extends DebugProcessor { - public function getLogs(Request $request = null): array + public function getLogs(?Request $request = null): array { return parent::getLogs($request); } - public function countErrors(Request $request = null): int + public function countErrors(?Request $request = null): int { return parent::countErrors($request); } diff --git a/src/Symfony/Bridge/PhpUnit/CoverageListener.php b/src/Symfony/Bridge/PhpUnit/CoverageListener.php index 766252b8728b7..65d6aa9dc9dcc 100644 --- a/src/Symfony/Bridge/PhpUnit/CoverageListener.php +++ b/src/Symfony/Bridge/PhpUnit/CoverageListener.php @@ -26,7 +26,7 @@ class CoverageListener implements TestListener private $sutFqcnResolver; private $warningOnSutNotFound; - public function __construct(callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false) + public function __construct(?callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false) { $this->sutFqcnResolver = $sutFqcnResolver ?? static function (Test $test): ?string { $class = \get_class($test); diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php index d4c78210114d7..42a2795d54d02 100644 --- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php +++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php @@ -44,7 +44,7 @@ class DebugCommand extends Command private $filesystemLoaders; private $fileLinkFormatter; - public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = [], string $twigDefaultPath = null, FileLinkFormatter $fileLinkFormatter = null) + public function __construct(Environment $twig, ?string $projectDir = null, array $bundlesMetadata = [], ?string $twigDefaultPath = null, ?FileLinkFormatter $fileLinkFormatter = null) { parent::__construct(); @@ -218,7 +218,7 @@ private function displayPathsJson(SymfonyStyle $io, string $name) $io->writeln(json_encode($data)); } - private function displayGeneralText(SymfonyStyle $io, string $filter = null) + private function displayGeneralText(SymfonyStyle $io, ?string $filter = null) { $decorated = $io->isDecorated(); $types = ['functions', 'filters', 'tests', 'globals']; @@ -280,7 +280,7 @@ private function displayGeneralJson(SymfonyStyle $io, ?string $filter) $io->writeln($decorated ? OutputFormatter::escape($data) : $data); } - private function getLoaderPaths(string $name = null): array + private function getLoaderPaths(?string $name = null): array { $loaderPaths = []; foreach ($this->getFilesystemLoaders() as $loader) { diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php index b91110b34a5bc..17bfa435a1b94 100644 --- a/src/Symfony/Bridge/Twig/Command/LintCommand.php +++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php @@ -236,7 +236,7 @@ private function displayJson(OutputInterface $output, array $filesInfo) return min($errors, 1); } - private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null) + private function renderException(SymfonyStyle $output, string $template, Error $exception, ?string $file = null, ?GithubActionReporter $githubReporter = null) { $line = $exception->getTemplateLine(); diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php index 4a469781084e0..3df1aa4a5951b 100644 --- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php +++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php @@ -32,7 +32,7 @@ class TwigDataCollector extends DataCollector implements LateDataCollectorInterf private $twig; private $computed; - public function __construct(Profile $profile, Environment $twig = null) + public function __construct(Profile $profile, ?Environment $twig = null) { $this->profile = $profile; $this->twig = $twig; @@ -41,7 +41,7 @@ public function __construct(Profile $profile, Environment $twig = null) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { } diff --git a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php index b0ccd684e8b6f..1bc1bb0774e7d 100644 --- a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php +++ b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php @@ -32,7 +32,7 @@ class TwigErrorRenderer implements ErrorRendererInterface /** * @param bool|callable $debug The debugging mode as a boolean or a callable that should return it */ - public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorRenderer = null, $debug = false) + 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__, get_debug_type($debug))); diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php index 694821f7bf6b8..9ec9778e3c29b 100644 --- a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php @@ -46,7 +46,7 @@ public function getFunctions(): array * If the package used to generate the path is an instance of * UrlPackage, you will always get a URL and not a path. */ - public function getAssetUrl(string $path, string $packageName = null): string + public function getAssetUrl(string $path, ?string $packageName = null): string { return $this->packages->getUrl($path, $packageName); } @@ -54,7 +54,7 @@ public function getAssetUrl(string $path, string $packageName = null): string /** * Returns the version of an asset. */ - public function getAssetVersion(string $path, string $packageName = null): string + public function getAssetVersion(string $path, ?string $packageName = null): string { return $this->packages->getVersion($path, $packageName); } diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php index 353bd84f3f6f7..d76924633efe0 100644 --- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php @@ -97,6 +97,8 @@ public function formatArgs(array $args): string $formattedValue = ''.strtolower(htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)).''; } elseif ('resource' === $item[0]) { $formattedValue = 'resource'; + } elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) { + $formattedValue = 'binary string'; } else { $formattedValue = str_replace("\n", '', htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)); } @@ -162,7 +164,7 @@ public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?stri /** * Formats a file path. */ - public function formatFile(string $file, int $line, string $text = null): string + public function formatFile(string $file, int $line, ?string $text = null): string { $file = trim($file); diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php index 46ad8eaf679c2..f6620062c8dcc 100644 --- a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php @@ -29,7 +29,7 @@ final class DumpExtension extends AbstractExtension private $cloner; private $dumper; - public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null) + public function __construct(ClonerInterface $cloner, ?HtmlDumper $dumper = null) { $this->cloner = $cloner; $this->dumper = $dumper; diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 7f0b1ed597e36..24c792aec5de2 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -32,7 +32,7 @@ final class FormExtension extends AbstractExtension { private $translator; - public function __construct(TranslatorInterface $translator = null) + public function __construct(?TranslatorInterface $translator = null) { $this->translator = $translator; } diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php index ab83054a9ff0f..565b37f71c498 100644 --- a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php +++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php @@ -25,7 +25,7 @@ final class HttpKernelRuntime private $handler; private $fragmentUriGenerator; - public function __construct(FragmentHandler $handler, FragmentUriGeneratorInterface $fragmentUriGenerator = null) + public function __construct(FragmentHandler $handler, ?FragmentUriGeneratorInterface $fragmentUriGenerator = null) { $this->handler = $handler; $this->fragmentUriGenerator = $fragmentUriGenerator; diff --git a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php index 071b9ff247f1d..94e9dedacfffd 100644 --- a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php @@ -45,7 +45,7 @@ public function getFunctions(): array * * @param string|null $key The firewall key or null to use the current firewall key */ - public function getLogoutPath(string $key = null): string + public function getLogoutPath(?string $key = null): string { return $this->generator->getLogoutPath($key); } @@ -55,7 +55,7 @@ public function getLogoutPath(string $key = null): string * * @param string|null $key The firewall key or null to use the current firewall key */ - public function getLogoutUrl(string $key = null): string + public function getLogoutUrl(?string $key = null): string { return $this->generator->getLogoutUrl($key); } diff --git a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php index 51d6eba2da185..c146848c6353a 100644 --- a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php @@ -28,7 +28,7 @@ final class ProfilerExtension extends BaseProfilerExtension */ private $events; - public function __construct(Profile $profile, Stopwatch $stopwatch = null) + public function __construct(Profile $profile, ?Stopwatch $stopwatch = null) { parent::__construct($profile); diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php index 0e58fc0ec66e4..8ff7ea79f8067 100644 --- a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php @@ -29,7 +29,7 @@ final class SecurityExtension extends AbstractExtension private $impersonateUrlGenerator; - public function __construct(AuthorizationCheckerInterface $securityChecker = null, ImpersonateUrlGenerator $impersonateUrlGenerator = null) + public function __construct(?AuthorizationCheckerInterface $securityChecker = null, ?ImpersonateUrlGenerator $impersonateUrlGenerator = null) { $this->securityChecker = $securityChecker; $this->impersonateUrlGenerator = $impersonateUrlGenerator; @@ -38,7 +38,7 @@ public function __construct(AuthorizationCheckerInterface $securityChecker = nul /** * @param mixed $object */ - public function isGranted($role, $object = null, string $field = null): bool + public function isGranted($role, $object = null, ?string $field = null): bool { if (null === $this->securityChecker) { return false; @@ -55,7 +55,7 @@ public function isGranted($role, $object = null, string $field = null): bool } } - public function getImpersonateExitUrl(string $exitTo = null): string + public function getImpersonateExitUrl(?string $exitTo = null): string { if (null === $this->impersonateUrlGenerator) { return ''; @@ -64,7 +64,7 @@ public function getImpersonateExitUrl(string $exitTo = null): string return $this->impersonateUrlGenerator->generateExitUrl($exitTo); } - public function getImpersonateExitPath(string $exitTo = null): string + public function getImpersonateExitPath(?string $exitTo = null): string { if (null === $this->impersonateUrlGenerator) { return ''; diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php index 80a25a949bdb5..4531ee506f26c 100644 --- a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php @@ -26,7 +26,7 @@ final class StopwatchExtension extends AbstractExtension private $stopwatch; private $enabled; - public function __construct(Stopwatch $stopwatch = null, bool $enabled = true) + public function __construct(?Stopwatch $stopwatch = null, bool $enabled = true) { $this->stopwatch = $stopwatch; $this->enabled = $enabled; diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php index d50348098e67a..f961b3def3e1f 100644 --- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php @@ -37,7 +37,7 @@ final class TranslationExtension extends AbstractExtension private $translator; private $translationNodeVisitor; - public function __construct(TranslatorInterface $translator = null, TranslationNodeVisitor $translationNodeVisitor = null) + public function __construct(?TranslatorInterface $translator = null, ?TranslationNodeVisitor $translationNodeVisitor = null) { $this->translator = $translator; $this->translationNodeVisitor = $translationNodeVisitor; @@ -109,7 +109,7 @@ public function getTranslationNodeVisitor(): TranslationNodeVisitor * @param string|\Stringable|TranslatableInterface|null $message * @param array|string $arguments Can be the locale as a string when $message is a TranslatableInterface */ - public function trans($message, $arguments = [], string $domain = null, string $locale = null, int $count = null): string + public function trans($message, $arguments = [], ?string $domain = null, ?string $locale = null, ?int $count = null): string { if ($message instanceof TranslatableInterface) { if ([] !== $arguments && !\is_string($arguments)) { @@ -138,7 +138,7 @@ public function trans($message, $arguments = [], string $domain = null, string $ return $this->getTranslator()->trans($message, $arguments, $domain, $locale); } - public function createTranslatable(string $message, array $parameters = [], string $domain = null): TranslatableMessage + public function createTranslatable(string $message, array $parameters = [], ?string $domain = null): TranslatableMessage { if (!class_exists(TranslatableMessage::class)) { throw new \LogicException(sprintf('You cannot use the "%s" as the Translation Component is not installed. Try running "composer require symfony/translation".', __CLASS__)); diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php index 9b5911ec28992..3b783fc78d43d 100644 --- a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php @@ -51,7 +51,7 @@ public function getFunctions(): array /** * Returns true if the transition is enabled. */ - public function canTransition(object $subject, string $transitionName, string $name = null): bool + public function canTransition(object $subject, string $transitionName, ?string $name = null): bool { return $this->workflowRegistry->get($subject, $name)->can($subject, $transitionName); } @@ -61,12 +61,12 @@ public function canTransition(object $subject, string $transitionName, string $n * * @return Transition[] */ - public function getEnabledTransitions(object $subject, string $name = null): array + public function getEnabledTransitions(object $subject, ?string $name = null): array { return $this->workflowRegistry->get($subject, $name)->getEnabledTransitions($subject); } - public function getEnabledTransition(object $subject, string $transition, string $name = null): ?Transition + public function getEnabledTransition(object $subject, string $transition, ?string $name = null): ?Transition { return $this->workflowRegistry->get($subject, $name)->getEnabledTransition($subject, $transition); } @@ -74,7 +74,7 @@ public function getEnabledTransition(object $subject, string $transition, string /** * Returns true if the place is marked. */ - public function hasMarkedPlace(object $subject, string $placeName, string $name = null): bool + public function hasMarkedPlace(object $subject, string $placeName, ?string $name = null): bool { return $this->workflowRegistry->get($subject, $name)->getMarking($subject)->has($placeName); } @@ -84,7 +84,7 @@ public function hasMarkedPlace(object $subject, string $placeName, string $name * * @return string[]|int[] */ - public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, string $name = null): array + public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, ?string $name = null): array { $places = $this->workflowRegistry->get($subject, $name)->getMarking($subject)->getPlaces(); @@ -102,7 +102,7 @@ public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, st * Use a string (the place name) to get place metadata * Use a Transition instance to get transition metadata */ - public function getMetadata(object $subject, string $key, $metadataSubject = null, string $name = null) + public function getMetadata(object $subject, string $key, $metadataSubject = null, ?string $name = null) { return $this ->workflowRegistry @@ -112,7 +112,7 @@ public function getMetadata(object $subject, string $key, $metadataSubject = nul ; } - public function buildTransitionBlockerList(object $subject, string $transitionName, string $name = null): TransitionBlockerList + public function buildTransitionBlockerList(object $subject, string $transitionName, ?string $name = null): TransitionBlockerList { $workflow = $this->workflowRegistry->get($subject, $name); diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php index 0f83de4198d65..2a66144552d65 100644 --- a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php +++ b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php @@ -40,7 +40,7 @@ class NotificationEmail extends TemplatedEmail 'footer_text' => 'Notification e-mail sent by Symfony', ]; - public function __construct(Headers $headers = null, AbstractPart $body = null) + public function __construct(?Headers $headers = null, ?AbstractPart $body = null) { $missingPackages = []; if (!class_exists(CssInlinerExtension::class)) { @@ -61,7 +61,7 @@ public function __construct(Headers $headers = null, AbstractPart $body = null) /** * Creates a NotificationEmail instance that is appropriate to send to normal (non-admin) users. */ - public static function asPublicEmail(Headers $headers = null, AbstractPart $body = null): self + public static function asPublicEmail(?Headers $headers = null, ?AbstractPart $body = null): self { $email = new static($headers, $body); $email->markAsPublic(); @@ -178,6 +178,26 @@ public function getHtmlTemplate(): ?string return '@email/'.$this->theme.'/notification/body.html.twig'; } + /** + * @return $this + */ + public function context(array $context) + { + $parentContext = []; + + foreach ($context as $key => $value) { + if (\array_key_exists($key, $this->context)) { + $this->context[$key] = $value; + } else { + $parentContext[$key] = $value; + } + } + + parent::context($parentContext); + + return $this; + } + public function getContext(): array { return array_merge($this->context, parent::getContext()); diff --git a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php index 853c01427da30..dcdb4e34f6619 100644 --- a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php +++ b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php @@ -41,7 +41,7 @@ public function toName(): string * @param string|null $contentType The media type (i.e. MIME type) of the image file (e.g. 'image/png'). * Some email clients require this to display embedded images. */ - public function image(string $image, string $contentType = null): string + public function image(string $image, ?string $contentType = null): string { $file = $this->twig->getLoader()->getSourceContext($image); if ($path = $file->getPath()) { @@ -60,7 +60,7 @@ public function image(string $image, string $contentType = null): string * @param string|null $contentType The media type (i.e. MIME type) of the file (e.g. 'application/pdf'). * Some email clients require this to display attached files. */ - public function attach(string $file, string $name = null, string $contentType = null): void + public function attach(string $file, ?string $name = null, ?string $contentType = null): void { $file = $this->twig->getLoader()->getSourceContext($file); if ($path = $file->getPath()) { diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php index 68c00556f86bf..3cd92674bd020 100644 --- a/src/Symfony/Bridge/Twig/Node/DumpNode.php +++ b/src/Symfony/Bridge/Twig/Node/DumpNode.php @@ -21,7 +21,7 @@ final class DumpNode extends Node { private $varPrefix; - public function __construct(string $varPrefix, ?Node $values, int $lineno, string $tag = null) + public function __construct(string $varPrefix, ?Node $values, int $lineno, ?string $tag = null) { $nodes = []; if (null !== $values) { diff --git a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php index e37311267bb17..2d4659ae7bb61 100644 --- a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php +++ b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php @@ -20,7 +20,7 @@ */ final class FormThemeNode extends Node { - public function __construct(Node $form, Node $resources, int $lineno, string $tag = null, bool $only = false) + public function __construct(Node $form, Node $resources, int $lineno, ?string $tag = null, bool $only = false) { parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag); } diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php index cfa4d8a197f9b..796ee4dab8d16 100644 --- a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php +++ b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php @@ -22,7 +22,7 @@ */ final class StopwatchNode extends Node { - public function __construct(Node $name, Node $body, AssignNameExpression $var, int $lineno = 0, string $tag = null) + public function __construct(Node $name, Node $body, AssignNameExpression $var, int $lineno = 0, ?string $tag = null) { parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag); } diff --git a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php index df29f0a19931f..5a96d7420122f 100644 --- a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php +++ b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php @@ -20,7 +20,7 @@ */ final class TransDefaultDomainNode extends Node { - public function __construct(AbstractExpression $expr, int $lineno = 0, string $tag = null) + public function __construct(AbstractExpression $expr, int $lineno = 0, ?string $tag = null) { parent::__construct(['expr' => $expr], [], $lineno, $tag); } diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php index 8a126ba569172..881104c8cc3fd 100644 --- a/src/Symfony/Bridge/Twig/Node/TransNode.php +++ b/src/Symfony/Bridge/Twig/Node/TransNode.php @@ -24,7 +24,7 @@ */ final class TransNode extends Node { - public function __construct(Node $body, Node $domain = null, AbstractExpression $count = null, AbstractExpression $vars = null, AbstractExpression $locale = null, int $lineno = 0, string $tag = null) + public function __construct(Node $body, ?Node $domain = null, ?AbstractExpression $count = null, ?AbstractExpression $vars = null, ?AbstractExpression $locale = null, int $lineno = 0, ?string $tag = null) { $nodes = ['body' => $body]; if (null !== $domain) { diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php index 765b4b69bd88c..3e86f482632c9 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php @@ -20,7 +20,7 @@ class Scope private $data = []; private $left = false; - public function __construct(self $parent = null) + public function __construct(?self $parent = null) { $this->parent = $parent; } diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php index d42245e2b89a4..ac0ccd21cdd37 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php @@ -158,6 +158,22 @@ private function getReadDomainFromNode(Node $node): ?string return $node->getAttribute('value'); } + if ( + $node instanceof FunctionExpression + && 'constant' === $node->getAttribute('name') + ) { + $nodeArguments = $node->getNode('arguments'); + if ($nodeArguments->getIterator()->current() instanceof ConstantExpression) { + $constantName = $nodeArguments->getIterator()->current()->getAttribute('value'); + if (\defined($constantName)) { + $value = \constant($constantName); + if (\is_string($value)) { + return $value; + } + } + } + } + return self::UNDEFINED_DOMAIN; } diff --git a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php index 45591415e3312..b04b8a6a739ae 100644 --- a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php @@ -321,7 +321,7 @@ public static function provideCompletionSuggestions(): iterable yield 'option --format' => [['--format', ''], ['text', 'json']]; } - private function createCommandTester(array $paths = [], array $bundleMetadata = [], string $defaultPath = null, bool $useChainLoader = false, array $globals = []): CommandTester + private function createCommandTester(array $paths = [], array $bundleMetadata = [], ?string $defaultPath = null, bool $useChainLoader = false, array $globals = []): CommandTester { $projectDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures'; $loader = new FilesystemLoader([], $projectDir); diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php index 7de52965b0ef7..a0230aa239606 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php @@ -206,7 +206,7 @@ public function testDefaultTranslationDomainWithNamedArguments() $this->assertEquals('foo (custom)foo (foo)foo (custom)foo (custom)foo (fr)foo (custom)foo (fr)', trim($template->render([]))); } - private function getTemplate($template, TranslatorInterface $translator = null): TemplateWrapper + private function getTemplate($template, ?TranslatorInterface $translator = null): TemplateWrapper { if (null === $translator) { $translator = new Translator('en'); diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php index ceafea1bb6b72..71ced84f7173e 100644 --- a/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php @@ -128,4 +128,54 @@ public function testPublicMailSubject() $headers = $email->getPreparedHeaders(); $this->assertSame('Foo', $headers->get('Subject')->getValue()); } + + public function testContext() + { + $email = new NotificationEmail(); + $email->context(['some' => 'context']); + + $this->assertSame([ + 'importance' => NotificationEmail::IMPORTANCE_LOW, + 'content' => '', + 'exception' => false, + 'action_text' => null, + 'action_url' => null, + 'markdown' => false, + 'raw' => false, + 'footer_text' => 'Notification e-mail sent by Symfony', + 'some' => 'context', + ], $email->getContext()); + + $context = $email->getContext(); + $context['foo'] = 'bar'; + $email->context($context); + + $this->assertSame([ + 'importance' => NotificationEmail::IMPORTANCE_LOW, + 'content' => '', + 'exception' => false, + 'action_text' => null, + 'action_url' => null, + 'markdown' => false, + 'raw' => false, + 'footer_text' => 'Notification e-mail sent by Symfony', + 'some' => 'context', + 'foo' => 'bar', + ], $email->getContext()); + + $email->action('Action Text', 'Action URL'); + + $this->assertSame([ + 'importance' => NotificationEmail::IMPORTANCE_LOW, + 'content' => '', + 'exception' => false, + 'action_text' => 'Action Text', + 'action_url' => 'Action URL', + 'markdown' => false, + 'raw' => false, + 'footer_text' => 'Notification e-mail sent by Symfony', + 'some' => 'context', + 'foo' => 'bar', + ], $email->getContext()); + } } diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php index b21017193251d..dd23cd37320f2 100644 --- a/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php @@ -94,8 +94,7 @@ public function testSymfonySerialize() } ] }, - "body": null, - "message": null + "body": null } EOF; diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php index 060a0578f2044..4e7b501da0050 100644 --- a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php @@ -22,6 +22,8 @@ class TwigExtractorTest extends TestCase { + public const CUSTOM_DOMAIN = 'domain'; + /** * @dataProvider getExtractData */ @@ -77,6 +79,11 @@ public static function getExtractData() // make sure this works with twig's named arguments ['{{ "new key" | trans(domain="domain") }}', ['new key' => 'domain']], + // make sure this works with const domain + ['{{ "new key" | trans({}, constant(\'Symfony\\\\Bridge\\\\Twig\\\\Tests\\\\Translation\\\\TwigExtractorTest::CUSTOM_DOMAIN\')) }}', ['new key' => self::CUSTOM_DOMAIN]], + ['{% trans from constant(\'Symfony\\\\Bridge\\\\Twig\\\\Tests\\\\Translation\\\\TwigExtractorTest::CUSTOM_DOMAIN\') %}new key{% endtrans %}', ['new key' => self::CUSTOM_DOMAIN]], + ['{{ t("new key", {}, constant(\'Symfony\\\\Bridge\\\\Twig\\\\Tests\\\\Translation\\\\TwigExtractorTest::CUSTOM_DOMAIN\')) | trans() }}', ['new key' => self::CUSTOM_DOMAIN]], + // concat translations ['{{ ("new" ~ " key") | trans() }}', ['new key' => 'messages']], ['{{ ("another " ~ "new " ~ "key") | trans() }}', ['another new key' => 'messages']], diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 07275fe457320..1abf3ad1df889 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -42,7 +42,7 @@ "symfony/security-core": "^4.4|^5.0|^6.0", "symfony/security-csrf": "^4.4|^5.0|^6.0", "symfony/security-http": "^4.4|^5.0|^6.0", - "symfony/serializer": "^5.2|^6.0", + "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3", "symfony/stopwatch": "^4.4|^5.0|^6.0", "symfony/console": "^5.3|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", diff --git a/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php b/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php index 0feabe95facb2..4c3930fadc116 100644 --- a/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php +++ b/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php @@ -32,7 +32,7 @@ class ServerDumpPlaceholderCommand extends Command private $replacedCommand; - public function __construct(DumpServer $server = null, array $descriptors = []) + public function __construct(?DumpServer $server = null, array $descriptors = []) { $this->replacedCommand = new ServerDumpCommand((new \ReflectionClass(DumpServer::class))->newInstanceWithoutConstructor(), $descriptors); diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php index 55044001798d0..9c6ac5fe03188 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php @@ -32,7 +32,7 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer /** * @param string $phpArrayFile The PHP file where annotations are cached */ - public function __construct(Reader $annotationReader, string $phpArrayFile, string $excludeRegexp = null, bool $debug = false) + public function __construct(Reader $annotationReader, string $phpArrayFile, ?string $excludeRegexp = null, bool $debug = false) { parent::__construct($phpArrayFile); $this->annotationReader = $annotationReader; diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php index 50843f5263c18..aabb0061e48b9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php @@ -31,7 +31,7 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface private $kernel; private $logger; - public function __construct(KernelInterface $kernel, LoggerInterface $logger = null) + public function __construct(KernelInterface $kernel, ?LoggerInterface $logger = null) { $this->kernel = $kernel; $this->logger = $logger; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php index 4d2d8422335bf..4be5c2c98a0a5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -41,7 +41,7 @@ class CacheClearCommand extends Command private $cacheClearer; private $filesystem; - public function __construct(CacheClearerInterface $cacheClearer, Filesystem $filesystem = null) + public function __construct(CacheClearerInterface $cacheClearer, ?Filesystem $filesystem = null) { parent::__construct(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php index b72924dfa78d6..21ac705ee2eac 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php @@ -38,7 +38,7 @@ final class CachePoolClearCommand extends Command /** * @param string[]|null $poolNames */ - public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null) + public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null) { parent::__construct(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php index b36d48cfe3973..e439665435c0d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php @@ -36,7 +36,7 @@ final class CachePoolDeleteCommand extends Command /** * @param string[]|null $poolNames */ - public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null) + public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null) { parent::__construct(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php index e1e3c95341de3..478509a5c21e1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php @@ -37,7 +37,7 @@ class DebugAutowiringCommand extends ContainerDebugCommand private $supportsHref; private $fileLinkFormatter; - public function __construct(string $name = null, FileLinkFormatter $fileLinkFormatter = null) + public function __construct(?string $name = null, ?FileLinkFormatter $fileLinkFormatter = null) { $this->supportsHref = method_exists(OutputFormatterStyle::class, 'setHref'); $this->fileLinkFormatter = $fileLinkFormatter; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php index cf929f9879b54..bb1eff1abda11 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php @@ -42,7 +42,7 @@ class RouterDebugCommand extends Command private $router; private $fileLinkFormatter; - public function __construct(RouterInterface $router, FileLinkFormatter $fileLinkFormatter = null) + public function __construct(RouterInterface $router, ?FileLinkFormatter $fileLinkFormatter = null) { parent::__construct(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php index 0e07d88fa3eb7..24bb242d91d15 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php @@ -32,7 +32,7 @@ final class SecretsDecryptToLocalCommand extends Command private $vault; private $localVault; - public function __construct(AbstractVault $vault, AbstractVault $localVault = null) + public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null) { $this->vault = $vault; $this->localVault = $localVault; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php index 79f51c51ad085..1e5edcfbbcfae 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php @@ -31,7 +31,7 @@ final class SecretsEncryptFromLocalCommand extends Command private $vault; private $localVault; - public function __construct(AbstractVault $vault, AbstractVault $localVault = null) + public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null) { $this->vault = $vault; $this->localVault = $localVault; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php index a9440b4c8fabc..f2c2a3cfee40d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php @@ -34,7 +34,7 @@ final class SecretsGenerateKeysCommand extends Command private $vault; private $localVault; - public function __construct(AbstractVault $vault, AbstractVault $localVault = null) + public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null) { $this->vault = $vault; $this->localVault = $localVault; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php index 0b13e0cf21889..7dd826e316c95 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php @@ -35,7 +35,7 @@ final class SecretsListCommand extends Command private $vault; private $localVault; - public function __construct(AbstractVault $vault, AbstractVault $localVault = null) + public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null) { $this->vault = $vault; $this->localVault = $localVault; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php index 0451ef300f634..5be85e45d5251 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php @@ -36,7 +36,7 @@ final class SecretsRemoveCommand extends Command private $vault; private $localVault; - public function __construct(AbstractVault $vault, AbstractVault $localVault = null) + public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null) { $this->vault = $vault; $this->localVault = $localVault; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php index 412247da70636..e96b838860712 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php @@ -37,7 +37,7 @@ final class SecretsSetCommand extends Command private $vault; private $localVault; - public function __construct(AbstractVault $vault, AbstractVault $localVault = null) + public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null) { $this->vault = $vault; $this->localVault = $localVault; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php index 006fd250550b8..12155a6465ac0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php @@ -60,7 +60,7 @@ class TranslationDebugCommand extends Command private $codePaths; private $enabledLocales; - public function __construct(TranslatorInterface $translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultTransPath = null, string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = []) + public function __construct(TranslatorInterface $translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = []) { parent::__construct(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index 7adc0b4bb5568..634c5be093c85 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -61,7 +61,7 @@ class TranslationUpdateCommand extends Command private $codePaths; private $enabledLocales; - public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, string $defaultTransPath = null, string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = []) + public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = []) { parent::__construct(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index 7fe7bc937d315..1bd56cc7a364e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -135,7 +135,7 @@ public function get(string $name) /** * {@inheritdoc} */ - public function all(string $namespace = null) + public function all(?string $namespace = null) { $this->registerCommands(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php index 537d6d08c3846..d3b3b6896ab67 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php @@ -113,7 +113,7 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr * * @param Definition|Alias|object $service */ - abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null); + abstract protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $builder = null); /** * Describes container services. @@ -127,7 +127,7 @@ abstract protected function describeContainerDeprecations(ContainerBuilder $buil abstract protected function describeContainerDefinition(Definition $definition, array $options = []); - abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null); + abstract protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $builder = null); abstract protected function describeContainerParameter($parameter, array $options = []); @@ -304,7 +304,7 @@ protected function sortByPriority(array $tag): array return $tag; } - public static function getClassDescription(string $class, string &$resolvedClass = null): string + public static function getClassDescription(string $class, ?string &$resolvedClass = null): string { $resolvedClass = $class; try { diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php index 0ad063343f78c..585af1eefd539 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php @@ -67,7 +67,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio $this->writeData($data, $options); } - protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $builder = null) { if (!isset($options['id'])) { throw new \InvalidArgumentException('An "id" option must be provided.'); @@ -120,7 +120,7 @@ protected function describeContainerDefinition(Definition $definition, array $op $this->writeData($this->getContainerDefinitionData($definition, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']), $options); } - protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $builder = null) { if (!$builder) { $this->writeData($this->getContainerAliasData($alias), $options); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php index a3fbabc6d2bf9..f23be9d579952 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php @@ -88,7 +88,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio } } - protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $builder = null) { if (!isset($options['id'])) { throw new \InvalidArgumentException('An "id" option must be provided.'); @@ -253,7 +253,7 @@ protected function describeContainerDefinition(Definition $definition, array $op $this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output); } - protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $builder = null) { $output = '- Service: `'.$alias.'`' ."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no'); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php index e7eb18762de86..56bb0fbd9bed4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php @@ -39,7 +39,7 @@ class TextDescriptor extends Descriptor { private $fileLinkFormatter; - public function __construct(FileLinkFormatter $fileLinkFormatter = null) + public function __construct(?FileLinkFormatter $fileLinkFormatter = null) { $this->fileLinkFormatter = $fileLinkFormatter; } @@ -141,7 +141,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio } } - protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $builder = null) { if (!isset($options['id'])) { throw new \InvalidArgumentException('An "id" option must be provided.'); @@ -389,7 +389,7 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra $options['output']->listing($formattedLogs); } - protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $builder = null) { if ($alias->isPublic() && !$alias->isPrivate()) { $options['output']->comment(sprintf('This service is a public alias for the service %s', (string) $alias)); @@ -541,7 +541,7 @@ private function formatRouterConfig(array $config): string return trim($configAsString); } - private function formatControllerLink($controller, string $anchorText, callable $getContainer = null): string + private function formatControllerLink($controller, string $anchorText, ?callable $getContainer = null): string { if (null === $this->fileLinkFormatter) { return $anchorText; diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php index 350452f33cee9..56b1af9bf6c64 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php @@ -53,7 +53,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio $this->writeDocument($this->getContainerTagsDocument($builder, isset($options['show_hidden']) && $options['show_hidden'])); } - protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $builder = null) { if (!isset($options['id'])) { throw new \InvalidArgumentException('An "id" option must be provided.'); @@ -72,7 +72,7 @@ protected function describeContainerDefinition(Definition $definition, array $op $this->writeDocument($this->getContainerDefinitionDocument($definition, $options['id'] ?? null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'])); } - protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null) + protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $builder = null) { $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, $options['id'] ?? null)->childNodes->item(0), true)); @@ -155,7 +155,7 @@ private function getRouteCollectionDocument(RouteCollection $routes): \DOMDocume return $dom; } - private function getRouteDocument(Route $route, string $name = null): \DOMDocument + private function getRouteDocument(Route $route, ?string $name = null): \DOMDocument { $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->appendChild($routeXML = $dom->createElement('route')); @@ -255,7 +255,7 @@ private function getContainerTagsDocument(ContainerBuilder $builder, bool $showH return $dom; } - private function getContainerServiceDocument(object $service, string $id, ContainerBuilder $builder = null, bool $showArguments = false): \DOMDocument + private function getContainerServiceDocument(object $service, string $id, ?ContainerBuilder $builder = null, bool $showArguments = false): \DOMDocument { $dom = new \DOMDocument('1.0', 'UTF-8'); @@ -275,7 +275,7 @@ private function getContainerServiceDocument(object $service, string $id, Contai return $dom; } - private function getContainerServicesDocument(ContainerBuilder $builder, string $tag = null, bool $showHidden = false, bool $showArguments = false, callable $filter = null): \DOMDocument + private function getContainerServicesDocument(ContainerBuilder $builder, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null): \DOMDocument { $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->appendChild($containerXML = $dom->createElement('container')); @@ -301,7 +301,7 @@ private function getContainerServicesDocument(ContainerBuilder $builder, string return $dom; } - private function getContainerDefinitionDocument(Definition $definition, string $id = null, bool $omitTags = false, bool $showArguments = false): \DOMDocument + private function getContainerDefinitionDocument(Definition $definition, ?string $id = null, bool $omitTags = false, bool $showArguments = false): \DOMDocument { $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->appendChild($serviceXML = $dom->createElement('definition')); @@ -432,7 +432,7 @@ private function getArgumentNodes(array $arguments, \DOMDocument $dom): array return $nodes; } - private function getContainerAliasDocument(Alias $alias, string $id = null): \DOMDocument + private function getContainerAliasDocument(Alias $alias, ?string $id = null): \DOMDocument { $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->appendChild($aliasXML = $dom->createElement('alias')); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php b/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php index 1f17c999424d3..ca303e12d2368 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php @@ -25,7 +25,7 @@ */ class DescriptorHelper extends BaseDescriptorHelper { - public function __construct(FileLinkFormatter $fileLinkFormatter = null) + public function __construct(?FileLinkFormatter $fileLinkFormatter = null) { $this ->register('txt', new TextDescriptor($fileLinkFormatter)) diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php index d4b9f4181642a..7eebd8ac7f9e6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php @@ -193,7 +193,7 @@ protected function json($data, int $status = 200, array $headers = [], array $co * * @param \SplFileInfo|string $file File object or path to file to be sent as response */ - protected function file($file, string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse + protected function file($file, ?string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse { $response = new BinaryFileResponse($file); $response->setContentDisposition($disposition, null === $fileName ? $response->getFile()->getFilename() : $fileName); @@ -261,7 +261,7 @@ protected function renderView(string $view, array $parameters = []): string /** * Renders a view. */ - protected function render(string $view, array $parameters = [], Response $response = null): Response + protected function render(string $view, array $parameters = [], ?Response $response = null): Response { $content = $this->renderView($view, $parameters); @@ -279,7 +279,7 @@ protected function render(string $view, array $parameters = [], Response $respon * * If an invalid form is found in the list of parameters, a 422 status code is returned. */ - protected function renderForm(string $view, array $parameters = [], Response $response = null): Response + protected function renderForm(string $view, array $parameters = [], ?Response $response = null): Response { if (null === $response) { $response = new Response(); @@ -307,7 +307,7 @@ protected function renderForm(string $view, array $parameters = [], Response $re /** * Streams a view. */ - protected function stream(string $view, array $parameters = [], StreamedResponse $response = null): StreamedResponse + protected function stream(string $view, array $parameters = [], ?StreamedResponse $response = null): StreamedResponse { if (!$this->container->has('twig')) { throw new \LogicException('You cannot use the "stream" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".'); @@ -335,7 +335,7 @@ protected function stream(string $view, array $parameters = [], StreamedResponse * * throw $this->createNotFoundException('Page not found!'); */ - protected function createNotFoundException(string $message = 'Not Found', \Throwable $previous = null): NotFoundHttpException + protected function createNotFoundException(string $message = 'Not Found', ?\Throwable $previous = null): NotFoundHttpException { return new NotFoundHttpException($message, $previous); } @@ -349,7 +349,7 @@ protected function createNotFoundException(string $message = 'Not Found', \Throw * * @throws \LogicException If the Security component is not available */ - protected function createAccessDeniedException(string $message = 'Access Denied.', \Throwable $previous = null): AccessDeniedException + protected function createAccessDeniedException(string $message = 'Access Denied.', ?\Throwable $previous = null): AccessDeniedException { if (!class_exists(AccessDeniedException::class)) { throw new \LogicException('You cannot use the "createAccessDeniedException" method if the Security component is not available. Try running "composer require symfony/security-bundle".'); diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php index 6a0fed64f6ae1..702d69748062b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php @@ -31,7 +31,7 @@ class RedirectController private $httpPort; private $httpsPort; - public function __construct(UrlGeneratorInterface $router = null, int $httpPort = null, int $httpsPort = null) + public function __construct(?UrlGeneratorInterface $router = null, ?int $httpPort = null, ?int $httpsPort = null) { $this->router = $router; $this->httpPort = $httpPort; @@ -107,7 +107,7 @@ public function redirectAction(Request $request, string $route, bool $permanent * * @throws HttpException In case the path is empty */ - public function urlRedirectAction(Request $request, string $path, bool $permanent = false, string $scheme = null, int $httpPort = null, int $httpsPort = null, bool $keepRequestMethod = false): Response + public function urlRedirectAction(Request $request, string $path, bool $permanent = false, ?string $scheme = null, ?int $httpPort = null, ?int $httpsPort = null, bool $keepRequestMethod = false): Response { if ('' == $path) { throw new HttpException($permanent ? 410 : 404); diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php index 2283dbc91fccf..5ea4c5b53a12c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php @@ -25,7 +25,7 @@ class TemplateController { private $twig; - public function __construct(Environment $twig = null) + public function __construct(?Environment $twig = null) { $this->twig = $twig; } @@ -40,7 +40,7 @@ public function __construct(Environment $twig = null) * @param array $context The context (arguments) of the template * @param int $statusCode The HTTP status code to return with the response. Defaults to 200 */ - public function templateAction(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = [], int $statusCode = 200): Response + public function templateAction(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200): Response { if (null === $this->twig) { throw new \LogicException('You cannot use the TemplateController if the Twig Bundle is not available.'); @@ -65,7 +65,7 @@ public function templateAction(string $template, int $maxAge = null, int $shared return $response; } - public function __invoke(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = [], int $statusCode = 200): Response + public function __invoke(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200): Response { return $this->templateAction($template, $maxAge, $sharedAge, $private, $context, $statusCode); } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 156c16b27ae8f..487759a87a1ba 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -123,7 +123,7 @@ public function getConfigTreeBuilder() ->end() ; - $willBeAvailable = static function (string $package, string $class, string $parentPackage = null) { + $willBeAvailable = static function (string $package, string $class, ?string $parentPackage = null) { $parentPackages = (array) $parentPackage; $parentPackages[] = 'symfony/framework-bundle'; diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 7529acd605873..aaaac8d30ab28 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -138,7 +138,7 @@ use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory as MailjetNotifierTransportFactory; use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory; use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory; -use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransport; +use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory; use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory; use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory; use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory; @@ -157,7 +157,7 @@ use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory; use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory; use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory; -use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransport; +use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory; use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory; use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory; use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory; @@ -2555,7 +2555,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $ MailjetNotifierTransportFactory::class => 'notifier.transport_factory.mailjet', MattermostTransportFactory::class => 'notifier.transport_factory.mattermost', MercureTransportFactory::class => 'notifier.transport_factory.mercure', - MessageBirdTransport::class => 'notifier.transport_factory.message-bird', + MessageBirdTransportFactory::class => 'notifier.transport_factory.message-bird', MessageMediaTransportFactory::class => 'notifier.transport_factory.message-media', MicrosoftTeamsTransportFactory::class => 'notifier.transport_factory.microsoft-teams', MobytTransportFactory::class => 'notifier.transport_factory.mobyt', @@ -2574,7 +2574,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $ SpotHitTransportFactory::class => 'notifier.transport_factory.spot-hit', TelegramTransportFactory::class => 'notifier.transport_factory.telegram', TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx', - TurboSmsTransport::class => 'notifier.transport_factory.turbo-sms', + TurboSmsTransportFactory::class => 'notifier.transport_factory.turbo-sms', TwilioTransportFactory::class => 'notifier.transport_factory.twilio', VonageTransportFactory::class => 'notifier.transport_factory.vonage', YunpianTransportFactory::class => 'notifier.transport_factory.yunpian', @@ -2594,27 +2594,27 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $ if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages, true) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) { $container->getDefinition($classToServices[MercureTransportFactory::class]) - ->replaceArgument('$registry', new Reference(HubRegistry::class)) - ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE)) - ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE)); + ->replaceArgument(0, new Reference(HubRegistry::class)) + ->replaceArgument(1, new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE)) + ->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE)); } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true)) { $container->removeDefinition($classToServices[MercureTransportFactory::class]); } if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'], true)) { $container->getDefinition($classToServices[FakeChatTransportFactory::class]) - ->replaceArgument('$mailer', new Reference('mailer')) - ->replaceArgument('$logger', new Reference('logger')) - ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE)) - ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE)); + ->replaceArgument(0, new Reference('mailer')) + ->replaceArgument(1, new Reference('logger')) + ->addArgument(new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE)) + ->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE)); } if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'], true)) { $container->getDefinition($classToServices[FakeSmsTransportFactory::class]) - ->replaceArgument('$mailer', new Reference('mailer')) - ->replaceArgument('$logger', new Reference('logger')) - ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE)) - ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE)); + ->replaceArgument(0, new Reference('mailer')) + ->replaceArgument(1, new Reference('logger')) + ->addArgument(new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE)) + ->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE)); } if (isset($config['admin_recipients'])) { diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php index fe38c4adcaa59..e2dd8f9408d96 100644 --- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php +++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php @@ -37,7 +37,7 @@ class HttpCache extends BaseHttpCache /** * @param string|StoreInterface $cache The cache directory (default used if null) or the storage instance */ - public function __construct(KernelInterface $kernel, $cache = null, SurrogateInterface $surrogate = null, array $options = null) + public function __construct(KernelInterface $kernel, $cache = null, ?SurrogateInterface $surrogate = null, ?array $options = null) { $this->kernel = $kernel; $this->surrogate = $surrogate; @@ -65,7 +65,7 @@ public function __construct(KernelInterface $kernel, $cache = null, SurrogateInt /** * {@inheritdoc} */ - protected function forward(Request $request, bool $catch = false, Response $entry = null) + protected function forward(Request $request, bool $catch = false, ?Response $entry = null) { $this->getKernel()->boot(); $this->getKernel()->getContainer()->set('cache', $this); diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php index a0285301250ba..3dec82d8c17ca 100644 --- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php +++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php @@ -37,7 +37,7 @@ class KernelBrowser extends HttpKernelBrowser /** * {@inheritdoc} */ - public function __construct(KernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null) + public function __construct(KernelInterface $kernel, array $server = [], ?History $history = null, ?CookieJar $cookieJar = null) { parent::__construct($kernel, $server, $history, $cookieJar); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php index e130bd2fa931f..2660f7265167a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php @@ -43,7 +43,7 @@ public function __construct(LoaderResolverInterface $resolver, array $defaultOpt /** * {@inheritdoc} */ - public function load($resource, string $type = null): RouteCollection + public function load($resource, ?string $type = null): RouteCollection { if ($this->loading) { // This can happen if a fatal error occurs in parent::load(). diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableCompiledUrlMatcher.php b/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableCompiledUrlMatcher.php index dba9d6d9613d1..3ae4523ba802c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableCompiledUrlMatcher.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableCompiledUrlMatcher.php @@ -24,7 +24,7 @@ class RedirectableCompiledUrlMatcher extends CompiledUrlMatcher implements Redir /** * {@inheritdoc} */ - public function redirect(string $path, string $route, string $scheme = null): array + public function redirect(string $path, string $route, ?string $scheme = null): array { return [ '_controller' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController::urlRedirectAction', diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index 8e36efe0a6184..06a3f71ffdc99 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -40,7 +40,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI /** * @param mixed $resource The main resource to load */ - public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, string $defaultLocale = null) + public function __construct(ContainerInterface $container, $resource, array $options = [], ?RequestContext $context = null, ?ContainerInterface $parameters = null, ?LoggerInterface $logger = null, ?string $defaultLocale = null) { $this->container = $container; $this->resource = $resource; diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php index 55b95f055994f..9b8db8ca3acf1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php @@ -43,7 +43,7 @@ public static function assertResponseFormatSame(?string $expectedFormat, string self::assertThatForResponse(new ResponseConstraint\ResponseFormatSame(self::getRequest(), $expectedFormat), $message); } - public static function assertResponseRedirects(string $expectedLocation = null, int $expectedCode = null, string $message = ''): void + public static function assertResponseRedirects(?string $expectedLocation = null, ?int $expectedCode = null, string $message = ''): void { $constraint = new ResponseConstraint\ResponseIsRedirected(); if ($expectedLocation) { @@ -76,17 +76,17 @@ public static function assertResponseHeaderNotSame(string $headerName, string $e self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHeaderSame($headerName, $expectedValue)), $message); } - public static function assertResponseHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void + public static function assertResponseHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void { self::assertThatForResponse(new ResponseConstraint\ResponseHasCookie($name, $path, $domain), $message); } - public static function assertResponseNotHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void + public static function assertResponseNotHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void { self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHasCookie($name, $path, $domain)), $message); } - public static function assertResponseCookieValueSame(string $name, string $expectedValue, string $path = '/', string $domain = null, string $message = ''): void + public static function assertResponseCookieValueSame(string $name, string $expectedValue, string $path = '/', ?string $domain = null, string $message = ''): void { self::assertThatForResponse(LogicalAnd::fromConstraints( new ResponseConstraint\ResponseHasCookie($name, $path, $domain), @@ -99,17 +99,17 @@ public static function assertResponseIsUnprocessable(string $message = ''): void self::assertThatForResponse(new ResponseConstraint\ResponseIsUnprocessable(), $message); } - public static function assertBrowserHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void + public static function assertBrowserHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void { self::assertThatForClient(new BrowserKitConstraint\BrowserHasCookie($name, $path, $domain), $message); } - public static function assertBrowserNotHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void + public static function assertBrowserNotHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void { self::assertThatForClient(new LogicalNot(new BrowserKitConstraint\BrowserHasCookie($name, $path, $domain)), $message); } - public static function assertBrowserCookieValueSame(string $name, string $expectedValue, bool $raw = false, string $path = '/', string $domain = null, string $message = ''): void + public static function assertBrowserCookieValueSame(string $name, string $expectedValue, bool $raw = false, string $path = '/', ?string $domain = null, string $message = ''): void { self::assertThatForClient(LogicalAnd::fromConstraints( new BrowserKitConstraint\BrowserHasCookie($name, $path, $domain), @@ -156,7 +156,7 @@ public static function assertThatForClient(Constraint $constraint, string $messa self::assertThat(self::getClient(), $constraint, $message); } - private static function getClient(AbstractBrowser $newClient = null): ?AbstractBrowser + private static function getClient(?AbstractBrowser $newClient = null): ?AbstractBrowser { static $client; diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php index 1a629d6255fbe..491812aa99d72 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php @@ -20,12 +20,12 @@ trait MailerAssertionsTrait { - public static function assertEmailCount(int $count, string $transport = null, string $message = ''): void + public static function assertEmailCount(int $count, ?string $transport = null, string $message = ''): void { self::assertThat(self::getMessageMailerEvents(), new MailerConstraint\EmailCount($count, $transport), $message); } - public static function assertQueuedEmailCount(int $count, string $transport = null, string $message = ''): void + public static function assertQueuedEmailCount(int $count, ?string $transport = null, string $message = ''): void { self::assertThat(self::getMessageMailerEvents(), new MailerConstraint\EmailCount($count, $transport, true), $message); } @@ -93,12 +93,12 @@ public static function assertEmailAddressContains(RawMessage $email, string $hea /** * @return MessageEvent[] */ - public static function getMailerEvents(string $transport = null): array + public static function getMailerEvents(?string $transport = null): array { return self::getMessageMailerEvents()->getEvents($transport); } - public static function getMailerEvent(int $index = 0, string $transport = null): ?MessageEvent + public static function getMailerEvent(int $index = 0, ?string $transport = null): ?MessageEvent { return self::getMailerEvents($transport)[$index] ?? null; } @@ -106,12 +106,12 @@ public static function getMailerEvent(int $index = 0, string $transport = null): /** * @return RawMessage[] */ - public static function getMailerMessages(string $transport = null): array + public static function getMailerMessages(?string $transport = null): array { return self::getMessageMailerEvents()->getMessages($transport); } - public static function getMailerMessage(int $index = 0, string $transport = null): ?RawMessage + public static function getMailerMessage(int $index = 0, ?string $transport = null): ?RawMessage { return self::getMailerMessages($transport)[$index] ?? null; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/TestBrowserToken.php b/src/Symfony/Bundle/FrameworkBundle/Test/TestBrowserToken.php index 7580743f6d5cb..ebc88c98e4926 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/TestBrowserToken.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/TestBrowserToken.php @@ -23,7 +23,7 @@ class TestBrowserToken extends AbstractToken { private $firewallName; - public function __construct(array $roles = [], UserInterface $user = null, string $firewallName = 'main') + public function __construct(array $roles = [], ?UserInterface $user = null, string $firewallName = 'main') { parent::__construct($roles); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php index e3ac1066af80a..57535aea50e35 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php @@ -158,12 +158,12 @@ protected function tearDown(): void $this->fs->remove($this->translationDir); } - private function createCommandTester(array $extractedMessages = [], array $loadedMessages = [], KernelInterface $kernel = null, array $transPaths = [], array $codePaths = []): CommandTester + private function createCommandTester(array $extractedMessages = [], array $loadedMessages = [], ?KernelInterface $kernel = null, array $transPaths = [], array $codePaths = []): CommandTester { return new CommandTester($this->createCommand($extractedMessages, $loadedMessages, $kernel, $transPaths, $codePaths)); } - private function createCommand(array $extractedMessages = [], array $loadedMessages = [], KernelInterface $kernel = null, array $transPaths = [], array $codePaths = [], ExtractorInterface $extractor = null, array $bundles = [], array $enabledLocales = []): TranslationDebugCommand + private function createCommand(array $extractedMessages = [], array $loadedMessages = [], ?KernelInterface $kernel = null, array $transPaths = [], array $codePaths = [], ?ExtractorInterface $extractor = null, array $bundles = [], array $enabledLocales = []): TranslationDebugCommand { $translator = $this->createMock(Translator::class); $translator diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php index 6992ade4d422b..0b8ee7648eab6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php @@ -67,7 +67,7 @@ protected function tearDown(): void $this->fs->remove($this->translationDir); } - private function createCommandCompletionTester($extractedMessages = [], $loadedMessages = [], KernelInterface $kernel = null, array $transPaths = [], array $codePaths = []): CommandCompletionTester + private function createCommandCompletionTester($extractedMessages = [], $loadedMessages = [], ?KernelInterface $kernel = null, array $transPaths = [], array $codePaths = []): CommandCompletionTester { $translator = $this->createMock(Translator::class); $translator diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php index f883fac0c57ce..8b2ad0891ce28 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php @@ -193,7 +193,7 @@ protected function tearDown(): void $this->fs->remove($this->translationDir); } - private function createCommandTester($extractedMessages = [], $loadedMessages = [], KernelInterface $kernel = null, array $transPaths = [], array $codePaths = []): CommandTester + private function createCommandTester($extractedMessages = [], $loadedMessages = [], ?KernelInterface $kernel = null, array $transPaths = [], array $codePaths = []): CommandTester { $translator = $this->createMock(Translator::class); $translator diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php index 5fb3e774a709d..68e9ea413aa2f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php @@ -148,7 +148,7 @@ class_exists(AbstractControllerTest::class); $this->assertSame($controllerContainer, $controller->getContainer()); } - protected function createControllerResolver(LoggerInterface $logger = null, Psr11ContainerInterface $container = null) + protected function createControllerResolver(?LoggerInterface $logger = null, ?Psr11ContainerInterface $container = null) { if (!$container) { $container = $this->createMockContainer(); @@ -172,7 +172,7 @@ class ContainerAwareController implements ContainerAwareInterface { private $container; - public function setContainer(ContainerInterface $container = null) + public function setContainer(?ContainerInterface $container = null) { $this->container = $container; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php index a5d58edbb4226..21275b490b249 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php @@ -108,7 +108,7 @@ public static function getNotImplementingTranslatorBagInterfaceTranslatorClassNa class TranslatorWithTranslatorBag implements TranslatorInterface { - public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string + public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string { } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php index 9792d2266050c..8794f539e56b6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php @@ -65,7 +65,7 @@ public function testValidCollector() public static function provideValidCollectorWithTemplateUsingAutoconfigure(): \Generator { yield [new class() implements TemplateAwareDataCollectorInterface { - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { } @@ -85,7 +85,7 @@ public static function getTemplate(): string }]; yield [new class() extends AbstractDataCollector { - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php index 52a6ad6a4840f..5e955d0163a31 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php @@ -2093,7 +2093,7 @@ protected function createContainer(array $data = []) ], $data))); } - protected function createContainerFromFile($file, $data = [], $resetCompilerPasses = true, $compile = true, FrameworkExtension $extension = null) + protected function createContainerFromFile($file, $data = [], $resetCompilerPasses = true, $compile = true, ?FrameworkExtension $extension = null) { $cacheKey = md5(static::class.$file.serialize($data)); if ($compile && isset(self::$containerCache[$cacheKey])) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php index 4743460e6ee5b..2dc1fac4bf83b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php @@ -21,7 +21,7 @@ class AutowiredServices private $dispatcher; private $cachePool; - public function __construct(Reader $annotationReader = null, EventDispatcherInterface $dispatcher, CacheItemPoolInterface $cachePool) + public function __construct(?Reader $annotationReader, EventDispatcherInterface $dispatcher, CacheItemPoolInterface $cachePool) { $this->annotationReader = $annotationReader; $this->dispatcher = $dispatcher; diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php index f2f077786f2b7..0a01712ca690a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php @@ -20,7 +20,7 @@ class AnnotatedController /** * @Route("/null_request", name="null_request") */ - public function requestDefaultNullAction(Request $request = null) + public function requestDefaultNullAction(?Request $request = null) { return new Response($request ? \get_class($request) : null); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php index 5173f8a8efb51..fba3fea8df641 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php @@ -120,7 +120,7 @@ public function warmUp(string $cacheDir) return []; } - public function addResource(string $format, $resource, string $locale, string $domain = null) + public function addResource(string $format, $resource, string $locale, ?string $domain = null) { if ($this->resourceFiles) { $this->addResourceFiles(); diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php index 1ed5129294961..01eea81a38315 100644 --- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php +++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php @@ -46,7 +46,7 @@ class SecurityDataCollector extends DataCollector implements LateDataCollectorIn private $hasVarDumper; private $authenticatorManagerEnabled; - public function __construct(TokenStorageInterface $tokenStorage = null, RoleHierarchyInterface $roleHierarchy = null, LogoutUrlGenerator $logoutUrlGenerator = null, AccessDecisionManagerInterface $accessDecisionManager = null, FirewallMapInterface $firewallMap = null, TraceableFirewallListener $firewall = null, bool $authenticatorManagerEnabled = false) + public function __construct(?TokenStorageInterface $tokenStorage = null, ?RoleHierarchyInterface $roleHierarchy = null, ?LogoutUrlGenerator $logoutUrlGenerator = null, ?AccessDecisionManagerInterface $accessDecisionManager = null, ?FirewallMapInterface $firewallMap = null, ?TraceableFirewallListener $firewall = null, bool $authenticatorManagerEnabled = false) { if (!$authenticatorManagerEnabled) { trigger_deprecation('symfony/security-bundle', '5.4', 'Setting the $authenticatorManagerEnabled argument of "%s" to "false" is deprecated, use the new authenticator system instead.', __METHOD__); @@ -65,7 +65,7 @@ public function __construct(TokenStorageInterface $tokenStorage = null, RoleHier /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { if (null === $this->tokenStorage) { $this->data = [ diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index c19cae041bd10..41740edf2d4db 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -620,7 +620,7 @@ private function createContextListener(ContainerBuilder $container, string $cont return $this->contextListeners[$contextKey] = $listenerId; } - private function createAuthenticationListeners(ContainerBuilder $container, string $id, array $firewall, array &$authenticationProviders, ?string $defaultProvider, array $providerIds, ?string $defaultEntryPoint, string $contextListenerId = null) + private function createAuthenticationListeners(ContainerBuilder $container, string $id, array $firewall, array &$authenticationProviders, ?string $defaultProvider, array $providerIds, ?string $defaultEntryPoint, ?string $contextListenerId = null) { $listeners = []; $hasListeners = false; @@ -1060,7 +1060,7 @@ private function createExpression(ContainerBuilder $container, string $expressio return $this->expressions[$id] = new Reference($id); } - private function createRequestMatcher(ContainerBuilder $container, string $path = null, string $host = null, int $port = null, array $methods = [], array $ips = null, array $attributes = []): Reference + private function createRequestMatcher(ContainerBuilder $container, ?string $path = null, ?string $host = null, ?int $port = null, array $methods = [], ?array $ips = null, array $attributes = []): Reference { if ($methods) { $methods = array_map('strtoupper', $methods); diff --git a/src/Symfony/Bundle/SecurityBundle/LoginLink/FirewallAwareLoginLinkHandler.php b/src/Symfony/Bundle/SecurityBundle/LoginLink/FirewallAwareLoginLinkHandler.php index 5c61cfcfabad4..ec9e658cccc77 100644 --- a/src/Symfony/Bundle/SecurityBundle/LoginLink/FirewallAwareLoginLinkHandler.php +++ b/src/Symfony/Bundle/SecurityBundle/LoginLink/FirewallAwareLoginLinkHandler.php @@ -38,7 +38,7 @@ public function __construct(FirewallMap $firewallMap, ContainerInterface $loginL $this->requestStack = $requestStack; } - public function createLoginLink(UserInterface $user, Request $request = null): LoginLinkDetails + public function createLoginLink(UserInterface $user, ?Request $request = null): LoginLinkDetails { return $this->getForFirewall()->createLoginLink($user, $request); } diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php index 4b361ffdba61b..92953024ccca8 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php @@ -29,7 +29,7 @@ final class FirewallConfig private $authenticators; private $switchUser; - public function __construct(string $name, string $userChecker, string $requestMatcher = null, bool $securityEnabled = true, bool $stateless = false, string $provider = null, string $context = null, string $entryPoint = null, string $accessDeniedHandler = null, string $accessDeniedUrl = null, array $authenticators = [], array $switchUser = null) + public function __construct(string $name, string $userChecker, ?string $requestMatcher = null, bool $securityEnabled = true, bool $stateless = false, ?string $provider = null, ?string $context = null, ?string $entryPoint = null, ?string $accessDeniedHandler = null, ?string $accessDeniedUrl = null, array $authenticators = [], ?array $switchUser = null) { $this->name = $name; $this->userChecker = $userChecker; diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php index 4ebc9c7de0dc7..e7ed2d0bf1ce0 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php @@ -30,7 +30,7 @@ class FirewallContext /** * @param iterable $listeners */ - public function __construct(iterable $listeners, ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null, FirewallConfig $config = null) + public function __construct(iterable $listeners, ?ExceptionListener $exceptionListener = null, ?LogoutListener $logoutListener = null, ?FirewallConfig $config = null) { $this->listeners = $listeners; $this->exceptionListener = $exceptionListener; diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php index 126a97020c192..ae706830738f3 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php @@ -230,7 +230,7 @@ public function testCollectCollectsDecisionLogWhenStrategyIsAffirmative() $voter2 = new DummyVoter(); $decoratedVoter1 = new TraceableVoter($voter1, new class() implements EventDispatcherInterface { - public function dispatch(object $event, string $eventName = null): object + public function dispatch(object $event, ?string $eventName = null): object { return new \stdClass(); } @@ -305,7 +305,7 @@ public function testCollectCollectsDecisionLogWhenStrategyIsUnanimous() $voter2 = new DummyVoter(); $decoratedVoter1 = new TraceableVoter($voter1, new class() implements EventDispatcherInterface { - public function dispatch(object $event, string $eventName = null): object + public function dispatch(object $event, ?string $eventName = null): object { return new \stdClass(); } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterEntryPointsPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterEntryPointsPassTest.php index b10b8a810bc7a..d2fb348676bc7 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterEntryPointsPassTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterEntryPointsPassTest.php @@ -93,7 +93,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio ], JsonResponse::HTTP_FORBIDDEN); } - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { } } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AnonymousBundle/AppCustomAuthenticator.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AnonymousBundle/AppCustomAuthenticator.php index c1d38688ecd25..ff3ed7c22ff87 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AnonymousBundle/AppCustomAuthenticator.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AnonymousBundle/AppCustomAuthenticator.php @@ -46,7 +46,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token, { } - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { return new Response($authException->getMessage(), Response::HTTP_UNAUTHORIZED); } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/Security/EntryPointStub.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/Security/EntryPointStub.php index 56552b99c7983..16a757260cf27 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/Security/EntryPointStub.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/Security/EntryPointStub.php @@ -20,7 +20,7 @@ class EntryPointStub implements AuthenticationEntryPointInterface { public const RESPONSE_TEXT = '2be8e651259189d841a19eecdf37e771e2431741'; - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { return new Response(self::RESPONSE_TEXT); } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php index db6aacca8cfc2..373a16229bbea 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php @@ -29,7 +29,7 @@ public function __construct(ContainerInterface $container) $this->container = $container; } - public function loginAction(Request $request, UserInterface $user = null) + public function loginAction(Request $request, ?UserInterface $user = null) { // get the login error if there is one if ($request->attributes->has(Security::AUTHENTICATION_ERROR)) { diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AppCustomAuthenticator.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AppCustomAuthenticator.php index 43e439ecfa9bf..91d65fc262419 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AppCustomAuthenticator.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AppCustomAuthenticator.php @@ -48,7 +48,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token, { } - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { return new Response($authException->getMessage(), Response::HTTP_UNAUTHORIZED); } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AuthenticationController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AuthenticationController.php index 21a2ea9e4b8f6..973588469da3a 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AuthenticationController.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/GuardedBundle/AuthenticationController.php @@ -27,7 +27,7 @@ public function manualLoginAction(GuardAuthenticatorHandler $guardAuthenticatorH return new Response('Logged in.'); } - public function profileAction(UserInterface $user = null) + public function profileAction(?UserInterface $user = null) { if (null === $user) { return new Response('Not logged in.'); diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php index 76faa0107e374..36b05857546de 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php @@ -147,7 +147,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode) ->normalizeKeys(false) ->useAttributeAsKey('paths') ->beforeNormalization() - ->always() + ->ifArray() ->then(function ($paths) { $normalized = []; foreach ($paths as $path => $namespace) { diff --git a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php index 8cc0ffc4df76f..6526ea4d07b80 100644 --- a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php +++ b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php @@ -34,7 +34,7 @@ class TemplateIterator implements \IteratorAggregate * @param array $paths Additional Twig paths to warm * @param string|null $defaultPath The directory where global templates can be stored */ - public function __construct(KernelInterface $kernel, array $paths = [], string $defaultPath = null) + public function __construct(KernelInterface $kernel, array $paths = [], ?string $defaultPath = null) { $this->kernel = $kernel; $this->paths = $paths; @@ -75,7 +75,7 @@ public function getIterator(): \Traversable * * @return string[] */ - private function findTemplatesInDirectory(string $dir, string $namespace = null, array $excludeDirs = []): array + private function findTemplatesInDirectory(string $dir, ?string $namespace = null, array $excludeDirs = []): array { if (!is_dir($dir)) { return []; diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php index 41627c48041e3..6ed43087579ce 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -52,4 +52,16 @@ public function testArrayKeysInGlobalsAreNotNormalized() $this->assertSame(['global' => ['value' => ['some-key' => 'some-value']]], $config['globals']); } + + public function testNullPathsAreConvertedToIterable() + { + $input = [ + 'paths' => null, + ]; + + $processor = new Processor(); + $config = $processor->processConfiguration(new Configuration(), [$input]); + + $this->assertSame([], $config['paths']); + } } diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionPanelController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionPanelController.php index 4941208c88bc2..0eb122314c070 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionPanelController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionPanelController.php @@ -28,7 +28,7 @@ class ExceptionPanelController private $errorRenderer; private $profiler; - public function __construct(HtmlErrorRenderer $errorRenderer, Profiler $profiler = null) + public function __construct(HtmlErrorRenderer $errorRenderer, ?Profiler $profiler = null) { $this->errorRenderer = $errorRenderer; $this->profiler = $profiler; diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index 2ad7df32928e9..72ed0e07474b8 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -40,7 +40,7 @@ class ProfilerController private $cspHandler; private $baseDir; - public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, Environment $twig, array $templates, ContentSecurityPolicyHandler $cspHandler = null, string $baseDir = null) + public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ?ContentSecurityPolicyHandler $cspHandler = null, ?string $baseDir = null) { $this->generator = $generator; $this->profiler = $profiler; @@ -124,7 +124,7 @@ public function panelAction(Request $request, string $token): Response * * @throws NotFoundHttpException */ - public function toolbarAction(Request $request, string $token = null): Response + public function toolbarAction(Request $request, ?string $token = null): Response { if (null === $this->profiler) { throw new NotFoundHttpException('The profiler must be enabled.'); diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php index 50560e0b3ffa1..0de07db823f97 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php @@ -40,7 +40,7 @@ class RouterController */ private $expressionLanguageProviders = []; - public function __construct(Profiler $profiler = null, Environment $twig, UrlMatcherInterface $matcher = null, RouteCollection $routes = null, iterable $expressionLanguageProviders = []) + public function __construct(?Profiler $profiler, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = []) { $this->profiler = $profiler; $this->twig = $twig; diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php index e703cf98c79f4..574e5f79c013d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php +++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php @@ -48,7 +48,7 @@ class WebDebugToolbarListener implements EventSubscriberInterface private $cspHandler; private $dumpDataCollector; - public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null, DumpDataCollector $dumpDataCollector = null) + public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, ?UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ?ContentSecurityPolicyHandler $cspHandler = null, ?DumpDataCollector $dumpDataCollector = null) { $this->twig = $twig; $this->urlGenerator = $urlGenerator; diff --git a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php index 039af91035c29..2a4e975760426 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php @@ -43,7 +43,7 @@ class WebProfilerExtension extends ProfilerExtension */ private $stackLevel = 0; - public function __construct(HtmlDumper $dumper = null) + public function __construct(?HtmlDumper $dumper = null) { $this->dumper = $dumper ?? new HtmlDumper(); $this->dumper->setOutput($this->output = fopen('php://memory', 'r+')); @@ -83,7 +83,7 @@ public function dumpData(Environment $env, Data $data, int $maxDepth = 0) return str_replace("\n$1"', $message); diff --git a/src/Symfony/Component/Asset/Exception/AssetNotFoundException.php b/src/Symfony/Component/Asset/Exception/AssetNotFoundException.php index f60ad306377af..d066ccd451ea1 100644 --- a/src/Symfony/Component/Asset/Exception/AssetNotFoundException.php +++ b/src/Symfony/Component/Asset/Exception/AssetNotFoundException.php @@ -24,7 +24,7 @@ class AssetNotFoundException extends RuntimeException * @param int $code Exception code * @param \Throwable $previous Previous exception used for the exception chaining */ - public function __construct(string $message, array $alternatives = [], int $code = 0, \Throwable $previous = null) + public function __construct(string $message, array $alternatives = [], int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/Asset/Package.php b/src/Symfony/Component/Asset/Package.php index a74e33449f8ed..ccd6707e15d22 100644 --- a/src/Symfony/Component/Asset/Package.php +++ b/src/Symfony/Component/Asset/Package.php @@ -26,7 +26,7 @@ class Package implements PackageInterface private $versionStrategy; private $context; - public function __construct(VersionStrategyInterface $versionStrategy, ContextInterface $context = null) + public function __construct(VersionStrategyInterface $versionStrategy, ?ContextInterface $context = null) { $this->versionStrategy = $versionStrategy; $this->context = $context ?? new NullContext(); diff --git a/src/Symfony/Component/Asset/Packages.php b/src/Symfony/Component/Asset/Packages.php index 4d1540e1ebcd0..7673432ee8709 100644 --- a/src/Symfony/Component/Asset/Packages.php +++ b/src/Symfony/Component/Asset/Packages.php @@ -28,7 +28,7 @@ class Packages /** * @param PackageInterface[] $packages Additional packages indexed by name */ - public function __construct(PackageInterface $defaultPackage = null, iterable $packages = []) + public function __construct(?PackageInterface $defaultPackage = null, iterable $packages = []) { $this->defaultPackage = $defaultPackage; @@ -57,7 +57,7 @@ public function addPackage(string $name, PackageInterface $package) * @throws InvalidArgumentException If there is no package by that name * @throws LogicException If no default package is defined */ - public function getPackage(string $name = null) + public function getPackage(?string $name = null) { if (null === $name) { if (null === $this->defaultPackage) { @@ -82,7 +82,7 @@ public function getPackage(string $name = null) * * @return string */ - public function getVersion(string $path, string $packageName = null) + public function getVersion(string $path, ?string $packageName = null) { return $this->getPackage($packageName)->getVersion($path); } @@ -97,7 +97,7 @@ public function getVersion(string $path, string $packageName = null) * * @return string A public path which takes into account the base path and URL path */ - public function getUrl(string $path, string $packageName = null) + public function getUrl(string $path, ?string $packageName = null) { return $this->getPackage($packageName)->getUrl($path); } diff --git a/src/Symfony/Component/Asset/PathPackage.php b/src/Symfony/Component/Asset/PathPackage.php index 3c7c0bfcfc3bb..68dcb88b89bd8 100644 --- a/src/Symfony/Component/Asset/PathPackage.php +++ b/src/Symfony/Component/Asset/PathPackage.php @@ -31,7 +31,7 @@ class PathPackage extends Package /** * @param string $basePath The base path to be prepended to relative paths */ - public function __construct(string $basePath, VersionStrategyInterface $versionStrategy, ContextInterface $context = null) + public function __construct(string $basePath, VersionStrategyInterface $versionStrategy, ?ContextInterface $context = null) { parent::__construct($versionStrategy, $context); diff --git a/src/Symfony/Component/Asset/UrlPackage.php b/src/Symfony/Component/Asset/UrlPackage.php index 9928bb217e89c..9b842224a4b7f 100644 --- a/src/Symfony/Component/Asset/UrlPackage.php +++ b/src/Symfony/Component/Asset/UrlPackage.php @@ -41,7 +41,7 @@ class UrlPackage extends Package /** * @param string|string[] $baseUrls Base asset URLs */ - public function __construct($baseUrls, VersionStrategyInterface $versionStrategy, ContextInterface $context = null) + public function __construct($baseUrls, VersionStrategyInterface $versionStrategy, ?ContextInterface $context = null) { parent::__construct($versionStrategy, $context); diff --git a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php index ee7c9ebf2f36c..650d02d568773 100644 --- a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php +++ b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php @@ -40,7 +40,7 @@ class JsonManifestVersionStrategy implements VersionStrategyInterface * @param string $manifestPath Absolute path to the manifest file * @param bool $strictMode Throws an exception for unknown paths */ - public function __construct(string $manifestPath, HttpClientInterface $httpClient = null, $strictMode = false) + public function __construct(string $manifestPath, ?HttpClientInterface $httpClient = null, $strictMode = false) { $this->manifestPath = $manifestPath; $this->httpClient = $httpClient; diff --git a/src/Symfony/Component/Asset/VersionStrategy/StaticVersionStrategy.php b/src/Symfony/Component/Asset/VersionStrategy/StaticVersionStrategy.php index 1d2fb6fe6774d..9e6e9ce8bae4e 100644 --- a/src/Symfony/Component/Asset/VersionStrategy/StaticVersionStrategy.php +++ b/src/Symfony/Component/Asset/VersionStrategy/StaticVersionStrategy.php @@ -25,7 +25,7 @@ class StaticVersionStrategy implements VersionStrategyInterface * @param string $version Version number * @param string $format Url format */ - public function __construct(string $version, string $format = null) + public function __construct(string $version, ?string $format = null) { $this->version = $version; $this->format = $format ?: '%s?%s'; diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php index 56792e70d48ff..785a21626435a 100644 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php @@ -50,7 +50,7 @@ abstract class AbstractBrowser /** * @param array $server The server parameters (equivalent of $_SERVER) */ - public function __construct(array $server = [], History $history = null, CookieJar $cookieJar = null) + public function __construct(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null) { $this->setServerParameters($server); $this->history = $history ?? new History(); @@ -146,7 +146,7 @@ public function getServerParameter(string $key, $default = '') return $this->server[$key] ?? $default; } - public function xmlHttpRequest(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], string $content = null, bool $changeHistory = true): Crawler + public function xmlHttpRequest(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], ?string $content = null, bool $changeHistory = true): Crawler { $this->setServerParameter('HTTP_X_REQUESTED_WITH', 'XMLHttpRequest'); @@ -352,7 +352,7 @@ public function submitForm(string $button, array $fieldValues = [], string $meth * * @return Crawler */ - public function request(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], string $content = null, bool $changeHistory = true) + public function request(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], ?string $content = null, bool $changeHistory = true) { if ($this->isMainRequest) { $this->redirectCount = 0; diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php index d4be13197543d..bbec9477409a9 100644 --- a/src/Symfony/Component/BrowserKit/Cookie.php +++ b/src/Symfony/Component/BrowserKit/Cookie.php @@ -55,7 +55,7 @@ class Cookie * @param bool $encodedValue Whether the value is encoded or not * @param string|null $samesite The cookie samesite attribute */ - public function __construct(string $name, ?string $value, string $expires = null, string $path = null, string $domain = '', bool $secure = false, bool $httponly = true, bool $encodedValue = false, string $samesite = null) + public function __construct(string $name, ?string $value, ?string $expires = null, ?string $path = null, string $domain = '', bool $secure = false, bool $httponly = true, bool $encodedValue = false, ?string $samesite = null) { if ($encodedValue) { $this->value = urldecode($value); @@ -125,7 +125,7 @@ public function __toString() * * @throws \InvalidArgumentException */ - public static function fromString(string $cookie, string $url = null) + public static function fromString(string $cookie, ?string $url = null) { $parts = explode(';', $cookie); diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php index 2185cd2f89bf9..ced9878550a68 100644 --- a/src/Symfony/Component/BrowserKit/CookieJar.php +++ b/src/Symfony/Component/BrowserKit/CookieJar.php @@ -35,7 +35,7 @@ public function set(Cookie $cookie) * * @return Cookie|null */ - public function get(string $name, string $path = '/', string $domain = null) + public function get(string $name, string $path = '/', ?string $domain = null) { $this->flushExpiredCookies(); @@ -67,7 +67,7 @@ public function get(string $name, string $path = '/', string $domain = null) * all cookies for the given name/path expire (this behavior * ensures a BC behavior with previous versions of Symfony). */ - public function expire(string $name, ?string $path = '/', string $domain = null) + public function expire(string $name, ?string $path = '/', ?string $domain = null) { if (null === $path) { $path = '/'; @@ -107,7 +107,7 @@ public function clear() * * @param string[] $setCookies Set-Cookie headers from an HTTP response */ - public function updateFromSetCookie(array $setCookies, string $uri = null) + public function updateFromSetCookie(array $setCookies, ?string $uri = null) { $cookies = []; @@ -133,7 +133,7 @@ public function updateFromSetCookie(array $setCookies, string $uri = null) /** * Updates the cookie jar from a Response object. */ - public function updateFromResponse(Response $response, string $uri = null) + public function updateFromResponse(Response $response, ?string $uri = null) { $this->updateFromSetCookie($response->getHeader('Set-Cookie', false), $uri); } diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php index d46060574858c..c1a0fdcbba2e7 100644 --- a/src/Symfony/Component/BrowserKit/HttpBrowser.php +++ b/src/Symfony/Component/BrowserKit/HttpBrowser.php @@ -28,7 +28,7 @@ class HttpBrowser extends AbstractBrowser { private $client; - public function __construct(HttpClientInterface $client = null, History $history = null, CookieJar $cookieJar = null) + public function __construct(?HttpClientInterface $client = null, ?History $history = null, ?CookieJar $cookieJar = null) { if (!$client && !class_exists(HttpClient::class)) { throw new \LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__)); diff --git a/src/Symfony/Component/BrowserKit/Request.php b/src/Symfony/Component/BrowserKit/Request.php index a8a4f501436c1..9ab1afd99e705 100644 --- a/src/Symfony/Component/BrowserKit/Request.php +++ b/src/Symfony/Component/BrowserKit/Request.php @@ -33,7 +33,7 @@ class Request * @param array $server An array of server parameters * @param string $content The raw body data */ - public function __construct(string $uri, string $method, array $parameters = [], array $files = [], array $cookies = [], array $server = [], string $content = null) + public function __construct(string $uri, string $method, array $parameters = [], array $files = [], array $cookies = [], array $server = [], ?string $content = null) { $this->uri = $uri; $this->method = $method; diff --git a/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserCookieValueSame.php b/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserCookieValueSame.php index f3103242c2109..d69d0f65113b2 100644 --- a/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserCookieValueSame.php +++ b/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserCookieValueSame.php @@ -22,7 +22,7 @@ final class BrowserCookieValueSame extends Constraint private $path; private $domain; - public function __construct(string $name, string $value, bool $raw = false, string $path = '/', string $domain = null) + public function __construct(string $name, string $value, bool $raw = false, string $path = '/', ?string $domain = null) { $this->name = $name; $this->path = $path; diff --git a/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserHasCookie.php b/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserHasCookie.php index 2b84a5e9b9bd7..e95a54c1514d5 100644 --- a/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserHasCookie.php +++ b/src/Symfony/Component/BrowserKit/Test/Constraint/BrowserHasCookie.php @@ -20,7 +20,7 @@ final class BrowserHasCookie extends Constraint private $path; private $domain; - public function __construct(string $name, string $path = '/', string $domain = null) + public function __construct(string $name, string $path = '/', ?string $domain = null) { $this->name = $name; $this->path = $path; diff --git a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php index c732238a7f126..1f0bb530497da 100644 --- a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php +++ b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php @@ -20,7 +20,7 @@ class AbstractBrowserTest extends TestCase { - public function getBrowser(array $server = [], History $history = null, CookieJar $cookieJar = null) + public function getBrowser(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null) { return new TestClient($server, $history, $cookieJar); } diff --git a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php index 44f61289d8d6a..e1f19b16ce814 100644 --- a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php +++ b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php @@ -19,7 +19,7 @@ class HttpBrowserTest extends AbstractBrowserTest { - public function getBrowser(array $server = [], History $history = null, CookieJar $cookieJar = null) + public function getBrowser(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null) { return new TestHttpClient($server, $history, $cookieJar); } diff --git a/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php b/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php index 184418b7b4477..6e8b523512b2c 100644 --- a/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php +++ b/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php @@ -23,7 +23,7 @@ class TestHttpClient extends HttpBrowser protected $nextResponse = null; protected $nextScript = null; - public function __construct(array $server = [], History $history = null, CookieJar $cookieJar = null) + public function __construct(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null) { $client = new MockHttpClient(function (string $method, string $url, array $options) { if (null === $this->nextResponse) { diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php index df900555bb515..de5af179320d2 100644 --- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php @@ -101,7 +101,7 @@ static function ($deferred, $namespace, &$expiredIds, $getId, $defaultLifetime) * * @return AdapterInterface */ - public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null) + public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, ?LoggerInterface $logger = null) { $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true); if (null !== $logger) { diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php index 270a139e83a48..639e3144107ed 100644 --- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php @@ -25,7 +25,7 @@ class ApcuAdapter extends AbstractAdapter /** * @throws CacheException if APCu is not enabled */ - public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null, MarshallerInterface $marshaller = null) + public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $version = null, ?MarshallerInterface $marshaller = null) { if (!static::isSupported()) { throw new CacheException('APCu is not enabled.'); diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php index d8695b743dae2..b251814eb28e5 100644 --- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php @@ -73,7 +73,7 @@ static function ($key, $value, $isHit) { /** * {@inheritdoc} */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { $item = $this->getItem($key); $metadata = $item->getMetadata(); diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php index 059c0ed275da7..7d95528363233 100644 --- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php @@ -92,7 +92,7 @@ static function ($sourceItem, $item, $defaultLifetime, $sourceMetadata = null) { /** * {@inheritdoc} */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { $doSave = true; $callback = static function (CacheItem $item, bool &$save) use ($callback, &$doSave) { @@ -104,7 +104,7 @@ public function get(string $key, callable $callback, float $beta = null, array & $lastItem = null; $i = 0; - $wrap = function (CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$i, &$doSave, &$lastItem, &$metadata) { + $wrap = function (?CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$i, &$doSave, &$lastItem, &$metadata) { $adapter = $this->adapters[$i]; if (isset($this->adapters[++$i])) { $callback = $wrap; diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php index fa5f85ad24558..84ab281438b65 100644 --- a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php @@ -39,7 +39,7 @@ class CouchbaseBucketAdapter extends AbstractAdapter private $bucket; private $marshaller; - public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null) + public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null) { if (!static::isSupported()) { throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.'); diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php index 1c4f9180b0ac6..c0a1317d23d1d 100644 --- a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php @@ -33,7 +33,7 @@ class CouchbaseCollectionAdapter extends AbstractAdapter private $connection; private $marshaller; - public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null) + public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null) { if (!static::isSupported()) { throw new CacheException('Couchbase >= 3.0.0 < 4.0.0 is required.'); diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php index d0ff0e55eb377..c126824138639 100644 --- a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php @@ -61,7 +61,7 @@ class DoctrineDbalAdapter extends AbstractAdapter implements PruneableInterface * * @throws InvalidArgumentException When namespace contains invalid characters */ - public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null) + public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], ?MarshallerInterface $marshaller = null) { if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) { throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0])); diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php b/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php index 7185dd4877e42..13daa568c7cdd 100644 --- a/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php @@ -20,7 +20,7 @@ class FilesystemAdapter extends AbstractAdapter implements PruneableInterface { use FilesystemTrait; - public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null) + public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null) { $this->marshaller = $marshaller ?? new DefaultMarshaller(); parent::__construct('', $defaultLifetime); diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php index afde84375fea9..440a37af5ede1 100644 --- a/src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php @@ -34,7 +34,7 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune */ private const TAG_FOLDER = 'tags'; - public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null) + public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null) { $this->marshaller = new TagAwareMarshaller($marshaller); parent::__construct('', $defaultLifetime); diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php index 2f953aa79b62e..0bc20d4b7f841 100644 --- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php @@ -46,7 +46,7 @@ class MemcachedAdapter extends AbstractAdapter * * Using a MemcachedAdapter as a pure items store is fine. */ - public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null) + public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null) { if (!static::isSupported()) { throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.'); @@ -114,6 +114,8 @@ public static function createConnection($servers, array $options = []) $params = preg_replace_callback('#^memcached:(//)?(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) { if (!empty($m[2])) { [$username, $password] = explode(':', $m[2], 2) + [1 => null]; + $username = rawurldecode($username); + $password = null !== $password ? rawurldecode($password) : null; } return 'file:'.($m[1] ?? ''); diff --git a/src/Symfony/Component/Cache/Adapter/NullAdapter.php b/src/Symfony/Component/Cache/Adapter/NullAdapter.php index 15f7f8c455a16..bf5382ffdb182 100644 --- a/src/Symfony/Component/Cache/Adapter/NullAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/NullAdapter.php @@ -40,7 +40,7 @@ static function ($key) { /** * {@inheritdoc} */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { $save = true; diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php index ba0aaa15853bf..52c139c3dfc29 100644 --- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php @@ -62,7 +62,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION * @throws InvalidArgumentException When namespace contains invalid characters */ - public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null) + public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], ?MarshallerInterface $marshaller = null) { if ($connOrDsn instanceof Connection || (\is_string($connOrDsn) && str_contains($connOrDsn, '://'))) { trigger_deprecation('symfony/cache', '5.4', 'Usage of a DBAL Connection with "%s" is deprecated and will be removed in symfony 6.0. Use "%s" instead.', __CLASS__, DoctrineDbalAdapter::class); @@ -176,7 +176,7 @@ public function clear(string $prefix = '') /** * {@inheritDoc} */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { if (isset($this->dbalAdapter)) { return $this->dbalAdapter->get($key, $callback, $beta, $metadata); diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php index 8c8fb916415ce..43e000a999d28 100644 --- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php @@ -83,7 +83,7 @@ public static function create(string $file, CacheItemPoolInterface $fallbackPool /** * {@inheritdoc} */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { if (null === $this->values) { $this->initialize(); diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php index d47c4053011cd..8dcd79cd98a90 100644 --- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php @@ -43,7 +43,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface * * @throws CacheException if OPcache is not enabled */ - public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false) + public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, bool $appendOnly = false) { $this->appendOnly = $appendOnly; self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time(); diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php index c715cade5c1f0..317018e59739b 100644 --- a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php @@ -102,7 +102,7 @@ static function (CacheItemInterface $innerItem, array $item) { /** * {@inheritdoc} */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { if (!$this->pool instanceof CacheInterface) { return $this->doGet($this, $key, $callback, $beta, $metadata); diff --git a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php index eb5950e531677..86714ae43726c 100644 --- a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php @@ -25,7 +25,7 @@ class RedisAdapter extends AbstractAdapter * @param string $namespace The default namespace * @param int $defaultLifetime The default lifetime */ - public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null) + public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null) { $this->init($redis, $namespace, $defaultLifetime, $marshaller); } diff --git a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php index 186b32e70d103..958486e0f0703 100644 --- a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php @@ -66,7 +66,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter * @param string $namespace The default namespace * @param int $defaultLifetime The default lifetime */ - public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null) + public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null) { if ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof ClusterInterface && !$redis->getConnection() instanceof PredisCluster) { throw new InvalidArgumentException(sprintf('Unsupported Predis cluster connection: only "%s" is, "%s" given.', PredisCluster::class, get_debug_type($redis->getConnection()))); diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php index ff22e5a8ac56e..fb59599eb02cf 100644 --- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php @@ -43,7 +43,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac private static $getTagsByKey; private static $saveTags; - public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15) + public function __construct(AdapterInterface $itemsPool, ?AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15) { $this->pool = $itemsPool; $this->tags = $tagsPool ?: $itemsPool; diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php index 4b06557f8502a..06951db265f7e 100644 --- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php @@ -38,7 +38,7 @@ public function __construct(AdapterInterface $pool) /** * {@inheritdoc} */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { if (!$this->pool instanceof CacheInterface) { throw new \BadMethodCallException(sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', get_debug_type($this->pool), CacheInterface::class)); diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php index e121596e83841..047958099335b 100644 --- a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php +++ b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php @@ -39,7 +39,7 @@ public function addInstance(string $name, TraceableAdapter $instance) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $empty = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []]; $this->data = ['instances' => $empty, 'total' => $empty]; diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php index 14ac2bde48f04..ee539af7730be 100644 --- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php +++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php @@ -209,10 +209,10 @@ public function process(ContainerBuilder $container) } $notAliasedCacheClearerId = $this->cacheClearerId; - while ($container->hasAlias($this->cacheClearerId)) { - $this->cacheClearerId = (string) $container->getAlias($this->cacheClearerId); + while ($container->hasAlias($notAliasedCacheClearerId)) { + $notAliasedCacheClearerId = (string) $container->getAlias($notAliasedCacheClearerId); } - if ($container->hasDefinition($this->cacheClearerId)) { + if ($container->hasDefinition($notAliasedCacheClearerId)) { $clearers[$notAliasedCacheClearerId] = $allPools; } diff --git a/src/Symfony/Component/Cache/LockRegistry.php b/src/Symfony/Component/Cache/LockRegistry.php index 65f20bb7328e8..d0c5fc5ba54f6 100644 --- a/src/Symfony/Component/Cache/LockRegistry.php +++ b/src/Symfony/Component/Cache/LockRegistry.php @@ -84,7 +84,7 @@ public static function setFiles(array $files): array return $previousFiles; } - public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata = null, LoggerInterface $logger = null) + public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, ?\Closure $setMetadata = null, ?LoggerInterface $logger = null) { if ('\\' === \DIRECTORY_SEPARATOR && null === self::$lockedFiles) { // disable locking on Windows by default diff --git a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php index 3202dd69cdab7..43f7e7e2ace11 100644 --- a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php +++ b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php @@ -23,7 +23,7 @@ class DefaultMarshaller implements MarshallerInterface private $useIgbinarySerialize = true; private $throwOnSerializationFailure; - public function __construct(bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false) + public function __construct(?bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false) { if (null === $useIgbinarySerialize) { $useIgbinarySerialize = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.6', phpversion('igbinary'), '<=')); diff --git a/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php b/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php index dbf486a721e47..7895ef557ebe6 100644 --- a/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php +++ b/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php @@ -29,7 +29,7 @@ class SodiumMarshaller implements MarshallerInterface * more rotating keys can be provided to decrypt values; * each key must be generated using sodium_crypto_box_keypair() */ - public function __construct(array $decryptionKeys, MarshallerInterface $marshaller = null) + public function __construct(array $decryptionKeys, ?MarshallerInterface $marshaller = null) { if (!self::isSupported()) { throw new CacheException('The "sodium" PHP extension is not loaded.'); diff --git a/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php b/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php index f7eeb7837678f..f2f26abcf93b3 100644 --- a/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php +++ b/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php @@ -20,7 +20,7 @@ class TagAwareMarshaller implements MarshallerInterface { private $marshaller; - public function __construct(MarshallerInterface $marshaller = null) + public function __construct(?MarshallerInterface $marshaller = null) { $this->marshaller = $marshaller ?? new DefaultMarshaller(); } diff --git a/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php b/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php index 6f11b8b5a2078..e09e2826f30a2 100644 --- a/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php +++ b/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php @@ -27,14 +27,14 @@ class EarlyExpirationDispatcher private $reverseContainer; private $callbackWrapper; - public function __construct(MessageBusInterface $bus, ReverseContainer $reverseContainer, callable $callbackWrapper = null) + public function __construct(MessageBusInterface $bus, ReverseContainer $reverseContainer, ?callable $callbackWrapper = null) { $this->bus = $bus; $this->reverseContainer = $reverseContainer; $this->callbackWrapper = $callbackWrapper; } - public function __invoke(callable $callback, CacheItem $item, bool &$save, AdapterInterface $pool, \Closure $setMetadata, LoggerInterface $logger = null) + public function __invoke(callable $callback, CacheItem $item, bool &$save, AdapterInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger = null) { if (!$item->isHit() || null === $message = EarlyExpirationMessage::create($this->reverseContainer, $callback, $item, $pool)) { // The item is stale or the callback cannot be reversed: we must compute the value now diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php index 10382178c8375..65104981fa33a 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php @@ -25,7 +25,7 @@ abstract class AbstractRedisAdapterTestCase extends AdapterTestCase protected static $redis; - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime); } diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php index 65700581931ae..91b648fd718ec 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php @@ -236,7 +236,7 @@ public function testPrune() /** @var PruneableInterface|CacheItemPoolInterface $cache */ $cache = $this->createCachePool(); - $doSet = function ($name, $value, \DateInterval $expiresAfter = null) use ($cache) { + $doSet = function ($name, $value, ?\DateInterval $expiresAfter = null) use ($cache) { $item = $cache->getItem($name); $item->set($value); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php index c6772f9f5a8f9..0106b9b414f9c 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php @@ -30,7 +30,7 @@ */ class ChainAdapterTest extends AdapterTestCase { - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testGetMetadata' === $testMethod) { return new ChainAdapter([new FilesystemAdapter('a', $defaultLifetime), new FilesystemAdapter('b', $defaultLifetime)], $defaultLifetime); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php index 63a567a069e08..acdb30435e437 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php @@ -106,7 +106,7 @@ public function testConfigureSchemaTableExists() /** * @dataProvider provideDsnWithSQLite */ - public function testDsnWithSQLite(string $dsn, string $file = null) + public function testDsnWithSQLite(string $dsn, ?string $file = null) { try { $pool = new DoctrineDbalAdapter($dsn); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php index 180ce6f3d0dab..e93316255c642 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php @@ -44,7 +44,7 @@ public static function setUpBeforeClass(): void } } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null, string $namespace = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null, ?string $namespace = null): CacheItemPoolInterface { $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client; diff --git a/src/Symfony/Component/Cache/Tests/Adapter/NamespacedProxyAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/NamespacedProxyAdapterTest.php index a4edc7a608db5..4e6ebede0a596 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/NamespacedProxyAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/NamespacedProxyAdapterTest.php @@ -21,7 +21,7 @@ */ class NamespacedProxyAdapterTest extends ProxyAdapterTest { - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testGetMetadata' === $testMethod) { return new ProxyAdapter(new FilesystemAdapter(), 'foo', $defaultLifetime); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php index b630e9eebea3a..5120d81c707e0 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php @@ -70,7 +70,7 @@ public function testCleanupExpiredItems() /** * @dataProvider provideDsnSQLite */ - public function testDsnWithSQLite(string $dsn, string $file = null) + public function testDsnWithSQLite(string $dsn, ?string $file = null) { try { $pool = new PdoAdapter($dsn); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php index 1ed86b06c8e91..29f210f8aafaa 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php @@ -121,7 +121,7 @@ public function testConfigureSchemaTableExists() /** * @dataProvider provideDsn */ - public function testDsn(string $dsn, string $file = null) + public function testDsn(string $dsn, ?string $file = null) { $this->expectDeprecation('Since symfony/cache 5.4: Usage of a DBAL Connection with "Symfony\Component\Cache\Adapter\PdoAdapter" is deprecated and will be removed in symfony 6.0. Use "Symfony\Component\Cache\Adapter\DoctrineDbalAdapter" instead.'); try { diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php index 83e230e8c22a6..541681df291c2 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php @@ -75,7 +75,7 @@ protected function tearDown(): void } } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testGetMetadata' === $testMethod || 'testClearPrefix' === $testMethod) { return new PhpArrayAdapter(self::$file, new FilesystemAdapter()); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php index 0971f80c553e5..0468e89449729 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php @@ -27,7 +27,7 @@ protected function setUp(): void $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite'; } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { $this->assertInstanceOf(\Predis\Client::class, self::$redis); $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php index af25b2df52c45..3a118dc17147e 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php @@ -27,7 +27,7 @@ protected function setUp(): void $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite'; } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { $this->assertInstanceOf(\Predis\Client::class, self::$redis); $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php index 1f800e19d1cdf..4bff8c33909d7 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php @@ -32,7 +32,7 @@ public static function setUpBeforeClass(): void self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST')); } - public function createCachePool($defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool($defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { return new ProxyAdapter(new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), 100), 'ProxyNS', $defaultLifetime); } @@ -66,6 +66,7 @@ static function (CacheItem $item, $expiry) { $this->assertSame($value, $this->cache->getItem('baz')->get()); sleep(1); + usleep(100000); $this->assertSame($value, $this->cache->getItem('foo')->get()); $this->assertSame($value, $this->cache->getItem('bar')->get()); $this->assertFalse($this->cache->getItem('baz')->isHit()); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php index 378efa7b759f9..387542bb1a631 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php @@ -29,7 +29,7 @@ class ProxyAdapterTest extends AdapterTestCase 'testPrune' => 'ProxyAdapter just proxies', ]; - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testGetMetadata' === $testMethod) { return new ProxyAdapter(new FilesystemAdapter(), '', $defaultLifetime); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php index 71fa5b0a6d568..b57f6ce1b0bcf 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php @@ -28,7 +28,7 @@ public static function setUpBeforeClass(): void self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]); } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testClearWithPrefix' === $testMethod && \defined('Redis::SCAN_PREFIX')) { self::$redis->setOption(\Redis::OPT_SCAN, \Redis::SCAN_PREFIX); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php index cdfa4f43e1a5a..aa550d705a2c6 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php @@ -36,7 +36,7 @@ public static function setUpBeforeClass(): void self::$redis->setOption(\Redis::OPT_PREFIX, 'prefix_'); } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testClearWithPrefix' === $testMethod && \defined('Redis::SCAN_PREFIX')) { self::$redis->setOption(\Redis::OPT_SCAN, \Redis::SCAN_PREFIX); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php index 12e3b6ff55365..f00eb9de8aaeb 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php @@ -28,7 +28,7 @@ protected function setUp(): void $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite'; } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testClearWithPrefix' === $testMethod && \defined('Redis::SCAN_PREFIX')) { self::$redis->setOption(\Redis::OPT_SCAN, \Redis::SCAN_PREFIX); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php index b5823711dc858..860709bf7f2cb 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php @@ -27,7 +27,7 @@ protected function setUp(): void $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite'; } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testClearWithPrefix' === $testMethod && \defined('Redis::SCAN_PREFIX')) { self::$redis->setOption(\Redis::OPT_SCAN, \Redis::SCAN_PREFIX); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php index d4a1bc97779ca..c7d143d3a35db 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php @@ -28,7 +28,7 @@ protected function setUp(): void $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite'; } - public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface + public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface { if ('testClearWithPrefix' === $testMethod && \defined('Redis::SCAN_PREFIX')) { self::$redis->setOption(\Redis::OPT_SCAN, \Redis::SCAN_PREFIX); diff --git a/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php b/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php index 39350274aea33..401abac24f628 100644 --- a/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php +++ b/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php @@ -20,8 +20,10 @@ use Symfony\Component\Cache\DependencyInjection\CachePoolPass; use Symfony\Component\DependencyInjection\ChildDefinition; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; +use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer; class CachePoolPassTest extends TestCase { @@ -232,4 +234,33 @@ public function testChainAdapterPool() $this->assertInstanceOf(ChildDefinition::class, $doctrineCachePool); $this->assertSame('cache.app', $doctrineCachePool->getParent()); } + + public function testGlobalClearerAlias() + { + $container = new ContainerBuilder(); + $container->setParameter('kernel.container_class', 'app'); + $container->setParameter('kernel.project_dir', 'foo'); + + $container->register('cache.default_clearer', Psr6CacheClearer::class); + + $container->setDefinition('cache.system_clearer', new ChildDefinition('cache.default_clearer')); + + $container->setDefinition('cache.foo_bar_clearer', new ChildDefinition('cache.default_clearer')); + $container->setAlias('cache.global_clearer', 'cache.foo_bar_clearer'); + + $container->register('cache.adapter.array', ArrayAdapter::class) + ->setAbstract(true) + ->addTag('cache.pool'); + + $cachePool = new ChildDefinition('cache.adapter.array'); + $cachePool->addTag('cache.pool', ['clearer' => 'cache.system_clearer']); + $container->setDefinition('app.cache_pool', $cachePool); + + $this->cachePoolPass->process($container); + + $definition = $container->getDefinition('cache.foo_bar_clearer'); + + $this->assertTrue($definition->hasTag('cache.pool.clearer')); + $this->assertEquals(['app.cache_pool' => new Reference('app.cache_pool', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)], $definition->getArgument(0)); + } } diff --git a/src/Symfony/Component/Cache/Traits/ContractsTrait.php b/src/Symfony/Component/Cache/Traits/ContractsTrait.php index 9a491adb5acb8..c22e75fb9a358 100644 --- a/src/Symfony/Component/Cache/Traits/ContractsTrait.php +++ b/src/Symfony/Component/Cache/Traits/ContractsTrait.php @@ -57,7 +57,7 @@ public function setCallbackWrapper(?callable $callbackWrapper): callable return $previousWrapper; } - private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null) + private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, ?array &$metadata = null) { if (0 > $beta = $beta ?? 1.0) { throw new InvalidArgumentException(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta)); diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php index 16e768990b942..0455093c9b93c 100644 --- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php +++ b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php @@ -88,7 +88,7 @@ protected function doUnlink(string $file) return @unlink($file); } - private function write(string $file, string $data, int $expiresAt = null) + private function write(string $file, string $data, ?int $expiresAt = null) { $unlink = false; set_error_handler(__CLASS__.'::throwError'); @@ -127,7 +127,7 @@ private function write(string $file, string $data, int $expiresAt = null) } } - private function getFile(string $id, bool $mkdir = false, string $directory = null) + private function getFile(string $id, bool $mkdir = false, ?string $directory = null) { // Use MD5 to favor speed over security, which is not an issue here $hash = str_replace('/', '-', base64_encode(hash('md5', static::class.$id, true))); diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index 352d142c9e5b4..a2a92aefd50df 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -560,7 +560,7 @@ protected function doSave(array $values, int $lifetime) return $failed; } - private function pipeline(\Closure $generator, object $redis = null): \Generator + private function pipeline(\Closure $generator, ?object $redis = null): \Generator { $ids = []; $redis = $redis ?? $this->redis; diff --git a/src/Symfony/Component/Config/Builder/ClassBuilder.php b/src/Symfony/Component/Config/Builder/ClassBuilder.php index 9960d650806a4..f8983fc9aa480 100644 --- a/src/Symfony/Component/Config/Builder/ClassBuilder.php +++ b/src/Symfony/Component/Config/Builder/ClassBuilder.php @@ -122,7 +122,7 @@ public function addMethod(string $name, string $body, array $params = []): void $this->methods[] = new Method(strtr($body, ['NAME' => $this->camelCase($name)] + $params)); } - public function addProperty(string $name, string $classType = null, string $defaultValue = null): Property + public function addProperty(string $name, ?string $classType = null, ?string $defaultValue = null): Property { $property = new Property($name, '_' !== $name[0] ? $this->camelCase($name) : $name); if (null !== $classType) { diff --git a/src/Symfony/Component/Config/ConfigCacheInterface.php b/src/Symfony/Component/Config/ConfigCacheInterface.php index 3cd7a5cc00179..b431cfae1cd9a 100644 --- a/src/Symfony/Component/Config/ConfigCacheInterface.php +++ b/src/Symfony/Component/Config/ConfigCacheInterface.php @@ -45,5 +45,5 @@ public function isFresh(); * * @throws \RuntimeException When the cache file cannot be written */ - public function write(string $content, array $metadata = null); + public function write(string $content, ?array $metadata = null); } diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index 673cfaf60ede8..e4ba288aaff26 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -45,7 +45,7 @@ abstract class BaseNode implements NodeInterface /** * @throws \InvalidArgumentException if the name contains a period */ - public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR) + public function __construct(?string $name, ?NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR) { if (str_contains($name = (string) $name, $pathSeparator)) { throw new \InvalidArgumentException('The name must not contain ".'.$pathSeparator.'".'); diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index eb5b04021f8ae..4e1171c4b4318 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -39,7 +39,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition /** * {@inheritdoc} */ - public function __construct(?string $name, NodeParentInterface $parent = null) + public function __construct(?string $name, ?NodeParentInterface $parent = null) { parent::__construct($name, $parent); @@ -197,7 +197,7 @@ public function disallowNewKeysInSubsequentConfigs() * * @return $this */ - public function fixXmlConfig(string $singular, string $plural = null) + public function fixXmlConfig(string $singular, ?string $plural = null) { $this->normalization()->remap($singular, $plural); diff --git a/src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php index ace0b34a20d5f..bbc0623951650 100644 --- a/src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php @@ -24,7 +24,7 @@ class BooleanNodeDefinition extends ScalarNodeDefinition /** * {@inheritdoc} */ - public function __construct(?string $name, NodeParentInterface $parent = null) + public function __construct(?string $name, ?NodeParentInterface $parent = null) { parent::__construct($name, $parent); diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php index 14387b51bbdee..cebc5274fadc3 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php @@ -35,7 +35,7 @@ public function __construct(NodeDefinition $node) * * @return $this */ - public function always(\Closure $then = null) + public function always(?\Closure $then = null) { $this->ifPart = function () { return true; }; @@ -53,7 +53,7 @@ public function always(\Closure $then = null) * * @return $this */ - public function ifTrue(\Closure $closure = null) + public function ifTrue(?\Closure $closure = null) { if (null === $closure) { $closure = function ($v) { return true === $v; }; diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php index 245e97277cf03..2868017c8665a 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php @@ -39,7 +39,7 @@ public function __construct() * * @return $this */ - public function setParent(ParentNodeDefinitionInterface $parent = null) + public function setParent(?ParentNodeDefinitionInterface $parent = null) { $this->parent = $parent; diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php index cf153f01ca4e0..b913d3b98ae02 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php @@ -38,7 +38,7 @@ abstract class NodeDefinition implements NodeParentInterface protected $parent; protected $attributes = []; - public function __construct(?string $name, NodeParentInterface $parent = null) + public function __construct(?string $name, ?NodeParentInterface $parent = null) { $this->parent = $parent; $this->name = $name; diff --git a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php index 06cbbd4345fff..a384ec3cf7c4e 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php @@ -35,7 +35,7 @@ public function __construct(NodeDefinition $node) * * @return $this */ - public function remap(string $key, string $plural = null) + public function remap(string $key, ?string $plural = null) { $this->remappings[] = [$key, null === $plural ? $key.'s' : $plural]; @@ -47,7 +47,7 @@ public function remap(string $key, string $plural = null) * * @return ExprBuilder|$this */ - public function before(\Closure $closure = null) + public function before(?\Closure $closure = null) { if (null !== $closure) { $this->before[] = $closure; diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php index f3c3c2109cd72..783792fac34c9 100644 --- a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php @@ -23,7 +23,7 @@ class TreeBuilder implements NodeParentInterface protected $tree; protected $root; - public function __construct(string $name, string $type = 'array', NodeBuilder $builder = null) + public function __construct(string $name, string $type = 'array', ?NodeBuilder $builder = null) { $builder = $builder ?? new NodeBuilder(); $this->root = $builder->node($name, $type)->setParent($this); diff --git a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php index 4efc726c0cf2d..d93e6950d779e 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php @@ -31,7 +31,7 @@ public function __construct(NodeDefinition $node) * * @return ExprBuilder|$this */ - public function rule(\Closure $closure = null) + public function rule(?\Closure $closure = null) { if (null !== $closure) { $this->rules[] = $closure; diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php index 4979ae96c813e..a0a5e2587438b 100644 --- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php +++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php @@ -27,12 +27,12 @@ class XmlReferenceDumper { private $reference; - public function dump(ConfigurationInterface $configuration, string $namespace = null) + public function dump(ConfigurationInterface $configuration, ?string $namespace = null) { return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace); } - public function dumpNode(NodeInterface $node, string $namespace = null) + public function dumpNode(NodeInterface $node, ?string $namespace = null) { $this->reference = ''; $this->writeNode($node, 0, true, $namespace); @@ -42,7 +42,7 @@ public function dumpNode(NodeInterface $node, string $namespace = null) return $ref; } - private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, string $namespace = null) + private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, ?string $namespace = null) { $rootName = ($root ? 'config' : $node->getName()); $rootNamespace = ($namespace ?: ($root ? 'http://example.org/schema/dic/'.$node->getName() : null)); diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php index 6fcfb71bd9818..718a1ae539ccd 100644 --- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php +++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php @@ -71,7 +71,7 @@ public function dumpNode(NodeInterface $node) return $ref; } - private function writeNode(NodeInterface $node, NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false) + private function writeNode(NodeInterface $node, ?NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false) { $comments = []; $default = ''; diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php index 822e6b57f1642..649a191cae32c 100644 --- a/src/Symfony/Component/Config/Definition/EnumNode.php +++ b/src/Symfony/Component/Config/Definition/EnumNode.php @@ -22,7 +22,7 @@ class EnumNode extends ScalarNode { private $values; - public function __construct(?string $name, NodeInterface $parent = null, array $values = [], string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR) + public function __construct(?string $name, ?NodeInterface $parent = null, array $values = [], string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR) { $values = array_unique($values); if (empty($values)) { diff --git a/src/Symfony/Component/Config/Definition/NumericNode.php b/src/Symfony/Component/Config/Definition/NumericNode.php index 50d137c2d71fb..7d1eff79a9720 100644 --- a/src/Symfony/Component/Config/Definition/NumericNode.php +++ b/src/Symfony/Component/Config/Definition/NumericNode.php @@ -27,7 +27,7 @@ class NumericNode extends ScalarNode * @param int|float|null $min * @param int|float|null $max */ - public function __construct(?string $name, NodeInterface $parent = null, $min = null, $max = null, string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR) + public function __construct(?string $name, ?NodeInterface $parent = null, $min = null, $max = null, string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR) { parent::__construct($name, $parent, $pathSeparator); $this->min = $min; diff --git a/src/Symfony/Component/Config/Definition/Processor.php b/src/Symfony/Component/Config/Definition/Processor.php index 312783f555bd5..55dd920183d0a 100644 --- a/src/Symfony/Component/Config/Definition/Processor.php +++ b/src/Symfony/Component/Config/Definition/Processor.php @@ -67,7 +67,7 @@ public function processConfiguration(ConfigurationInterface $configuration, arra * @param string $key The key to normalize * @param string|null $plural The plural form of the key if it is irregular */ - public static function normalizeConfig(array $config, string $key, string $plural = null): array + public static function normalizeConfig(array $config, string $key, ?string $plural = null): array { if (null === $plural) { $plural = $key.'s'; diff --git a/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php b/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php index e235ea04956a6..e020642fc2546 100644 --- a/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php +++ b/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php @@ -18,7 +18,7 @@ */ class FileLoaderImportCircularReferenceException extends LoaderLoadException { - public function __construct(array $resources, ?int $code = 0, \Throwable $previous = null) + public function __construct(array $resources, ?int $code = 0, ?\Throwable $previous = null) { if (null === $code) { trigger_deprecation('symfony/config', '5.3', 'Passing null as $code to "%s()" is deprecated, pass 0 instead.', __METHOD__); diff --git a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php index 3ee4b938f417a..bd9302dc29fe5 100644 --- a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php +++ b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php @@ -20,7 +20,7 @@ class FileLocatorFileNotFoundException extends \InvalidArgumentException { private $paths; - public function __construct(string $message = '', int $code = 0, \Throwable $previous = null, array $paths = []) + public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null, array $paths = []) { parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/Config/Exception/LoaderLoadException.php b/src/Symfony/Component/Config/Exception/LoaderLoadException.php index b20e74db463f4..a2a657bdf0c1e 100644 --- a/src/Symfony/Component/Config/Exception/LoaderLoadException.php +++ b/src/Symfony/Component/Config/Exception/LoaderLoadException.php @@ -25,7 +25,7 @@ class LoaderLoadException extends \Exception * @param \Throwable|null $previous A previous exception * @param string|null $type The type of resource */ - public function __construct(string $resource, string $sourceResource = null, ?int $code = 0, \Throwable $previous = null, string $type = null) + public function __construct(string $resource, ?string $sourceResource = null, ?int $code = 0, ?\Throwable $previous = null, ?string $type = null) { if (null === $code) { trigger_deprecation('symfony/config', '5.3', 'Passing null as $code to "%s()" is deprecated, pass 0 instead.', __METHOD__); diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php index da350908a6bd9..e50324850da50 100644 --- a/src/Symfony/Component/Config/FileLocator.php +++ b/src/Symfony/Component/Config/FileLocator.php @@ -33,7 +33,7 @@ public function __construct($paths = []) /** * {@inheritdoc} */ - public function locate(string $name, string $currentPath = null, bool $first = true) + public function locate(string $name, ?string $currentPath = null, bool $first = true) { if ('' === $name) { throw new \InvalidArgumentException('An empty file name is not valid to be located.'); diff --git a/src/Symfony/Component/Config/FileLocatorInterface.php b/src/Symfony/Component/Config/FileLocatorInterface.php index e3ca1d49c4066..97b5ff39357ba 100644 --- a/src/Symfony/Component/Config/FileLocatorInterface.php +++ b/src/Symfony/Component/Config/FileLocatorInterface.php @@ -30,5 +30,5 @@ interface FileLocatorInterface * @throws \InvalidArgumentException If $name is empty * @throws FileLocatorFileNotFoundException If a file is not found */ - public function locate(string $name, string $currentPath = null, bool $first = true); + public function locate(string $name, ?string $currentPath = null, bool $first = true); } diff --git a/src/Symfony/Component/Config/Loader/DelegatingLoader.php b/src/Symfony/Component/Config/Loader/DelegatingLoader.php index e5a74ee63b39d..617cb2ad6d140 100644 --- a/src/Symfony/Component/Config/Loader/DelegatingLoader.php +++ b/src/Symfony/Component/Config/Loader/DelegatingLoader.php @@ -31,7 +31,7 @@ public function __construct(LoaderResolverInterface $resolver) /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { if (false === $loader = $this->resolver->resolve($resource, $type)) { throw new LoaderLoadException($resource, null, 0, null, $type); @@ -43,7 +43,7 @@ public function load($resource, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return false !== $this->resolver->resolve($resource, $type); } diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php index 4e1b46c4edd7b..5e1d8d563789b 100644 --- a/src/Symfony/Component/Config/Loader/FileLoader.php +++ b/src/Symfony/Component/Config/Loader/FileLoader.php @@ -31,7 +31,7 @@ abstract class FileLoader extends Loader private $currentDir; - public function __construct(FileLocatorInterface $locator, string $env = null) + public function __construct(FileLocatorInterface $locator, ?string $env = null) { $this->locator = $locator; parent::__construct($env); @@ -70,7 +70,7 @@ public function getLocator() * @throws FileLoaderImportCircularReferenceException * @throws FileLocatorFileNotFoundException */ - public function import($resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null, $exclude = null) + public function import($resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null, $exclude = null) { if (\is_string($resource) && \strlen($resource) !== ($i = strcspn($resource, '*?{[')) && !str_contains($resource, "\n")) { $excluded = []; @@ -133,7 +133,7 @@ protected function glob(string $pattern, bool $recursive, &$resource = null, boo yield from $resource; } - private function doImport($resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null) + private function doImport($resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null) { try { $loader = $this->resolve($resource, $type); diff --git a/src/Symfony/Component/Config/Loader/GlobFileLoader.php b/src/Symfony/Component/Config/Loader/GlobFileLoader.php index fecb1c5d073ac..cccae608b1d15 100644 --- a/src/Symfony/Component/Config/Loader/GlobFileLoader.php +++ b/src/Symfony/Component/Config/Loader/GlobFileLoader.php @@ -21,7 +21,7 @@ class GlobFileLoader extends FileLoader /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { return $this->import($resource); } @@ -29,7 +29,7 @@ public function load($resource, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return 'glob' === $type; } diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php index e7d74b5a10b74..892164da2044a 100644 --- a/src/Symfony/Component/Config/Loader/Loader.php +++ b/src/Symfony/Component/Config/Loader/Loader.php @@ -23,7 +23,7 @@ abstract class Loader implements LoaderInterface protected $resolver; protected $env; - public function __construct(string $env = null) + public function __construct(?string $env = null) { $this->env = $env; } @@ -52,7 +52,7 @@ public function setResolver(LoaderResolverInterface $resolver) * * @return mixed */ - public function import($resource, string $type = null) + public function import($resource, ?string $type = null) { return $this->resolve($resource, $type)->load($resource, $type); } @@ -67,7 +67,7 @@ public function import($resource, string $type = null) * * @throws LoaderLoadException If no loader is found */ - public function resolve($resource, string $type = null) + public function resolve($resource, ?string $type = null) { if ($this->supports($resource, $type)) { return $this; diff --git a/src/Symfony/Component/Config/Loader/LoaderInterface.php b/src/Symfony/Component/Config/Loader/LoaderInterface.php index 93a160b1e4b69..9497a521ebcdd 100644 --- a/src/Symfony/Component/Config/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Config/Loader/LoaderInterface.php @@ -27,7 +27,7 @@ interface LoaderInterface * * @throws \Exception If something went wrong */ - public function load($resource, string $type = null); + public function load($resource, ?string $type = null); /** * Returns whether this class supports the given resource. @@ -36,7 +36,7 @@ public function load($resource, string $type = null); * * @return bool */ - public function supports($resource, string $type = null); + public function supports($resource, ?string $type = null); /** * Gets the loader resolver. diff --git a/src/Symfony/Component/Config/Loader/LoaderResolver.php b/src/Symfony/Component/Config/Loader/LoaderResolver.php index cce0702b71b35..a6ee1a27d91e7 100644 --- a/src/Symfony/Component/Config/Loader/LoaderResolver.php +++ b/src/Symfony/Component/Config/Loader/LoaderResolver.php @@ -39,7 +39,7 @@ public function __construct(array $loaders = []) /** * {@inheritdoc} */ - public function resolve($resource, string $type = null) + public function resolve($resource, ?string $type = null) { foreach ($this->loaders as $loader) { if ($loader->supports($resource, $type)) { diff --git a/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php b/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php index 8a4841947e55e..3245eba8c7f96 100644 --- a/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php +++ b/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php @@ -26,5 +26,5 @@ interface LoaderResolverInterface * * @return LoaderInterface|false */ - public function resolve($resource, string $type = null); + public function resolve($resource, ?string $type = null); } diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php index 661603692c2ba..186056c59a099 100644 --- a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php +++ b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php @@ -34,7 +34,7 @@ class ClassExistenceResource implements SelfCheckingResourceInterface * @param string $resource The fully-qualified class name * @param bool|null $exists Boolean when the existence check has already been done */ - public function __construct(string $resource, bool $exists = null) + public function __construct(string $resource, ?bool $exists = null) { $this->resource = $resource; if (null !== $exists) { @@ -143,7 +143,7 @@ public function __wakeup() * * @internal */ - public static function throwOnRequiredClass(string $class, \Exception $previous = null) + public static function throwOnRequiredClass(string $class, ?\Exception $previous = null) { // If the passed class is the resource being checked, we shouldn't throw. if (null === $previous && self::$autoloadedClass === $class) { diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php index 035814a2a59ec..19b0a4bccbc4e 100644 --- a/src/Symfony/Component/Config/Resource/DirectoryResource.php +++ b/src/Symfony/Component/Config/Resource/DirectoryResource.php @@ -29,7 +29,7 @@ class DirectoryResource implements SelfCheckingResourceInterface * * @throws \InvalidArgumentException */ - public function __construct(string $resource, string $pattern = null) + public function __construct(string $resource, ?string $pattern = null) { $this->resource = realpath($resource) ?: (file_exists($resource) ? $resource : false); $this->pattern = $pattern; diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php index ba0e180c53537..dfc46e97fbfa6 100644 --- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php +++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php @@ -115,7 +115,7 @@ public function isFresh() * * @throws \RuntimeException When cache file can't be written */ - public function write(string $content, array $metadata = null) + public function write(string $content, ?array $metadata = null) { $mode = 0666; $umask = umask(); diff --git a/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php b/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php index 5f20ca6ac9f7f..8c8c3b02f538b 100644 --- a/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php +++ b/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php @@ -160,7 +160,7 @@ public function testSetExtraKeyMethodIsNotGeneratedWhenAllowExtraKeysIsFalse() /** * Generate the ConfigBuilder or return an already generated instance. */ - private function generateConfigBuilder(string $configurationClass, string $outputDir = null) + private function generateConfigBuilder(string $configurationClass, ?string $outputDir = null) { $outputDir ?? $outputDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf_config_builder', true); if (!str_contains($outputDir, __DIR__)) { diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php index 64b5d8d7456fa..8dbe54a3374a6 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php @@ -223,7 +223,7 @@ protected function getTestBuilder(): ExprBuilder * @param array|null $config The config you want to use for the finalization, if nothing provided * a simple ['key'=>'value'] will be used */ - protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, array $config = null): array + protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, ?array $config = null): array { return $nodeDefinition ->end() diff --git a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php index 9aa991ecc5b5e..cae46ca8f9adf 100644 --- a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php +++ b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php @@ -155,12 +155,12 @@ class TestFileLoader extends FileLoader { private $supports = true; - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { return $resource; } - public function supports($resource, string $type = null): bool + public function supports($resource, ?string $type = null): bool { return $this->supports; } diff --git a/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php index 9b163f100fd7b..3fe6c1e54ca82 100644 --- a/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php +++ b/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php @@ -104,11 +104,11 @@ public function testImportWithType() class ProjectLoader1 extends Loader { - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { } - public function supports($resource, string $type = null): bool + public function supports($resource, ?string $type = null): bool { return \is_string($resource) && 'foo' === pathinfo($resource, \PATHINFO_EXTENSION); } diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php index 875baf9f7f370..7d8ed91cdfb85 100644 --- a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php +++ b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php @@ -64,7 +64,7 @@ public function testIsFreshForDeletedResources() /** * @dataProvider provideHashedSignature */ - public function testHashedSignature(bool $changeExpected, int $changedLine, ?string $changedCode, \Closure $setContext = null) + public function testHashedSignature(bool $changeExpected, int $changedLine, ?string $changedCode, ?\Closure $setContext = null) { if ($setContext) { $setContext(); diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 29951e9c1a164..bb5341882181a 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -134,7 +134,7 @@ public function setSignalsToDispatchEvent(int ...$signalsToDispatchEvent) * * @throws \Exception When running fails. Bypass this when {@link setCatchExceptions()}. */ - public function run(InputInterface $input = null, OutputInterface $output = null) + public function run(?InputInterface $input = null, ?OutputInterface $output = null) { if (\function_exists('putenv')) { @putenv('LINES='.$this->terminal->getHeight()); @@ -778,7 +778,7 @@ public function find(string $name) * * @return Command[] */ - public function all(string $namespace = null) + public function all(?string $namespace = null) { $this->init(); @@ -1147,7 +1147,7 @@ private function getAbbreviationSuggestions(array $abbrevs): string * * @return string */ - public function extractNamespace(string $name, int $limit = null) + public function extractNamespace(string $name, ?int $limit = null) { $parts = explode(':', $name, -1); diff --git a/src/Symfony/Component/Console/CI/GithubActionReporter.php b/src/Symfony/Component/Console/CI/GithubActionReporter.php index a15c1ff18b864..065717854af4f 100644 --- a/src/Symfony/Component/Console/CI/GithubActionReporter.php +++ b/src/Symfony/Component/Console/CI/GithubActionReporter.php @@ -57,7 +57,7 @@ public static function isGithubActionEnvironment(): bool * * @see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-an-error-message */ - public function error(string $message, string $file = null, int $line = null, int $col = null): void + public function error(string $message, ?string $file = null, ?int $line = null, ?int $col = null): void { $this->log('error', $message, $file, $line, $col); } @@ -67,7 +67,7 @@ public function error(string $message, string $file = null, int $line = null, in * * @see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message */ - public function warning(string $message, string $file = null, int $line = null, int $col = null): void + public function warning(string $message, ?string $file = null, ?int $line = null, ?int $col = null): void { $this->log('warning', $message, $file, $line, $col); } @@ -77,12 +77,12 @@ public function warning(string $message, string $file = null, int $line = null, * * @see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-a-debug-message */ - public function debug(string $message, string $file = null, int $line = null, int $col = null): void + public function debug(string $message, ?string $file = null, ?int $line = null, ?int $col = null): void { $this->log('debug', $message, $file, $line, $col); } - private function log(string $type, string $message, string $file = null, int $line = null, int $col = null): void + private function log(string $type, string $message, ?string $file = null, ?int $line = null, ?int $col = null): void { // Some values must be encoded. $message = strtr($message, self::ESCAPED_DATA); diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index cfa18361ea980..d181036709ebe 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -96,7 +96,7 @@ public static function getDefaultDescription(): ?string * * @throws LogicException When the command name is empty */ - public function __construct(string $name = null) + public function __construct(?string $name = null) { $this->definition = new InputDefinition(); @@ -132,7 +132,7 @@ public function ignoreValidationErrors() $this->ignoreValidationErrors = true; } - public function setApplication(Application $application = null) + public function setApplication(?Application $application = null) { $this->application = $application; if ($application) { @@ -433,7 +433,7 @@ public function getNativeDefinition() * * @throws InvalidArgumentException When argument mode is not valid */ - public function addArgument(string $name, int $mode = null, string $description = '', $default = null) + public function addArgument(string $name, ?int $mode = null, string $description = '', $default = null) { $this->definition->addArgument(new InputArgument($name, $mode, $description, $default)); if (null !== $this->fullDefinition) { @@ -454,7 +454,7 @@ public function addArgument(string $name, int $mode = null, string $description * * @throws InvalidArgumentException If option mode is invalid or incompatible */ - public function addOption(string $name, $shortcut = null, int $mode = null, string $description = '', $default = null) + public function addOption(string $name, $shortcut = null, ?int $mode = null, string $description = '', $default = null) { $this->definition->addOption(new InputOption($name, $shortcut, $mode, $description, $default)); if (null !== $this->fullDefinition) { diff --git a/src/Symfony/Component/Console/Command/LazyCommand.php b/src/Symfony/Component/Console/Command/LazyCommand.php index e576ad03fe468..302a0809e8b80 100644 --- a/src/Symfony/Component/Console/Command/LazyCommand.php +++ b/src/Symfony/Component/Console/Command/LazyCommand.php @@ -43,7 +43,7 @@ public function ignoreValidationErrors(): void $this->getCommand()->ignoreValidationErrors(); } - public function setApplication(Application $application = null): void + public function setApplication(?Application $application = null): void { if ($this->command instanceof parent) { $this->command->setApplication($application); @@ -117,7 +117,7 @@ public function getNativeDefinition(): InputDefinition /** * @return $this */ - public function addArgument(string $name, int $mode = null, string $description = '', $default = null): self + public function addArgument(string $name, ?int $mode = null, string $description = '', $default = null): self { $this->getCommand()->addArgument($name, $mode, $description, $default); @@ -127,7 +127,7 @@ public function addArgument(string $name, int $mode = null, string $description /** * @return $this */ - public function addOption(string $name, $shortcut = null, int $mode = null, string $description = '', $default = null): self + public function addOption(string $name, $shortcut = null, ?int $mode = null, string $description = '', $default = null): self { $this->getCommand()->addOption($name, $shortcut, $mode, $description, $default); diff --git a/src/Symfony/Component/Console/Command/LockableTrait.php b/src/Symfony/Component/Console/Command/LockableTrait.php index b1856dca7c3a8..d21edc2c0ee6f 100644 --- a/src/Symfony/Component/Console/Command/LockableTrait.php +++ b/src/Symfony/Component/Console/Command/LockableTrait.php @@ -30,7 +30,7 @@ trait LockableTrait /** * Locks a command. */ - private function lock(string $name = null, bool $blocking = false): bool + private function lock(?string $name = null, bool $blocking = false): bool { if (!class_exists(SemaphoreStore::class)) { throw new LogicException('To enable the locking feature you must install the symfony/lock component.'); diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php index 2a3acc99b7be4..eb11b4f91cde0 100644 --- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php +++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php @@ -43,7 +43,7 @@ class ApplicationDescription */ private $aliases; - public function __construct(Application $application, string $namespace = null, bool $showHidden = false) + public function __construct(Application $application, ?string $namespace = null, bool $showHidden = false) { $this->application = $application; $this->namespace = $namespace; diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php index 4f7cd8b3e0821..f17e5f1f2bd9e 100644 --- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php @@ -79,7 +79,7 @@ public function getCommandDocument(Command $command, bool $short = false): \DOMD return $dom; } - public function getApplicationDocument(Application $application, string $namespace = null, bool $short = false): \DOMDocument + public function getApplicationDocument(Application $application, ?string $namespace = null, bool $short = false): \DOMDocument { $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->appendChild($rootXml = $dom->createElement('symfony')); diff --git a/src/Symfony/Component/Console/Event/ConsoleErrorEvent.php b/src/Symfony/Component/Console/Event/ConsoleErrorEvent.php index 57d9b38ba0c3b..d4c26493f4d96 100644 --- a/src/Symfony/Component/Console/Event/ConsoleErrorEvent.php +++ b/src/Symfony/Component/Console/Event/ConsoleErrorEvent.php @@ -25,7 +25,7 @@ final class ConsoleErrorEvent extends ConsoleEvent private $error; private $exitCode; - public function __construct(InputInterface $input, OutputInterface $output, \Throwable $error, Command $command = null) + public function __construct(InputInterface $input, OutputInterface $output, \Throwable $error, ?Command $command = null) { parent::__construct($command, $input, $output); diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php index 897d9853f2848..e9c9e3ea478d3 100644 --- a/src/Symfony/Component/Console/EventListener/ErrorListener.php +++ b/src/Symfony/Component/Console/EventListener/ErrorListener.php @@ -26,7 +26,7 @@ class ErrorListener implements EventSubscriberInterface { private $logger; - public function __construct(LoggerInterface $logger = null) + public function __construct(?LoggerInterface $logger = null) { $this->logger = $logger; } diff --git a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php b/src/Symfony/Component/Console/Exception/CommandNotFoundException.php index 910ae19286712..81ec318abf26d 100644 --- a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php +++ b/src/Symfony/Component/Console/Exception/CommandNotFoundException.php @@ -26,7 +26,7 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce * @param int $code Exception code * @param \Throwable|null $previous Previous exception used for the exception chaining */ - public function __construct(string $message, array $alternatives = [], int $code = 0, \Throwable $previous = null) + public function __construct(string $message, array $alternatives = [], int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/Console/Formatter/NullOutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/NullOutputFormatterStyle.php index 9232510f4a49c..afd3d004359ec 100644 --- a/src/Symfony/Component/Console/Formatter/NullOutputFormatterStyle.php +++ b/src/Symfony/Component/Console/Formatter/NullOutputFormatterStyle.php @@ -27,7 +27,7 @@ public function apply(string $text): string /** * {@inheritdoc} */ - public function setBackground(string $color = null): void + public function setBackground(?string $color = null): void { // do nothing } @@ -35,7 +35,7 @@ public function setBackground(string $color = null): void /** * {@inheritdoc} */ - public function setForeground(string $color = null): void + public function setForeground(?string $color = null): void { // do nothing } diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php index 8370ba0587a79..d7ae66494d67c 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php @@ -33,7 +33,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface * @param string|null $foreground The style foreground color name * @param string|null $background The style background color name */ - public function __construct(string $foreground = null, string $background = null, array $options = []) + public function __construct(?string $foreground = null, ?string $background = null, array $options = []) { $this->color = new Color($this->foreground = $foreground ?: '', $this->background = $background ?: '', $this->options = $options); } @@ -41,7 +41,7 @@ public function __construct(string $foreground = null, string $background = null /** * {@inheritdoc} */ - public function setForeground(string $color = null) + public function setForeground(?string $color = null) { $this->color = new Color($this->foreground = $color ?: '', $this->background, $this->options); } @@ -49,7 +49,7 @@ public function setForeground(string $color = null) /** * {@inheritdoc} */ - public function setBackground(string $color = null) + public function setBackground(?string $color = null) { $this->color = new Color($this->foreground, $this->background = $color ?: '', $this->options); } diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php index b30560d22e161..89e4d24381be0 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php @@ -21,12 +21,12 @@ interface OutputFormatterStyleInterface /** * Sets style foreground color. */ - public function setForeground(string $color = null); + public function setForeground(?string $color = null); /** * Sets style background color. */ - public function setBackground(string $color = null); + public function setBackground(?string $color = null); /** * Sets some specific style option. diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php index fc48dc0e15e6a..1b9356301e2dd 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php @@ -26,7 +26,7 @@ class OutputFormatterStyleStack implements ResetInterface private $emptyStyle; - public function __construct(OutputFormatterStyleInterface $emptyStyle = null) + public function __construct(?OutputFormatterStyleInterface $emptyStyle = null) { $this->emptyStyle = $emptyStyle ?? new OutputFormatterStyle(); $this->reset(); @@ -55,7 +55,7 @@ public function push(OutputFormatterStyleInterface $style) * * @throws InvalidArgumentException When style tags incorrectly nested */ - public function pop(OutputFormatterStyleInterface $style = null) + public function pop(?OutputFormatterStyleInterface $style = null) { if (empty($this->styles)) { return $this->emptyStyle; diff --git a/src/Symfony/Component/Console/Helper/Dumper.php b/src/Symfony/Component/Console/Helper/Dumper.php index b013b6c527b6c..605e4d70b7c2d 100644 --- a/src/Symfony/Component/Console/Helper/Dumper.php +++ b/src/Symfony/Component/Console/Helper/Dumper.php @@ -26,7 +26,7 @@ final class Dumper private $cloner; private $handler; - public function __construct(OutputInterface $output, CliDumper $dumper = null, ClonerInterface $cloner = null) + public function __construct(OutputInterface $output, ?CliDumper $dumper = null, ?ClonerInterface $cloner = null) { $this->output = $output; $this->dumper = $dumper; diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php index c7d3e25d0e33e..6b3f7f43ad971 100644 --- a/src/Symfony/Component/Console/Helper/Helper.php +++ b/src/Symfony/Component/Console/Helper/Helper.php @@ -26,7 +26,7 @@ abstract class Helper implements HelperInterface /** * {@inheritdoc} */ - public function setHelperSet(HelperSet $helperSet = null) + public function setHelperSet(?HelperSet $helperSet = null) { $this->helperSet = $helperSet; } @@ -96,7 +96,7 @@ public static function length(?string $string): int * * @return string */ - public static function substr(?string $string, int $from, int $length = null) + public static function substr(?string $string, int $from, ?int $length = null) { $string ?? $string = ''; diff --git a/src/Symfony/Component/Console/Helper/HelperInterface.php b/src/Symfony/Component/Console/Helper/HelperInterface.php index fc952b48612ec..5bf4d63271a40 100644 --- a/src/Symfony/Component/Console/Helper/HelperInterface.php +++ b/src/Symfony/Component/Console/Helper/HelperInterface.php @@ -21,7 +21,7 @@ interface HelperInterface /** * Sets the helper set associated with this helper. */ - public function setHelperSet(HelperSet $helperSet = null); + public function setHelperSet(?HelperSet $helperSet = null); /** * Gets the helper set associated with this helper. diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php index 719762d242ca9..c870ab997ea2d 100644 --- a/src/Symfony/Component/Console/Helper/HelperSet.php +++ b/src/Symfony/Component/Console/Helper/HelperSet.php @@ -37,7 +37,7 @@ public function __construct(array $helpers = []) } } - public function set(HelperInterface $helper, string $alias = null) + public function set(HelperInterface $helper, ?string $alias = null) { $this->helpers[$helper->getName()] = $helper; if (null !== $alias) { @@ -76,7 +76,7 @@ public function get(string $name) /** * @deprecated since Symfony 5.4 */ - public function setCommand(Command $command = null) + public function setCommand(?Command $command = null) { trigger_deprecation('symfony/console', '5.4', 'Method "%s()" is deprecated.', __METHOD__); diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php index 4ea3d724d88dc..86a250b27f11b 100644 --- a/src/Symfony/Component/Console/Helper/ProcessHelper.php +++ b/src/Symfony/Component/Console/Helper/ProcessHelper.php @@ -32,7 +32,7 @@ class ProcessHelper extends Helper * @param callable|null $callback A PHP callback to run whenever there is some * output available on STDOUT or STDERR */ - public function run(OutputInterface $output, $cmd, string $error = null, callable $callback = null, int $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE): Process + public function run(OutputInterface $output, $cmd, ?string $error = null, ?callable $callback = null, int $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE): Process { if (!class_exists(Process::class)) { throw new \LogicException('The ProcessHelper cannot be run as the Process component is not installed. Try running "compose require symfony/process".'); @@ -98,7 +98,7 @@ public function run(OutputInterface $output, $cmd, string $error = null, callabl * * @see run() */ - public function mustRun(OutputInterface $output, $cmd, string $error = null, callable $callback = null): Process + public function mustRun(OutputInterface $output, $cmd, ?string $error = null, ?callable $callback = null): Process { $process = $this->run($output, $cmd, $error, $callback); @@ -112,7 +112,7 @@ public function mustRun(OutputInterface $output, $cmd, string $error = null, cal /** * Wraps a Process callback to add debugging output. */ - public function wrapCallback(OutputInterface $output, Process $process, callable $callback = null): callable + public function wrapCallback(OutputInterface $output, Process $process, ?callable $callback = null): callable { if ($output instanceof ConsoleOutputInterface) { $output = $output->getErrorOutput(); diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php index eb6aacb1a4018..1d7b8d4562cb6 100644 --- a/src/Symfony/Component/Console/Helper/ProgressBar.php +++ b/src/Symfony/Component/Console/Helper/ProgressBar.php @@ -293,7 +293,7 @@ public function maxSecondsBetweenRedraws(float $seconds): void * * @param int|null $max Number of steps to complete the bar (0 if indeterminate), if null it will be inferred from $iterable */ - public function iterate(iterable $iterable, int $max = null): iterable + public function iterate(iterable $iterable, ?int $max = null): iterable { $this->start($max ?? (is_countable($iterable) ? \count($iterable) : 0)); @@ -311,7 +311,7 @@ public function iterate(iterable $iterable, int $max = null): iterable * * @param int|null $max Number of steps to complete the bar (0 if indeterminate), null to leave unchanged */ - public function start(int $max = null) + public function start(?int $max = null) { $this->startTime = time(); $this->step = 0; diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php index 3482343fcdfc0..3cc0e1451ac5f 100644 --- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php +++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php @@ -50,7 +50,7 @@ class ProgressIndicator * @param int $indicatorChangeInterval Change interval in milliseconds * @param array|null $indicatorValues Animated indicator characters */ - public function __construct(OutputInterface $output, string $format = null, int $indicatorChangeInterval = 100, array $indicatorValues = null) + public function __construct(OutputInterface $output, ?string $format = null, int $indicatorChangeInterval = 100, ?array $indicatorValues = null) { $this->output = $output; @@ -129,8 +129,6 @@ public function advance() /** * Finish the indicator with message. - * - * @param $message */ public function finish(string $message) { diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php index 5c3447ab3afa5..408a76d67dd61 100644 --- a/src/Symfony/Component/Console/Helper/Table.php +++ b/src/Symfony/Component/Console/Helper/Table.php @@ -451,7 +451,7 @@ public function render() * * +-----+-----------+-------+ */ - private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $title = null, string $titleFormat = null) + private function renderRowSeparator(int $type = self::SEPARATOR_MID, ?string $title = null, ?string $titleFormat = null) { if (0 === $count = $this->numberOfColumns) { return; @@ -516,7 +516,7 @@ private function renderColumnSeparator(int $type = self::BORDER_OUTSIDE): string * * | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | */ - private function renderRow(array $row, string $cellFormat, string $firstCellFormat = null) + private function renderRow(array $row, string $cellFormat, ?string $firstCellFormat = null) { $rowContent = $this->renderColumnSeparator(self::BORDER_OUTSIDE); $columns = $this->getRowColumns($row); diff --git a/src/Symfony/Component/Console/Helper/TableStyle.php b/src/Symfony/Component/Console/Helper/TableStyle.php index dfc41e6a4c0bb..0643c79eb90ee 100644 --- a/src/Symfony/Component/Console/Helper/TableStyle.php +++ b/src/Symfony/Component/Console/Helper/TableStyle.php @@ -90,7 +90,7 @@ public function getPaddingChar() * * @return $this */ - public function setHorizontalBorderChars(string $outside, string $inside = null): self + public function setHorizontalBorderChars(string $outside, ?string $inside = null): self { $this->horizontalOutsideBorderChar = $outside; $this->horizontalInsideBorderChar = $inside ?? $outside; @@ -115,7 +115,7 @@ public function setHorizontalBorderChars(string $outside, string $inside = null) * * @return $this */ - public function setVerticalBorderChars(string $outside, string $inside = null): self + public function setVerticalBorderChars(string $outside, ?string $inside = null): self { $this->verticalOutsideBorderChar = $outside; $this->verticalInsideBorderChar = $inside ?? $outside; @@ -169,7 +169,7 @@ public function getBorderChars(): array * * @return $this */ - public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, string $topLeftBottom = null, string $topMidBottom = null, string $topRightBottom = null): self + public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, ?string $topLeftBottom = null, ?string $topMidBottom = null, ?string $topRightBottom = null): self { $this->crossingChar = $cross; $this->crossingTopLeftChar = $topLeft; diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 675b9ef5891f5..0c4b2d25bd4d3 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -43,7 +43,7 @@ class ArgvInput extends Input private $tokens; private $parsed; - public function __construct(array $argv = null, InputDefinition $definition = null) + public function __construct(?array $argv = null, ?InputDefinition $definition = null) { $argv = $argv ?? $_SERVER['argv'] ?? []; diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php index c65161484ec92..21a517cfb6f82 100644 --- a/src/Symfony/Component/Console/Input/ArrayInput.php +++ b/src/Symfony/Component/Console/Input/ArrayInput.php @@ -27,7 +27,7 @@ class ArrayInput extends Input { private $parameters; - public function __construct(array $parameters, InputDefinition $definition = null) + public function __construct(array $parameters, ?InputDefinition $definition = null) { $this->parameters = $parameters; diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php index d37460ed3a026..0faab2cf12cb7 100644 --- a/src/Symfony/Component/Console/Input/Input.php +++ b/src/Symfony/Component/Console/Input/Input.php @@ -33,7 +33,7 @@ abstract class Input implements InputInterface, StreamableInputInterface protected $arguments = []; protected $interactive = true; - public function __construct(InputDefinition $definition = null) + public function __construct(?InputDefinition $definition = null) { if (null === $definition) { $this->definition = new InputDefinition(); diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php index 8a64f7ac8a8e9..1a8bf44b73b07 100644 --- a/src/Symfony/Component/Console/Input/InputArgument.php +++ b/src/Symfony/Component/Console/Input/InputArgument.php @@ -38,7 +38,7 @@ class InputArgument * * @throws InvalidArgumentException When argument mode is not valid */ - public function __construct(string $name, int $mode = null, string $description = '', $default = null) + public function __construct(string $name, ?int $mode = null, string $description = '', $default = null) { if (null === $mode) { $mode = self::OPTIONAL; diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php index 2bec34fe1a395..1d8dbca310212 100644 --- a/src/Symfony/Component/Console/Input/InputOption.php +++ b/src/Symfony/Component/Console/Input/InputOption.php @@ -59,7 +59,7 @@ class InputOption * * @throws InvalidArgumentException If option mode is invalid or incompatible */ - public function __construct(string $name, $shortcut = null, int $mode = null, string $description = '', $default = null) + public function __construct(string $name, $shortcut = null, ?int $mode = null, string $description = '', $default = null) { if (str_starts_with($name, '--')) { $name = substr($name, 2); @@ -69,7 +69,7 @@ public function __construct(string $name, $shortcut = null, int $mode = null, st throw new InvalidArgumentException('An option name cannot be empty.'); } - if (empty($shortcut)) { + if ('' === $shortcut || [] === $shortcut) { $shortcut = null; } @@ -78,10 +78,10 @@ public function __construct(string $name, $shortcut = null, int $mode = null, st $shortcut = implode('|', $shortcut); } $shortcuts = preg_split('{(\|)-?}', ltrim($shortcut, '-')); - $shortcuts = array_filter($shortcuts); + $shortcuts = array_filter($shortcuts, 'strlen'); $shortcut = implode('|', $shortcuts); - if (empty($shortcut)) { + if ('' === $shortcut) { throw new InvalidArgumentException('An option shortcut cannot be empty.'); } } diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php index f19f9ebf444cb..560aeb5814d40 100644 --- a/src/Symfony/Component/Console/Output/ConsoleOutput.php +++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php @@ -37,7 +37,7 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface * @param bool|null $decorated Whether to decorate messages (null for auto-guessing) * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter) */ - public function __construct(int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = null, OutputFormatterInterface $formatter = null) + public function __construct(int $verbosity = self::VERBOSITY_NORMAL, ?bool $decorated = null, ?OutputFormatterInterface $formatter = null) { parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter); diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php index 8f16497583b66..70d70c50bb84e 100644 --- a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php +++ b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php @@ -43,7 +43,7 @@ public function __construct($stream, array &$sections, int $verbosity, bool $dec * * @param int $lines Number of lines to clear. If null, then the entire output of this section is cleared */ - public function clear(int $lines = null) + public function clear(?int $lines = null) { if (empty($this->content) || !$this->isDecorated()) { return; diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php index d7c5fb2d11433..28c40bb3e6ec8 100644 --- a/src/Symfony/Component/Console/Output/Output.php +++ b/src/Symfony/Component/Console/Output/Output.php @@ -37,7 +37,7 @@ abstract class Output implements OutputInterface * @param bool $decorated Whether to decorate messages * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter) */ - public function __construct(?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null) + public function __construct(?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, ?OutputFormatterInterface $formatter = null) { $this->verbosity = $verbosity ?? self::VERBOSITY_NORMAL; $this->formatter = $formatter ?? new OutputFormatter(); diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php index f057f0e51d159..0ef15cf318b46 100644 --- a/src/Symfony/Component/Console/Output/StreamOutput.php +++ b/src/Symfony/Component/Console/Output/StreamOutput.php @@ -39,7 +39,7 @@ class StreamOutput extends Output * * @throws InvalidArgumentException When first argument is not a real stream */ - public function __construct($stream, int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = null, OutputFormatterInterface $formatter = null) + public function __construct($stream, int $verbosity = self::VERBOSITY_NORMAL, ?bool $decorated = null, ?OutputFormatterInterface $formatter = null) { if (!\is_resource($stream) || 'stream' !== get_resource_type($stream)) { throw new InvalidArgumentException('The StreamOutput class needs a stream as its first argument.'); @@ -95,6 +95,10 @@ protected function hasColorSupport() return false; } + if (!$this->isTty()) { + return false; + } + if (\DIRECTORY_SEPARATOR === '\\' && \function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support($this->stream) @@ -105,7 +109,36 @@ protected function hasColorSupport() return 'Hyper' === getenv('TERM_PROGRAM') || false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') - || str_starts_with((string) getenv('TERM'), 'xterm') - || stream_isatty($this->stream); + || str_starts_with((string) getenv('TERM'), 'xterm'); + } + + /** + * Checks if the stream is a TTY, i.e; whether the output stream is connected to a terminal. + * + * Reference: Composer\Util\Platform::isTty + * https://github.com/composer/composer + */ + private function isTty(): bool + { + // Detect msysgit/mingw and assume this is a tty because detection + // does not work correctly, see https://github.com/composer/composer/issues/9690 + if (\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) { + return true; + } + + // Modern cross-platform function, includes the fstat fallback so if it is present we trust it + if (\function_exists('stream_isatty')) { + return stream_isatty($this->stream); + } + + // Only trusting this if it is positive, otherwise prefer fstat fallback. + if (\function_exists('posix_isatty') && posix_isatty($this->stream)) { + return true; + } + + $stat = @fstat($this->stream); + + // Check if formatted mode is S_IFCHR + return $stat ? 0020000 === ($stat['mode'] & 0170000) : false; } } diff --git a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php index 3f4d375f42dcb..b08503b3ab00e 100644 --- a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php +++ b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php @@ -24,7 +24,7 @@ class TrimmedBufferOutput extends Output private $maxLength; private $buffer = ''; - public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null) + public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, ?OutputFormatterInterface $formatter = null) { if ($maxLength <= 0) { throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength)); diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php index 3a73f04b2383d..ba574428377c5 100644 --- a/src/Symfony/Component/Console/Question/Question.php +++ b/src/Symfony/Component/Console/Question/Question.php @@ -186,7 +186,7 @@ public function getAutocompleterCallback(): ?callable * * @return $this */ - public function setAutocompleterCallback(callable $callback = null): self + public function setAutocompleterCallback(?callable $callback = null): self { if ($this->hidden && null !== $callback) { throw new LogicException('A hidden question cannot use the autocompleter.'); @@ -202,7 +202,7 @@ public function setAutocompleterCallback(callable $callback = null): self * * @return $this */ - public function setValidator(callable $validator = null) + public function setValidator(?callable $validator = null) { $this->validator = $validator; diff --git a/src/Symfony/Component/Console/SingleCommandApplication.php b/src/Symfony/Component/Console/SingleCommandApplication.php index e93c1821b8a52..774e5d8c44359 100644 --- a/src/Symfony/Component/Console/SingleCommandApplication.php +++ b/src/Symfony/Component/Console/SingleCommandApplication.php @@ -46,7 +46,7 @@ public function setAutoExit(bool $autoExit): self return $this; } - public function run(InputInterface $input = null, OutputInterface $output = null): int + public function run(?InputInterface $input = null, ?OutputInterface $output = null): int { if ($this->running) { return parent::run($input, $output); diff --git a/src/Symfony/Component/Console/Style/StyleInterface.php b/src/Symfony/Component/Console/Style/StyleInterface.php index 38d23b77ebec6..9f25a43f6c42a 100644 --- a/src/Symfony/Component/Console/Style/StyleInterface.php +++ b/src/Symfony/Component/Console/Style/StyleInterface.php @@ -85,14 +85,14 @@ public function table(array $headers, array $rows); * * @return mixed */ - public function ask(string $question, string $default = null, callable $validator = null); + public function ask(string $question, ?string $default = null, ?callable $validator = null); /** * Asks a question with the user input hidden. * * @return mixed */ - public function askHidden(string $question, callable $validator = null); + public function askHidden(string $question, ?callable $validator = null); /** * Asks for confirmation. diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index e3c5ac8e74460..00edf388276ea 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -61,7 +61,7 @@ public function __construct(InputInterface $input, OutputInterface $output) * * @param string|array $messages The message to write in the block */ - public function block($messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true) + public function block($messages, ?string $type = null, ?string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true) { $messages = \is_array($messages) ? array_values($messages) : [$messages]; @@ -250,7 +250,7 @@ public function definitionList(...$list) /** * {@inheritdoc} */ - public function ask(string $question, string $default = null, callable $validator = null) + public function ask(string $question, ?string $default = null, ?callable $validator = null) { $question = new Question($question, $default); $question->setValidator($validator); @@ -261,7 +261,7 @@ public function ask(string $question, string $default = null, callable $validato /** * {@inheritdoc} */ - public function askHidden(string $question, callable $validator = null) + public function askHidden(string $question, ?callable $validator = null) { $question = new Question($question); @@ -338,7 +338,7 @@ public function createProgressBar(int $max = 0) /** * @see ProgressBar::iterate() */ - public function progressIterate(iterable $iterable, int $max = null): iterable + public function progressIterate(iterable $iterable, ?int $max = null): iterable { yield from $this->createProgressBar()->iterate($iterable, $max); @@ -463,7 +463,7 @@ private function writeBuffer(string $message, bool $newLine, int $type): void $this->bufferedOutput->write($message, $newLine, $type); } - private function createBlock(iterable $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = false): array + private function createBlock(iterable $messages, ?string $type = null, ?string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = false): array { $indentLength = 0; $prefixLength = Helper::width(Helper::removeDecoration($this->getFormatter(), $prefix)); diff --git a/src/Symfony/Component/Console/Tests/CI/GithubActionReporterTest.php b/src/Symfony/Component/Console/Tests/CI/GithubActionReporterTest.php index 23f7a3bd9ddbd..a35927950d252 100644 --- a/src/Symfony/Component/Console/Tests/CI/GithubActionReporterTest.php +++ b/src/Symfony/Component/Console/Tests/CI/GithubActionReporterTest.php @@ -34,7 +34,7 @@ public function testIsGithubActionEnvironment() /** * @dataProvider annotationsFormatProvider */ - public function testAnnotationsFormat(string $type, string $message, string $file = null, int $line = null, int $col = null, string $expected) + public function testAnnotationsFormat(string $type, string $message, ?string $file, ?int $line, ?int $col, string $expected) { $reporter = new GithubActionReporter($buffer = new BufferedOutput()); diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php index 0b1772107bbd7..21905f4750dd0 100644 --- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php +++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php @@ -162,7 +162,7 @@ public function testInlineStyle() /** * @dataProvider provideInlineStyleOptionsCases */ - public function testInlineStyleOptions(string $tag, string $expected = null, string $input = null, bool $truecolor = false) + public function testInlineStyleOptions(string $tag, ?string $expected = null, ?string $input = null, bool $truecolor = false) { if ($truecolor && 'truecolor' !== getenv('COLORTERM')) { $this->markTestSkipped('The terminal does not support true colors.'); diff --git a/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php b/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php index 78d22939cd536..c83b9d5a37c2c 100644 --- a/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php +++ b/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php @@ -117,7 +117,7 @@ public function testIteration() } } - private function getGenericMockHelper($name, HelperSet $helperset = null) + private function getGenericMockHelper($name, ?HelperSet $helperset = null) { $mock_helper = $this->createMock(HelperInterface::class); $mock_helper->expects($this->any()) diff --git a/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php b/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php index 943bcf628c586..55a840ac7c7a8 100644 --- a/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php +++ b/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php @@ -55,6 +55,20 @@ public function testShortcut() $this->assertEquals('f|ff|fff', $option->getShortcut(), '__construct() removes the leading - of the shortcuts'); $option = new InputOption('foo'); $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null by default'); + $option = new InputOption('foo', ''); + $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null when given an empty string'); + $option = new InputOption('foo', []); + $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null when given an empty array'); + $option = new InputOption('foo', ['f', '', 'fff']); + $this->assertEquals('f|fff', $option->getShortcut(), '__construct() removes empty shortcuts'); + $option = new InputOption('foo', 'f||fff'); + $this->assertEquals('f|fff', $option->getShortcut(), '__construct() removes empty shortcuts'); + $option = new InputOption('foo', '0'); + $this->assertEquals('0', $option->getShortcut(), '-0 is an acceptable shortcut value'); + $option = new InputOption('foo', ['0', 'z']); + $this->assertEquals('0|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in an array'); + $option = new InputOption('foo', '0|z'); + $this->assertEquals('0|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in a string-list'); } public function testModes() diff --git a/src/Symfony/Component/CssSelector/Node/ElementNode.php b/src/Symfony/Component/CssSelector/Node/ElementNode.php index fbf8ea0f99096..a1881975be17f 100644 --- a/src/Symfony/Component/CssSelector/Node/ElementNode.php +++ b/src/Symfony/Component/CssSelector/Node/ElementNode.php @@ -26,7 +26,7 @@ class ElementNode extends AbstractNode private $namespace; private $element; - public function __construct(string $namespace = null, string $element = null) + public function __construct(?string $namespace = null, ?string $element = null) { $this->namespace = $namespace; $this->element = $element; diff --git a/src/Symfony/Component/CssSelector/Node/SelectorNode.php b/src/Symfony/Component/CssSelector/Node/SelectorNode.php index 6e52b2fa720cf..cdb0e462b6daa 100644 --- a/src/Symfony/Component/CssSelector/Node/SelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/SelectorNode.php @@ -26,7 +26,7 @@ class SelectorNode extends AbstractNode private $tree; private $pseudoElement; - public function __construct(NodeInterface $tree, string $pseudoElement = null) + public function __construct(NodeInterface $tree, ?string $pseudoElement = null) { $this->tree = $tree; $this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null; diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php index d73489edfb481..b0b6427f7121c 100644 --- a/src/Symfony/Component/CssSelector/Parser/Parser.php +++ b/src/Symfony/Component/CssSelector/Parser/Parser.php @@ -29,7 +29,7 @@ class Parser implements ParserInterface { private $tokenizer; - public function __construct(Tokenizer $tokenizer = null) + public function __construct(?Tokenizer $tokenizer = null) { $this->tokenizer = $tokenizer ?? new Tokenizer(); } diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php index 8ce4730360354..3d3ac7ac92b9a 100644 --- a/src/Symfony/Component/CssSelector/XPath/Translator.php +++ b/src/Symfony/Component/CssSelector/XPath/Translator.php @@ -48,7 +48,7 @@ class Translator implements TranslatorInterface private $pseudoClassTranslators = []; private $attributeMatchingTranslators = []; - public function __construct(ParserInterface $parser = null) + public function __construct(?ParserInterface $parser = null) { $this->mainParser = $parser ?? new Parser(); diff --git a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php index c2afe2cfa2920..be86e21ab7d75 100644 --- a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php +++ b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php @@ -28,7 +28,7 @@ final class BoundArgument implements ArgumentInterface private $type; private $file; - public function __construct($value, bool $trackUsage = true, int $type = 0, string $file = null) + public function __construct($value, bool $trackUsage = true, int $type = 0, ?string $file = null) { $this->value = $value; if ($trackUsage) { diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php index bc138fe239fd3..1aface4878cbb 100644 --- a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php +++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php @@ -24,7 +24,7 @@ class ServiceLocator extends BaseServiceLocator private $serviceMap; private $serviceTypes; - public function __construct(\Closure $factory, array $serviceMap, array $serviceTypes = null) + public function __construct(\Closure $factory, array $serviceMap, ?array $serviceTypes = null) { $this->factory = $factory; $this->serviceMap = $serviceMap; diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php index 1ba8de790b69e..cc6adc626d49a 100644 --- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php +++ b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php @@ -31,7 +31,7 @@ class TaggedIteratorArgument extends IteratorArgument * @param bool $needsIndexes Whether indexes are required and should be generated when computing the map * @param string|null $defaultPriorityMethod The static method that should be called to get each service's priority when their tag doesn't define the "priority" attribute */ - public function __construct(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, bool $needsIndexes = false, string $defaultPriorityMethod = null) + public function __construct(string $tag, ?string $indexAttribute = null, ?string $defaultIndexMethod = null, bool $needsIndexes = false, ?string $defaultPriorityMethod = null) { parent::__construct([]); diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AutoconfigureTag.php b/src/Symfony/Component/DependencyInjection/Attribute/AutoconfigureTag.php index ed5807ca02670..a83a6e975ef6c 100644 --- a/src/Symfony/Component/DependencyInjection/Attribute/AutoconfigureTag.php +++ b/src/Symfony/Component/DependencyInjection/Attribute/AutoconfigureTag.php @@ -19,7 +19,7 @@ #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)] class AutoconfigureTag extends Autoconfigure { - public function __construct(string $name = null, array $attributes = []) + public function __construct(?string $name = null, array $attributes = []) { parent::__construct( tags: [ diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php index 0e679d21826ed..ef392a512da7c 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @@ -595,7 +595,7 @@ private function populateAutowiringAlias(string $id): void } } - private function getCombinedAlias(string $type, string $name = null): ?string + private function getCombinedAlias(string $type, ?string $name = null): ?string { if (str_contains($type, '&')) { $types = explode('&', $type); diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php index 867a4a22412f2..2f5edde2df25b 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php @@ -164,7 +164,7 @@ private function checkTypeDeclarations(Definition $checkedDefinition, \Reflectio /** * @throws InvalidParameterTypeException When a parameter is not compatible with the declared type */ - private function checkType(Definition $checkedDefinition, $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, \ReflectionType $reflectionType = null): void + private function checkType(Definition $checkedDefinition, $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, ?\ReflectionType $reflectionType = null): void { $reflectionType = $reflectionType ?? $parameter->getType(); diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php index 2285f8ea5b784..b4528d67b90fe 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php @@ -32,7 +32,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass private $notInlinableIds = []; private $graph; - public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null) + public function __construct(?AnalyzeServiceReferencesPass $analyzingPass = null) { $this->analyzingPass = $analyzingPass; } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php index 9dc39314cb619..0a07be8213e65 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php @@ -153,7 +153,7 @@ class MergeExtensionConfigurationContainerBuilder extends ContainerBuilder { private $extensionClass; - public function __construct(ExtensionInterface $extension, ParameterBagInterface $parameterBag = null) + public function __construct(ExtensionInterface $extension, ?ParameterBagInterface $parameterBag = null) { parent::__construct($parameterBag); @@ -187,7 +187,7 @@ public function compile(bool $resolveEnvPlaceholders = false) /** * {@inheritdoc} */ - public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null) + public function resolveEnvPlaceholders($value, $format = null, ?array &$usedEnvs = null) { if (true !== $format || !\is_string($value)) { return parent::resolveEnvPlaceholders($value, $format, $usedEnvs); diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php index 44ef3a52e9046..f44622b166387 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php @@ -104,7 +104,7 @@ protected function processValue($value, bool $isRoot = false) /** * @param Reference[] $refMap */ - public static function register(ContainerBuilder $container, array $refMap, string $callerId = null): Reference + public static function register(ContainerBuilder $container, array $refMap, ?string $callerId = null): Reference { foreach ($refMap as $id => $ref) { if (!$ref instanceof Reference) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php index 1225514c24f21..e67f03610832e 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php @@ -74,7 +74,7 @@ public function clear() /** * Connects 2 nodes together in the Graph. */ - public function connect(?string $sourceId, $sourceValue, ?string $destId, $destValue = null, Reference $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false) + public function connect(?string $sourceId, $sourceValue, ?string $destId, $destValue = null, ?Reference $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false) { if (null === $sourceId || null === $destId) { return; diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index 6cb148e0ccd25..ced09e991ed0b 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -63,7 +63,7 @@ class Container implements ContainerInterface, ResetInterface private $compiled = false; private $getEnv; - public function __construct(ParameterBagInterface $parameterBag = null) + public function __construct(?ParameterBagInterface $parameterBag = null) { $this->parameterBag = $parameterBag ?? new EnvPlaceholderParameterBag(); } diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php index e7b9d575ece50..23bf8b762cb7a 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php +++ b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php @@ -21,5 +21,5 @@ interface ContainerAwareInterface /** * Sets the container. */ - public function setContainer(ContainerInterface $container = null); + public function setContainer(?ContainerInterface $container = null); } diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php index b0727b32f9ec3..f5a5d30fc1edc 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php +++ b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php @@ -23,7 +23,7 @@ trait ContainerAwareTrait */ protected $container; - public function setContainer(ContainerInterface $container = null) + public function setContainer(?ContainerInterface $container = null) { $this->container = $container; } diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index e51691006e7c2..a9e61ab88121d 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -163,7 +163,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface 'mixed' => true, ]; - public function __construct(ParameterBagInterface $parameterBag = null) + public function __construct(?ParameterBagInterface $parameterBag = null) { parent::__construct($parameterBag); @@ -440,7 +440,7 @@ public function fileExists(string $path, $trackContents = true): bool * @throws BadMethodCallException When this ContainerBuilder is compiled * @throws \LogicException if the extension is not registered */ - public function loadFromExtension(string $extension, array $values = null) + public function loadFromExtension(string $extension, ?array $values = null) { if ($this->isCompiled()) { throw new BadMethodCallException('Cannot load from an extension on a compiled container.'); @@ -553,7 +553,7 @@ public function get(string $id, int $invalidBehavior = ContainerInterface::EXCEP return $this->doGet($id, $invalidBehavior); } - private function doGet(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, array &$inlineServices = null, bool $isConstructorArgument = false) + private function doGet(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, ?array &$inlineServices = null, bool $isConstructorArgument = false) { if (isset($inlineServices[$id])) { return $inlineServices[$id]; @@ -900,7 +900,7 @@ public function getAlias(string $id) * * @return Definition */ - public function register(string $id, string $class = null) + public function register(string $id, ?string $class = null) { return $this->setDefinition($id, new Definition($class)); } @@ -913,7 +913,7 @@ public function register(string $id, string $class = null) * * @return Definition */ - public function autowire(string $id, string $class = null) + public function autowire(string $id, ?string $class = null) { return $this->setDefinition($id, (new Definition($class))->setAutowired(true)); } @@ -1037,7 +1037,7 @@ public function findDefinition(string $id) * @throws RuntimeException When the service is a synthetic service * @throws InvalidArgumentException When configure callable is not callable */ - private function createService(Definition $definition, array &$inlineServices, bool $isConstructorArgument = false, string $id = null, bool $tryProxy = true) + private function createService(Definition $definition, array &$inlineServices, bool $isConstructorArgument = false, ?string $id = null, bool $tryProxy = true) { if (null === $id && isset($inlineServices[$h = spl_object_hash($definition)])) { return $inlineServices[$h]; @@ -1353,7 +1353,7 @@ public function registerAttributeForAutoconfiguration(string $attributeClass, ca * "$fooBar"-named arguments with $type as type-hint. Such arguments will * receive the service $id when autowiring is used. */ - public function registerAliasForArgument(string $id, string $type, string $name = null): Alias + public function registerAliasForArgument(string $id, string $type, ?string $name = null): Alias { $name = (new Target($name ?? $id))->name; @@ -1393,7 +1393,7 @@ public function getAutoconfiguredAttributes(): array * * @return mixed The value with env parameters resolved if a string or an array is passed */ - public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null) + public function resolveEnvPlaceholders($value, $format = null, ?array &$usedEnvs = null) { if (null === $format) { $format = '%%env(%s)%%'; diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php index 7fc6752554f70..749dac415cd2c 100644 --- a/src/Symfony/Component/DependencyInjection/Definition.php +++ b/src/Symfony/Component/DependencyInjection/Definition.php @@ -61,7 +61,7 @@ class Definition */ public $decorationOnInvalid; - public function __construct(string $class = null, array $arguments = []) + public function __construct(?string $class = null, array $arguments = []) { if (null !== $class) { $this->setClass($class); @@ -135,7 +135,7 @@ public function getFactory() * * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals */ - public function setDecoratedService(?string $id, string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE) + public function setDecoratedService(?string $id, ?string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE) { if ($renamedId && $id === $renamedId) { throw new InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id)); diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 66bf26879b70e..ae27c374ac85c 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -1031,7 +1031,7 @@ private function addInlineReference(string $id, Definition $definition, string $ return $code; } - private function addInlineService(string $id, Definition $definition, Definition $inlineDef = null, bool $forConstructor = true): string + private function addInlineService(string $id, Definition $definition, ?Definition $inlineDef = null, bool $forConstructor = true): string { $code = ''; @@ -1088,7 +1088,7 @@ private function addInlineService(string $id, Definition $definition, Definition return $code; } - private function addServices(array &$services = null): string + private function addServices(?array &$services = null): string { $publicServices = $privateServices = ''; $definitions = $this->container->getDefinitions(); @@ -1130,7 +1130,7 @@ private function generateServiceFiles(array $services): iterable } } - private function addNewInstance(Definition $definition, string $return = '', string $id = null): string + private function addNewInstance(Definition $definition, string $return = '', ?string $id = null): string { $tail = $return ? ";\n" : ''; @@ -1704,7 +1704,7 @@ private function getServiceConditionals($value): string return implode(' && ', $conditions); } - private function getDefinitionsFromArguments(array $arguments, \SplObjectStorage $definitions = null, array &$calls = [], bool $byConstructor = null): \SplObjectStorage + private function getDefinitionsFromArguments(array $arguments, ?\SplObjectStorage $definitions = null, array &$calls = [], ?bool $byConstructor = null): \SplObjectStorage { if (null === $definitions) { $definitions = new \SplObjectStorage(); @@ -1935,7 +1935,7 @@ private function dumpParameter(string $name): string return sprintf('$this->parameters[%s]', $this->doExport($name)); } - private function getServiceCall(string $id, Reference $reference = null): string + private function getServiceCall(string $id, ?Reference $reference = null): string { while ($this->container->hasAlias($id)) { $id = (string) $this->container->getAlias($id); diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 823eb97b0e8ed..dbeb0db1e3521 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -317,7 +317,7 @@ private function dumpValue($value) return $value; } - private function getServiceCall(string $id, Reference $reference = null): string + private function getServiceCall(string $id, ?Reference $reference = null): string { if (null !== $reference) { switch ($reference->getInvalidBehavior()) { diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php index 818174b3970c7..a9f88128cc009 100644 --- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php +++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php @@ -27,7 +27,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface /** * @param EnvVarLoaderInterface[] $loaders */ - public function __construct(ContainerInterface $container, \Traversable $loaders = null) + public function __construct(ContainerInterface $container, ?\Traversable $loaders = null) { $this->container = $container; $this->loaders = $loaders ?? new \ArrayIterator(); @@ -253,15 +253,15 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv) } if ('url' === $prefix) { - $parsedEnv = parse_url($env); + $params = parse_url($env); - if (false === $parsedEnv) { + if (false === $params) { throw new RuntimeException(sprintf('Invalid URL in env var "%s".', $name)); } - if (!isset($parsedEnv['scheme'], $parsedEnv['host'])) { + if (!isset($params['scheme'], $params['host'])) { throw new RuntimeException(sprintf('Invalid URL env var "%s": schema and host expected, "%s" given.', $name, $env)); } - $parsedEnv += [ + $params += [ 'port' => null, 'user' => null, 'pass' => null, @@ -270,10 +270,13 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv) 'fragment' => null, ]; + $params['user'] = null !== $params['user'] ? rawurldecode($params['user']) : null; + $params['pass'] = null !== $params['pass'] ? rawurldecode($params['pass']) : null; + // remove the '/' separator - $parsedEnv['path'] = '/' === ($parsedEnv['path'] ?? '/') ? '' : substr($parsedEnv['path'], 1); + $params['path'] = '/' === ($params['path'] ?? '/') ? '' : substr($params['path'], 1); - return $parsedEnv; + return $params; } if ('query_string' === $prefix) { diff --git a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php index 0006f5621cbf2..f9c4ffa345a44 100644 --- a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php +++ b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php @@ -19,13 +19,11 @@ class AutowiringFailedException extends RuntimeException private $serviceId; private $messageCallback; - public function __construct(string $serviceId, $message = '', int $code = 0, \Throwable $previous = null) + public function __construct(string $serviceId, $message = '', int $code = 0, ?\Throwable $previous = null) { $this->serviceId = $serviceId; - if ($message instanceof \Closure - && (\function_exists('xdebug_is_enabled') ? xdebug_is_enabled() : \function_exists('xdebug_info')) - ) { + if ($message instanceof \Closure && \function_exists('xdebug_is_enabled') && xdebug_is_enabled()) { $message = $message(); } diff --git a/src/Symfony/Component/DependencyInjection/Exception/EnvParameterException.php b/src/Symfony/Component/DependencyInjection/Exception/EnvParameterException.php index 48b5e486ae71d..6cd53c9f738ba 100644 --- a/src/Symfony/Component/DependencyInjection/Exception/EnvParameterException.php +++ b/src/Symfony/Component/DependencyInjection/Exception/EnvParameterException.php @@ -18,7 +18,7 @@ */ class EnvParameterException extends InvalidArgumentException { - public function __construct(array $envs, \Throwable $previous = null, string $message = 'Incompatible use of dynamic environment variables "%s" found in parameters.') + public function __construct(array $envs, ?\Throwable $previous = null, string $message = 'Incompatible use of dynamic environment variables "%s" found in parameters.') { parent::__construct(sprintf($message, implode('", "', $envs)), 0, $previous); } diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php index 2450ccb5c797f..38438803e8ea7 100644 --- a/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php +++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php @@ -20,7 +20,7 @@ class ParameterCircularReferenceException extends RuntimeException { private $parameters; - public function __construct(array $parameters, \Throwable $previous = null) + public function __construct(array $parameters, ?\Throwable $previous = null) { parent::__construct(sprintf('Circular reference detected for parameter "%s" ("%s" > "%s").', $parameters[0], implode('" > "', $parameters), $parameters[0]), 0, $previous); diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php index 5d38310141d1b..77c5792ee9198 100644 --- a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php +++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php @@ -34,7 +34,7 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not * @param string[] $alternatives Some parameter name alternatives * @param string|null $nonNestedAlternative The alternative parameter name when the user expected dot notation for nested parameters */ - public function __construct(string $key, string $sourceId = null, string $sourceKey = null, \Throwable $previous = null, array $alternatives = [], string $nonNestedAlternative = null) + public function __construct(string $key, ?string $sourceId = null, ?string $sourceKey = null, ?\Throwable $previous = null, array $alternatives = [], ?string $nonNestedAlternative = null) { $this->key = $key; $this->sourceId = $sourceId; diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php index a38671bcf24bd..238471a1a5656 100644 --- a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php +++ b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php @@ -21,7 +21,7 @@ class ServiceCircularReferenceException extends RuntimeException private $serviceId; private $path; - public function __construct(string $serviceId, array $path, \Throwable $previous = null) + public function __construct(string $serviceId, array $path, ?\Throwable $previous = null) { parent::__construct(sprintf('Circular reference detected for service "%s", path: "%s".', $serviceId, implode(' -> ', $path)), 0, $previous); diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php index f91afae397d94..7cb46534dd9ec 100644 --- a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php +++ b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php @@ -24,7 +24,7 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo private $sourceId; private $alternatives; - public function __construct(string $id, string $sourceId = null, \Throwable $previous = null, array $alternatives = [], string $msg = null) + public function __construct(string $id, ?string $sourceId = null, ?\Throwable $previous = null, array $alternatives = [], ?string $msg = null) { if (null !== $msg) { // no-op diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php index 961c737e8d5c5..852797c23c74a 100644 --- a/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php +++ b/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php @@ -30,7 +30,7 @@ class ExpressionLanguage extends BaseExpressionLanguage /** * {@inheritdoc} */ - public function __construct(CacheItemPoolInterface $cache = null, array $providers = [], callable $serviceCompiler = null) + public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [], ?callable $serviceCompiler = null) { // prepend the default provider to let users override it easily array_unshift($providers, new ExpressionLanguageProvider($serviceCompiler)); diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php index 9198ca0a40a9a..a62d64e8d82ec 100644 --- a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php +++ b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php @@ -26,7 +26,7 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface { private $serviceCompiler; - public function __construct(callable $serviceCompiler = null) + public function __construct(?callable $serviceCompiler = null) { $this->serviceCompiler = $serviceCompiler; } diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php index f33011ad1d84f..eb9fd65467ad5 100644 --- a/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php +++ b/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php @@ -21,7 +21,7 @@ class ProxyHelper /** * @return string|null The FQCN or builtin name of the type hint, or null when the type hint references an invalid self|parent context */ - public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionParameter $p = null, bool $noBuiltin = false): ?string + public static function getTypeHint(\ReflectionFunctionAbstract $r, ?\ReflectionParameter $p = null, bool $noBuiltin = false): ?string { if ($p instanceof \ReflectionParameter) { $type = $p->getType(); diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php index fe2b91a2a49f9..966668873d4c9 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php @@ -25,7 +25,7 @@ class ClosureLoader extends Loader { private $container; - public function __construct(ContainerBuilder $container, string $env = null) + public function __construct(ContainerBuilder $container, ?string $env = null) { $this->container = $container; parent::__construct($env); @@ -34,7 +34,7 @@ public function __construct(ContainerBuilder $container, string $env = null) /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { return $resource($this->container, $this->env); } @@ -42,7 +42,7 @@ public function load($resource, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return $resource instanceof \Closure; } diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php index 96d6fd75a7764..178798ceae264 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php @@ -20,7 +20,7 @@ abstract class AbstractServiceConfigurator extends AbstractConfigurator protected $id; private $defaultTags = []; - public function __construct(ServicesConfigurator $parent, Definition $definition, string $id = null, array $defaultTags = []) + public function __construct(ServicesConfigurator $parent, Definition $definition, ?string $id = null, array $defaultTags = []) { $this->parent = $parent; $this->definition = $definition; @@ -42,7 +42,7 @@ public function __destruct() /** * Registers a service. */ - final public function set(?string $id, string $class = null): ServiceConfigurator + final public function set(?string $id, ?string $class = null): ServiceConfigurator { $this->__destruct(); @@ -106,7 +106,7 @@ final public function stack(string $id, array $services): AliasConfigurator /** * Registers a service. */ - final public function __invoke(string $id, string $class = null): ServiceConfigurator + final public function __invoke(string $id, ?string $class = null): ServiceConfigurator { $this->__destruct(); diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php index ac6fdb6d0030e..0efd54111df8c 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php @@ -38,7 +38,7 @@ class ContainerConfigurator extends AbstractConfigurator private $anonymousCount = 0; private $env; - public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path, string $file, string $env = null) + public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path, string $file, ?string $env = null) { $this->container = $container; $this->loader = $loader; @@ -58,7 +58,7 @@ final public function extension(string $namespace, array $config) $this->container->loadFromExtension($namespace, static::processValue($config)); } - final public function import(string $resource, string $type = null, $ignoreErrors = false) + final public function import(string $resource, ?string $type = null, $ignoreErrors = false) { $this->loader->setCurrentDir(\dirname($this->path)); $this->loader->import($resource, $type, $ignoreErrors, $this->file); @@ -128,7 +128,7 @@ function service(string $serviceId): ReferenceConfigurator * * @deprecated since Symfony 5.1, use inline_service() instead. */ -function inline(string $class = null): InlineServiceConfigurator +function inline(?string $class = null): InlineServiceConfigurator { trigger_deprecation('symfony/dependency-injection', '5.1', '"%s()" is deprecated, use "inline_service()" instead.', __FUNCTION__); @@ -138,7 +138,7 @@ function inline(string $class = null): InlineServiceConfigurator /** * Creates an inline service. */ -function inline_service(string $class = null): InlineServiceConfigurator +function inline_service(?string $class = null): InlineServiceConfigurator { return new InlineServiceConfigurator(new Definition($class)); } @@ -166,7 +166,7 @@ function iterator(array $values): IteratorArgument /** * Creates a lazy iterator by tag name. */ -function tagged_iterator(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, string $defaultPriorityMethod = null): TaggedIteratorArgument +function tagged_iterator(string $tag, ?string $indexAttribute = null, ?string $defaultIndexMethod = null, ?string $defaultPriorityMethod = null): TaggedIteratorArgument { return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, false, $defaultPriorityMethod); } @@ -174,7 +174,7 @@ function tagged_iterator(string $tag, string $indexAttribute = null, string $def /** * Creates a service locator by tag name. */ -function tagged_locator(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, string $defaultPriorityMethod = null): ServiceLocatorArgument +function tagged_locator(string $tag, ?string $indexAttribute = null, ?string $defaultIndexMethod = null, ?string $defaultPriorityMethod = null): ServiceLocatorArgument { return new ServiceLocatorArgument(new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, true, $defaultPriorityMethod)); } diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php index e0b42750d55c3..db0e1c47e4386 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php @@ -28,7 +28,7 @@ class DefaultsConfigurator extends AbstractServiceConfigurator private $path; - public function __construct(ServicesConfigurator $parent, Definition $definition, string $path = null) + public function __construct(ServicesConfigurator $parent, Definition $definition, ?string $path = null) { parent::__construct($parent, $definition, null, []); diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php index fbba62304d28e..2f472db6559ab 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php @@ -32,7 +32,7 @@ class InstanceofConfigurator extends AbstractServiceConfigurator private $path; - public function __construct(ServicesConfigurator $parent, Definition $definition, string $id, string $path = null) + public function __construct(ServicesConfigurator $parent, Definition $definition, string $id, ?string $path = null) { parent::__construct($parent, $definition, $id, []); diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php index 932ecd35153d5..92a92a760e653 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php @@ -47,7 +47,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator private $path; private $destructed = false; - public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, ?string $id, array $defaultTags, string $path = null) + public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, ?string $id, array $defaultTags, ?string $path = null) { $this->container = $container; $this->instanceof = $instanceof; diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php index 388251e26a374..d18aad120f802 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php @@ -34,7 +34,7 @@ class ServicesConfigurator extends AbstractConfigurator private $anonymousHash; private $anonymousCount; - public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path = null, int &$anonymousCount = 0) + public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, ?string $path = null, int &$anonymousCount = 0) { $this->defaults = new Definition(); $this->container = $container; @@ -70,7 +70,7 @@ final public function instanceof(string $fqcn): InstanceofConfigurator * @param string|null $id The service id, or null to create an anonymous service * @param string|null $class The class of the service, or null when $id is also the class name */ - final public function set(?string $id, string $class = null): ServiceConfigurator + final public function set(?string $id, ?string $class = null): ServiceConfigurator { $defaults = $this->defaults; $definition = new Definition(); @@ -180,7 +180,7 @@ final public function stack(string $id, array $services): AliasConfigurator /** * Registers a service. */ - final public function __invoke(string $id, string $class = null): ServiceConfigurator + final public function __invoke(string $id, ?string $class = null): ServiceConfigurator { return $this->set($id, $class); } diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php index b3a1ae1b54793..2209056ad44c4 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php @@ -25,7 +25,7 @@ trait DecorateTrait * * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals */ - final public function decorate(?string $id, string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): self + final public function decorate(?string $id, ?string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): self { $this->definition->setDecoratedService($id, $renamedId, $priority, $invalidBehavior); diff --git a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php index b4e9a5917c972..aed79ff43d232 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php @@ -21,7 +21,7 @@ class DirectoryLoader extends FileLoader /** * {@inheritdoc} */ - public function load($file, string $type = null) + public function load($file, ?string $type = null) { $file = rtrim($file, '/'); $path = $this->locator->locate($file); @@ -45,7 +45,7 @@ public function load($file, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { if ('directory' === $type) { return true; diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php index f5f78e30f0096..a63dbe1330d20 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -40,7 +40,7 @@ abstract class FileLoader extends BaseFileLoader protected $singlyImplemented = []; protected $autoRegisterAliasesForSinglyImplementedInterfaces = true; - public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null) + public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, ?string $env = null) { $this->container = $container; @@ -52,7 +52,7 @@ public function __construct(ContainerBuilder $container, FileLocatorInterface $l * * @param bool|string $ignoreErrors Whether errors should be ignored; pass "not_found" to ignore only when the loaded resource is not found */ - public function import($resource, string $type = null, $ignoreErrors = false, string $sourceResource = null, $exclude = null) + public function import($resource, ?string $type = null, $ignoreErrors = false, ?string $sourceResource = null, $exclude = null) { $args = \func_get_args(); diff --git a/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php index e38aaf43bedab..5378dfcf992a4 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php @@ -21,7 +21,7 @@ class GlobFileLoader extends FileLoader /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { foreach ($this->glob($resource, false, $globResource) as $path => $info) { $this->import($path); @@ -35,7 +35,7 @@ public function load($resource, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return 'glob' === $type; } diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php index d88d7a6307b86..4f0c35b5465d1 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php @@ -24,7 +24,7 @@ class IniFileLoader extends FileLoader /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { $path = $this->locator->locate($resource); @@ -57,7 +57,7 @@ public function load($resource, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { if (!\is_string($resource)) { return false; diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php index 3815b28f00fba..245592c936652 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php @@ -36,7 +36,7 @@ class PhpFileLoader extends FileLoader protected $autoRegisterAliasesForSinglyImplementedInterfaces = false; private $generator; - public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ConfigBuilderGeneratorInterface $generator = null) + public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, ?string $env = null, ?ConfigBuilderGeneratorInterface $generator = null) { parent::__construct($container, $locator, $env); $this->generator = $generator; @@ -45,7 +45,7 @@ public function __construct(ContainerBuilder $container, FileLocatorInterface $l /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { // the container and loader variables are exposed to the included file below $container = $this->container; @@ -77,7 +77,7 @@ public function load($resource, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { if (!\is_string($resource)) { return false; diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 73b0f0deb37d2..7d52958809f62 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -43,7 +43,7 @@ class XmlFileLoader extends FileLoader /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { $path = $this->locator->locate($resource); @@ -70,7 +70,7 @@ public function load($resource, string $type = null) return null; } - private function loadXml(\DOMDocument $xml, string $path, \DOMNode $root = null): void + private function loadXml(\DOMDocument $xml, string $path, ?\DOMNode $root = null): void { $defaults = $this->getServiceDefaults($xml, $path, $root); @@ -98,7 +98,7 @@ private function loadXml(\DOMDocument $xml, string $path, \DOMNode $root = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { if (!\is_string($resource)) { return false; @@ -111,14 +111,14 @@ public function supports($resource, string $type = null) return 'xml' === $type; } - private function parseParameters(\DOMDocument $xml, string $file, \DOMNode $root = null) + private function parseParameters(\DOMDocument $xml, string $file, ?\DOMNode $root = null) { if ($parameters = $this->getChildren($root ?? $xml->documentElement, 'parameters')) { $this->container->getParameterBag()->add($this->getArgumentsAsPhp($parameters[0], 'parameter', $file)); } } - private function parseImports(\DOMDocument $xml, string $file, \DOMNode $root = null) + private function parseImports(\DOMDocument $xml, string $file, ?\DOMNode $root = null) { $xpath = new \DOMXPath($xml); $xpath->registerNamespace('container', self::NS); @@ -134,7 +134,7 @@ private function parseImports(\DOMDocument $xml, string $file, \DOMNode $root = } } - private function parseDefinitions(\DOMDocument $xml, string $file, Definition $defaults, \DOMNode $root = null) + private function parseDefinitions(\DOMDocument $xml, string $file, Definition $defaults, ?\DOMNode $root = null) { $xpath = new \DOMXPath($xml); $xpath->registerNamespace('container', self::NS); @@ -192,7 +192,7 @@ private function parseDefinitions(\DOMDocument $xml, string $file, Definition $d } } - private function getServiceDefaults(\DOMDocument $xml, string $file, \DOMNode $root = null): Definition + private function getServiceDefaults(\DOMDocument $xml, string $file, ?\DOMNode $root = null): Definition { $xpath = new \DOMXPath($xml); $xpath->registerNamespace('container', self::NS); @@ -415,7 +415,7 @@ private function parseFileToDOM(string $file): \DOMDocument /** * Processes anonymous services. */ - private function processAnonymousServices(\DOMDocument $xml, string $file, \DOMNode $root = null) + private function processAnonymousServices(\DOMDocument $xml, string $file, ?\DOMNode $root = null) { $definitions = []; $count = 0; diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index 2d9137cb5e40f..66e1cd84db52c 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -116,7 +116,7 @@ class YamlFileLoader extends FileLoader /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { $path = $this->locator->locate($resource); @@ -183,7 +183,7 @@ private function loadContent(array $content, string $path) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { if (!\is_string($resource)) { return false; diff --git a/src/Symfony/Component/DependencyInjection/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/ServiceLocator.php index 4be0d6f721f82..36eac64f03d65 100644 --- a/src/Symfony/Component/DependencyInjection/ServiceLocator.php +++ b/src/Symfony/Component/DependencyInjection/ServiceLocator.php @@ -134,7 +134,7 @@ private function createCircularReferenceException(string $id, array $path): Cont return new ServiceCircularReferenceException($id, $path); } - private function formatAlternatives(array $alternatives = null, string $separator = 'and'): string + private function formatAlternatives(?array $alternatives = null, string $separator = 'and'): string { $format = '"%s"%s'; if (null === $alternatives) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php index fae8772193b32..66c04d09aea98 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php @@ -239,7 +239,7 @@ public function testAliasDecoratedService() /** * @dataProvider getYamlCompileTests */ - public function testYamlContainerCompiles($directory, $actualServiceId, $expectedServiceId, ContainerBuilder $mainContainer = null) + public function testYamlContainerCompiles($directory, $actualServiceId, $expectedServiceId, ?ContainerBuilder $mainContainer = null) { // allow a container to be passed in, which might have autoconfigure settings $container = $mainContainer ?? new ContainerBuilder(); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php index 50828a47b4bb3..a0eb24d223945 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php @@ -365,7 +365,7 @@ class EnvExtension extends Extension private $configuration; private $config; - public function __construct(ConfigurationInterface $configuration = null) + public function __construct(?ConfigurationInterface $configuration = null) { $this->configuration = $configuration ?? new EnvConfiguration(); } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php index 02e34fc13e376..5dbaadcb17d64 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php @@ -299,12 +299,12 @@ class TestFileLoader extends FileLoader { public $autoRegisterAliasesForSinglyImplementedInterfaces = true; - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { return $resource; } - public function supports($resource, string $type = null): bool + public function supports($resource, ?string $type = null): bool { return false; } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php index 2f45c844c568e..1ae959b5cecfd 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php @@ -38,7 +38,7 @@ public function testLoadAddsTheGlobResourceToTheContainer() class GlobFileLoaderWithoutImport extends GlobFileLoader { - public function import($resource, string $type = null, $ignoreErrors = false, string $sourceResource = null, $exclude = null) + public function import($resource, ?string $type = null, $ignoreErrors = false, ?string $sourceResource = null, $exclude = null) { return null; } diff --git a/src/Symfony/Component/DependencyInjection/TypedReference.php b/src/Symfony/Component/DependencyInjection/TypedReference.php index 4099a0059b133..d31a00388be3e 100644 --- a/src/Symfony/Component/DependencyInjection/TypedReference.php +++ b/src/Symfony/Component/DependencyInjection/TypedReference.php @@ -27,7 +27,7 @@ class TypedReference extends Reference * @param int $invalidBehavior The behavior when the service does not exist * @param string|null $name The name of the argument targeting the service */ - public function __construct(string $id, string $type, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, string $name = null) + public function __construct(string $id, string $type, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, ?string $name = null) { $this->name = $type === $id ? $name : null; parent::__construct($id, $invalidBehavior); diff --git a/src/Symfony/Component/DomCrawler/AbstractUriElement.php b/src/Symfony/Component/DomCrawler/AbstractUriElement.php index 8ff0b992ac7d1..f4b0e0661bc78 100644 --- a/src/Symfony/Component/DomCrawler/AbstractUriElement.php +++ b/src/Symfony/Component/DomCrawler/AbstractUriElement.php @@ -40,7 +40,7 @@ abstract class AbstractUriElement * * @throws \InvalidArgumentException if the node is not a link */ - public function __construct(\DOMElement $node, string $currentUri = null, ?string $method = 'GET') + public function __construct(\DOMElement $node, ?string $currentUri = null, ?string $method = 'GET') { $this->setNode($node); $this->method = $method ? strtoupper($method) : null; diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index 08baced5e9b88..a6c214add0964 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -81,7 +81,7 @@ class Crawler implements \Countable, \IteratorAggregate /** * @param \DOMNodeList|\DOMNode|\DOMNode[]|string|null $node A Node to use as the base for the crawling */ - public function __construct($node = null, string $uri = null, string $baseHref = null) + public function __construct($node = null, ?string $uri = null, ?string $baseHref = null) { $this->uri = $uri; $this->baseHref = $baseHref ?: $uri; @@ -153,7 +153,7 @@ public function add($node) * or ISO-8859-1 as a fallback, which is the default charset defined by the * HTTP 1.1 specification. */ - public function addContent(string $content, string $type = null) + public function addContent(string $content, ?string $type = null) { if (empty($type)) { $type = str_starts_with($content, 'createSubCrawler(\array_slice($this->nodes, $offset, $length)); } @@ -546,7 +546,7 @@ public function ancestors() * @throws \InvalidArgumentException When current node is empty * @throws \RuntimeException If the CssSelector Component is not available and $selector is provided */ - public function children(string $selector = null) + public function children(?string $selector = null) { if (!$this->nodes) { throw new \InvalidArgumentException('The current node list is empty.'); @@ -610,7 +610,7 @@ public function nodeName() * * @throws \InvalidArgumentException When current node is empty */ - public function text(string $default = null, bool $normalizeWhitespace = true) + public function text(?string $default = null, bool $normalizeWhitespace = true) { if (!$this->nodes) { if (null !== $default) { @@ -646,7 +646,7 @@ public function innerText(): string * * @throws \InvalidArgumentException When current node is empty */ - public function html(string $default = null) + public function html(?string $default = null) { if (!$this->nodes) { if (null !== $default) { @@ -915,7 +915,7 @@ public function images() * * @throws \InvalidArgumentException If the current node list is empty or the selected node is not instance of DOMElement */ - public function form(array $values = null, string $method = null) + public function form(?array $values = null, ?string $method = null) { if (!$this->nodes) { throw new \InvalidArgumentException('The current node list is empty.'); diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index ebad35b3827fc..3b03b58694928 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -44,7 +44,7 @@ class Form extends Link implements \ArrayAccess * * @throws \LogicException if the node is not a button inside a form tag */ - public function __construct(\DOMElement $node, string $currentUri = null, string $method = null, string $baseHref = null) + public function __construct(\DOMElement $node, ?string $currentUri = null, ?string $method = null, ?string $baseHref = null) { parent::__construct($node, $currentUri, $method); $this->baseHref = $baseHref; diff --git a/src/Symfony/Component/DomCrawler/Image.php b/src/Symfony/Component/DomCrawler/Image.php index b1ac5ca2ccb42..fb3a579369854 100644 --- a/src/Symfony/Component/DomCrawler/Image.php +++ b/src/Symfony/Component/DomCrawler/Image.php @@ -16,7 +16,7 @@ */ class Image extends AbstractUriElement { - public function __construct(\DOMElement $node, string $currentUri = null) + public function __construct(\DOMElement $node, ?string $currentUri = null) { parent::__construct($node, $currentUri, 'GET'); } diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php index 55178ca0e4538..831c2f060b012 100644 --- a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php +++ b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php @@ -24,7 +24,7 @@ abstract class AbstractCrawlerTestCase extends TestCase abstract public static function getDoctype(): string; - protected function createCrawler($node = null, string $uri = null, string $baseHref = null) + protected function createCrawler($node = null, ?string $uri = null, ?string $baseHref = null) { return new Crawler($node, $uri, $baseHref); } diff --git a/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php b/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php index 44110543f93d3..5b3b84e7a4d05 100644 --- a/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php +++ b/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php @@ -33,7 +33,7 @@ final class DotenvDumpCommand extends Command private $projectDir; private $defaultEnv; - public function __construct(string $projectDir, string $defaultEnv = null) + public function __construct(string $projectDir, ?string $defaultEnv = null) { $this->projectDir = $projectDir; $this->defaultEnv = $defaultEnv; diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php index 685df57d736f8..b454452608fe0 100644 --- a/src/Symfony/Component/Dotenv/Dotenv.php +++ b/src/Symfony/Component/Dotenv/Dotenv.php @@ -107,7 +107,7 @@ public function load(string $path, string ...$extraPaths): void * @throws FormatException when a file has a syntax error * @throws PathException when a file does not exist or is not readable */ - public function loadEnv(string $path, string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void + public function loadEnv(string $path, ?string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void { $k = $envKey ?? $this->envKey; diff --git a/src/Symfony/Component/Dotenv/Exception/FormatException.php b/src/Symfony/Component/Dotenv/Exception/FormatException.php index 3ac77e592d6a1..358fbaab01a46 100644 --- a/src/Symfony/Component/Dotenv/Exception/FormatException.php +++ b/src/Symfony/Component/Dotenv/Exception/FormatException.php @@ -20,7 +20,7 @@ final class FormatException extends \LogicException implements ExceptionInterfac { private $context; - public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Throwable $previous = null) + public function __construct(string $message, FormatExceptionContext $context, int $code = 0, ?\Throwable $previous = null) { $this->context = $context; diff --git a/src/Symfony/Component/Dotenv/Exception/PathException.php b/src/Symfony/Component/Dotenv/Exception/PathException.php index 4a4d71722223d..e432b2e33a8bf 100644 --- a/src/Symfony/Component/Dotenv/Exception/PathException.php +++ b/src/Symfony/Component/Dotenv/Exception/PathException.php @@ -18,7 +18,7 @@ */ final class PathException extends \RuntimeException implements ExceptionInterface { - public function __construct(string $path, int $code = 0, \Throwable $previous = null) + public function __construct(string $path, int $code = 0, ?\Throwable $previous = null) { parent::__construct(sprintf('Unable to read the "%s" environment file.', $path), $code, $previous); } diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php index 844dbd6d23e85..d5e81052ce6f3 100644 --- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php +++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php @@ -301,7 +301,7 @@ public function loadClass(string $class): void $this->checkClass($class, $file); } - private function checkClass(string $class, string $file = null): void + private function checkClass(string $class, ?string $file = null): void { $exists = null === $file || class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false); @@ -763,7 +763,7 @@ private function getOwnInterfaces(string $class, ?string $parent): array return $ownInterfaces; } - private function setReturnType(string $types, string $class, string $method, string $filename, ?string $parent, \ReflectionType $returnType = null): void + private function setReturnType(string $types, string $class, string $method, string $filename, ?string $parent, ?\ReflectionType $returnType = null): void { if ('__construct' === $method) { return; diff --git a/src/Symfony/Component/ErrorHandler/Error/FatalError.php b/src/Symfony/Component/ErrorHandler/Error/FatalError.php index 57fc690e26d6c..73fa3aaa0e6b8 100644 --- a/src/Symfony/Component/ErrorHandler/Error/FatalError.php +++ b/src/Symfony/Component/ErrorHandler/Error/FatalError.php @@ -20,7 +20,7 @@ class FatalError extends \Error * * @param array $error An array as returned by error_get_last() */ - public function __construct(string $message, int $code, array $error, int $traceOffset = null, bool $traceArgs = true, array $trace = null) + public function __construct(string $message, int $code, array $error, ?int $traceOffset = null, bool $traceArgs = true, ?array $trace = null) { parent::__construct($message, $code); diff --git a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php index f85d275151a52..4e1ae8e86a83f 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php @@ -21,9 +21,6 @@ */ class ClassNotFoundErrorEnhancer implements ErrorEnhancerInterface { - /** - * {@inheritdoc} - */ public function enhance(\Throwable $error): ?\Throwable { // Some specific versions of PHP produce a fatal error when extending a not found class. @@ -110,7 +107,8 @@ private function getClassCandidates(string $class): array private function findClassInPath(string $path, string $class, string $prefix): array { - if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) { + $path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path); + if (!$path || !is_dir($path)) { return []; } diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php index 003040242f39c..d7b90439a5a5c 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php +++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php @@ -108,7 +108,7 @@ class ErrorHandler /** * Registers the error handler. */ - public static function register(self $handler = null, bool $replace = true): self + public static function register(?self $handler = null, bool $replace = true): self { if (null === self::$reservedMemory) { self::$reservedMemory = str_repeat('x', 32768); @@ -181,7 +181,7 @@ public static function call(callable $function, ...$arguments) } } - public function __construct(BufferingLogger $bootstrappingLogger = null, bool $debug = false) + public function __construct(?BufferingLogger $bootstrappingLogger = null, bool $debug = false) { if ($bootstrappingLogger) { $this->bootstrappingLogger = $bootstrappingLogger; @@ -633,7 +633,7 @@ public function handleException(\Throwable $exception) * * @internal */ - public static function handleFatalError(array $error = null): void + public static function handleFatalError(?array $error = null): void { if (null === self::$reservedMemory) { return; diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php index 92434b8e94506..80b65ad8b3501 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php @@ -47,7 +47,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface * @param string|FileLinkFormatter|null $fileLinkFormat * @param bool|callable $outputBuffer The output buffer as a string or a callable that should return it */ - public function __construct($debug = false, string $charset = null, $fileLinkFormat = null, string $projectDir = null, $outputBuffer = '', LoggerInterface $logger = null) + 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__, \gettype($debug))); @@ -173,6 +173,8 @@ private function formatArgs(array $args): string $formattedValue = ''.strtolower(var_export($item[1], true)).''; } elseif ('resource' === $item[0]) { $formattedValue = 'resource'; + } elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) { + $formattedValue = 'binary string'; } else { $formattedValue = str_replace("\n", '', $this->escape(var_export($item[1], true))); } @@ -233,7 +235,7 @@ private function getFileLink(string $file, int $line) * @param int $line The line number * @param string $text Use this text for the link rather than the file path */ - private function formatFile(string $file, int $line, string $text = null): string + private function formatFile(string $file, int $line, ?string $text = null): string { $file = trim($file); diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php index 4d1e752dc1ffe..e6c4c898e19df 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php @@ -34,7 +34,7 @@ class SerializerErrorRenderer implements ErrorRendererInterface * formats not supported by Request::getMimeTypes() should be given as mime types * @param bool|callable $debug The debugging mode as a boolean or a callable that should return it */ - public function __construct(SerializerInterface $serializer, $format, ErrorRendererInterface $fallbackErrorRenderer = null, $debug = false) + 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__, \gettype($format))); diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php index 262dae62bcbf0..f73842ad8f721 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php @@ -63,7 +63,7 @@ class FlattenException /** * @return static */ - public static function create(\Exception $exception, int $statusCode = null, array $headers = []): self + public static function create(\Exception $exception, ?int $statusCode = null, array $headers = []): self { return static::createFromThrowable($exception, $statusCode, $headers); } @@ -71,7 +71,7 @@ public static function create(\Exception $exception, int $statusCode = null, arr /** * @return static */ - public static function createFromThrowable(\Throwable $exception, int $statusCode = null, array $headers = []): self + public static function createFromThrowable(\Throwable $exception, ?int $statusCode = null, array $headers = []): self { $e = new static(); $e->setMessage($exception->getMessage()); diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php index 6680b95a0cc3d..1ae12d5e74dc2 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php @@ -54,4 +54,45 @@ public static function getRenderData(): iterable $expectedNonDebug, ]; } + + public function testRendersStackWithoutBinaryStrings() + { + if (\PHP_VERSION_ID >= 70400) { + // make sure method arguments are available in stack traces (see https://www.php.net/manual/en/ini.core.php) + ini_set('zend.exception_ignore_args', false); + } + + $binaryData = file_get_contents(__DIR__.'/../Fixtures/pixel.png'); + $exception = $this->getRuntimeException($binaryData); + + $rendered = (new HtmlErrorRenderer(true))->render($exception)->getAsString(); + + $this->assertStringContainsString( + "buildRuntimeException('FooException')", + $rendered, + '->render() contains the method call with "FooException"' + ); + + $this->assertStringContainsString( + 'getRuntimeException(binary string)', + $rendered, + '->render() contains the method call with "binary string" replacement' + ); + + $this->assertStringContainsString( + 'binary string', + $rendered, + '->render() returns the HTML content with "binary string" replacement' + ); + } + + private function getRuntimeException(string $unusedArgument): \RuntimeException + { + return $this->buildRuntimeException('FooException'); + } + + private function buildRuntimeException(string $message): \RuntimeException + { + return new \RuntimeException($message); + } } diff --git a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/pixel.png b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/pixel.png new file mode 100644 index 0000000000000..35269f61fcde4 Binary files /dev/null and b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/pixel.png differ diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php index acfbf619c4f97..84d6a08a14a5b 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php @@ -42,7 +42,7 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa private $requestStack; private $currentRequestHash = ''; - public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null) + public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, ?LoggerInterface $logger = null, ?RequestStack $requestStack = null) { $this->dispatcher = $dispatcher; $this->stopwatch = $stopwatch; @@ -97,7 +97,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber) /** * {@inheritdoc} */ - public function getListeners(string $eventName = null) + public function getListeners(?string $eventName = null) { return $this->dispatcher->getListeners($eventName); } @@ -123,7 +123,7 @@ public function getListenerPriority(string $eventName, $listener) /** * {@inheritdoc} */ - public function hasListeners(string $eventName = null) + public function hasListeners(?string $eventName = null) { return $this->dispatcher->hasListeners($eventName); } @@ -131,7 +131,7 @@ public function hasListeners(string $eventName = null) /** * {@inheritdoc} */ - public function dispatch(object $event, string $eventName = null): object + public function dispatch(object $event, ?string $eventName = null): object { $eventName = $eventName ?? \get_class($event); @@ -171,7 +171,7 @@ public function dispatch(object $event, string $eventName = null): object /** * @return array */ - public function getCalledListeners(Request $request = null) + public function getCalledListeners(?Request $request = null) { if (null === $this->callStack) { return []; @@ -192,7 +192,7 @@ public function getCalledListeners(Request $request = null) /** * @return array */ - public function getNotCalledListeners(Request $request = null) + public function getNotCalledListeners(?Request $request = null) { try { $allListeners = $this->getListeners(); @@ -235,7 +235,7 @@ public function getNotCalledListeners(Request $request = null) return $notCalled; } - public function getOrphanedEvents(Request $request = null): array + public function getOrphanedEvents(?Request $request = null): array { if ($request) { return $this->orphanedEvents[spl_object_hash($request)] ?? []; diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php index 3c4cc13352c4c..80d49a168b701 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php +++ b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php @@ -33,7 +33,7 @@ final class WrappedListener private $priority; private static $hasClassStub; - public function __construct($listener, ?string $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null) + public function __construct($listener, ?string $name, Stopwatch $stopwatch, ?EventDispatcherInterface $dispatcher = null) { $this->listener = $listener; $this->optimizedListener = $listener instanceof \Closure ? $listener : (\is_callable($listener) ? \Closure::fromCallable($listener) : null); diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php index 8fe8fb5c299af..9c86bd95c76ad 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php @@ -45,7 +45,7 @@ public function __construct() /** * {@inheritdoc} */ - public function dispatch(object $event, string $eventName = null): object + public function dispatch(object $event, ?string $eventName = null): object { $eventName = $eventName ?? \get_class($event); @@ -65,7 +65,7 @@ public function dispatch(object $event, string $eventName = null): object /** * {@inheritdoc} */ - public function getListeners(string $eventName = null) + public function getListeners(?string $eventName = null) { if (null !== $eventName) { if (empty($this->listeners[$eventName])) { @@ -120,7 +120,7 @@ public function getListenerPriority(string $eventName, $listener) /** * {@inheritdoc} */ - public function hasListeners(string $eventName = null) + public function hasListeners(?string $eventName = null) { if (null !== $eventName) { return !empty($this->listeners[$eventName]); diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php index cc324e1c6160c..4b65e5a66a916 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php @@ -50,7 +50,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber); * * @return array */ - public function getListeners(string $eventName = null); + public function getListeners(?string $eventName = null); /** * Gets the listener priority for a specific event. @@ -66,5 +66,5 @@ public function getListenerPriority(string $eventName, callable $listener); * * @return bool */ - public function hasListeners(string $eventName = null); + public function hasListeners(?string $eventName = null); } diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php index 568d79c3a2916..4e00bfa455fc3 100644 --- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php @@ -28,7 +28,7 @@ public function __construct(EventDispatcherInterface $dispatcher) /** * {@inheritdoc} */ - public function dispatch(object $event, string $eventName = null): object + public function dispatch(object $event, ?string $eventName = null): object { return $this->dispatcher->dispatch($event, $eventName); } @@ -68,7 +68,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber) /** * {@inheritdoc} */ - public function getListeners(string $eventName = null) + public function getListeners(?string $eventName = null) { return $this->dispatcher->getListeners($eventName); } @@ -84,7 +84,7 @@ public function getListenerPriority(string $eventName, $listener) /** * {@inheritdoc} */ - public function hasListeners(string $eventName = null) + public function hasListeners(?string $eventName = null) { return $this->dispatcher->hasListeners($eventName); } diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php index 2bc17b4403ddf..de841fd517602 100644 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php @@ -81,7 +81,7 @@ public function getEvaluator() * @throws \InvalidArgumentException if given PHP function name is in namespace * and expression function name is not defined */ - public static function fromPhp(string $phpFunctionName, string $expressionFunctionName = null) + public static function fromPhp(string $phpFunctionName, ?string $expressionFunctionName = null) { $phpFunctionName = ltrim($phpFunctionName, '\\'); if (!\function_exists($phpFunctionName)) { diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php index 001f49d36262c..69ea781f6afdf 100644 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php @@ -34,7 +34,7 @@ class ExpressionLanguage /** * @param ExpressionFunctionProviderInterface[] $providers */ - public function __construct(CacheItemPoolInterface $cache = null, array $providers = []) + public function __construct(?CacheItemPoolInterface $cache = null, array $providers = []) { $this->cache = $cache ?? new ArrayAdapter(); $this->registerFunctions(); diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php index a8d68f924241a..b347d20f8462c 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php @@ -27,7 +27,7 @@ public function __construct() $this->index = -1; } - public function addElement(Node $value, Node $key = null) + public function addElement(Node $value, ?Node $key = null) { if (null === $key) { $key = new ConstantNode(++$this->index); diff --git a/src/Symfony/Component/ExpressionLanguage/SyntaxError.php b/src/Symfony/Component/ExpressionLanguage/SyntaxError.php index 0bfd7e9977727..e165dc22a0d72 100644 --- a/src/Symfony/Component/ExpressionLanguage/SyntaxError.php +++ b/src/Symfony/Component/ExpressionLanguage/SyntaxError.php @@ -13,7 +13,7 @@ class SyntaxError extends \LogicException { - public function __construct(string $message, int $cursor = 0, string $expression = '', string $subject = null, array $proposals = null) + public function __construct(string $message, int $cursor = 0, string $expression = '', ?string $subject = null, ?array $proposals = null) { $message = sprintf('%s around position %d', rtrim($message, '.'), $cursor); if ($expression) { diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php index d98091adea460..7c02289c0d950 100644 --- a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php +++ b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php @@ -243,7 +243,7 @@ public function testNameProposal() /** * @dataProvider getLintData */ - public function testLint($expression, $names, string $exception = null) + public function testLint($expression, $names, ?string $exception = null) { if ($exception) { $this->expectException(SyntaxError::class); diff --git a/src/Symfony/Component/ExpressionLanguage/Token.php b/src/Symfony/Component/ExpressionLanguage/Token.php index 3df869f07147b..e2e1a5c7dd9e4 100644 --- a/src/Symfony/Component/ExpressionLanguage/Token.php +++ b/src/Symfony/Component/ExpressionLanguage/Token.php @@ -56,7 +56,7 @@ public function __toString() * * @return bool */ - public function test(string $type, string $value = null) + public function test(string $type, ?string $value = null) { return $this->type === $type && (null === $value || $this->value == $value); } diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php index 130513bbf8d21..8814e6c00e270 100644 --- a/src/Symfony/Component/ExpressionLanguage/TokenStream.php +++ b/src/Symfony/Component/ExpressionLanguage/TokenStream.php @@ -58,7 +58,7 @@ public function next() /** * @param string|null $message The syntax error message */ - public function expect(string $type, string $value = null, string $message = null) + public function expect(string $type, ?string $value = null, ?string $message = null) { $token = $this->current; if (!$token->test($type, $value)) { diff --git a/src/Symfony/Component/Filesystem/Exception/FileNotFoundException.php b/src/Symfony/Component/Filesystem/Exception/FileNotFoundException.php index 48b6408095a13..06b732b1685c8 100644 --- a/src/Symfony/Component/Filesystem/Exception/FileNotFoundException.php +++ b/src/Symfony/Component/Filesystem/Exception/FileNotFoundException.php @@ -19,7 +19,7 @@ */ class FileNotFoundException extends IOException { - public function __construct(string $message = null, int $code = 0, \Throwable $previous = null, string $path = null) + public function __construct(?string $message = null, int $code = 0, ?\Throwable $previous = null, ?string $path = null) { if (null === $message) { if (null === $path) { diff --git a/src/Symfony/Component/Filesystem/Exception/IOException.php b/src/Symfony/Component/Filesystem/Exception/IOException.php index fea26e4ddc40c..44254a819d4eb 100644 --- a/src/Symfony/Component/Filesystem/Exception/IOException.php +++ b/src/Symfony/Component/Filesystem/Exception/IOException.php @@ -22,7 +22,7 @@ class IOException extends \RuntimeException implements IOExceptionInterface { private $path; - public function __construct(string $message, int $code = 0, \Throwable $previous = null, string $path = null) + public function __construct(string $message, int $code = 0, ?\Throwable $previous = null, ?string $path = null) { $this->path = $path; diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index 23192bc74c237..037629f18919d 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -132,7 +132,7 @@ public function exists($files) * * @throws IOException When touch fails */ - public function touch($files, int $time = null, int $atime = null) + public function touch($files, ?int $time = null, ?int $atime = null) { foreach ($this->toIterable($files) as $file) { if (!($time ? self::box('touch', $file, $time, $atime) : self::box('touch', $file))) { @@ -534,7 +534,7 @@ public function makePathRelative(string $endPath, string $startPath) * * @throws IOException When file type is unknown */ - public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = []) + public function mirror(string $originDir, string $targetDir, ?\Traversable $iterator = null, array $options = []) { $targetDir = rtrim($targetDir, '/\\'); $originDir = rtrim($originDir, '/\\'); diff --git a/src/Symfony/Component/Filesystem/Path.php b/src/Symfony/Component/Filesystem/Path.php index 9aa37355a8555..858e1623eb2cd 100644 --- a/src/Symfony/Component/Filesystem/Path.php +++ b/src/Symfony/Component/Filesystem/Path.php @@ -257,7 +257,7 @@ public static function getRoot(string $path): string * @param string|null $extension if specified, only that extension is cut * off (may contain leading dot) */ - public static function getFilenameWithoutExtension(string $path, string $extension = null): string + public static function getFilenameWithoutExtension(string $path, ?string $extension = null): string { if ('' === $path) { return ''; diff --git a/src/Symfony/Component/Finder/Comparator/Comparator.php b/src/Symfony/Component/Finder/Comparator/Comparator.php index 3af551f4cc4ac..23cf94ecc72ce 100644 --- a/src/Symfony/Component/Finder/Comparator/Comparator.php +++ b/src/Symfony/Component/Finder/Comparator/Comparator.php @@ -19,7 +19,7 @@ class Comparator private $target; private $operator = '=='; - public function __construct(string $target = null, string $operator = '==') + public function __construct(?string $target = null, string $operator = '==') { if (null === $target) { trigger_deprecation('symfony/finder', '5.4', 'Constructing a "%s" without setting "$target" is deprecated.', __CLASS__); diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php index 1ffdd469fcec1..03ae96f0736ba 100644 --- a/src/Symfony/Component/Form/Button.php +++ b/src/Symfony/Component/Form/Button.php @@ -114,7 +114,7 @@ public function offsetUnset($offset) /** * {@inheritdoc} */ - public function setParent(FormInterface $parent = null) + public function setParent(?FormInterface $parent = null) { if ($this->submitted) { throw new AlreadySubmittedException('You cannot set the parent of a submitted button.'); @@ -140,7 +140,7 @@ public function getParent() * * @throws BadMethodCallException */ - public function add($child, string $type = null, array $options = []) + public function add($child, ?string $type = null, array $options = []) { throw new BadMethodCallException('Buttons cannot have children.'); } @@ -414,7 +414,7 @@ public function isRoot() /** * {@inheritdoc} */ - public function createView(FormView $parent = null) + public function createView(?FormView $parent = null) { if (null === $parent && $this->parent) { $parent = $this->parent->createView(); diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php index c85bcc0d9e344..3c6b0be18cbd9 100644 --- a/src/Symfony/Component/Form/ButtonBuilder.php +++ b/src/Symfony/Component/Form/ButtonBuilder.php @@ -71,7 +71,7 @@ public function __construct(?string $name, array $options = []) * * @throws BadMethodCallException */ - public function add($child, string $type = null, array $options = []) + public function add($child, ?string $type = null, array $options = []) { throw new BadMethodCallException('Buttons cannot have children.'); } @@ -81,7 +81,7 @@ public function add($child, string $type = null, array $options = []) * * @throws BadMethodCallException */ - public function create(string $name, string $type = null, array $options = []) + public function create(string $name, ?string $type = null, array $options = []) { throw new BadMethodCallException('Buttons cannot have children.'); } @@ -221,7 +221,7 @@ public function setAttributes(array $attributes) * * @throws BadMethodCallException */ - public function setDataMapper(DataMapperInterface $dataMapper = null) + public function setDataMapper(?DataMapperInterface $dataMapper = null) { throw new BadMethodCallException('Buttons do not support data mappers.'); } diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php index e5056d897fc9d..c3b38e6e62856 100644 --- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php +++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php @@ -57,7 +57,7 @@ class ArrayChoiceList implements ChoiceListInterface * incrementing integers are used as * values */ - public function __construct(iterable $choices, callable $value = null) + public function __construct(iterable $choices, ?callable $value = null) { if ($choices instanceof \Traversable) { $choices = iterator_to_array($choices); diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLoader.php index 83b2ca0aa2ab4..eb137f5021d48 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLoader.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLoader.php @@ -29,7 +29,7 @@ final class ChoiceLoader extends AbstractStaticOption implements ChoiceLoaderInt /** * {@inheritdoc} */ - public function loadChoiceList(callable $value = null): ChoiceListInterface + public function loadChoiceList(?callable $value = null): ChoiceListInterface { return $this->getOption()->loadChoiceList($value); } @@ -37,7 +37,7 @@ public function loadChoiceList(callable $value = null): ChoiceListInterface /** * {@inheritdoc} */ - public function loadChoicesForValues(array $values, callable $value = null): array + public function loadChoicesForValues(array $values, ?callable $value = null): array { return $this->getOption()->loadChoicesForValues($values, $value); } @@ -45,7 +45,7 @@ public function loadChoicesForValues(array $values, callable $value = null): arr /** * {@inheritdoc} */ - public function loadValuesForChoices(array $choices, callable $value = null): array + public function loadValuesForChoices(array $choices, ?callable $value = null): array { return $this->getOption()->loadValuesForChoices($choices, $value); } diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php b/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php index 1c08d812a937f..c6c654b6f8a4b 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php @@ -35,7 +35,7 @@ interface ChoiceListFactoryInterface * * @return ChoiceListInterface */ - public function createListFromChoices(iterable $choices, callable $value = null/* , callable $filter = null */); + public function createListFromChoices(iterable $choices, ?callable $value = null/* , callable $filter = null */); /** * Creates a choice list that is loaded with the given loader. @@ -48,7 +48,7 @@ public function createListFromChoices(iterable $choices, callable $value = null/ * * @return ChoiceListInterface */ - public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null/* , callable $filter = null */); + public function createListFromLoader(ChoiceLoaderInterface $loader, ?callable $value = null/* , callable $filter = null */); /** * Creates a view for the given choice list. @@ -84,5 +84,5 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va * * @return ChoiceListView */ - public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, callable $index = null, callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */); + public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, ?callable $index = null, ?callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */); } diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php index 9a244e542ec23..9ee423bdf1041 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php @@ -35,7 +35,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface * * @param callable|null $filter */ - public function createListFromChoices(iterable $choices, callable $value = null/* , callable $filter = null */) + public function createListFromChoices(iterable $choices, ?callable $value = null/* , callable $filter = null */) { $filter = \func_num_args() > 2 ? func_get_arg(2) : null; @@ -56,7 +56,7 @@ public function createListFromChoices(iterable $choices, callable $value = null/ * * @param callable|null $filter */ - public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null/* , callable $filter = null */) + public function createListFromLoader(ChoiceLoaderInterface $loader, ?callable $value = null/* , callable $filter = null */) { $filter = \func_num_args() > 2 ? func_get_arg(2) : null; @@ -72,7 +72,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va * * @param array|callable $labelTranslationParameters The parameters used to translate the choice labels */ - public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, callable $index = null, callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */) + public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, ?callable $index = null, ?callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */) { $labelTranslationParameters = \func_num_args() > 6 ? func_get_arg(6) : []; $preferredViews = []; diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php index 2f1ec6475e2db..abd514783f5a3 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php @@ -41,7 +41,7 @@ class PropertyAccessDecorator implements ChoiceListFactoryInterface private $decoratedFactory; private $propertyAccessor; - public function __construct(ChoiceListFactoryInterface $decoratedFactory, PropertyAccessorInterface $propertyAccessor = null) + public function __construct(ChoiceListFactoryInterface $decoratedFactory, ?PropertyAccessorInterface $propertyAccessor = null) { $this->decoratedFactory = $decoratedFactory; $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor(); diff --git a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php index ab4c103e849dd..f6acd7f6e696a 100644 --- a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php +++ b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php @@ -47,7 +47,7 @@ class LazyChoiceList implements ChoiceListInterface * * @param callable|null $value The callable generating the choice values */ - public function __construct(ChoiceLoaderInterface $loader, callable $value = null) + public function __construct(ChoiceLoaderInterface $loader, ?callable $value = null) { $this->loader = $loader; $this->value = $value; diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php index 0f6a64dd3214b..d79d693f47318 100644 --- a/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php +++ b/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php @@ -31,7 +31,7 @@ abstract class AbstractChoiceLoader implements ChoiceLoaderInterface * * {@inheritdoc} */ - public function loadChoiceList(callable $value = null): ChoiceListInterface + public function loadChoiceList(?callable $value = null): ChoiceListInterface { return new ArrayChoiceList($this->choices ?? $this->choices = $this->loadChoices(), $value); } @@ -39,7 +39,7 @@ public function loadChoiceList(callable $value = null): ChoiceListInterface /** * {@inheritdoc} */ - public function loadChoicesForValues(array $values, callable $value = null) + public function loadChoicesForValues(array $values, ?callable $value = null) { if (!$values) { return []; @@ -51,7 +51,7 @@ public function loadChoicesForValues(array $values, callable $value = null) /** * {@inheritdoc} */ - public function loadValuesForChoices(array $choices, callable $value = null) + public function loadValuesForChoices(array $choices, ?callable $value = null) { if (!$choices) { return []; diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php b/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php index 98e03bbe3a567..4bf467f9890b5 100644 --- a/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php +++ b/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php @@ -36,7 +36,7 @@ interface ChoiceLoaderInterface * * @return ChoiceListInterface */ - public function loadChoiceList(callable $value = null); + public function loadChoiceList(?callable $value = null); /** * Loads the choices corresponding to the given values. @@ -54,7 +54,7 @@ public function loadChoiceList(callable $value = null); * * @return array */ - public function loadChoicesForValues(array $values, callable $value = null); + public function loadChoicesForValues(array $values, ?callable $value = null); /** * Loads the values corresponding to the given choices. @@ -72,5 +72,5 @@ public function loadChoicesForValues(array $values, callable $value = null); * * @return string[] */ - public function loadValuesForChoices(array $choices, callable $value = null); + public function loadValuesForChoices(array $choices, ?callable $value = null); } diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php b/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php index 5e9314e2bad2a..f5ad609815f6e 100644 --- a/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php +++ b/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php @@ -55,7 +55,7 @@ protected function loadChoices(): iterable /** * {@inheritdoc} */ - public function loadChoicesForValues(array $values, callable $value = null): array + public function loadChoicesForValues(array $values, ?callable $value = null): array { return array_filter($this->decoratedLoader->loadChoicesForValues($values, $value), $this->filter); } @@ -63,7 +63,7 @@ public function loadChoicesForValues(array $values, callable $value = null): arr /** * {@inheritdoc} */ - public function loadValuesForChoices(array $choices, callable $value = null): array + public function loadValuesForChoices(array $choices, ?callable $value = null): array { return $this->decoratedLoader->loadValuesForChoices(array_filter($choices, $this->filter), $value); } diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php index 546937b900c0c..80d73af1323ea 100644 --- a/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php +++ b/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php @@ -22,7 +22,7 @@ class IntlCallbackChoiceLoader extends CallbackChoiceLoader /** * {@inheritdoc} */ - public function loadChoicesForValues(array $values, callable $value = null) + public function loadChoicesForValues(array $values, ?callable $value = null) { return parent::loadChoicesForValues(array_filter($values), $value); } @@ -30,7 +30,7 @@ public function loadChoicesForValues(array $values, callable $value = null) /** * {@inheritdoc} */ - public function loadValuesForChoices(array $choices, callable $value = null) + public function loadValuesForChoices(array $choices, ?callable $value = null) { $choices = array_filter($choices); diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php index 6979831c32682..e408a909b9f9c 100644 --- a/src/Symfony/Component/Form/Command/DebugCommand.php +++ b/src/Symfony/Component/Form/Command/DebugCommand.php @@ -43,7 +43,7 @@ class DebugCommand extends Command private $guessers; private $fileLinkFormatter; - public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], FileLinkFormatter $fileLinkFormatter = null) + public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], ?FileLinkFormatter $fileLinkFormatter = null) { parent::__construct(); diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php index 4862a674c2b52..1146b35d731ba 100644 --- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php @@ -26,7 +26,7 @@ class TextDescriptor extends Descriptor { private $fileLinkFormatter; - public function __construct(FileLinkFormatter $fileLinkFormatter = null) + public function __construct(?FileLinkFormatter $fileLinkFormatter = null) { $this->fileLinkFormatter = $fileLinkFormatter; } @@ -192,7 +192,7 @@ private function normalizeAndSortOptionsColumns(array $options): array return $options; } - private function formatClassLink(string $class, string $text = null): string + private function formatClassLink(string $class, ?string $text = null): string { if (null === $text) { $text = $class; diff --git a/src/Symfony/Component/Form/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Form/Console/Helper/DescriptorHelper.php index 355fb95989a36..72bfa6e6a7ee3 100644 --- a/src/Symfony/Component/Form/Console/Helper/DescriptorHelper.php +++ b/src/Symfony/Component/Form/Console/Helper/DescriptorHelper.php @@ -23,7 +23,7 @@ */ class DescriptorHelper extends BaseDescriptorHelper { - public function __construct(FileLinkFormatter $fileLinkFormatter = null) + public function __construct(?FileLinkFormatter $fileLinkFormatter = null) { $this ->register('txt', new TextDescriptor($fileLinkFormatter)) diff --git a/src/Symfony/Component/Form/Exception/TransformationFailedException.php b/src/Symfony/Component/Form/Exception/TransformationFailedException.php index 89eba088edbdb..4d4fce1962431 100644 --- a/src/Symfony/Component/Form/Exception/TransformationFailedException.php +++ b/src/Symfony/Component/Form/Exception/TransformationFailedException.php @@ -21,7 +21,7 @@ class TransformationFailedException extends RuntimeException private $invalidMessage; private $invalidMessageParameters; - public function __construct(string $message = '', int $code = 0, \Throwable $previous = null, string $invalidMessage = null, array $invalidMessageParameters = []) + public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null, ?string $invalidMessage = null, array $invalidMessageParameters = []) { parent::__construct($message, $code, $previous); @@ -34,7 +34,7 @@ public function __construct(string $message = '', int $code = 0, \Throwable $pre * @param string|null $invalidMessage The message or message key * @param array $invalidMessageParameters Data to be passed into the translator */ - public function setInvalidMessage(string $invalidMessage = null, array $invalidMessageParameters = []): void + public function setInvalidMessage(?string $invalidMessage = null, array $invalidMessageParameters = []): void { $this->invalidMessage = $invalidMessage; $this->invalidMessageParameters = $invalidMessageParameters; diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index c6768b86b497a..717d64633eb0d 100644 --- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php @@ -32,7 +32,7 @@ class CoreExtension extends AbstractExtension private $choiceListFactory; private $translator; - public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null) + public function __construct(?PropertyAccessorInterface $propertyAccessor = null, ?ChoiceListFactoryInterface $choiceListFactory = null, ?TranslatorInterface $translator = null) { $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/DataAccessor/PropertyPathAccessor.php b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php index 3c97075e5fcb4..e639bad2a49c2 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php +++ b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php @@ -31,7 +31,7 @@ class PropertyPathAccessor implements DataAccessorInterface { private $propertyAccessor; - public function __construct(PropertyAccessorInterface $propertyAccessor = null) + public function __construct(?PropertyAccessorInterface $propertyAccessor = null) { $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor(); } diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php index 5f4c498a33526..7995842eecbbf 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php +++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php @@ -27,7 +27,7 @@ class DataMapper implements DataMapperInterface { private $dataAccessor; - public function __construct(DataAccessorInterface $dataAccessor = null) + public function __construct(?DataAccessorInterface $dataAccessor = null) { $this->dataAccessor = $dataAccessor ?? new ChainAccessor([ new CallbackAccessor(), diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php index 4c4257cfb21a3..fe3fe1886b7a2 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php +++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php @@ -32,7 +32,7 @@ class PropertyPathMapper implements DataMapperInterface { private $propertyAccessor; - public function __construct(PropertyAccessorInterface $propertyAccessor = null) + public function __construct(?PropertyAccessorInterface $propertyAccessor = null) { $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor(); } diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php index 142f4894e1401..1c56d179f99b1 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php @@ -34,7 +34,7 @@ abstract class BaseDateTimeTransformer implements DataTransformerInterface * * @throws InvalidArgumentException if a timezone is not valid */ - public function __construct(string $inputTimezone = null, string $outputTimezone = null) + public function __construct(?string $inputTimezone = null, ?string $outputTimezone = null) { $this->inputTimezone = $inputTimezone ?: date_default_timezone_get(); $this->outputTimezone = $outputTimezone ?: date_default_timezone_get(); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php index 5a37d4c706780..f11fd9011f70d 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php @@ -46,7 +46,7 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface * @param string[]|null $fields The date fields * @param bool $pad Whether to use padding */ - public function __construct(array $fields = null, bool $pad = false) + public function __construct(?array $fields = null, bool $pad = false) { $this->fields = $fields ?? ['years', 'months', 'days', 'hours', 'minutes', 'seconds', 'invert']; $this->pad = $pad; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php index 710dfb59658b5..7cc9b96469758 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php @@ -31,7 +31,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer * @param string[]|null $fields The date fields * @param bool $pad Whether to use padding */ - public function __construct(string $inputTimezone = null, string $outputTimezone = null, array $fields = null, bool $pad = false, \DateTimeInterface $referenceDate = null) + public function __construct(?string $inputTimezone = null, ?string $outputTimezone = null, ?array $fields = null, bool $pad = false, ?\DateTimeInterface $referenceDate = null) { parent::__construct($inputTimezone, $outputTimezone); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php index 7c8a4bcb28b3e..b0b1f187cec56 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php @@ -39,7 +39,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer * * @throws UnexpectedTypeException If a format is not supported or if a timezone is not a string */ - public function __construct(string $inputTimezone = null, string $outputTimezone = null, int $dateFormat = null, int $timeFormat = null, int $calendar = \IntlDateFormatter::GREGORIAN, string $pattern = null) + public function __construct(?string $inputTimezone = null, ?string $outputTimezone = null, ?int $dateFormat = null, ?int $timeFormat = null, int $calendar = \IntlDateFormatter::GREGORIAN, ?string $pattern = null) { parent::__construct($inputTimezone, $outputTimezone); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php index 9e680b1c762d3..4e3df8690a571 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php @@ -49,7 +49,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer * @param string $format The date format * @param string|null $parseFormat The parse format when different from $format */ - public function __construct(string $inputTimezone = null, string $outputTimezone = null, string $format = 'Y-m-d H:i:s', string $parseFormat = null) + public function __construct(?string $inputTimezone = null, ?string $outputTimezone = null, string $format = 'Y-m-d H:i:s', ?string $parseFormat = null) { parent::__construct($inputTimezone, $outputTimezone); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php index 36bc131887805..57e3093e6235f 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php @@ -28,7 +28,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo * @param int|null $roundingMode One of the ROUND_ constants in this class * @param string|null $locale locale used for transforming */ - public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN, string $locale = null) + public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN, ?string $locale = null) { parent::__construct(0, $grouping, $roundingMode, $locale); } diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php index 9784fe673b121..5d013a16b9eef 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php @@ -23,7 +23,7 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform { private $divisor; - public function __construct(?int $scale = 2, ?bool $grouping = true, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, ?int $divisor = 1, string $locale = null) + public function __construct(?int $scale = 2, ?bool $grouping = true, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, ?int $divisor = 1, ?string $locale = null) { parent::__construct($scale ?? 2, $grouping ?? true, $roundingMode, $locale); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php index 53e564b139eeb..f06fd80a118a9 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php @@ -65,7 +65,7 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface private $scale; private $locale; - public function __construct(int $scale = null, ?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, string $locale = null) + public function __construct(?int $scale = null, ?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, ?string $locale = null) { $this->scale = $scale; $this->grouping = $grouping ?? false; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php index 5b97f0190f4ae..fdeed2231cce5 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php @@ -44,7 +44,7 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface * * @throws UnexpectedTypeException if the given value of type is unknown */ - public function __construct(int $scale = null, string $type = null, int $roundingMode = null, bool $html5Format = false) + public function __construct(?int $scale = null, ?string $type = null, ?int $roundingMode = null, bool $html5Format = false) { if (null === $type) { $type = self::FRACTIONAL; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/StringToFloatTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/StringToFloatTransformer.php index 27e60b4306336..e79b66988811c 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/StringToFloatTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/StringToFloatTransformer.php @@ -18,7 +18,7 @@ class StringToFloatTransformer implements DataTransformerInterface { private $scale; - public function __construct(int $scale = null) + public function __construct(?int $scale = null) { $this->scale = $scale; } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php index 70a7c19c22fa1..fb8f0c0b5fb8a 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php @@ -24,7 +24,7 @@ class TransformationFailureListener implements EventSubscriberInterface { private $translator; - public function __construct(TranslatorInterface $translator = null) + public function __construct(?TranslatorInterface $translator = null) { $this->translator = $translator; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php index c5f27b2f4811a..4a61c7f1b35b0 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php @@ -55,7 +55,7 @@ class ChoiceType extends AbstractType /** * @param TranslatorInterface $translator */ - public function __construct(ChoiceListFactoryInterface $choiceListFactory = null, $translator = null) + public function __construct(?ChoiceListFactoryInterface $choiceListFactory = null, $translator = null) { $this->choiceListFactory = $choiceListFactory ?? new CachingFactoryDecorator( new PropertyAccessDecorator( diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php index 4609a1aff0770..1dbdfc31736ca 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php @@ -29,7 +29,7 @@ class ColorType extends AbstractType private $translator; - public function __construct(TranslatorInterface $translator = null) + public function __construct(?TranslatorInterface $translator = null) { $this->translator = $translator; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php index b66b7ff5d28ce..67f5992d10b10 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php @@ -35,7 +35,7 @@ class FileType extends AbstractType private $translator; - public function __construct(TranslatorInterface $translator = null) + public function __construct(?TranslatorInterface $translator = null) { $this->translator = $translator; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php index bd8ba13a3e7a5..f7d28010213cc 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php @@ -31,7 +31,7 @@ class FormType extends BaseType { private $dataMapper; - public function __construct(PropertyAccessorInterface $propertyAccessor = null) + public function __construct(?PropertyAccessorInterface $propertyAccessor = null) { $this->dataMapper = new DataMapper(new ChainAccessor([ new CallbackAccessor(), diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php index 31b5df5c3c9c9..6ee109ad6c781 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php @@ -126,7 +126,7 @@ private static function getPhpTimezones(string $input): array return $timezones; } - private static function getIntlTimezones(string $input, string $locale = null): array + private static function getIntlTimezones(string $input, ?string $locale = null): array { $timezones = array_flip(Timezones::getNames($locale)); diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php index f766633c9b469..4de50a90af869 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php @@ -23,7 +23,7 @@ class TransformationFailureExtension extends AbstractTypeExtension { private $translator; - public function __construct(TranslatorInterface $translator = null) + public function __construct(?TranslatorInterface $translator = null) { $this->translator = $translator; } diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php index 609a371ea05d9..d86574ed67a2e 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php @@ -26,7 +26,7 @@ class CsrfExtension extends AbstractExtension private $translator; private $translationDomain; - public function __construct(CsrfTokenManagerInterface $tokenManager, TranslatorInterface $translator = null, string $translationDomain = null) + public function __construct(CsrfTokenManagerInterface $tokenManager, ?TranslatorInterface $translator = null, ?string $translationDomain = null) { $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 37548ef55053d..89eb5c4ff8b58 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php +++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php @@ -40,7 +40,7 @@ public static function getSubscribedEvents() ]; } - public function __construct(string $fieldName, CsrfTokenManagerInterface $tokenManager, string $tokenId, string $errorMessage, TranslatorInterface $translator = null, string $translationDomain = null, ServerParams $serverParams = null) + public function __construct(string $fieldName, CsrfTokenManagerInterface $tokenManager, string $tokenId, string $errorMessage, ?TranslatorInterface $translator = null, ?string $translationDomain = null, ?ServerParams $serverParams = null) { $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 cd17b8e94a869..dfb3fec46b81f 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php @@ -35,7 +35,7 @@ class FormTypeCsrfExtension extends AbstractTypeExtension private $translationDomain; private $serverParams; - public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool $defaultEnabled = true, string $defaultFieldName = '_token', TranslatorInterface $translator = null, string $translationDomain = null, ServerParams $serverParams = null) + public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool $defaultEnabled = true, string $defaultFieldName = '_token', ?TranslatorInterface $translator = null, ?string $translationDomain = null, ?ServerParams $serverParams = null) { $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 2fe2fbed1aa39..8d4f8e0ea71be 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php @@ -81,7 +81,7 @@ public function __construct(FormDataExtractorInterface $dataExtractor) /** * Does nothing. The data is collected during the form event listeners. */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { } @@ -298,7 +298,7 @@ private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array & return $output; } - private function &recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, array &$outputByHash) + private function &recursiveBuildFinalFormTree(?FormInterface $form, FormView $view, array &$outputByHash) { $viewHash = spl_object_hash($view); $formHash = null; diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php index 54358d5d49aa1..89aac42286257 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php @@ -82,7 +82,7 @@ public function createBuilder(FormFactoryInterface $factory, string $name, array /** * {@inheritdoc} */ - public function createView(FormInterface $form, FormView $parent = null) + public function createView(FormInterface $form, ?FormView $parent = null) { return $this->proxiedType->createView($form, $parent); } diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php index 068d5cc0bf75b..c59271461a2fb 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php @@ -36,7 +36,7 @@ public function __construct(ResolvedFormTypeFactoryInterface $proxiedFactory, Fo /** * {@inheritdoc} */ - public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ResolvedFormTypeInterface $parent = null) + public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ?ResolvedFormTypeInterface $parent = null) { return new ResolvedTypeDataCollectorProxy( $this->proxiedFactory->createResolvedType($type, $typeExtensions, $parent), diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php index 90723fd8b48a9..a047729fa8e85 100644 --- a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php +++ b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php @@ -31,7 +31,7 @@ class HttpFoundationRequestHandler implements RequestHandlerInterface { private $serverParams; - public function __construct(ServerParams $serverParams = null) + public function __construct(?ServerParams $serverParams = null) { $this->serverParams = $serverParams ?? new ServerParams(); } diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php index 0d77f06ce3fd8..b789af22935b8 100644 --- a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php +++ b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php @@ -24,7 +24,7 @@ class FormTypeHttpFoundationExtension extends AbstractTypeExtension { private $requestHandler; - public function __construct(RequestHandlerInterface $requestHandler = null) + public function __construct(?RequestHandlerInterface $requestHandler = null) { $this->requestHandler = $requestHandler ?? new HttpFoundationRequestHandler(); } diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php index d4c520ce86c91..58d1b758a88e2 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php @@ -31,7 +31,7 @@ class FormTypeValidatorExtension extends BaseValidatorExtension private $violationMapper; private $legacyErrorMessages; - public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null) + public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, ?FormRendererInterface $formRenderer = null, ?TranslatorInterface $translator = null) { $this->validator = $validator; $this->violationMapper = new ViolationMapper($formRenderer, $translator); diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php index 21e4fe20eaf69..2915d538f0be4 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php @@ -26,7 +26,7 @@ class UploadValidatorExtension extends AbstractTypeExtension private $translator; private $translationDomain; - public function __construct(TranslatorInterface $translator, string $translationDomain = null) + public function __construct(TranslatorInterface $translator, ?string $translationDomain = null) { $this->translator = $translator; $this->translationDomain = $translationDomain; diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php index 3a5728a827875..16b84eb2c40bc 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php @@ -31,7 +31,7 @@ class ValidatorExtension extends AbstractExtension private $translator; private $legacyErrorMessages; - public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null) + public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, ?FormRendererInterface $formRenderer = null, ?TranslatorInterface $translator = null) { $this->legacyErrorMessages = $legacyErrorMessages; diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php index 1fb1d1fb03257..6ecc284c4ffe7 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php @@ -32,7 +32,7 @@ class ViolationMapper implements ViolationMapperInterface private $translator; private $allowNonSynchronized = false; - public function __construct(FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null) + public function __construct(?FormRendererInterface $formRenderer = null, ?TranslatorInterface $translator = null) { $this->formRenderer = $formRenderer; $this->translator = $translator; diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 0c36032f13ffe..9410051a5cf80 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -275,7 +275,7 @@ public function isDisabled() /** * {@inheritdoc} */ - public function setParent(FormInterface $parent = null) + public function setParent(?FormInterface $parent = null) { if ($this->submitted) { throw new AlreadySubmittedException('You cannot set the parent of a submitted form.'); @@ -850,7 +850,7 @@ public function all() /** * {@inheritdoc} */ - public function add($child, string $type = null, array $options = []) + public function add($child, ?string $type = null, array $options = []) { if ($this->submitted) { throw new AlreadySubmittedException('You cannot add children to a submitted form.'); @@ -1045,7 +1045,7 @@ public function count() /** * {@inheritdoc} */ - public function createView(FormView $parent = null) + public function createView(?FormView $parent = null) { if (null === $parent && $this->parent) { $parent = $this->parent->createView(); diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php index 37fca950a77cb..3881cc56deb52 100644 --- a/src/Symfony/Component/Form/FormBuilder.php +++ b/src/Symfony/Component/Form/FormBuilder.php @@ -50,7 +50,7 @@ public function __construct(?string $name, ?string $dataClass, EventDispatcherIn /** * {@inheritdoc} */ - public function add($child, string $type = null, array $options = []) + public function add($child, ?string $type = null, array $options = []) { if ($this->locked) { throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.'); @@ -83,7 +83,7 @@ public function add($child, string $type = null, array $options = []) /** * {@inheritdoc} */ - public function create($name, string $type = null, array $options = []) + public function create($name, ?string $type = null, array $options = []) { if ($this->locked) { throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.'); diff --git a/src/Symfony/Component/Form/FormBuilderInterface.php b/src/Symfony/Component/Form/FormBuilderInterface.php index 52bf5b67922bf..014bfbdff2628 100644 --- a/src/Symfony/Component/Form/FormBuilderInterface.php +++ b/src/Symfony/Component/Form/FormBuilderInterface.php @@ -30,7 +30,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild * * @return static */ - public function add($child, string $type = null, array $options = []); + public function add($child, ?string $type = null, array $options = []); /** * Creates a form builder. @@ -41,7 +41,7 @@ public function add($child, string $type = null, array $options = []); * * @return self */ - public function create(string $name, string $type = null, array $options = []); + public function create(string $name, ?string $type = null, array $options = []); /** * Returns a child by name. diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php index b511c2f1364fb..1dddd71e302df 100644 --- a/src/Symfony/Component/Form/FormConfigBuilder.php +++ b/src/Symfony/Component/Form/FormConfigBuilder.php @@ -501,7 +501,7 @@ public function setAttributes(array $attributes) /** * {@inheritdoc} */ - public function setDataMapper(DataMapperInterface $dataMapper = null) + public function setDataMapper(?DataMapperInterface $dataMapper = null) { if ($this->locked) { throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.'); diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php index 757fa2584968e..86d6171c220fa 100644 --- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php +++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php @@ -102,7 +102,7 @@ public function setAttributes(array $attributes); * * @return $this */ - public function setDataMapper(DataMapperInterface $dataMapper = null); + public function setDataMapper(?DataMapperInterface $dataMapper = null); /** * Sets whether the form is disabled. diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php index e03f3eef5ba4a..07fbb8c00e9be 100644 --- a/src/Symfony/Component/Form/FormError.php +++ b/src/Symfony/Component/Form/FormError.php @@ -47,7 +47,7 @@ class FormError * * @see \Symfony\Component\Translation\Translator */ - public function __construct(string $message, string $messageTemplate = null, array $messageParameters = [], int $messagePluralization = null, $cause = null) + public function __construct(string $message, ?string $messageTemplate = null, array $messageParameters = [], ?int $messagePluralization = null, $cause = null) { $this->message = $message; $this->messageTemplate = $messageTemplate ?: $message; diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php index 016d2ccfb1f74..7ecc9b612a409 100644 --- a/src/Symfony/Component/Form/FormInterface.php +++ b/src/Symfony/Component/Form/FormInterface.php @@ -34,7 +34,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * @throws Exception\LogicException when trying to set a parent for a form with * an empty name */ - public function setParent(self $parent = null); + public function setParent(?self $parent = null); /** * Returns the parent form. @@ -56,7 +56,7 @@ public function getParent(); * @throws Exception\LogicException when trying to add a child to a non-compound form * @throws Exception\UnexpectedTypeException if $child or $type has an unexpected type */ - public function add($child, string $type = null, array $options = []); + public function add($child, ?string $type = null, array $options = []); /** * Returns the child with the given name. @@ -324,5 +324,5 @@ public function isRoot(); /** * @return FormView */ - public function createView(FormView $parent = null); + public function createView(?FormView $parent = null); } diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php index 2f8f35199098e..0be517e4f7ecf 100644 --- a/src/Symfony/Component/Form/FormRenderer.php +++ b/src/Symfony/Component/Form/FormRenderer.php @@ -31,7 +31,7 @@ class FormRenderer implements FormRendererInterface private $hierarchyLevelMap = []; private $variableStack = []; - public function __construct(FormRendererEngineInterface $engine, CsrfTokenManagerInterface $csrfTokenManager = null) + public function __construct(FormRendererEngineInterface $engine, ?CsrfTokenManagerInterface $csrfTokenManager = null) { $this->engine = $engine; $this->csrfTokenManager = $csrfTokenManager; diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php index 0162208e64784..49ab5b92162a8 100644 --- a/src/Symfony/Component/Form/FormView.php +++ b/src/Symfony/Component/Form/FormView.php @@ -54,7 +54,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable private $methodRendered = false; - public function __construct(self $parent = null) + public function __construct(?self $parent = null) { $this->parent = $parent; } diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php index 1afa6a6ba734f..d3e34042751a6 100644 --- a/src/Symfony/Component/Form/NativeRequestHandler.php +++ b/src/Symfony/Component/Form/NativeRequestHandler.php @@ -35,7 +35,7 @@ class NativeRequestHandler implements RequestHandlerInterface 'type', ]; - public function __construct(ServerParams $params = null) + public function __construct(?ServerParams $params = null) { $this->serverParams = $params ?? new ServerParams(); } diff --git a/src/Symfony/Component/Form/PreloadedExtension.php b/src/Symfony/Component/Form/PreloadedExtension.php index c6767dc3e3e6a..1e8dd085bb483 100644 --- a/src/Symfony/Component/Form/PreloadedExtension.php +++ b/src/Symfony/Component/Form/PreloadedExtension.php @@ -30,7 +30,7 @@ class PreloadedExtension implements FormExtensionInterface * @param FormTypeInterface[] $types The types that the extension should support * @param FormTypeExtensionInterface[][] $typeExtensions The type extensions that the extension should support */ - public function __construct(array $types, array $typeExtensions, FormTypeGuesserInterface $typeGuesser = null) + public function __construct(array $types, array $typeExtensions, ?FormTypeGuesserInterface $typeGuesser = null) { $this->typeExtensions = $typeExtensions; $this->typeGuesser = $typeGuesser; diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php index b484c9149288b..d76ce9d6f2a0b 100644 --- a/src/Symfony/Component/Form/ResolvedFormType.php +++ b/src/Symfony/Component/Form/ResolvedFormType.php @@ -46,7 +46,7 @@ class ResolvedFormType implements ResolvedFormTypeInterface /** * @param FormTypeExtensionInterface[] $typeExtensions */ - public function __construct(FormTypeInterface $innerType, array $typeExtensions = [], ResolvedFormTypeInterface $parent = null) + public function __construct(FormTypeInterface $innerType, array $typeExtensions = [], ?ResolvedFormTypeInterface $parent = null) { foreach ($typeExtensions as $extension) { if (!$extension instanceof FormTypeExtensionInterface) { @@ -114,7 +114,7 @@ public function createBuilder(FormFactoryInterface $factory, string $name, array /** * {@inheritdoc} */ - public function createView(FormInterface $form, FormView $parent = null) + public function createView(FormInterface $form, ?FormView $parent = null) { return $this->newView($parent); } @@ -217,7 +217,7 @@ protected function newBuilder(string $name, ?string $dataClass, FormFactoryInter * * @return FormView */ - protected function newView(FormView $parent = null) + protected function newView(?FormView $parent = null) { return new FormView($parent); } diff --git a/src/Symfony/Component/Form/ResolvedFormTypeFactory.php b/src/Symfony/Component/Form/ResolvedFormTypeFactory.php index d93d1c06dfdf3..b20cde2a10bd3 100644 --- a/src/Symfony/Component/Form/ResolvedFormTypeFactory.php +++ b/src/Symfony/Component/Form/ResolvedFormTypeFactory.php @@ -19,7 +19,7 @@ class ResolvedFormTypeFactory implements ResolvedFormTypeFactoryInterface /** * {@inheritdoc} */ - public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ResolvedFormTypeInterface $parent = null) + public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ?ResolvedFormTypeInterface $parent = null) { return new ResolvedFormType($type, $typeExtensions, $parent); } diff --git a/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php index 4f133e0395e4a..47d2eb2790fc7 100644 --- a/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php +++ b/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php @@ -32,5 +32,5 @@ interface ResolvedFormTypeFactoryInterface * @throws Exception\UnexpectedTypeException if the types parent {@link FormTypeInterface::getParent()} is not a string * @throws Exception\InvalidArgumentException if the types parent cannot be retrieved from any extension */ - public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ResolvedFormTypeInterface $parent = null); + public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ?ResolvedFormTypeInterface $parent = null); } diff --git a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php index 6074af9cb6dd6..4d0d67454755b 100644 --- a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php +++ b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php @@ -62,7 +62,7 @@ public function createBuilder(FormFactoryInterface $factory, string $name, array * * @return FormView */ - public function createView(FormInterface $form, FormView $parent = null); + public function createView(FormInterface $form, ?FormView $parent = null); /** * Configures a form builder for the type hierarchy. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.af.xlf b/src/Symfony/Component/Form/Resources/translations/validators.af.xlf index 58cd939cf793f..c726e93b9e2a2 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.af.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.af.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ar.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ar.xlf index e30daaf1dff5d..d18b4691e1f69 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.ar.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.ar.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.az.xlf b/src/Symfony/Component/Form/Resources/translations/validators.az.xlf index b9269706db3e8..87791b6d423c2 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.az.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.az.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.be.xlf b/src/Symfony/Component/Form/Resources/translations/validators.be.xlf index 0513ca1dc9f7f..b24976e13cc7f 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.be.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.be.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf b/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf index 32fa9433108c1..19b80f5f8f2b7 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.bs.xlf b/src/Symfony/Component/Form/Resources/translations/validators.bs.xlf index 319f91544d50c..d360635dfc348 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.bs.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.bs.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf index 69379608048c9..76df58246b328 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.cs.xlf b/src/Symfony/Component/Form/Resources/translations/validators.cs.xlf index 3c4052b1ca496..829fea17b1a07 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.cs.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.cs.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.cy.xlf b/src/Symfony/Component/Form/Resources/translations/validators.cy.xlf new file mode 100644 index 0000000000000..48f18afe7c1ea --- /dev/null +++ b/src/Symfony/Component/Form/Resources/translations/validators.cy.xlf @@ -0,0 +1,139 @@ + + + + + + This form should not contain extra fields. + Ni ddylai'r ffurflen gynnwys meysydd ychwanegol. + + + The uploaded file was too large. Please try to upload a smaller file. + Roedd y ffeil a uwchlwythwyd yn rhy fawr. Ceisiwch uwchlwytho ffeil llai. + + + The CSRF token is invalid. Please try to resubmit the form. + Mae'r tocyn CSRF yn annilys. Ceisiwch ailgyflwyno'r ffurflen. + + + This value is not a valid HTML5 color. + Nid yw'r gwerth hwn yn lliw HTML5 dilys. + + + Please enter a valid birthdate. + Nodwch ddyddiad geni dilys. + + + The selected choice is invalid. + Mae'r dewis a ddewiswyd yn annilys. + + + The collection is invalid. + Mae'r casgliad yn annilys. + + + Please select a valid color. + Dewiswch liw dilys. + + + Please select a valid country. + Dewiswch wlad ddilys. + + + Please select a valid currency. + Dewiswch arian cyfred dilys. + + + Please choose a valid date interval. + Dewiswch ystod dyddiadau dilys. + + + Please enter a valid date and time. + Nodwch ddyddiad ac amser dilys. + + + Please enter a valid date. + Nodwch ddyddiad dilys. + + + Please select a valid file. + Dewiswch ffeil ddilys. + + + The hidden field is invalid. + Mae'r maes cudd yn annilys. + + + Please enter an integer. + Nodwch rif cyfan. + + + Please select a valid language. + Dewiswch iaith ddilys. + + + Please select a valid locale. + Dewiswch leoliad dilys. + + + Please enter a valid money amount. + Nodwch swm arian dilys. + + + Please enter a number. + Nodwch rif. + + + The password is invalid. + Mae'r cyfrinair yn annilys. + + + Please enter a percentage value. + Nodwch werth canran. + + + The values do not match. + Nid yw'r gwerthoedd yn cyfateb. + + + Please enter a valid time. + Nodwch amser dilys. + + + Please select a valid timezone. + Dewiswch barth amser dilys. + + + Please enter a valid URL. + Nodwch URL dilys. + + + Please enter a valid search term. + Nodwch derm chwilio dilys. + + + Please provide a valid phone number. + Darparwch rif ffôn dilys. + + + The checkbox has an invalid value. + Mae gan y blwch ticio werth annilys. + + + Please enter a valid email address. + Nodwch gyfeiriad e-bost dilys. + + + Please select a valid option. + Dewiswch opsiwn dilys. + + + Please select a valid range. + Dewiswch ystod ddilys. + + + Please enter a valid week. + Nodwch wythnos ddilys. + + + + diff --git a/src/Symfony/Component/Form/Resources/translations/validators.da.xlf b/src/Symfony/Component/Form/Resources/translations/validators.da.xlf index b4f078ff35f40..36f49b2c89ec5 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.da.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.da.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.de.xlf b/src/Symfony/Component/Form/Resources/translations/validators.de.xlf index 7b30839f9183d..759fa2a19cee9 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.de.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.de.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.el.xlf b/src/Symfony/Component/Form/Resources/translations/validators.el.xlf index 595630e76f453..b544dcbc61698 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.el.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.el.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.en.xlf b/src/Symfony/Component/Form/Resources/translations/validators.en.xlf index e556c40b647f6..57d3da969f36b 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.en.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.en.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.es.xlf b/src/Symfony/Component/Form/Resources/translations/validators.es.xlf index c143e009e1938..301e2b33f7ed3 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.es.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.et.xlf b/src/Symfony/Component/Form/Resources/translations/validators.et.xlf index 6524c86b144ee..0767220efa346 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.et.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.et.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.eu.xlf b/src/Symfony/Component/Form/Resources/translations/validators.eu.xlf index f43ab35a49f93..a73c63abb73f7 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.eu.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.eu.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. @@ -11,8 +11,8 @@ Igotako fitxategia handiegia da. Mesedez saiatu fitxategi txikiago bat igotzen. - The CSRF token is invalid. - CSRF tokena ez da egokia. + The CSRF token is invalid. Please try to resubmit the form. + CSRF tokena baliogabea da. Mesedez, saiatu berriro formularioa bidaltzen. This value is not a valid HTML5 color. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.fa.xlf b/src/Symfony/Component/Form/Resources/translations/validators.fa.xlf index 4a98eea8eb314..2ebb1cc2bb93f 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.fa.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.fa.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.fi.xlf b/src/Symfony/Component/Form/Resources/translations/validators.fi.xlf index 7ad87b5468261..438365404ed47 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.fi.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.fi.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf b/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf index d65826467229f..cbfb4f83cd5be 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.gl.xlf b/src/Symfony/Component/Form/Resources/translations/validators.gl.xlf index 5ef404a481a45..e3427f8d28cac 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.gl.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.gl.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.he.xlf b/src/Symfony/Component/Form/Resources/translations/validators.he.xlf index efd68b8807bfd..41428ac70f69f 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.he.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.he.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.hr.xlf b/src/Symfony/Component/Form/Resources/translations/validators.hr.xlf index 9f17b5ea1eb37..e3aa7b2b9cf59 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.hr.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.hr.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.hu.xlf b/src/Symfony/Component/Form/Resources/translations/validators.hu.xlf index 3b70461d394b7..0ea74fea91277 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.hu.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.hu.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf b/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf index 10ac326fb1600..ccca2473538fc 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.id.xlf b/src/Symfony/Component/Form/Resources/translations/validators.id.xlf index 535f9e6b15860..e4b43f7e3aa36 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.id.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.id.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.it.xlf b/src/Symfony/Component/Form/Resources/translations/validators.it.xlf index 1a8eee3ac8e26..bdea7132f5938 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.it.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.it.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf index ea2226ce4182f..5728d9b1d4af7 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. @@ -15,125 +15,125 @@ CSRFトークンが無効です、再送信してください。 - This value is not a valid HTML5 color. - 有効なHTML5の色ではありません。 - - - Please enter a valid birthdate. - 有効な生年月日を入力してください。 - - - The selected choice is invalid. - 選択した値は無効です。 - - - The collection is invalid. - コレクションは無効です。 - - - Please select a valid color. - 有効な色を選択してください。 - - - Please select a valid country. - 有効な国を選択してください。 - - - Please select a valid currency. - 有効な通貨を選択してください。 - - - Please choose a valid date interval. - 有効な日付間隔を選択してください。 - - - Please enter a valid date and time. - 有効な日時を入力してください。 - - - Please enter a valid date. - 有効な日付を入力してください。 - - - Please select a valid file. - 有効なファイルを選択してください。 - - - The hidden field is invalid. - 隠しフィールドが無効です。 - - - Please enter an integer. - 整数で入力してください。 - - - Please select a valid language. - 有効な言語を選択してください。 - - - Please select a valid locale. - 有効なロケールを選択してください。 - - - Please enter a valid money amount. - 有効な金額を入力してください。 - - - Please enter a number. - 数値で入力してください。 - - - The password is invalid. - パスワードが無効です。 - - - Please enter a percentage value. - パーセント値で入力してください。 - - - The values do not match. - 値が一致しません。 - - - Please enter a valid time. - 有効な時間を入力してください。 - - - Please select a valid timezone. - 有効なタイムゾーンを選択してください。 - - - Please enter a valid URL. - 有効なURLを入力してください。 - - - Please enter a valid search term. - 有効な検索語を入力してください。 - - - Please provide a valid phone number. - 有効な電話番号を入力してください。 - - - The checkbox has an invalid value. - チェックボックスの値が無効です。 - - - Please enter a valid email address. - 有効なメールアドレスを入力してください。 - - - Please select a valid option. - 有効な値を選択してください。 - - - Please select a valid range. - 有効な範囲を選択してください。 - - - Please enter a valid week. - 有効な週を入力してください。 - + This value is not a valid HTML5 color. + 有効なHTML5の色ではありません。 + + + Please enter a valid birthdate. + 有効な生年月日を入力してください。 + + + The selected choice is invalid. + 選択した値は無効です。 + + + The collection is invalid. + コレクションは無効です。 + + + Please select a valid color. + 有効な色を選択してください。 + + + Please select a valid country. + 有効な国を選択してください。 + + + Please select a valid currency. + 有効な通貨を選択してください。 + + + Please choose a valid date interval. + 有効な日付間隔を選択してください。 + + + Please enter a valid date and time. + 有効な日時を入力してください。 + + + Please enter a valid date. + 有効な日付を入力してください。 + + + Please select a valid file. + 有効なファイルを選択してください。 + + + The hidden field is invalid. + 隠しフィールドが無効です。 + + + Please enter an integer. + 整数で入力してください。 + + + Please select a valid language. + 有効な言語を選択してください。 + + + Please select a valid locale. + 有効なロケールを選択してください。 + + + Please enter a valid money amount. + 有効な金額を入力してください。 + + + Please enter a number. + 数値で入力してください。 + + + The password is invalid. + パスワードが無効です。 + + + Please enter a percentage value. + パーセント値で入力してください。 + + + The values do not match. + 値が一致しません。 + + + Please enter a valid time. + 有効な時間を入力してください。 + + + Please select a valid timezone. + 有効なタイムゾーンを選択してください。 + + + Please enter a valid URL. + 有効なURLを入力してください。 + + + Please enter a valid search term. + 有効な検索語を入力してください。 + + + Please provide a valid phone number. + 有効な電話番号を入力してください。 + + + The checkbox has an invalid value. + チェックボックスの値が無効です。 + + + Please enter a valid email address. + 有効なメールアドレスを入力してください。 + + + Please select a valid option. + 有効な値を選択してください。 + + + Please select a valid range. + 有効な範囲を選択してください。 + + + Please enter a valid week. + 有効な週を入力してください。 + diff --git a/src/Symfony/Component/Form/Resources/translations/validators.lb.xlf b/src/Symfony/Component/Form/Resources/translations/validators.lb.xlf index e989264f962b8..1f4ee820b28cb 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.lb.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.lb.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.lt.xlf b/src/Symfony/Component/Form/Resources/translations/validators.lt.xlf index 5613c42b5bf16..aba1120e3ef1a 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.lt.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.lt.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.lv.xlf b/src/Symfony/Component/Form/Resources/translations/validators.lv.xlf index 54711cb5f88b0..fb358dccf25b5 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.lv.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.lv.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.mk.xlf b/src/Symfony/Component/Form/Resources/translations/validators.mk.xlf index ea86b304cee25..5f2af85eb57b4 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.mk.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.mk.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.mn.xlf b/src/Symfony/Component/Form/Resources/translations/validators.mn.xlf index 620112d8814a9..2e6d09bc6b350 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.mn.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.mn.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.my.xlf b/src/Symfony/Component/Form/Resources/translations/validators.my.xlf index b0180c551172f..9ecb9d368a6b1 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.my.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.my.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.nb.xlf b/src/Symfony/Component/Form/Resources/translations/validators.nb.xlf index 1d8385086aa82..193306b7191ed 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.nb.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.nb.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. @@ -11,8 +11,8 @@ Den opplastede filen var for stor. Vennligst last opp en mindre fil. - The CSRF token is invalid. - CSRF nøkkelen er ugyldig. + The CSRF token is invalid. Please try to resubmit the form. + CSRF-tokenen er ugyldig. Vennligst prøv å sende inn skjemaet på nytt. This value is not a valid HTML5 color. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.nl.xlf b/src/Symfony/Component/Form/Resources/translations/validators.nl.xlf index 7aa56ebf1bda4..6330ecf8a3336 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.nl.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.nl.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.nn.xlf b/src/Symfony/Component/Form/Resources/translations/validators.nn.xlf index 9fac1bf34e34f..0722b456879f4 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.nn.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.nn.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. @@ -11,8 +11,8 @@ Fila du lasta opp var for stor. Last opp ei mindre fil. - The CSRF token is invalid. - CSRF-nøkkelen er ikkje gyldig. + The CSRF token is invalid. Please try to resubmit the form. + CSRF-teiknet er ugyldig. Ver venleg og prøv å sende inn skjemaet på nytt. This value is not a valid HTML5 color. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.no.xlf b/src/Symfony/Component/Form/Resources/translations/validators.no.xlf index 1d8385086aa82..193306b7191ed 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.no.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.no.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. @@ -11,8 +11,8 @@ Den opplastede filen var for stor. Vennligst last opp en mindre fil. - The CSRF token is invalid. - CSRF nøkkelen er ugyldig. + The CSRF token is invalid. Please try to resubmit the form. + CSRF-tokenen er ugyldig. Vennligst prøv å sende inn skjemaet på nytt. This value is not a valid HTML5 color. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.pl.xlf b/src/Symfony/Component/Form/Resources/translations/validators.pl.xlf index d553f2a179a97..767f05d29f85a 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.pl.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.pl.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.pt.xlf b/src/Symfony/Component/Form/Resources/translations/validators.pt.xlf index 6ce1c3242cab3..755108f357f5a 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.pt.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.pt.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. @@ -14,7 +14,7 @@ The CSRF token is invalid. Please try to resubmit the form. O token CSRF está inválido. Por favor, tente enviar o formulário novamente. - + This value is not a valid HTML5 color. Este valor não é uma cor HTML5 válida. @@ -50,7 +50,7 @@ Please enter a valid date and time. Por favor, informe uma data e horário válidos. - + Please enter a valid date. Por favor, informe uma data válida. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.pt_BR.xlf b/src/Symfony/Component/Form/Resources/translations/validators.pt_BR.xlf index 37717fe983dd9..c386ab304932c 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.pt_BR.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.pt_BR.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ro.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ro.xlf index a7dc62b579c6b..63b4c551ff637 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.ro.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.ro.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ru.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ru.xlf index b11b7cef57a31..26535d26d33fe 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.ru.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.ru.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sk.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sk.xlf index 06b2bbdbead5f..72ecd13e183ce 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.sk.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.sk.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sl.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sl.xlf index 7e6a3fb85016c..c19949d713b98 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.sl.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.sl.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sq.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sq.xlf index 3224f6e38ad0a..2c730bcfefc69 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.sq.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.sq.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. @@ -68,7 +68,7 @@ Please select a valid language. - Please select a valid language. + Ju lutem zgjidhni një gjuhë të vlefshme. Please select a valid locale. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sr_Cyrl.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sr_Cyrl.xlf index a5610e0ead295..4b3e5b9b8e17f 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.sr_Cyrl.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.sr_Cyrl.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sr_Latn.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sr_Latn.xlf index 02fb5aa56ead4..6f64f5634d849 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.sr_Latn.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.sr_Latn.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf index 43e925628a488..052a569605d61 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.th.xlf b/src/Symfony/Component/Form/Resources/translations/validators.th.xlf index 060dc9ec48094..82d417d955775 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.th.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.th.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf b/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf index 272e331298a2f..6aeef41e1e94f 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.tr.xlf b/src/Symfony/Component/Form/Resources/translations/validators.tr.xlf index d1ddc1d0ef33d..71a469619c530 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.tr.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.tr.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.uk.xlf b/src/Symfony/Component/Form/Resources/translations/validators.uk.xlf index ca707bcffa916..c6bbca1857733 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.uk.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.uk.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ur.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ur.xlf index 1ec61be6d840c..42b891bbf3849 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.ur.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.ur.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.uz.xlf b/src/Symfony/Component/Form/Resources/translations/validators.uz.xlf index 58591d69e9539..86be2379cb364 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.uz.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.uz.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf b/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf index 6a8f2bd862c9d..92171c055ad6d 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.zh_CN.xlf b/src/Symfony/Component/Form/Resources/translations/validators.zh_CN.xlf index 3106db2bd97b7..a1469b798c942 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.zh_CN.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.zh_CN.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Resources/translations/validators.zh_TW.xlf b/src/Symfony/Component/Form/Resources/translations/validators.zh_TW.xlf index 858b9db42ea5f..831759783e21f 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.zh_TW.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.zh_TW.xlf @@ -1,6 +1,6 @@ - - - + + + This form should not contain extra fields. diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php index 4b504a3c74d6b..4d73db8fdf14d 100644 --- a/src/Symfony/Component/Form/Tests/CompoundFormTest.php +++ b/src/Symfony/Component/Form/Tests/CompoundFormTest.php @@ -1145,7 +1145,7 @@ private function createForm(string $name = 'name', bool $compound = true): FormI return $builder->getForm(); } - private function getBuilder(string $name = 'name', string $dataClass = null, array $options = []): FormBuilder + private function getBuilder(string $name = 'name', ?string $dataClass = null, array $options = []): FormBuilder { return new FormBuilder($name, $dataClass, new EventDispatcher(), $this->factory, $options); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTestCase.php index 7e86f2c069118..8210b22930e50 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTestCase.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTestCase.php @@ -31,5 +31,5 @@ public function testConstructFailsIfOutputTimezoneIsInvalid() $this->createDateTimeTransformer(null, 'that_timezone_does_not_exist'); } - abstract protected function createDateTimeTransformer(string $inputTimezone = null, string $outputTimezone = null): BaseDateTimeTransformer; + abstract protected function createDateTimeTransformer(?string $inputTimezone = null, ?string $outputTimezone = null): BaseDateTimeTransformer; } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php index 08e05c58405f2..8ed6114f04cfc 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php @@ -536,7 +536,7 @@ public function testReverseTransformWithEmptyStringSecond() ]); } - protected function createDateTimeTransformer(string $inputTimezone = null, string $outputTimezone = null): BaseDateTimeTransformer + protected function createDateTimeTransformer(?string $inputTimezone = null, ?string $outputTimezone = null): BaseDateTimeTransformer { return new DateTimeToArrayTransformer($inputTimezone, $outputTimezone); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php index 06f04150c6014..18fbf7da6742c 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php @@ -116,7 +116,7 @@ public function testReverseTransformExpectsValidDateString() $transformer->reverseTransform('2010-2010-2010'); } - protected function createDateTimeTransformer(string $inputTimezone = null, string $outputTimezone = null): BaseDateTimeTransformer + protected function createDateTimeTransformer(?string $inputTimezone = null, ?string $outputTimezone = null): BaseDateTimeTransformer { return new DateTimeToHtml5LocalDateTimeTransformer($inputTimezone, $outputTimezone); } 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 e4e70714785a9..a29873a26779e 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php @@ -373,7 +373,7 @@ public function testReverseTransformWrapsIntlErrorsWithExceptionsAndErrorLevel() $transformer->reverseTransform('12345'); } - protected function createDateTimeTransformer(string $inputTimezone = null, string $outputTimezone = null): BaseDateTimeTransformer + protected function createDateTimeTransformer(?string $inputTimezone = null, ?string $outputTimezone = null): BaseDateTimeTransformer { return new DateTimeToLocalizedStringTransformer($inputTimezone, $outputTimezone); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php index 18c5976a09de8..f3dcf1dd7d39e 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php @@ -138,7 +138,7 @@ public static function invalidDateStringProvider(): array ]; } - protected function createDateTimeTransformer(string $inputTimezone = null, string $outputTimezone = null): BaseDateTimeTransformer + protected function createDateTimeTransformer(?string $inputTimezone = null, ?string $outputTimezone = null): BaseDateTimeTransformer { return new DateTimeToRfc3339Transformer($inputTimezone, $outputTimezone); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php index 56ff98117aee9..66ad9ff416e26 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php @@ -171,7 +171,7 @@ public function testReverseTransformWithNonExistingDate() $reverseTransformer->reverseTransform('2010-04-31'); } - protected function createDateTimeTransformer(string $inputTimezone = null, string $outputTimezone = null): BaseDateTimeTransformer + protected function createDateTimeTransformer(?string $inputTimezone = null, ?string $outputTimezone = null): BaseDateTimeTransformer { return new DateTimeToStringTransformer($inputTimezone, $outputTimezone); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php index bf662d6464bef..183a7f9bd47d7 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php @@ -115,7 +115,7 @@ public function testReverseTransformExpectsValidTimestamp() $reverseTransformer->reverseTransform('2010-2010-2010'); } - protected function createDateTimeTransformer(string $inputTimezone = null, string $outputTimezone = null): BaseDateTimeTransformer + protected function createDateTimeTransformer(?string $inputTimezone = null, ?string $outputTimezone = null): BaseDateTimeTransformer { return new DateTimeToTimestampTransformer($inputTimezone, $outputTimezone); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/StringToFloatTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/StringToFloatTransformerTest.php index 0ffb0b0ea8941..aaea8b2984d3e 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/StringToFloatTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/StringToFloatTransformerTest.php @@ -71,7 +71,7 @@ public static function provideReverseTransformations(): array /** * @dataProvider provideReverseTransformations */ - public function testReverseTransform($from, $to, int $scale = null) + public function testReverseTransform($from, $to, ?int $scale = null) { $transformer = new StringToFloatTransformer($scale); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php index eea9b60551516..d0db40fd7931f 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php @@ -120,7 +120,7 @@ public function testResizedDownWithDeleteEmptyCallable() $form = $this->factory->create(static::TESTED_TYPE, null, [ 'entry_type' => AuthorType::class, 'allow_delete' => true, - 'delete_empty' => function (Author $obj = null) { + 'delete_empty' => function (?Author $obj = null) { return null === $obj || empty($obj->firstName); }, ]); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php index dee5e50e37afe..64f116313b932 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -695,6 +695,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa $form = $this->factory->create(static::TESTED_TYPE, null, [ 'widget' => $widget, 'empty_data' => $emptyData, + 'years' => range(2018, (int) date('Y')), ]); $form->submit(null); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php index b892a1c34ea6e..ee3ceb958513b 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php @@ -91,8 +91,8 @@ public function testSubmitFromSingleTextDateTime() // we test against "de_DE", so we need the full implementation IntlTestHelper::requireFullIntl($this, false); - if ('71.1' === Intl::getIcuVersion()) { - $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.'); + if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) { + $this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.'); } \Locale::setDefault('de_DE'); @@ -117,8 +117,8 @@ public function testSubmitFromSingleTextDateTimeImmutable() // we test against "de_DE", so we need the full implementation IntlTestHelper::requireFullIntl($this, false); - if ('71.1' === Intl::getIcuVersion()) { - $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.'); + if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) { + $this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.'); } \Locale::setDefault('de_DE'); @@ -144,8 +144,8 @@ public function testSubmitFromSingleTextString() // we test against "de_DE", so we need the full implementation IntlTestHelper::requireFullIntl($this, false); - if ('71.1' === Intl::getIcuVersion()) { - $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.'); + if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) { + $this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.'); } \Locale::setDefault('de_DE'); @@ -170,8 +170,8 @@ public function testSubmitFromSingleTextTimestamp() // we test against "de_DE", so we need the full implementation IntlTestHelper::requireFullIntl($this, false); - if ('71.1' === Intl::getIcuVersion()) { - $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.'); + if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) { + $this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.'); } \Locale::setDefault('de_DE'); @@ -198,8 +198,8 @@ public function testSubmitFromSingleTextRaw() // we test against "de_DE", so we need the full implementation IntlTestHelper::requireFullIntl($this, false); - if ('71.1' === Intl::getIcuVersion()) { - $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.'); + if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) { + $this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.'); } \Locale::setDefault('de_DE'); @@ -1064,6 +1064,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa $form = $this->factory->create(static::TESTED_TYPE, null, [ 'widget' => $widget, 'empty_data' => $emptyData, + 'years' => range(2018, (int) date('Y')), ]); $form->submit(null); diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php index af8f048e5404c..67b5abd0a46f0 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php @@ -719,7 +719,7 @@ protected function createValidator() return new FormValidator(); } - private function getBuilder(string $name = 'name', string $dataClass = null, array $options = []): FormBuilder + private function getBuilder(string $name = 'name', ?string $dataClass = null, array $options = []): FormBuilder { $options = array_replace([ 'constraints' => [], diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php index 624d0a4fe817a..af091b49c9206 100644 --- a/src/Symfony/Component/Form/Tests/SimpleFormTest.php +++ b/src/Symfony/Component/Form/Tests/SimpleFormTest.php @@ -1128,7 +1128,7 @@ private function createForm(): FormInterface return $this->getBuilder()->getForm(); } - private function getBuilder(?string $name = 'name', string $dataClass = null, array $options = []): FormBuilder + private function getBuilder(?string $name = 'name', ?string $dataClass = null, array $options = []): FormBuilder { return new FormBuilder($name, $dataClass, new EventDispatcher(), new FormFactory(new FormRegistry([], new ResolvedFormTypeFactory())), $options); } diff --git a/src/Symfony/Component/Form/Util/ServerParams.php b/src/Symfony/Component/Form/Util/ServerParams.php index ebe09f60e872a..168471a252e5c 100644 --- a/src/Symfony/Component/Form/Util/ServerParams.php +++ b/src/Symfony/Component/Form/Util/ServerParams.php @@ -20,7 +20,7 @@ class ServerParams { private $requestStack; - public function __construct(RequestStack $requestStack = null) + public function __construct(?RequestStack $requestStack = null) { $this->requestStack = $requestStack; } diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 39babd350174e..0a97b6e62fb87 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -39,7 +39,7 @@ "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/intl": "^4.4|^5.0|^6.0", "symfony/security-csrf": "^4.4|^5.0|^6.0", - "symfony/translation": "^4.4|^5.0|^6.0", + "symfony/translation": "^5.4.35|~6.3.12|^6.4.3", "symfony/var-dumper": "^4.4|^5.0|^6.0", "symfony/uid": "^5.1|^6.0" }, @@ -50,7 +50,7 @@ "symfony/error-handler": "<4.4.5", "symfony/framework-bundle": "<4.4", "symfony/http-kernel": "<4.4", - "symfony/translation": "<4.4", + "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3", "symfony/translation-contracts": "<1.1.7", "symfony/twig-bridge": "<5.4.21|>=6,<6.2.7" }, diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php index 2ab7e27f77c53..48df9ca19623c 100644 --- a/src/Symfony/Component/HttpClient/AmpHttpClient.php +++ b/src/Symfony/Component/HttpClient/AmpHttpClient.php @@ -62,7 +62,7 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface, * * @see HttpClientInterface::OPTIONS_DEFAULTS for available options */ - public function __construct(array $defaultOptions = [], callable $clientConfigurator = null, int $maxHostConnections = 6, int $maxPendingPushes = 50) + public function __construct(array $defaultOptions = [], ?callable $clientConfigurator = null, int $maxHostConnections = 6, int $maxPendingPushes = 50) { $this->defaultOptions['buffer'] = $this->defaultOptions['buffer'] ?? \Closure::fromCallable([__CLASS__, 'shouldBuffer']); @@ -151,7 +151,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { if ($responses instanceof AmpResponse) { $responses = [$responses]; diff --git a/src/Symfony/Component/HttpClient/AsyncDecoratorTrait.php b/src/Symfony/Component/HttpClient/AsyncDecoratorTrait.php index aff402d83cede..21f716b8f62eb 100644 --- a/src/Symfony/Component/HttpClient/AsyncDecoratorTrait.php +++ b/src/Symfony/Component/HttpClient/AsyncDecoratorTrait.php @@ -35,7 +35,7 @@ abstract public function request(string $method, string $url, array $options = [ /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { if ($responses instanceof AsyncResponse) { $responses = [$responses]; diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php index e1d7023d9a05b..3d2fe8ce97197 100644 --- a/src/Symfony/Component/HttpClient/CachingHttpClient.php +++ b/src/Symfony/Component/HttpClient/CachingHttpClient.php @@ -110,7 +110,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { if ($responses instanceof ResponseInterface) { $responses = [$responses]; diff --git a/src/Symfony/Component/HttpClient/Chunk/ErrorChunk.php b/src/Symfony/Component/HttpClient/Chunk/ErrorChunk.php index a19f433620f64..bfb90970ed91b 100644 --- a/src/Symfony/Component/HttpClient/Chunk/ErrorChunk.php +++ b/src/Symfony/Component/HttpClient/Chunk/ErrorChunk.php @@ -111,7 +111,7 @@ public function getError(): ?string /** * @return bool Whether the wrapped error has been thrown or not */ - public function didThrow(bool $didThrow = null): bool + public function didThrow(?bool $didThrow = null): bool { if (null !== $didThrow && $this->didThrow !== $didThrow) { return !$this->didThrow = $didThrow; diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index ef6d700cc9360..52e1c74267b7e 100644 --- a/src/Symfony/Component/HttpClient/CurlHttpClient.php +++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php @@ -316,7 +316,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { if ($responses instanceof CurlResponse) { $responses = [$responses]; diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php index 1925786369159..88172b3564b52 100644 --- a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php +++ b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php @@ -36,7 +36,7 @@ public function registerClient(string $name, TraceableHttpClient $client) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->lateCollect(); } diff --git a/src/Symfony/Component/HttpClient/DecoratorTrait.php b/src/Symfony/Component/HttpClient/DecoratorTrait.php index 790fc32a59aab..cb3ca2a9c2824 100644 --- a/src/Symfony/Component/HttpClient/DecoratorTrait.php +++ b/src/Symfony/Component/HttpClient/DecoratorTrait.php @@ -25,7 +25,7 @@ trait DecoratorTrait { private $client; - public function __construct(HttpClientInterface $client = null) + public function __construct(?HttpClientInterface $client = null) { $this->client = $client ?? HttpClient::create(); } @@ -41,7 +41,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { return $this->client->stream($responses, $timeout); } diff --git a/src/Symfony/Component/HttpClient/EventSourceHttpClient.php b/src/Symfony/Component/HttpClient/EventSourceHttpClient.php index 60e4e821d1ee7..e801c1c4f39c7 100644 --- a/src/Symfony/Component/HttpClient/EventSourceHttpClient.php +++ b/src/Symfony/Component/HttpClient/EventSourceHttpClient.php @@ -33,7 +33,7 @@ final class EventSourceHttpClient implements HttpClientInterface, ResetInterface private $reconnectionTime; - public function __construct(HttpClientInterface $client = null, float $reconnectionTime = 10.0) + public function __construct(?HttpClientInterface $client = null, float $reconnectionTime = 10.0) { $this->client = $client ?? HttpClient::create(); $this->reconnectionTime = $reconnectionTime; diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php index 3d6044320d48c..3f44f36953efc 100644 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php @@ -419,7 +419,7 @@ private static function normalizePeerFingerprint($fingerprint): array * * @throws InvalidArgumentException When the value cannot be json-encoded */ - private static function jsonEncode($value, int $flags = null, int $maxDepth = 512): string + private static function jsonEncode($value, ?int $flags = null, int $maxDepth = 512): string { $flags = $flags ?? (\JSON_HEX_TAG | \JSON_HEX_APOS | \JSON_HEX_AMP | \JSON_HEX_QUOT | \JSON_PRESERVE_ZERO_FRACTION); diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php index c2fd4635b037a..8442b061615a4 100644 --- a/src/Symfony/Component/HttpClient/HttplugClient.php +++ b/src/Symfony/Component/HttpClient/HttplugClient.php @@ -71,7 +71,7 @@ final class HttplugClient implements HttplugInterface, HttpAsyncClient, RequestF private $waitLoop; - public function __construct(HttpClientInterface $client = null, ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null) + public function __construct(?HttpClientInterface $client = null, ?ResponseFactoryInterface $responseFactory = null, ?StreamFactoryInterface $streamFactory = null) { $this->client = $client ?? HttpClient::create(); $this->responseFactory = $responseFactory; @@ -145,7 +145,7 @@ public function sendAsyncRequest(RequestInterface $request): Promise * * @return int The number of remaining pending promises */ - public function wait(float $maxDuration = null, float $idleTimeout = null): int + public function wait(?float $maxDuration = null, ?float $idleTimeout = null): int { return $this->waitLoop->wait(null, $maxDuration, $idleTimeout); } @@ -247,7 +247,7 @@ public function reset() } } - private function sendPsr7Request(RequestInterface $request, bool $buffer = null): ResponseInterface + private function sendPsr7Request(RequestInterface $request, ?bool $buffer = null): ResponseInterface { try { $body = $request->getBody(); diff --git a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php index 3061f0802dad3..61a0c004acfb9 100644 --- a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php +++ b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php @@ -149,7 +149,7 @@ private function getClient(array $options): array public $uri; public $handle; - public function connect(string $uri, ConnectContext $context = null, CancellationToken $token = null): Promise + public function connect(string $uri, ?ConnectContext $context = null, ?CancellationToken $token = null): Promise { $result = $this->connector->connect($this->uri ?? $uri, $context, $token); $result->onResolve(function ($e, $socket) { diff --git a/src/Symfony/Component/HttpClient/Internal/AmpResolver.php b/src/Symfony/Component/HttpClient/Internal/AmpResolver.php index d31476a5832b1..402f71d80d294 100644 --- a/src/Symfony/Component/HttpClient/Internal/AmpResolver.php +++ b/src/Symfony/Component/HttpClient/Internal/AmpResolver.php @@ -32,7 +32,7 @@ public function __construct(array &$dnsMap) $this->dnsMap = &$dnsMap; } - public function resolve(string $name, int $typeRestriction = null): Promise + public function resolve(string $name, ?int $typeRestriction = null): Promise { if (!isset($this->dnsMap[$name]) || !\in_array($typeRestriction, [Record::A, null], true)) { return Dns\resolver()->resolve($name, $typeRestriction); diff --git a/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php b/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php index 66bbc45711f14..9dbeaad4d3e16 100644 --- a/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php +++ b/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php @@ -46,7 +46,7 @@ public function __construct(HttpClientInterface $client, ?\SplObjectStorage $pro $this->streamFactory = $streamFactory; } - public function wait(?ResponseInterface $pendingResponse, float $maxDuration = null, float $idleTimeout = null): int + public function wait(?ResponseInterface $pendingResponse, ?float $maxDuration = null, ?float $idleTimeout = null): int { if (!$this->promisePool) { return 0; diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php index fecba0ee56ddb..4e8c6a896fe3d 100644 --- a/src/Symfony/Component/HttpClient/MockHttpClient.php +++ b/src/Symfony/Component/HttpClient/MockHttpClient.php @@ -90,7 +90,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { if ($responses instanceof ResponseInterface) { $responses = [$responses]; diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php index 63fcc1ca91e0c..3d4747a254068 100644 --- a/src/Symfony/Component/HttpClient/NativeHttpClient.php +++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php @@ -263,7 +263,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { if ($responses instanceof NativeResponse) { $responses = [$responses]; diff --git a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php index 911cce9da4b9a..757a9e8a9b38e 100644 --- a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php +++ b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php @@ -97,7 +97,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { return $this->client->stream($responses, $timeout); } diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php index 0cd8f7d24416d..b389dfe6ee5b3 100644 --- a/src/Symfony/Component/HttpClient/Psr18Client.php +++ b/src/Symfony/Component/HttpClient/Psr18Client.php @@ -58,7 +58,7 @@ final class Psr18Client implements ClientInterface, RequestFactoryInterface, Str private $responseFactory; private $streamFactory; - public function __construct(HttpClientInterface $client = null, ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null) + public function __construct(?HttpClientInterface $client = null, ?ResponseFactoryInterface $responseFactory = null, ?StreamFactoryInterface $streamFactory = null) { $this->client = $client ?? HttpClient::create(); $this->responseFactory = $responseFactory; diff --git a/src/Symfony/Component/HttpClient/Response/AmpResponse.php b/src/Symfony/Component/HttpClient/Response/AmpResponse.php index 900c70d6e0e3a..e4999b73688c0 100644 --- a/src/Symfony/Component/HttpClient/Response/AmpResponse.php +++ b/src/Symfony/Component/HttpClient/Response/AmpResponse.php @@ -138,7 +138,7 @@ public function __construct(AmpClientState $multi, Request $request, array $opti /** * {@inheritdoc} */ - public function getInfo(string $type = null) + public function getInfo(?string $type = null) { return null !== $type ? $this->info[$type] ?? null : $this->info; } @@ -188,7 +188,7 @@ private static function schedule(self $response, array &$runningResponses): void * * @param AmpClientState $multi */ - private static function perform(ClientState $multi, array &$responses = null): void + private static function perform(ClientState $multi, ?array &$responses = null): void { if ($responses) { foreach ($responses as $response) { diff --git a/src/Symfony/Component/HttpClient/Response/AsyncContext.php b/src/Symfony/Component/HttpClient/Response/AsyncContext.php index e0c0ebb836d38..3c5397c873845 100644 --- a/src/Symfony/Component/HttpClient/Response/AsyncContext.php +++ b/src/Symfony/Component/HttpClient/Response/AsyncContext.php @@ -111,7 +111,7 @@ public function cancel(): ChunkInterface /** * Returns the current info of the response. */ - public function getInfo(string $type = null) + public function getInfo(?string $type = null) { if (null !== $type) { return $this->info[$type] ?? $this->response->getInfo($type); @@ -184,7 +184,7 @@ public function replaceResponse(ResponseInterface $response): ResponseInterface * * @param ?callable(ChunkInterface, self): ?\Iterator $passthru */ - public function passthru(callable $passthru = null): void + public function passthru(?callable $passthru = null): void { $this->passthru = $passthru ?? static function ($chunk, $context) { $context->passthru = null; diff --git a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php index 80c9f7da370fa..ae0d004f7651b 100644 --- a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php +++ b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php @@ -44,7 +44,7 @@ final class AsyncResponse implements ResponseInterface, StreamableInterface /** * @param ?callable(ChunkInterface, AsyncContext): ?\Iterator $passthru */ - public function __construct(HttpClientInterface $client, string $method, string $url, array $options, callable $passthru = null) + public function __construct(HttpClientInterface $client, string $method, string $url, array $options, ?callable $passthru = null) { $this->client = $client; $this->shouldBuffer = $options['buffer'] ?? true; @@ -57,7 +57,7 @@ public function __construct(HttpClientInterface $client, string $method, string } $this->response = $client->request($method, $url, ['buffer' => false] + $options); $this->passthru = $passthru; - $this->initializer = static function (self $response, float $timeout = null) { + $this->initializer = static function (self $response, ?float $timeout = null) { if (null === $response->shouldBuffer) { return false; } @@ -65,7 +65,7 @@ public function __construct(HttpClientInterface $client, string $method, string while (true) { foreach (self::stream([$response], $timeout) as $chunk) { if ($chunk->isTimeout() && $response->passthru) { - foreach (self::passthru($response->client, $response, new ErrorChunk($response->offset, new TransportException($chunk->getError()))) as $chunk) { + foreach (self::passthru($response->client, $response, new ErrorChunk($response->offset, $chunk->getError())) as $chunk) { if ($chunk->isFirst()) { return false; } @@ -114,7 +114,7 @@ public function getHeaders(bool $throw = true): array return $headers; } - public function getInfo(string $type = null) + public function getInfo(?string $type = null) { if (null !== $type) { return $this->info[$type] ?? $this->response->getInfo($type); @@ -123,9 +123,6 @@ public function getInfo(string $type = null) return $this->info + $this->response->getInfo(); } - /** - * {@inheritdoc} - */ public function toStream(bool $throw = true) { if ($throw) { @@ -146,9 +143,6 @@ public function toStream(bool $throw = true) return $stream; } - /** - * {@inheritdoc} - */ public function cancel(): void { if ($this->info['canceled']) { @@ -209,7 +203,7 @@ public function __destruct() /** * @internal */ - public static function stream(iterable $responses, float $timeout = null, string $class = null): \Generator + public static function stream(iterable $responses, ?float $timeout = null, ?string $class = null): \Generator { while ($responses) { $wrappedResponses = []; @@ -317,7 +311,7 @@ public static function stream(iterable $responses, float $timeout = null, string /** * @param \SplObjectStorage|null $asyncMap */ - private static function passthru(HttpClientInterface $client, self $r, ChunkInterface $chunk, \SplObjectStorage $asyncMap = null): \Generator + private static function passthru(HttpClientInterface $client, self $r, ChunkInterface $chunk, ?\SplObjectStorage $asyncMap = null): \Generator { $r->stream = null; $response = $r->response; diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php index 2418203060c82..633b74a1256ed 100644 --- a/src/Symfony/Component/HttpClient/Response/CurlResponse.php +++ b/src/Symfony/Component/HttpClient/Response/CurlResponse.php @@ -40,7 +40,7 @@ final class CurlResponse implements ResponseInterface, StreamableInterface * * @internal */ - public function __construct(CurlClientState $multi, $ch, array $options = null, LoggerInterface $logger = null, string $method = 'GET', callable $resolveRedirect = null, int $curlVersion = 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; @@ -95,7 +95,6 @@ public function __construct(CurlClientState $multi, $ch, array $options = null, $this->info['pause_handler'] = static function (float $duration) use ($ch, $multi, $execCounter) { if (0 < $duration) { if ($execCounter === $multi->execCounter) { - $multi->execCounter = !\is_float($execCounter) ? 1 + $execCounter : \PHP_INT_MIN; curl_multi_remove_handle($multi->handle, $ch); } @@ -193,7 +192,7 @@ public function __construct(CurlClientState $multi, $ch, array $options = null, /** * {@inheritdoc} */ - public function getInfo(string $type = null) + public function getInfo(?string $type = null) { if (!$info = $this->finalInfo) { $info = array_merge($this->info, curl_getinfo($this->handle)); @@ -274,7 +273,7 @@ private static function schedule(self $response, array &$runningResponses): void * * @param CurlClientState $multi */ - private static function perform(ClientState $multi, array &$responses = null): void + private static function perform(ClientState $multi, ?array &$responses = null): void { if ($multi->performing) { if ($responses) { diff --git a/src/Symfony/Component/HttpClient/Response/HttplugPromise.php b/src/Symfony/Component/HttpClient/Response/HttplugPromise.php index 2efacca763b8b..d15b473e66c13 100644 --- a/src/Symfony/Component/HttpClient/Response/HttplugPromise.php +++ b/src/Symfony/Component/HttpClient/Response/HttplugPromise.php @@ -30,7 +30,7 @@ public function __construct(GuzzlePromiseInterface $promise) $this->promise = $promise; } - public function then(callable $onFulfilled = null, callable $onRejected = null): self + public function then(?callable $onFulfilled = null, ?callable $onRejected = null): self { return new self($this->promise->then( $this->wrapThenCallback($onFulfilled), diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php index 2c00108758bde..dc65a49fa96c6 100644 --- a/src/Symfony/Component/HttpClient/Response/MockResponse.php +++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php @@ -93,7 +93,7 @@ public function getRequestMethod(): string /** * {@inheritdoc} */ - public function getInfo(string $type = null) + public function getInfo(?string $type = null) { return null !== $type ? $this->info[$type] ?? null : $this->info; } diff --git a/src/Symfony/Component/HttpClient/Response/NativeResponse.php b/src/Symfony/Component/HttpClient/Response/NativeResponse.php index c00e946f63508..6eeaf6004ab96 100644 --- a/src/Symfony/Component/HttpClient/Response/NativeResponse.php +++ b/src/Symfony/Component/HttpClient/Response/NativeResponse.php @@ -82,7 +82,7 @@ public function __construct(NativeClientState $multi, $context, string $url, arr /** * {@inheritdoc} */ - public function getInfo(string $type = null) + public function getInfo(?string $type = null) { if (!$info = $this->finalInfo) { $info = $this->info; @@ -232,7 +232,7 @@ private static function schedule(self $response, array &$runningResponses): void * * @param NativeClientState $multi */ - private static function perform(ClientState $multi, array &$responses = null): void + private static function perform(ClientState $multi, ?array &$responses = null): void { foreach ($multi->openHandles as $i => [$pauseExpiry, $h, $buffer, $onProgress]) { if ($pauseExpiry) { diff --git a/src/Symfony/Component/HttpClient/Response/StreamWrapper.php b/src/Symfony/Component/HttpClient/Response/StreamWrapper.php index 50a7c36623ff1..1c7a2eee7c9a5 100644 --- a/src/Symfony/Component/HttpClient/Response/StreamWrapper.php +++ b/src/Symfony/Component/HttpClient/Response/StreamWrapper.php @@ -47,7 +47,7 @@ class StreamWrapper * * @return resource */ - public static function createResource(ResponseInterface $response, HttpClientInterface $client = null) + public static function createResource(ResponseInterface $response, ?HttpClientInterface $client = null) { if ($response instanceof StreamableInterface) { $stack = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS, 2); diff --git a/src/Symfony/Component/HttpClient/Response/TraceableResponse.php b/src/Symfony/Component/HttpClient/Response/TraceableResponse.php index 3bf1571fda1fb..68a8deeaeb89a 100644 --- a/src/Symfony/Component/HttpClient/Response/TraceableResponse.php +++ b/src/Symfony/Component/HttpClient/Response/TraceableResponse.php @@ -36,7 +36,7 @@ class TraceableResponse implements ResponseInterface, StreamableInterface private $content; private $event; - public function __construct(HttpClientInterface $client, ResponseInterface $response, &$content, StopwatchEvent $event = null) + public function __construct(HttpClientInterface $client, ResponseInterface $response, &$content, ?StopwatchEvent $event = null) { $this->client = $client; $this->response = $response; @@ -134,7 +134,7 @@ public function cancel(): void } } - public function getInfo(string $type = null) + public function getInfo(?string $type = null) { return $this->response->getInfo($type); } diff --git a/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php b/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php index 0482ccbabf0ba..6d5ae506391b5 100644 --- a/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php +++ b/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php @@ -146,7 +146,7 @@ private function doDestruct() * * @internal */ - public static function stream(iterable $responses, float $timeout = null): \Generator + public static function stream(iterable $responses, ?float $timeout = null): \Generator { $runningResponses = []; diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php index bec13784b1799..ae025e4aade0a 100644 --- a/src/Symfony/Component/HttpClient/RetryableHttpClient.php +++ b/src/Symfony/Component/HttpClient/RetryableHttpClient.php @@ -39,7 +39,7 @@ class RetryableHttpClient implements HttpClientInterface, ResetInterface /** * @param int $maxRetries The maximum number of times to retry */ - public function __construct(HttpClientInterface $client, RetryStrategyInterface $strategy = null, int $maxRetries = 3, LoggerInterface $logger = null) + public function __construct(HttpClientInterface $client, ?RetryStrategyInterface $strategy = null, int $maxRetries = 3, ?LoggerInterface $logger = null) { $this->client = $client; $this->strategy = $strategy ?? new GenericRetryStrategy(); diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/ScopingHttpClient.php index 85fa26acd8ff2..402bc87c788c9 100644 --- a/src/Symfony/Component/HttpClient/ScopingHttpClient.php +++ b/src/Symfony/Component/HttpClient/ScopingHttpClient.php @@ -32,7 +32,7 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAw private $defaultOptionsByRegexp; private $defaultRegexp; - public function __construct(HttpClientInterface $client, array $defaultOptionsByRegexp, string $defaultRegexp = null) + public function __construct(HttpClientInterface $client, array $defaultOptionsByRegexp, ?string $defaultRegexp = null) { $this->client = $client; $this->defaultOptionsByRegexp = $defaultOptionsByRegexp; @@ -43,7 +43,7 @@ public function __construct(HttpClientInterface $client, array $defaultOptionsBy } } - public static function forBaseUri(HttpClientInterface $client, string $baseUri, array $defaultOptions = [], string $regexp = null): self + public static function forBaseUri(HttpClientInterface $client, string $baseUri, array $defaultOptions = [], ?string $regexp = null): self { if (null === $regexp) { $regexp = preg_quote(implode('', self::resolveUrl(self::parseUrl('.'), self::parseUrl($baseUri)))); @@ -96,7 +96,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { return $this->client->stream($responses, $timeout); } diff --git a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php index 199d2cf5d0b81..1f55296ff7c38 100644 --- a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php +++ b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php @@ -25,7 +25,7 @@ class AsyncDecoratorTraitTest extends NativeHttpClientTest { - protected function getHttpClient(string $testCase, \Closure $chunkFilter = null, HttpClientInterface $decoratedClient = null): HttpClientInterface + protected function getHttpClient(string $testCase, ?\Closure $chunkFilter = null, ?HttpClientInterface $decoratedClient = null): HttpClientInterface { if ('testHandleIsRemovedOnException' === $testCase) { $this->markTestSkipped("AsyncDecoratorTrait doesn't cache handles"); @@ -42,7 +42,7 @@ protected function getHttpClient(string $testCase, \Closure $chunkFilter = null, private $chunkFilter; - public function __construct(HttpClientInterface $client, \Closure $chunkFilter = null) + public function __construct(HttpClientInterface $client, ?\Closure $chunkFilter = null) { $this->chunkFilter = $chunkFilter; $this->client = $client; diff --git a/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php index cf2af1560c345..0e4befafcf4fb 100644 --- a/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php +++ b/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php @@ -13,6 +13,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\HttpClient\Exception\ServerException; +use Symfony\Component\HttpClient\Exception\TimeoutException; use Symfony\Component\HttpClient\HttpClient; use Symfony\Component\HttpClient\MockHttpClient; use Symfony\Component\HttpClient\NativeHttpClient; @@ -21,6 +22,7 @@ use Symfony\Component\HttpClient\Retry\GenericRetryStrategy; use Symfony\Component\HttpClient\RetryableHttpClient; use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface; +use Symfony\Contracts\HttpClient\Test\TestHttpServer; class RetryableHttpClientTest extends TestCase { @@ -244,4 +246,33 @@ public function testRetryOnErrorAssertContent() self::assertSame('Test out content', $response->getContent()); self::assertSame('Test out content', $response->getContent(), 'Content should be buffered'); } + + /** + * @testWith ["GET"] + * ["POST"] + * ["PUT"] + * ["PATCH"] + * ["DELETE"] + */ + public function testRetryOnHeaderTimeout(string $method) + { + $client = HttpClient::create(); + + if ($client instanceof NativeHttpClient) { + $this->markTestSkipped('NativeHttpClient cannot timeout before receiving headers'); + } + + TestHttpServer::start(); + + $client = new RetryableHttpClient($client); + $response = $client->request($method, 'http://localhost:8057/timeout-header', ['timeout' => 0.1]); + + try { + $response->getStatusCode(); + $this->fail(TimeoutException::class.' expected'); + } catch (TimeoutException $e) { + } + + $this->assertSame('Idle timeout reached for "http://localhost:8057/timeout-header".', $response->getInfo('error')); + } } diff --git a/src/Symfony/Component/HttpClient/TraceableHttpClient.php b/src/Symfony/Component/HttpClient/TraceableHttpClient.php index 76c9282243df3..0c1f05adf7736 100644 --- a/src/Symfony/Component/HttpClient/TraceableHttpClient.php +++ b/src/Symfony/Component/HttpClient/TraceableHttpClient.php @@ -30,7 +30,7 @@ final class TraceableHttpClient implements HttpClientInterface, ResetInterface, private $stopwatch; private $tracedRequests; - public function __construct(HttpClientInterface $client, Stopwatch $stopwatch = null) + public function __construct(HttpClientInterface $client, ?Stopwatch $stopwatch = null) { $this->client = $client; $this->stopwatch = $stopwatch; @@ -72,7 +72,7 @@ public function request(string $method, string $url, array $options = []): Respo /** * {@inheritdoc} */ - public function stream($responses, float $timeout = null): ResponseStreamInterface + public function stream($responses, ?float $timeout = null): ResponseStreamInterface { if ($responses instanceof TraceableResponse) { $responses = [$responses]; diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php index d3caa36aa08ff..1878caae132d7 100644 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -45,7 +45,7 @@ class BinaryFileResponse extends Response * @param bool $autoEtag Whether the ETag header should be automatically set * @param bool $autoLastModified Whether the Last-Modified header should be automatically set */ - public function __construct($file, int $status = 200, array $headers = [], bool $public = true, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true) + public function __construct($file, int $status = 200, array $headers = [], bool $public = true, ?string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true) { parent::__construct(null, $status, $headers); @@ -69,7 +69,7 @@ public function __construct($file, int $status = 200, array $headers = [], bool * * @deprecated since Symfony 5.2, use __construct() instead. */ - public static function create($file = null, int $status = 200, array $headers = [], bool $public = true, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true) + public static function create($file = null, int $status = 200, array $headers = [], bool $public = true, ?string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true) { trigger_deprecation('symfony/http-foundation', '5.2', 'The "%s()" method is deprecated, use "new %s()" instead.', __METHOD__, static::class); @@ -85,7 +85,7 @@ public static function create($file = null, int $status = 200, array $headers = * * @throws FileException */ - public function setFile($file, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true) + public function setFile($file, ?string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true) { if (!$file instanceof File) { if ($file instanceof \SplFileInfo) { diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php index 91024535b2c68..3ff93b9c12040 100644 --- a/src/Symfony/Component/HttpFoundation/Cookie.php +++ b/src/Symfony/Component/HttpFoundation/Cookie.php @@ -71,7 +71,7 @@ public static function fromString(string $cookie, bool $decode = false) return new static($name, $value, $data['expires'], $data['path'], $data['domain'], $data['secure'], $data['httponly'], $data['raw'], $data['samesite']); } - public static function create(string $name, string $value = null, $expire = 0, ?string $path = '/', string $domain = null, bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX): self + public static function create(string $name, ?string $value = null, $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX): self { return new self($name, $value, $expire, $path, $domain, $secure, $httpOnly, $raw, $sameSite); } @@ -89,7 +89,7 @@ public static function create(string $name, string $value = null, $expire = 0, ? * * @throws \InvalidArgumentException */ - public function __construct(string $name, string $value = null, $expire = 0, ?string $path = '/', string $domain = null, bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = 'lax') + public function __construct(string $name, ?string $value = null, $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = 'lax') { // from PHP source code if ($raw && false !== strpbrk($name, self::RESERVED_CHARS_LIST)) { diff --git a/src/Symfony/Component/HttpFoundation/Exception/SessionNotFoundException.php b/src/Symfony/Component/HttpFoundation/Exception/SessionNotFoundException.php index 94b0cb69aae1f..80a21bf151c8e 100644 --- a/src/Symfony/Component/HttpFoundation/Exception/SessionNotFoundException.php +++ b/src/Symfony/Component/HttpFoundation/Exception/SessionNotFoundException.php @@ -20,7 +20,7 @@ */ class SessionNotFoundException extends \LogicException implements RequestExceptionInterface { - public function __construct(string $message = 'There is currently no session available.', int $code = 0, \Throwable $previous = null) + public function __construct(string $message = 'There is currently no session available.', int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); } diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php index d941577d25982..2deb53d6dd91d 100644 --- a/src/Symfony/Component/HttpFoundation/File/File.php +++ b/src/Symfony/Component/HttpFoundation/File/File.php @@ -88,7 +88,7 @@ public function getMimeType() * * @throws FileException if the target file could not be created */ - public function move(string $directory, string $name = null) + public function move(string $directory, ?string $name = null) { $target = $this->getTargetFile($directory, $name); @@ -121,7 +121,7 @@ public function getContent(): string /** * @return self */ - protected function getTargetFile(string $directory, string $name = null) + protected function getTargetFile(string $directory, ?string $name = null) { if (!is_dir($directory)) { if (false === @mkdir($directory, 0777, true) && !is_dir($directory)) { diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php index 1161556c4fea7..6ff6e51a84655 100644 --- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -60,7 +60,7 @@ class UploadedFile extends File * @throws FileException If file_uploads is disabled * @throws FileNotFoundException If the file does not exist */ - public function __construct(string $path, string $originalName, string $mimeType = null, int $error = null, bool $test = false) + public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $error = null, bool $test = false) { $this->originalName = $this->getName($originalName); $this->mimeType = $mimeType ?: 'application/octet-stream'; @@ -172,7 +172,7 @@ public function isValid() * * @throws FileException if, for any reason, the file could not have been moved */ - public function move(string $directory, string $name = null) + public function move(string $directory, ?string $name = null) { if ($this->isValid()) { if ($this->test) { diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php index 4683a684095a5..43d5f6327e877 100644 --- a/src/Symfony/Component/HttpFoundation/HeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php @@ -67,7 +67,7 @@ public function __toString() * * @return array>|array */ - public function all(string $key = null) + public function all(?string $key = null) { if (null !== $key) { return $this->headers[strtr($key, self::UPPER, self::LOWER)] ?? []; @@ -110,7 +110,7 @@ public function add(array $headers) * * @return string|null */ - public function get(string $key, string $default = null) + public function get(string $key, ?string $default = null) { $headers = $this->all($key); @@ -197,7 +197,7 @@ public function remove(string $key) * * @throws \RuntimeException When the HTTP header is not parseable */ - public function getDate(string $key, \DateTime $default = null) + public function getDate(string $key, ?\DateTime $default = null) { if (null === $value = $this->get($key)) { return $default; diff --git a/src/Symfony/Component/HttpFoundation/InputBag.php b/src/Symfony/Component/HttpFoundation/InputBag.php index a9d3cd82af8f0..356fbbc6f59e6 100644 --- a/src/Symfony/Component/HttpFoundation/InputBag.php +++ b/src/Symfony/Component/HttpFoundation/InputBag.php @@ -45,7 +45,7 @@ public function get(string $key, $default = null) /** * {@inheritdoc} */ - public function all(string $key = null): array + public function all(?string $key = null): array { return parent::all($key); } diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php index 501a6387d908d..51bdf1976e883 100644 --- a/src/Symfony/Component/HttpFoundation/JsonResponse.php +++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php @@ -105,7 +105,7 @@ public static function fromJsonString(string $data, int $status = 200, array $he * * @throws \InvalidArgumentException When the callback name is not valid */ - public function setCallback(string $callback = null) + public function setCallback(?string $callback = null) { if (null !== $callback) { // partially taken from https://geekality.net/2011/08/03/valid-javascript-identifier/ diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index f8e342154764f..75db0300b8a57 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -451,7 +451,7 @@ public static function setFactory(?callable $callable) * * @return static */ - public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null) + public function duplicate(?array $query = null, ?array $request = null, ?array $attributes = null, ?array $cookies = null, ?array $files = null, ?array $server = null) { $dup = clone $this; if (null !== $query) { @@ -1651,7 +1651,7 @@ public function getPreferredFormat(?string $default = 'html'): ?string * * @return string|null */ - public function getPreferredLanguage(array $locales = null) + public function getPreferredLanguage(?array $locales = null) { $preferredLanguages = $this->getLanguages(); @@ -2061,7 +2061,7 @@ public function isFromTrustedProxy() return self::$trustedProxies && IpUtils::checkIp($this->server->get('REMOTE_ADDR', ''), self::$trustedProxies); } - private function getTrustedValues(int $type, string $ip = null): array + private function getTrustedValues(int $type, ?string $ip = null): array { $clientValues = []; $forwardedValues = []; diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php index 5212634479834..03ccee97edb8f 100644 --- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php +++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php @@ -58,7 +58,7 @@ class RequestMatcher implements RequestMatcherInterface * @param string|string[]|null $ips * @param string|string[]|null $schemes */ - public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = [], $schemes = null, int $port = null) + public function __construct(?string $path = null, ?string $host = null, $methods = null, $ips = null, array $attributes = [], $schemes = null, ?int $port = null) { $this->matchPath($path); $this->matchHost($host); diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 23bfb2199d98c..6798a04c8334e 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -463,7 +463,7 @@ public function getProtocolVersion(): string * * @final */ - public function setStatusCode(int $code, string $text = null): object + public function setStatusCode(int $code, ?string $text = null): object { $this->statusCode = $code; if ($this->isInvalid()) { @@ -737,7 +737,7 @@ public function getExpires(): ?\DateTimeInterface * * @final */ - public function setExpires(\DateTimeInterface $date = null): object + public function setExpires(?\DateTimeInterface $date = null): object { if (null === $date) { $this->headers->remove('Expires'); @@ -886,7 +886,7 @@ public function getLastModified(): ?\DateTimeInterface * * @final */ - public function setLastModified(\DateTimeInterface $date = null): object + public function setLastModified(?\DateTimeInterface $date = null): object { if (null === $date) { $this->headers->remove('Last-Modified'); @@ -924,7 +924,7 @@ public function getEtag(): ?string * * @final */ - public function setEtag(string $etag = null, bool $weak = false): object + public function setEtag(?string $etag = null, bool $weak = false): object { if (null === $etag) { $this->headers->remove('Etag'); @@ -1217,7 +1217,7 @@ public function isNotFound(): bool * * @final */ - public function isRedirect(string $location = null): bool + public function isRedirect(?string $location = null): bool { return \in_array($this->statusCode, [201, 301, 302, 303, 307, 308]) && (null === $location ?: $location == $this->headers->get('Location')); } diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index 1df13fa21b77e..d4c4f393f8249 100644 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -88,7 +88,7 @@ public function replace(array $headers = []) /** * {@inheritdoc} */ - public function all(string $key = null) + public function all(?string $key = null) { $headers = parent::all(); @@ -186,7 +186,7 @@ public function setCookie(Cookie $cookie) /** * Removes a cookie from the array, but does not unset it in the browser. */ - public function removeCookie(string $name, ?string $path = '/', string $domain = null) + public function removeCookie(string $name, ?string $path = '/', ?string $domain = null) { if (null === $path) { $path = '/'; @@ -239,7 +239,7 @@ public function getCookies(string $format = self::COOKIES_FLAT) /** * Clears a cookie in the browser. */ - public function clearCookie(string $name, ?string $path = '/', string $domain = null, bool $secure = false, bool $httpOnly = true, string $sameSite = null) + public function clearCookie(string $name, ?string $path = '/', ?string $domain = null, bool $secure = false, bool $httpOnly = true, ?string $sameSite = null) { $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly, false, $sameSite)); } diff --git a/src/Symfony/Component/HttpFoundation/ServerBag.php b/src/Symfony/Component/HttpFoundation/ServerBag.php index 004af5708a516..831caa67e68e6 100644 --- a/src/Symfony/Component/HttpFoundation/ServerBag.php +++ b/src/Symfony/Component/HttpFoundation/ServerBag.php @@ -31,7 +31,7 @@ public function getHeaders() foreach ($this->parameters as $key => $value) { if (str_starts_with($key, 'HTTP_')) { $headers[substr($key, 5)] = $value; - } elseif (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) { + } elseif (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true) && '' !== $value) { $headers[$key] = $value; } } diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php index 022e3986fe187..917920a46cb98 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Session.php +++ b/src/Symfony/Component/HttpFoundation/Session/Session.php @@ -39,7 +39,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable private $usageIndex = 0; private $usageReporter; - public function __construct(SessionStorageInterface $storage = null, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null, callable $usageReporter = null) + public function __construct(?SessionStorageInterface $storage = null, ?AttributeBagInterface $attributes = null, ?FlashBagInterface $flashes = null, ?callable $usageReporter = null) { $this->storage = $storage ?? new NativeSessionStorage(); $this->usageReporter = $usageReporter; @@ -175,7 +175,7 @@ public function isEmpty(): bool /** * {@inheritdoc} */ - public function invalidate(int $lifetime = null) + public function invalidate(?int $lifetime = null) { $this->storage->clear(); @@ -185,7 +185,7 @@ public function invalidate(int $lifetime = null) /** * {@inheritdoc} */ - public function migrate(bool $destroy = false, int $lifetime = null) + public function migrate(bool $destroy = false, ?int $lifetime = null) { return $this->storage->regenerate($destroy, $lifetime); } diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php b/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php index 04c4b06a040f9..bd79282ee17b7 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php @@ -26,7 +26,7 @@ class SessionFactory implements SessionFactoryInterface private $storageFactory; private $usageReporter; - public function __construct(RequestStack $requestStack, SessionStorageFactoryInterface $storageFactory, callable $usageReporter = null) + public function __construct(RequestStack $requestStack, SessionStorageFactoryInterface $storageFactory, ?callable $usageReporter = null) { $this->requestStack = $requestStack; $this->storageFactory = $storageFactory; diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php index e673383372e75..b73dfd0c3848e 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php @@ -66,7 +66,7 @@ public function setName(string $name); * * @return bool */ - public function invalidate(int $lifetime = null); + public function invalidate(?int $lifetime = null); /** * Migrates the current session to a new session id while maintaining all @@ -80,7 +80,7 @@ public function invalidate(int $lifetime = null); * * @return bool */ - public function migrate(bool $destroy = false, int $lifetime = null); + public function migrate(bool $destroy = false, ?int $lifetime = null); /** * Force the session to be saved and closed. diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php index 52a103879bce3..570d4f4278033 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php @@ -28,7 +28,7 @@ class NativeFileSessionHandler extends \SessionHandler * @throws \InvalidArgumentException On invalid $savePath * @throws \RuntimeException When failing to create the save directory */ - public function __construct(string $savePath = null) + public function __construct(?string $savePath = null) { if (null === $savePath) { $savePath = \ini_get('session.save_path'); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php index 52d3320942fa0..3e10f6dbcd5f2 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php @@ -100,7 +100,7 @@ public function getLifetime() * to expire with browser session. Time is in seconds, and is * not a Unix timestamp. */ - public function stampNew(int $lifetime = null) + public function stampNew(?int $lifetime = null) { $this->stampCreated($lifetime); } @@ -158,7 +158,7 @@ public function setName(string $name) $this->name = $name; } - private function stampCreated(int $lifetime = null): void + private function stampCreated(?int $lifetime = null): void { $timeStamp = time(); $this->meta[self::CREATED] = $this->meta[self::UPDATED] = $this->lastUsed = $timeStamp; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php index c5c2bb0731001..77bb38f157c12 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php @@ -62,7 +62,7 @@ class MockArraySessionStorage implements SessionStorageInterface */ protected $bags = []; - public function __construct(string $name = 'MOCKSESSID', MetadataBag $metaBag = null) + public function __construct(string $name = 'MOCKSESSID', ?MetadataBag $metaBag = null) { $this->name = $name; $this->setMetadataBag($metaBag); @@ -94,7 +94,7 @@ public function start() /** * {@inheritdoc} */ - public function regenerate(bool $destroy = false, int $lifetime = null) + public function regenerate(bool $destroy = false, ?int $lifetime = null) { if (!$this->started) { $this->start(); @@ -204,7 +204,7 @@ public function isStarted() return $this->started; } - public function setMetadataBag(MetadataBag $bag = null) + public function setMetadataBag(?MetadataBag $bag = null) { if (null === $bag) { $bag = new MetadataBag(); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php index 8e32a45e38c41..8aeb9724c1281 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php @@ -30,7 +30,7 @@ class MockFileSessionStorage extends MockArraySessionStorage /** * @param string|null $savePath Path of directory to save session files */ - public function __construct(string $savePath = null, string $name = 'MOCKSESSID', MetadataBag $metaBag = null) + public function __construct(?string $savePath = null, string $name = 'MOCKSESSID', ?MetadataBag $metaBag = null) { if (null === $savePath) { $savePath = sys_get_temp_dir(); @@ -68,7 +68,7 @@ public function start() /** * {@inheritdoc} */ - public function regenerate(bool $destroy = false, int $lifetime = null) + public function regenerate(bool $destroy = false, ?int $lifetime = null) { if (!$this->started) { $this->start(); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php index d0da1e16922fc..900fa7cfa08e3 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php @@ -28,7 +28,7 @@ class MockFileSessionStorageFactory implements SessionStorageFactoryInterface /** * @see MockFileSessionStorage constructor. */ - public function __construct(string $savePath = null, string $name = 'MOCKSESSID', MetadataBag $metaBag = null) + public function __construct(?string $savePath = null, string $name = 'MOCKSESSID', ?MetadataBag $metaBag = null) { $this->savePath = $savePath; $this->name = $name; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index 242478c420280..e7b42ed0b93ef 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -97,7 +97,7 @@ class NativeSessionStorage implements SessionStorageInterface * * @param AbstractProxy|\SessionHandlerInterface|null $handler */ - public function __construct(array $options = [], $handler = null, MetadataBag $metaBag = null) + public function __construct(array $options = [], $handler = null, ?MetadataBag $metaBag = null) { if (!\extension_loaded('session')) { throw new \LogicException('PHP extension "session" is required.'); @@ -233,7 +233,7 @@ public function setName(string $name) /** * {@inheritdoc} */ - public function regenerate(bool $destroy = false, int $lifetime = null) + public function regenerate(bool $destroy = false, ?int $lifetime = null) { // Cannot regenerate the session ID for non-active sessions. if (\PHP_SESSION_ACTIVE !== session_status()) { @@ -355,7 +355,7 @@ public function getBag(string $name) return $this->bags[$name]; } - public function setMetadataBag(MetadataBag $metaBag = null) + public function setMetadataBag(?MetadataBag $metaBag = null) { if (null === $metaBag) { $metaBag = new MetadataBag(); @@ -487,7 +487,7 @@ public function setSaveHandler($saveHandler = null) * PHP takes the return value from the read() handler, unserializes it * and populates $_SESSION with the result automatically. */ - protected function loadSession(array &$session = null) + protected function loadSession(?array &$session = null) { if (null === $session) { $session = &$_SESSION; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php index a7d7411ff3fc9..48e65267ed63b 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php @@ -29,7 +29,7 @@ class NativeSessionStorageFactory implements SessionStorageFactoryInterface /** * @see NativeSessionStorage constructor. */ - public function __construct(array $options = [], $handler = null, MetadataBag $metaBag = null, bool $secure = false) + public function __construct(array $options = [], $handler = null, ?MetadataBag $metaBag = null, bool $secure = false) { $this->options = $options; $this->handler = $handler; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php index 72dbef134671b..855d5e111b881 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php @@ -23,7 +23,7 @@ class PhpBridgeSessionStorage extends NativeSessionStorage /** * @param AbstractProxy|\SessionHandlerInterface|null $handler */ - public function __construct($handler = null, MetadataBag $metaBag = null) + public function __construct($handler = null, ?MetadataBag $metaBag = null) { if (!\extension_loaded('session')) { throw new \LogicException('PHP extension "session" is required.'); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php index 173ef71dea424..aa9326322f716 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php @@ -28,7 +28,7 @@ class PhpBridgeSessionStorageFactory implements SessionStorageFactoryInterface /** * @see PhpBridgeSessionStorage constructor. */ - public function __construct($handler = null, MetadataBag $metaBag = null, bool $secure = false) + public function __construct($handler = null, ?MetadataBag $metaBag = null, bool $secure = false) { $this->handler = $handler; $this->metaBag = $metaBag; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php index 705374552d343..70b7c6a159f6f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php @@ -90,7 +90,7 @@ public function setName(string $name); * * @throws \RuntimeException If an error occurs while regenerating this storage */ - public function regenerate(bool $destroy = false, int $lifetime = null); + public function regenerate(bool $destroy = false, ?int $lifetime = null); /** * Force the session to be saved and closed. diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php index 0599bd1e4c2b6..b42330dcd403c 100644 --- a/src/Symfony/Component/HttpFoundation/StreamedResponse.php +++ b/src/Symfony/Component/HttpFoundation/StreamedResponse.php @@ -30,7 +30,7 @@ class StreamedResponse extends Response protected $streamed; private $headersSent; - public function __construct(callable $callback = null, int $status = 200, array $headers = []) + public function __construct(?callable $callback = null, int $status = 200, array $headers = []) { parent::__construct(null, $status, $headers); diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php index eb9c26a3b7ee8..939925b9811a0 100644 --- a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php +++ b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php @@ -22,7 +22,7 @@ final class ResponseCookieValueSame extends Constraint private $path; private $domain; - public function __construct(string $name, string $value, string $path = '/', string $domain = null) + public function __construct(string $name, string $value, string $path = '/', ?string $domain = null) { $this->name = $name; $this->value = $value; diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php index eae9e271bc74b..9d6e58c8d0990 100644 --- a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php +++ b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php @@ -21,7 +21,7 @@ final class ResponseHasCookie extends Constraint private $path; private $domain; - public function __construct(string $name, string $path = '/', string $domain = null) + public function __construct(string $name, string $path = '/', ?string $domain = null) { $this->name = $name; $this->path = $path; diff --git a/src/Symfony/Component/HttpFoundation/Tests/HeaderUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/HeaderUtilsTest.php index befa4aea035a5..3279b9a53b47d 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/HeaderUtilsTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/HeaderUtilsTest.php @@ -149,7 +149,7 @@ public static function provideMakeDispositionFail() /** * @dataProvider provideParseQuery */ - public function testParseQuery(string $query, string $expected = null) + public function testParseQuery(string $query, ?string $expected = null) { $this->assertSame($expected ?? $query, http_build_query(HeaderUtils::parseQuery($query), '', '&')); } diff --git a/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php index e26714bc4640a..3d675c5127868 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php @@ -177,4 +177,20 @@ public function testItDoesNotOverwriteTheAuthorizationHeaderIfItIsAlreadySet() 'PHP_AUTH_PW' => '', ], $bag->getHeaders()); } + + /** + * An HTTP request without content-type and content-length will result in + * the variables $_SERVER['CONTENT_TYPE'] and $_SERVER['CONTENT_LENGTH'] + * containing an empty string in PHP. + */ + public function testRequestWithoutContentTypeAndContentLength() + { + $bag = new ServerBag([ + 'CONTENT_TYPE' => '', + 'CONTENT_LENGTH' => '', + 'HTTP_USER_AGENT' => 'foo', + ]); + + $this->assertSame(['USER_AGENT' => 'foo'], $bag->getHeaders()); + } } diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php index 4403cda3df8b2..5b5f660c4e81a 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php @@ -368,7 +368,7 @@ class MockPdo extends \PDO private $driverName; private $errorMode; - public function __construct(string $driverName = null, int $errorMode = null) + public function __construct(?string $driverName = null, ?int $errorMode = null) { $this->driverName = $driverName; $this->errorMode = null !== $errorMode ?: \PDO::ERRMODE_EXCEPTION; diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php index 67f9ed50b49c9..730f0f7bb74d4 100644 --- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php +++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php @@ -29,7 +29,7 @@ class CacheWarmerAggregate implements CacheWarmerInterface /** * @param iterable $warmers */ - public function __construct(iterable $warmers = [], bool $debug = false, string $deprecationLogsFilepath = null) + public function __construct(iterable $warmers = [], bool $debug = false, ?string $deprecationLogsFilepath = null) { $this->warmers = $warmers; $this->debug = $debug; diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php index 6eca98635c570..4b984375357a4 100644 --- a/src/Symfony/Component/HttpKernel/Config/FileLocator.php +++ b/src/Symfony/Component/HttpKernel/Config/FileLocator.php @@ -33,7 +33,7 @@ public function __construct(KernelInterface $kernel) /** * {@inheritdoc} */ - public function locate(string $file, string $currentPath = null, bool $first = true) + public function locate(string $file, ?string $currentPath = null, bool $first = true) { if (isset($file[0]) && '@' === $file[0]) { $resource = $this->kernel->locateResource($file); diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php index a54140b7e5426..76ef79741bf50 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php @@ -33,7 +33,7 @@ final class ArgumentResolver implements ArgumentResolverInterface /** * @param iterable $argumentValueResolvers */ - public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = []) + public function __construct(?ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = []) { $this->argumentMetadataFactory = $argumentMetadataFactory ?? new ArgumentMetadataFactory(); $this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers(); diff --git a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php index 3b9468465c52c..b7f77d00b3283 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php @@ -25,7 +25,7 @@ class ContainerControllerResolver extends ControllerResolver { protected $container; - public function __construct(ContainerInterface $container, LoggerInterface $logger = null) + public function __construct(ContainerInterface $container, ?LoggerInterface $logger = null) { $this->container = $container; diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index 8abbadd48b5bb..e6b4b8055c082 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -25,7 +25,7 @@ class ControllerResolver implements ControllerResolverInterface { private $logger; - public function __construct(LoggerInterface $logger = null) + public function __construct(?LoggerInterface $logger = null) { $this->logger = $logger; } diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php index 0c5b1da36dad4..5046c84b041e9 100644 --- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php +++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php @@ -137,7 +137,7 @@ public function getAttribute(): ?ArgumentInterface /** * @return object[] */ - public function getAttributes(string $name = null, int $flags = 0): array + public function getAttributes(?string $name = null, int $flags = 0): array { if (!$name) { return $this->attributes; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php index fda6a4eaaa92b..31764f09f4589 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php @@ -21,7 +21,7 @@ */ class AjaxDataCollector extends DataCollector { - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { // all collecting is done client side } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php index 9819507aabc3c..72f79c5bf728e 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php @@ -32,7 +32,7 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte /** * Sets the Kernel associated with this Request. */ - public function setKernel(KernelInterface $kernel = null) + public function setKernel(?KernelInterface $kernel = null) { $this->kernel = $kernel; } @@ -40,7 +40,7 @@ public function setKernel(KernelInterface $kernel = null) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $eom = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE); $eol = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE); diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php index 1cb865fd66036..8aca94802dea0 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php @@ -25,7 +25,7 @@ interface DataCollectorInterface extends ResetInterface /** * Collects data for the given Request and Response. */ - public function collect(Request $request, Response $response, \Throwable $exception = null); + public function collect(Request $request, Response $response, ?\Throwable $exception = null); /** * Returns the name of the collector. diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php index 9a85c19267806..3311bd400e0d0 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php @@ -47,7 +47,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface * @param string|FileLinkFormatter|null $fileLinkFormat * @param DataDumperInterface|Connection|null $dumper */ - public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, $dumper = null) + public function __construct(?Stopwatch $stopwatch = null, $fileLinkFormat = null, ?string $charset = null, ?RequestStack $requestStack = null, $dumper = null) { $fileLinkFormat = $fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'); $this->stopwatch = $stopwatch; @@ -101,7 +101,7 @@ public function dump(Data $data) } } - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { if (!$this->dataCount) { $this->data = []; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php index a8135533641d9..3f6ef4f7c6319 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php @@ -30,7 +30,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter private $requestStack; private $currentRequest; - public function __construct(EventDispatcherInterface $dispatcher = null, RequestStack $requestStack = null) + public function __construct(?EventDispatcherInterface $dispatcher = null, ?RequestStack $requestStack = null) { $this->dispatcher = $dispatcher; $this->requestStack = $requestStack; @@ -39,7 +39,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null, Request /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->currentRequest = $this->requestStack && $this->requestStack->getMainRequest() !== $request ? $request : null; $this->data = [ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php index 14bbbb364b54f..d93b813951942 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php @@ -25,7 +25,7 @@ class ExceptionDataCollector extends DataCollector /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { if (null !== $exception) { $this->data = [ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php index 7b1896ac2925c..0d6df48cd917c 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php @@ -30,7 +30,7 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte private $requestStack; private $processedLogs; - public function __construct(object $logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null) + public function __construct(?object $logger = null, ?string $containerPathPrefix = null, ?RequestStack $requestStack = null) { if (null !== $logger && $logger instanceof DebugLoggerInterface) { $this->logger = $logger; @@ -43,7 +43,7 @@ public function __construct(object $logger = null, string $containerPathPrefix = /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->currentRequest = $this->requestStack && $this->requestStack->getMainRequest() !== $request ? $request : null; } @@ -222,7 +222,7 @@ private function getContainerDeprecationLogs(): array return $logs; } - private function getContainerCompilerLogs(string $compilerLogsFilepath = null): array + private function getContainerCompilerLogs(?string $compilerLogsFilepath = null): array { if (!$compilerLogsFilepath || !is_file($compilerLogsFilepath)) { return []; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php index 3affae298c7c9..62d048ad16b15 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php @@ -29,7 +29,7 @@ public function __construct() /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->updateMemoryUsage(); } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index 5717000f292c7..c56013c2eaad8 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -38,7 +38,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter private $sessionUsages = []; private $requestStack; - public function __construct(RequestStack $requestStack = null) + public function __construct(?RequestStack $requestStack = null) { $this->controllers = new \SplObjectStorage(); $this->requestStack = $requestStack; @@ -47,7 +47,7 @@ public function __construct(RequestStack $requestStack = null) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { // attributes are serialized and as they can be anything, they need to be converted to strings. $attributes = []; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php index 372ede0378d3a..f3735fe56fcba 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php @@ -36,7 +36,7 @@ public function __construct() * * @final */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { if ($response instanceof RedirectResponse) { $this->data['redirect'] = true; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php index fa8bb4a52a969..13a62e6329973 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php @@ -27,7 +27,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf private $kernel; private $stopwatch; - public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null) + public function __construct(?KernelInterface $kernel = null, ?Stopwatch $stopwatch = null) { $this->kernel = $kernel; $this->stopwatch = $stopwatch; @@ -37,7 +37,7 @@ public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { if (null !== $this->kernel) { $startTime = $this->kernel->getStartTime(); diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php index 39d4d3b501653..8ec7e38d3d076 100644 --- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php +++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php @@ -43,7 +43,7 @@ class FileLinkFormatter * @param string|array|null $fileLinkFormat * @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand */ - public function __construct($fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null) + public function __construct($fileLinkFormat = null, ?RequestStack $requestStack = null, ?string $baseDir = null, $urlFormat = null) { if (!\is_array($fileLinkFormat) && $fileLinkFormat = (self::FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) { $i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f); diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php index 979154be9a7b0..a339f44a0b72d 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php @@ -57,7 +57,7 @@ abstract class AbstractSessionListener implements EventSubscriberInterface, Rese /** * @internal */ - public function __construct(ContainerInterface $container = null, bool $debug = false, array $sessionOptions = []) + public function __construct(?ContainerInterface $container = null, bool $debug = false, array $sessionOptions = []) { $this->container = $container; $this->debug = $debug; diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php index bd124f94d0740..da71d08629004 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php @@ -49,7 +49,7 @@ class DebugHandlersListener implements EventSubscriberInterface * @param bool $scream Enables/disables screaming mode, where even silenced errors are logged * @param bool $scope Enables/disables scoping mode */ - public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, $scope = true, $deprecationLogger = null, $fileLinkFormat = null) + public function __construct(?callable $exceptionHandler = null, ?LoggerInterface $logger = null, $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, $scope = true, $deprecationLogger = null, $fileLinkFormat = null) { if (!\is_bool($scope)) { trigger_deprecation('symfony/http-kernel', '5.4', 'Passing a $fileLinkFormat is deprecated.'); @@ -73,7 +73,7 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $ /** * Configures the error handler. */ - public function configure(object $event = null) + public function configure(?object $event = null) { if ($event instanceof ConsoleEvent && !\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) { return; diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php index 30908a4f45652..f7f9bd693f5aa 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php @@ -29,7 +29,7 @@ class DumpListener implements EventSubscriberInterface private $dumper; private $connection; - public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper, Connection $connection = null) + public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper, ?Connection $connection = null) { $this->cloner = $cloner; $this->dumper = $dumper; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php index b6fd0a357d6fe..668a908e57093 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php @@ -41,7 +41,7 @@ class ErrorListener implements EventSubscriberInterface /** * @param array|null}> $exceptionsMapping */ - public function __construct($controller, LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = []) + public function __construct($controller, ?LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = []) { $this->controller = $controller; $this->logger = $logger; @@ -155,7 +155,7 @@ public static function getSubscribedEvents(): array /** * Logs an exception. */ - protected function logException(\Throwable $exception, string $message, string $logLevel = null): void + protected function logException(\Throwable $exception, string $message, ?string $logLevel = null): void { if (null !== $this->logger) { if (null !== $logLevel) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php index 2c09e22bda7ac..a4073eaac84d9 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php @@ -35,7 +35,7 @@ class LocaleListener implements EventSubscriberInterface private $useAcceptLanguageHeader; private $enabledLocales; - public function __construct(RequestStack $requestStack, string $defaultLocale = 'en', RequestContextAwareInterface $router = null, bool $useAcceptLanguageHeader = false, array $enabledLocales = []) + public function __construct(RequestStack $requestStack, string $defaultLocale = 'en', ?RequestContextAwareInterface $router = null, bool $useAcceptLanguageHeader = false, array $enabledLocales = []) { $this->defaultLocale = $defaultLocale; $this->requestStack = $requestStack; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php index adbafe62e9a9e..e4261871b0e72 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php @@ -48,7 +48,7 @@ class ProfilerListener implements EventSubscriberInterface * @param bool $onlyException True if the profiler only collects data when an exception occurs, false otherwise * @param bool $onlyMainRequests True if the profiler only collects data when the request is the main request, false otherwise */ - public function __construct(Profiler $profiler, RequestStack $requestStack, RequestMatcherInterface $matcher = null, bool $onlyException = false, bool $onlyMainRequests = false, string $collectParameter = null) + public function __construct(Profiler $profiler, RequestStack $requestStack, ?RequestMatcherInterface $matcher = null, bool $onlyException = false, bool $onlyMainRequests = false, ?string $collectParameter = null) { $this->profiler = $profiler; $this->matcher = $matcher; diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php index 7c4da98928abf..8c1bc0ac6ebc7 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php @@ -55,7 +55,7 @@ class RouterListener implements EventSubscriberInterface * * @throws \InvalidArgumentException */ - public function __construct($matcher, RequestStack $requestStack, RequestContext $context = null, LoggerInterface $logger = null, string $projectDir = null, bool $debug = true) + public function __construct($matcher, RequestStack $requestStack, ?RequestContext $context = null, ?LoggerInterface $logger = null, ?string $projectDir = null, bool $debug = true) { if (!$matcher instanceof UrlMatcherInterface && !$matcher instanceof RequestMatcherInterface) { throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.'); @@ -73,7 +73,7 @@ public function __construct($matcher, RequestStack $requestStack, RequestContext $this->debug = $debug; } - private function setCurrentRequest(Request $request = null) + private function setCurrentRequest(?Request $request = null) { if (null !== $request) { try { diff --git a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php index 9081bff652976..dbf3846db652e 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php @@ -28,7 +28,7 @@ class SurrogateListener implements EventSubscriberInterface { private $surrogate; - public function __construct(SurrogateInterface $surrogate = null) + public function __construct(?SurrogateInterface $surrogate = null) { $this->surrogate = $surrogate; } diff --git a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php index 58680a327838c..a93954a4c26ac 100644 --- a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php @@ -22,7 +22,7 @@ class AccessDeniedHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php index f530f7db4927c..343769c958b5b 100644 --- a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php @@ -21,7 +21,7 @@ class BadRequestHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php index 79c36041c3f55..541e9f12e045e 100644 --- a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php @@ -21,7 +21,7 @@ class ConflictHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php index 9ea65057b38f5..1a36a53125561 100644 --- a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php @@ -21,7 +21,7 @@ class GoneHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/HttpException.php b/src/Symfony/Component/HttpKernel/Exception/HttpException.php index 249fe366d5b76..c308893712bd0 100644 --- a/src/Symfony/Component/HttpKernel/Exception/HttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/HttpException.php @@ -21,7 +21,7 @@ class HttpException extends \RuntimeException implements HttpExceptionInterface private $statusCode; private $headers; - public function __construct(int $statusCode, ?string $message = '', \Throwable $previous = null, array $headers = [], ?int $code = 0) + public function __construct(int $statusCode, ?string $message = '', ?\Throwable $previous = null, array $headers = [], ?int $code = 0) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php index fcac13785220a..7531ecfb6ce15 100644 --- a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php @@ -21,7 +21,7 @@ class LengthRequiredHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php index 37576bcacb354..e3dc84111ee4a 100644 --- a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php @@ -22,7 +22,7 @@ class MethodNotAllowedHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int|null $code The internal exception code */ - public function __construct(array $allow, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = []) + public function __construct(array $allow, ?string $message = '', ?\Throwable $previous = null, ?int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php index 5a422406ba715..9283dcd997f3d 100644 --- a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php @@ -21,7 +21,7 @@ class NotAcceptableHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php index a475113c5fe81..d0adb03c721f5 100644 --- a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php @@ -21,7 +21,7 @@ class NotFoundHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php index e23740a28dcf2..30ce081535205 100644 --- a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php @@ -21,7 +21,7 @@ class PreconditionFailedHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php index 5c31fae822b0c..4f8a484f65b2e 100644 --- a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php @@ -23,7 +23,7 @@ class PreconditionRequiredHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php index d5681bbeb3bc8..16efd93493424 100644 --- a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php @@ -22,7 +22,7 @@ class ServiceUnavailableHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int|null $code The internal exception code */ - public function __construct($retryAfter = null, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = []) + public function __construct($retryAfter = null, ?string $message = '', ?\Throwable $previous = null, ?int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php index fd74402b5d033..81148f16191fe 100644 --- a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php @@ -24,7 +24,7 @@ class TooManyRequestsHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int|null $code The internal exception code */ - public function __construct($retryAfter = null, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = []) + public function __construct($retryAfter = null, ?string $message = '', ?\Throwable $previous = null, ?int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php index aeb9713a3ded6..e1b8acec58270 100644 --- a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php @@ -22,7 +22,7 @@ class UnauthorizedHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int|null $code The internal exception code */ - public function __construct(string $challenge, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = []) + public function __construct(string $challenge, ?string $message = '', ?\Throwable $previous = null, ?int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php index 7b828b1d92ccb..5dc7b986658b5 100644 --- a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php @@ -21,7 +21,7 @@ class UnprocessableEntityHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php index 7908423f42580..35e20a01e38d5 100644 --- a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php @@ -21,7 +21,7 @@ class UnsupportedMediaTypeHttpException extends HttpException * @param \Throwable|null $previous The previous exception * @param int $code The internal exception code */ - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) + public function __construct(?string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []) { if (null === $message) { trigger_deprecation('symfony/http-kernel', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php index 4e4d028b48d81..8a21f6bfc1cf2 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php @@ -34,7 +34,7 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere * * @param FragmentRendererInterface $inlineStrategy The inline strategy to use when the surrogate is not supported */ - public function __construct(SurrogateInterface $surrogate = null, FragmentRendererInterface $inlineStrategy, UriSigner $signer = null) + public function __construct(?SurrogateInterface $surrogate, FragmentRendererInterface $inlineStrategy, ?UriSigner $signer = null) { $this->surrogate = $surrogate; $this->inlineStrategy = $inlineStrategy; diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php index 4c0fac997ab7d..6ab0b81451eaa 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php +++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php @@ -28,7 +28,7 @@ final class FragmentUriGenerator implements FragmentUriGeneratorInterface private $signer; private $requestStack; - public function __construct(string $fragmentPath, UriSigner $signer = null, RequestStack $requestStack = null) + public function __construct(string $fragmentPath, ?UriSigner $signer = null, ?RequestStack $requestStack = null) { $this->fragmentPath = $fragmentPath; $this->signer = $signer; @@ -38,7 +38,7 @@ public function __construct(string $fragmentPath, UriSigner $signer = null, Requ /** * {@inheritDoc} */ - public function generate(ControllerReference $controller, Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string + public function generate(ControllerReference $controller, ?Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string { if (null === $request && (null === $this->requestStack || null === $request = $this->requestStack->getCurrentRequest())) { throw new \LogicException('Generating a fragment URL can only be done when handling a Request.'); diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGeneratorInterface.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGeneratorInterface.php index b211f5e373020..040011b55bd4a 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGeneratorInterface.php +++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGeneratorInterface.php @@ -28,5 +28,5 @@ interface FragmentUriGeneratorInterface * @param bool $strict Whether to allow non-scalar attributes or not * @param bool $sign Whether to sign the URL or not */ - public function generate(ControllerReference $controller, Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string; + public function generate(ControllerReference $controller, ?Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string; } diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php index bd3eb5cd54f19..a23ffcc7cc190 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php @@ -32,7 +32,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer /** * @param string|null $globalDefaultTemplate The global default content (it can be a template name or the content) */ - public function __construct(Environment $twig = null, UriSigner $signer = null, string $globalDefaultTemplate = null, string $charset = 'utf-8') + public function __construct(?Environment $twig = null, ?UriSigner $signer = null, ?string $globalDefaultTemplate = null, string $charset = 'utf-8') { $this->twig = $twig; $this->globalDefaultTemplate = $globalDefaultTemplate; diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php index ea45fdcb3f1fe..60421f09651df 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php @@ -30,7 +30,7 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer private $kernel; private $dispatcher; - public function __construct(HttpKernelInterface $kernel, EventDispatcherInterface $dispatcher = null) + public function __construct(HttpKernelInterface $kernel, ?EventDispatcherInterface $dispatcher = null) { $this->kernel = $kernel; $this->dispatcher = $dispatcher; diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php index 9f453249325b2..5e7d17a779ab1 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php @@ -45,7 +45,7 @@ public function addSurrogateControl(Response $response) /** * {@inheritdoc} */ - public function renderIncludeTag(string $uri, string $alt = null, bool $ignoreErrors = true, string $comment = '') + public function renderIncludeTag(string $uri, ?string $alt = null, bool $ignoreErrors = true, string $comment = '') { $html = sprintf('', $uri, diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index b01bd722607a9..9bffc8add01db 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -81,7 +81,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface * This setting is overridden by the stale-if-error HTTP Cache-Control extension * (see RFC 5861). */ - public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = []) + public function __construct(HttpKernelInterface $kernel, StoreInterface $store, ?SurrogateInterface $surrogate = null, array $options = []) { $this->store = $store; $this->kernel = $kernel; @@ -471,7 +471,7 @@ protected function fetch(Request $request, bool $catch = false) * * @return Response */ - protected function forward(Request $request, bool $catch = false, Response $entry = null) + protected function forward(Request $request, bool $catch = false, ?Response $entry = null) { if ($this->surrogate) { $this->surrogate->addSurrogateCapability($request); diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php index 61909100e6157..d7903ff13e89d 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php @@ -42,7 +42,7 @@ public function addSurrogateControl(Response $response) /** * {@inheritdoc} */ - public function renderIncludeTag(string $uri, string $alt = null, bool $ignoreErrors = true, string $comment = '') + public function renderIncludeTag(string $uri, ?string $alt = null, bool $ignoreErrors = true, string $comment = '') { return sprintf('', $uri); } diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php index 9d7f3e4f6949d..f4810b2ab6f29 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php @@ -475,7 +475,7 @@ private function persistResponse(Response $response): array /** * Restores a Response from the HTTP headers and body. */ - private function restoreResponse(array $headers, string $path = null): ?Response + private function restoreResponse(array $headers, ?string $path = null): ?Response { $status = $headers['X-Status'][0]; unset($headers['X-Status']); diff --git a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php index 557f4e959e4bd..12ed055247493 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php @@ -64,7 +64,7 @@ public function needsParsing(Response $response); * * @return string */ - public function renderIncludeTag(string $uri, string $alt = null, bool $ignoreErrors = true, string $comment = ''); + public function renderIncludeTag(string $uri, ?string $alt = null, bool $ignoreErrors = true, string $comment = ''); /** * Replaces a Response Surrogate tags with the included resource content. diff --git a/src/Symfony/Component/HttpKernel/HttpClientKernel.php b/src/Symfony/Component/HttpKernel/HttpClientKernel.php index 58ca82e5a8105..2b4620bb54ae8 100644 --- a/src/Symfony/Component/HttpKernel/HttpClientKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpClientKernel.php @@ -33,7 +33,7 @@ final class HttpClientKernel implements HttpKernelInterface { private $client; - public function __construct(HttpClientInterface $client = null) + public function __construct(?HttpClientInterface $client = null) { if (null === $client && !class_exists(HttpClient::class)) { throw new \LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__)); diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index 38102e2525ac9..f4b4b8ff2ed32 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -55,7 +55,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface protected $requestStack; private $argumentResolver; - public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null, ArgumentResolverInterface $argumentResolver = null) + public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, ?RequestStack $requestStack = null, ?ArgumentResolverInterface $argumentResolver = null) { $this->dispatcher = $dispatcher; $this->resolver = $resolver; @@ -100,7 +100,7 @@ public function terminate(Request $request, Response $response) /** * @internal */ - public function terminateWithException(\Throwable $exception, Request $request = null) + public function terminateWithException(\Throwable $exception, ?Request $request = null) { if (!$request = $request ?: $this->requestStack->getMainRequest()) { throw $exception; diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php index 643134f1bba08..5c6506cca9aa2 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php +++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php @@ -36,7 +36,7 @@ class HttpKernelBrowser extends AbstractBrowser /** * @param array $server The server parameters (equivalent of $_SERVER) */ - public function __construct(HttpKernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null) + public function __construct(HttpKernelInterface $kernel, array $server = [], ?History $history = null, ?CookieJar $cookieJar = null) { // These class properties must be set before calling the parent constructor, as it may depend on it. $this->kernel = $kernel; diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index bd6b152b8ac7a..13734f1b36e10 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -78,11 +78,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static $freshCache = []; - public const VERSION = '5.4.34'; - public const VERSION_ID = 50434; + public const VERSION = '5.4.35'; + public const VERSION_ID = 50435; public const MAJOR_VERSION = 5; public const MINOR_VERSION = 4; - public const RELEASE_VERSION = 34; + public const RELEASE_VERSION = 35; public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '11/2024'; diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php index 19ff0db181ef7..d5167fcc9b842 100644 --- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php +++ b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php @@ -29,14 +29,14 @@ interface DebugLoggerInterface * * @return array */ - public function getLogs(Request $request = null); + public function getLogs(?Request $request = null); /** * Returns the number of errors. * * @return int */ - public function countErrors(Request $request = null); + public function countErrors(?Request $request = null); /** * Removes all log records. diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php index c2a45bb9512d0..a37c0cf1c31bf 100644 --- a/src/Symfony/Component/HttpKernel/Log/Logger.php +++ b/src/Symfony/Component/HttpKernel/Log/Logger.php @@ -42,7 +42,7 @@ class Logger extends AbstractLogger /** * @param string|resource|null $output */ - public function __construct(string $minLevel = null, $output = null, callable $formatter = null) + public function __construct(?string $minLevel = null, $output = null, ?callable $formatter = null) { if (null === $minLevel) { $minLevel = null === $output || 'php://stdout' === $output || 'php://stderr' === $output ? LogLevel::ERROR : LogLevel::WARNING; diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php index e20a15c3fadee..6fa24f1117ad1 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php @@ -47,7 +47,7 @@ public function __construct(string $dsn) /** * {@inheritdoc} */ - public function find(?string $ip, ?string $url, ?int $limit, ?string $method, int $start = null, int $end = null, string $statusCode = null): array + public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null, ?string $statusCode = null): array { $file = $this->getIndexFilename(); @@ -265,7 +265,7 @@ protected function readLineFromFile($file) return '' === $line ? null : $line; } - protected function createProfileFromData(string $token, array $data, Profile $parent = null) + protected function createProfileFromData(string $token, array $data, ?Profile $parent = null) { $profile = new Profile($token); $profile->setIp($data['ip']); @@ -292,7 +292,7 @@ protected function createProfileFromData(string $token, array $data, Profile $pa return $profile; } - private function doRead($token, Profile $profile = null): ?Profile + private function doRead($token, ?Profile $profile = null): ?Profile { if (!$token || !file_exists($file = $this->getFilename($token))) { return null; diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index d07b887c02de8..412a85925138d 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -37,7 +37,7 @@ class Profiler implements ResetInterface private $initiallyEnabled = true; private $enabled = true; - public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null, bool $enable = true) + public function __construct(ProfilerStorageInterface $storage, ?LoggerInterface $logger = null, bool $enable = true) { $this->storage = $storage; $this->logger = $logger; @@ -124,7 +124,7 @@ public function purge() * * @see https://php.net/datetime.formats for the supported date/time formats */ - public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?string $start, ?string $end, string $statusCode = null) + public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?string $start, ?string $end, ?string $statusCode = null) { return $this->storage->find($ip, $url, $limit, $method, $this->getTimestamp($start), $this->getTimestamp($end), $statusCode); } @@ -134,7 +134,7 @@ public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?s * * @return Profile|null */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { if (false === $this->enabled) { return null; diff --git a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php index 95d72f46b3872..6b23c1a225746 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php +++ b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php @@ -33,7 +33,7 @@ interface ProfilerStorageInterface * @param int|null $start The start date to search from * @param int|null $end The end date to search to */ - public function find(?string $ip, ?string $url, ?int $limit, ?string $method, int $start = null, int $end = null): array; + public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null): array; /** * Reads data associated with the given token. diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php index 9d127436cfe02..9960e851d24f6 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php @@ -228,7 +228,7 @@ public static function getUndefinedControllers(): array return $tests; } - protected function createControllerResolver(LoggerInterface $logger = null, ContainerInterface $container = null) + protected function createControllerResolver(?LoggerInterface $logger = null, ?ContainerInterface $container = null) { if (!$container) { $container = $this->createMockContainer(); diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php index 621d948197cb4..e76821bf1863d 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php @@ -187,7 +187,7 @@ public static function getUndefinedControllers() ]; } - protected function createControllerResolver(LoggerInterface $logger = null) + protected function createControllerResolver(?LoggerInterface $logger = null) { return new ControllerResolver($logger); } diff --git a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php index 6c3f2a1ea8311..ae75b09f4238a 100644 --- a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php @@ -167,7 +167,7 @@ private function signature1(self $foo, array $bar, callable $baz) { } - private function signature2(self $foo = null, FakeClassThatDoesNotExist $bar = null, ImportedAndFake $baz = null) + private function signature2(?self $foo = null, ?FakeClassThatDoesNotExist $bar = null, ?ImportedAndFake $baz = null) { } @@ -179,7 +179,7 @@ private function signature4($foo = 'default', $bar = 500, $baz = []) { } - private function signature5(array $foo = null, $bar = null) + private function signature5(?array $foo = null, $bar = null) { } } diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php index ab0efe32f56e8..89e2eed6e8a64 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php @@ -60,7 +60,7 @@ public function testValidContentRenderer() class RendererService implements FragmentRendererInterface { - public function render($uri, Request $request = null, array $options = []): Response + public function render($uri, ?Request $request = null, array $options = []): Response { } diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php index 69e1cc8cd6ce2..3dec2e912af71 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php @@ -508,11 +508,11 @@ public function fooAction(\Acme\NonExistentClass $nonExistent) class NonExistentClassOptionalController { - public function fooAction(NonExistentClass $nonExistent = null) + public function fooAction(?NonExistentClass $nonExistent = null) { } - public function barAction(NonExistentClass $nonExistent = null, $bar) + public function barAction(?NonExistentClass $nonExistent, $bar) { } } diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php index b9dd84d592fa6..8c99b882d32ca 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php @@ -81,7 +81,7 @@ public function testInvoke() class RemoveTestController1 { - public function fooAction(\stdClass $bar, ClassNotInContainer $baz = null) + public function fooAction(\stdClass $bar, ?ClassNotInContainer $baz = null) { } } @@ -92,7 +92,7 @@ public function setTestCase(TestCase $test) { } - public function fooAction(ClassNotInContainer $bar = null) + public function fooAction(?ClassNotInContainer $bar = null) { } } diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php index b97737218c1b2..623b50cd0cd44 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php @@ -222,7 +222,7 @@ public static function controllerProvider() class TestLogger extends Logger implements DebugLoggerInterface { - public function countErrors(Request $request = null): int + public function countErrors(?Request $request = null): int { return \count($this->logs['critical']); } diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php index bb989b33023eb..7e42653dffb69 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php @@ -158,7 +158,7 @@ public function testDoesNotThrowIfRequestDoesNotHaveASession() $this->assertTrue(true); } - private function filterResponse(Request $request, $type = HttpKernelInterface::MAIN_REQUEST, Response $response = null) + private function filterResponse(Request $request, $type = HttpKernelInterface::MAIN_REQUEST, ?Response $response = null) { $request->setSession($this->session); $response = $response ?? new Response(); diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php index a810255b1eb02..4ce91afac8933 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php @@ -16,7 +16,7 @@ class AccessDeniedHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new AccessDeniedHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php index 2e09653fa7eaf..4dfb2cbc01268 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php @@ -16,7 +16,7 @@ class BadRequestHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new BadRequestHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php index dbab2acff555d..4f0b554511522 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php @@ -16,7 +16,7 @@ class ConflictHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new ConflictHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php index 2582ab71b33f0..775db75b92c41 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php @@ -16,7 +16,7 @@ class GoneHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new GoneHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php index fad9e796f439b..781cb85eb68a3 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php @@ -63,7 +63,7 @@ public function testThrowableIsAllowedForPrevious() $this->assertSame($previous, $exception->getPrevious()); } - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new HttpException(200, $message, $previous, $headers, $code); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php index 5525870e1e324..4e1c3f645ffa3 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php @@ -16,7 +16,7 @@ class LengthRequiredHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new LengthRequiredHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php index 61ecb84da4f73..a5cc1f70e1d8e 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php @@ -45,7 +45,7 @@ public function testHeadersSetter($headers) $this->assertSame($headers, $exception->getHeaders()); } - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new MethodNotAllowedHttpException(['get'], $message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php index 6df823ada0584..97c460b5cd1a2 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php @@ -16,7 +16,7 @@ class NotAcceptableHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new NotAcceptableHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php index 8152a727fd215..45fee0457a192 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php @@ -16,7 +16,7 @@ class NotFoundHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new NotFoundHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php index d215792875e38..f7750d9a631bb 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php @@ -16,7 +16,7 @@ class PreconditionFailedHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new PreconditionFailedHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php index 452b226c49c6a..6373d2718f1e9 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php @@ -16,7 +16,7 @@ class PreconditionRequiredHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new PreconditionRequiredHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php index 4f0aa3a45827f..34172b446a343 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php @@ -45,7 +45,7 @@ public function testHeadersSetter($headers) $this->assertSame($headers, $exception->getHeaders()); } - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new ServiceUnavailableHttpException(null, $message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php index 4dc2e41ea5428..995e56d5540e8 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php @@ -45,7 +45,7 @@ public function testHeadersSetter($headers) $this->assertSame($headers, $exception->getHeaders()); } - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new TooManyRequestsHttpException(null, $message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php index dda2777c91878..3797ce0dd0204 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php @@ -45,7 +45,7 @@ public function testHeadersSetter($headers) $this->assertSame($headers, $exception->getHeaders()); } - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new UnauthorizedHttpException('Challenge', $message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php index 8b4ece20ee2da..6d5c309088417 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php @@ -16,7 +16,7 @@ class UnprocessableEntityHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new UnprocessableEntityHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php index 0295d61e0a49b..2407b0a85bd7a 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php @@ -16,7 +16,7 @@ class UnsupportedMediaTypeHttpExceptionTest extends HttpExceptionTest { - protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException + protected function createException(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = []): HttpException { return new UnsupportedMediaTypeHttpException($message, $previous, $code, $headers); } diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php index c8b48ff811c76..d60abb1032ddc 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php @@ -147,7 +147,7 @@ public function getMetaStorageValues() } // A basic response with 200 status code and a tiny body. - public function setNextResponse($statusCode = 200, array $headers = [], $body = 'Hello World', \Closure $customizer = null) + public function setNextResponse($statusCode = 200, array $headers = [], $body = 'Hello World', ?\Closure $customizer = null) { $this->kernel = new TestHttpKernel($body, $statusCode, $headers, $customizer); } diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php index 471212f5e30b8..871e8e36f021f 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php @@ -29,7 +29,7 @@ class TestHttpKernel extends HttpKernel implements ControllerResolverInterface, protected $catch = false; protected $backendRequest; - public function __construct($body, $status, $headers, \Closure $customizer = null) + public function __construct($body, $status, $headers, ?\Closure $customizer = null) { $this->body = $body; $this->status = $status; diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php index 09e7b9a524c45..8ac289d5d2bc0 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php @@ -391,7 +391,7 @@ public function testInconsistentClientIpsOnMainRequests() Request::setTrustedProxies([], -1); } - private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = []) + private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, ?RequestStack $requestStack = null, array $arguments = []) { if (null === $controller) { $controller = function () { return new Response('Hello'); }; diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php index d60924b9ad1d5..74cd34cde3131 100644 --- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php @@ -713,7 +713,7 @@ class CustomProjectDirKernel extends Kernel implements WarmableInterface private $buildContainer; private $httpKernel; - public function __construct(\Closure $buildContainer = null, HttpKernelInterface $httpKernel = null, $env = 'custom') + public function __construct(?\Closure $buildContainer = null, ?HttpKernelInterface $httpKernel = null, $env = 'custom') { parent::__construct($env, true); diff --git a/src/Symfony/Component/Intl/Countries.php b/src/Symfony/Component/Intl/Countries.php index cdaa2527220f1..fca58aa918c15 100644 --- a/src/Symfony/Component/Intl/Countries.php +++ b/src/Symfony/Component/Intl/Countries.php @@ -89,7 +89,7 @@ public static function alpha3CodeExists(string $alpha3Code): bool * * @throws MissingResourceException if the country code does not exist */ - public static function getName(string $country, string $displayLocale = null): string + public static function getName(string $country, ?string $displayLocale = null): string { return self::readEntry(['Names', $country], $displayLocale); } @@ -99,7 +99,7 @@ public static function getName(string $country, string $displayLocale = null): s * * @throws MissingResourceException if the country code does not exist */ - public static function getAlpha3Name(string $alpha3Code, string $displayLocale = null): string + public static function getAlpha3Name(string $alpha3Code, ?string $displayLocale = null): string { return self::getName(self::getAlpha2Code($alpha3Code), $displayLocale); } @@ -109,7 +109,7 @@ public static function getAlpha3Name(string $alpha3Code, string $displayLocale = * * @return array */ - public static function getNames(string $displayLocale = null): array + public static function getNames(?string $displayLocale = null): array { return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale); } @@ -121,7 +121,7 @@ public static function getNames(string $displayLocale = null): array * * @return array */ - public static function getAlpha3Names(string $displayLocale = null): array + public static function getAlpha3Names(?string $displayLocale = null): array { $alpha2Names = self::getNames($displayLocale); $alpha3Names = []; diff --git a/src/Symfony/Component/Intl/Currencies.php b/src/Symfony/Component/Intl/Currencies.php index 60dbfcd6f1d36..231d369f82910 100644 --- a/src/Symfony/Component/Intl/Currencies.php +++ b/src/Symfony/Component/Intl/Currencies.php @@ -50,7 +50,7 @@ public static function exists(string $currency): bool /** * @throws MissingResourceException if the currency code does not exist */ - public static function getName(string $currency, string $displayLocale = null): string + public static function getName(string $currency, ?string $displayLocale = null): string { return self::readEntry(['Names', $currency, self::INDEX_NAME], $displayLocale); } @@ -58,7 +58,7 @@ public static function getName(string $currency, string $displayLocale = null): /** * @return string[] */ - public static function getNames(string $displayLocale = null): array + public static function getNames(?string $displayLocale = null): array { // ==================================================================== // For reference: It is NOT possible to return names indexed by @@ -82,7 +82,7 @@ public static function getNames(string $displayLocale = null): array /** * @throws MissingResourceException if the currency code does not exist */ - public static function getSymbol(string $currency, string $displayLocale = null): string + public static function getSymbol(string $currency, ?string $displayLocale = null): string { return self::readEntry(['Names', $currency, self::INDEX_SYMBOL], $displayLocale); } diff --git a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php index 54101f442be75..5c633c1a4bde7 100644 --- a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php @@ -177,7 +177,7 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD $regionFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'regionFormat']); $fallbackFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'fallbackFormat']); - $resolveName = function (string $id, string $city = null) use ($reader, $tempDir, $locale, $regionFormat, $fallbackFormat): ?string { + $resolveName = function (string $id, ?string $city = null) use ($reader, $tempDir, $locale, $regionFormat, $fallbackFormat): ?string { // Resolve default name as described per http://cldr.unicode.org/translation/timezones if (isset($this->zoneToCountryMapping[$id])) { try { diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php index 34e4b3a5c5594..da4073326647f 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php @@ -36,7 +36,7 @@ public function format(\DateTime $dateTime, int $length): string /** * {@inheritdoc} */ - public function normalizeHour(int $hour, string $marker = null): int + public function normalizeHour(int $hour, ?string $marker = null): int { if ('PM' === $marker) { $hour += 12; diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php index 8e5eba1daf4fe..67e612dd85f4e 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php @@ -33,7 +33,7 @@ public function format(\DateTime $dateTime, int $length): string /** * {@inheritdoc} */ - public function normalizeHour(int $hour, string $marker = null): int + public function normalizeHour(int $hour, ?string $marker = null): int { if ('PM' !== $marker && 12 === $hour) { $hour = 0; diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php index 4296978713f13..b9771141b7e00 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php @@ -33,7 +33,7 @@ public function format(\DateTime $dateTime, int $length): string /** * {@inheritdoc} */ - public function normalizeHour(int $hour, string $marker = null): int + public function normalizeHour(int $hour, ?string $marker = null): int { if ('AM' === $marker) { $hour = 0; diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php index 0db1a888b5ee7..4a26acaa1c0b3 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php @@ -36,7 +36,7 @@ public function format(\DateTime $dateTime, int $length): string /** * {@inheritdoc} */ - public function normalizeHour(int $hour, string $marker = null): int + public function normalizeHour(int $hour, ?string $marker = null): int { if ((null === $marker && 24 === $hour) || 'AM' === $marker) { $hour = 0; diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/HourTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/HourTransformer.php index a9734ac0a960e..54c105be295be 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/HourTransformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/HourTransformer.php @@ -30,5 +30,5 @@ abstract class HourTransformer extends Transformer * * @return int The normalized hour value */ - abstract public function normalizeHour(int $hour, string $marker = null): int; + abstract public function normalizeHour(int $hour, ?string $marker = null): int; } diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php index 86257898c1d81..31a6758028864 100644 --- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php +++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php @@ -134,7 +134,7 @@ abstract class IntlDateFormatter * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed * @throws MethodArgumentValueNotImplementedException When $calendar different than GREGORIAN is passed */ - public function __construct(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, ?int $calendar = self::GREGORIAN, string $pattern = null) + public function __construct(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, ?int $calendar = self::GREGORIAN, ?string $pattern = null) { if ('en' !== $locale && null !== $locale) { throw new MethodArgumentValueNotImplementedException(__METHOD__, 'locale', $locale, 'Only the locale "en" is supported'); @@ -174,7 +174,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed * @throws MethodArgumentValueNotImplementedException When $calendar different than GREGORIAN is passed */ - public static function create(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, int $calendar = self::GREGORIAN, string $pattern = null) + public static function create(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, int $calendar = self::GREGORIAN, ?string $pattern = null) { return new static($locale, $datetype, $timetype, $timezone, $calendar, $pattern); } @@ -244,7 +244,7 @@ public function format($timestamp) * * @throws MethodNotImplementedException */ - public static function formatObject(object $object, $format = null, string $locale = null) + public static function formatObject(object $object, $format = null, ?string $locale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -430,7 +430,7 @@ public function localtime(string $value, int &$position = 0) * * @throws MethodArgumentNotImplementedException When $position different than null, behavior not implemented */ - public function parse(string $value, int &$position = null) + public function parse(string $value, ?int &$position = null) { // We don't calculate the position when parsing the value if (null !== $position) { diff --git a/src/Symfony/Component/Intl/Languages.php b/src/Symfony/Component/Intl/Languages.php index 7aeb445e7eedb..a8898d042f393 100644 --- a/src/Symfony/Component/Intl/Languages.php +++ b/src/Symfony/Component/Intl/Languages.php @@ -56,7 +56,7 @@ public static function exists(string $language): bool * * @throws MissingResourceException if the language code does not exist */ - public static function getName(string $language, string $displayLocale = null): string + public static function getName(string $language, ?string $displayLocale = null): string { try { return self::readEntry(['Names', $language], $displayLocale); @@ -78,7 +78,7 @@ public static function getName(string $language, string $displayLocale = null): * * @return array */ - public static function getNames(string $displayLocale = null): array + public static function getNames(?string $displayLocale = null): array { return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale); } @@ -139,7 +139,7 @@ public static function alpha3CodeExists(string $language): bool * * @throws MissingResourceException if the country code does not exists */ - public static function getAlpha3Name(string $language, string $displayLocale = null): string + public static function getAlpha3Name(string $language, ?string $displayLocale = null): string { try { return self::getName(self::getAlpha2Code($language), $displayLocale); @@ -159,7 +159,7 @@ public static function getAlpha3Name(string $language, string $displayLocale = n * * @return array */ - public static function getAlpha3Names(string $displayLocale = null): array + public static function getAlpha3Names(?string $displayLocale = null): array { $alpha2Names = self::getNames($displayLocale); $alpha3Names = []; diff --git a/src/Symfony/Component/Intl/Locale/Locale.php b/src/Symfony/Component/Intl/Locale/Locale.php index d8066714a017d..c2924b326ff09 100644 --- a/src/Symfony/Component/Intl/Locale/Locale.php +++ b/src/Symfony/Component/Intl/Locale/Locale.php @@ -161,7 +161,7 @@ public static function getDefault() * * @throws MethodNotImplementedException */ - public static function getDisplayLanguage(string $locale, string $inLocale = null) + public static function getDisplayLanguage(string $locale, ?string $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -178,7 +178,7 @@ public static function getDisplayLanguage(string $locale, string $inLocale = nul * * @throws MethodNotImplementedException */ - public static function getDisplayName(string $locale, string $inLocale = null) + public static function getDisplayName(string $locale, ?string $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -195,7 +195,7 @@ public static function getDisplayName(string $locale, string $inLocale = null) * * @throws MethodNotImplementedException */ - public static function getDisplayRegion(string $locale, string $inLocale = null) + public static function getDisplayRegion(string $locale, ?string $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -212,7 +212,7 @@ public static function getDisplayRegion(string $locale, string $inLocale = null) * * @throws MethodNotImplementedException */ - public static function getDisplayScript(string $locale, string $inLocale = null) + public static function getDisplayScript(string $locale, ?string $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -229,7 +229,7 @@ public static function getDisplayScript(string $locale, string $inLocale = null) * * @throws MethodNotImplementedException */ - public static function getDisplayVariant(string $locale, string $inLocale = null) + public static function getDisplayVariant(string $locale, ?string $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -310,7 +310,7 @@ public static function getScript(string $locale) * * @throws MethodNotImplementedException */ - public static function lookup(array $langtag, string $locale, bool $canonicalize = false, string $default = null) + public static function lookup(array $langtag, string $locale, bool $canonicalize = false, ?string $default = null) { throw new MethodNotImplementedException(__METHOD__); } diff --git a/src/Symfony/Component/Intl/Locales.php b/src/Symfony/Component/Intl/Locales.php index 1be7cea90922e..a8b36f71b17bf 100644 --- a/src/Symfony/Component/Intl/Locales.php +++ b/src/Symfony/Component/Intl/Locales.php @@ -51,7 +51,7 @@ public static function exists(string $locale): bool /** * @throws MissingResourceException if the locale does not exist */ - public static function getName(string $locale, string $displayLocale = null): string + public static function getName(string $locale, ?string $displayLocale = null): string { try { return self::readEntry(['Names', $locale], $displayLocale); @@ -67,7 +67,7 @@ public static function getName(string $locale, string $displayLocale = null): st /** * @return string[] */ - public static function getNames(string $displayLocale = null): array + public static function getNames(?string $displayLocale = null): array { return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale); } diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index b573f639308e3..376384f65e540 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -259,7 +259,7 @@ abstract class NumberFormatter * @throws MethodArgumentValueNotImplementedException When the $style is not supported * @throws MethodArgumentNotImplementedException When the pattern value is different than null */ - public function __construct(?string $locale = 'en', int $style = null, string $pattern = null) + public function __construct(?string $locale = 'en', ?int $style = null, ?string $pattern = null) { if ('en' !== $locale && null !== $locale) { throw new MethodArgumentValueNotImplementedException(__METHOD__, 'locale', $locale, 'Only the locale "en" is supported'); @@ -298,7 +298,7 @@ public function __construct(?string $locale = 'en', int $style = null, string $p * @throws MethodArgumentValueNotImplementedException When the $style is not supported * @throws MethodArgumentNotImplementedException When the pattern value is different than null */ - public static function create(?string $locale = 'en', int $style = null, string $pattern = null) + public static function create(?string $locale = 'en', ?int $style = null, ?string $pattern = null) { return new static($locale, $style, $pattern); } @@ -495,7 +495,7 @@ public function getTextAttribute(int $attr) * * @throws MethodNotImplementedException */ - public function parseCurrency(string $value, string &$currency, int &$position = null) + public function parseCurrency(string $value, string &$currency, ?int &$position = null) { throw new MethodNotImplementedException(__METHOD__); } diff --git a/src/Symfony/Component/Intl/ResourceBundle.php b/src/Symfony/Component/Intl/ResourceBundle.php index c0ef5d1e8e7d1..4aa959c417918 100644 --- a/src/Symfony/Component/Intl/ResourceBundle.php +++ b/src/Symfony/Component/Intl/ResourceBundle.php @@ -43,7 +43,7 @@ abstract protected static function getPath(): string; * @return mixed returns an array or {@link \ArrayAccess} instance for * complex data and a scalar value for simple data */ - final protected static function readEntry(array $indices, string $locale = null, bool $fallback = true) + final protected static function readEntry(array $indices, ?string $locale = null, bool $fallback = true) { if (null === self::$entryReader) { self::$entryReader = new BundleEntryReader(new BufferedBundleReader( @@ -58,7 +58,7 @@ final protected static function readEntry(array $indices, string $locale = null, return self::$entryReader->readEntry(static::getPath(), $locale ?? \Locale::getDefault(), $indices, $fallback); } - final protected static function asort(iterable $list, string $locale = null): array + final protected static function asort(iterable $list, ?string $locale = null): array { if ($list instanceof \Traversable) { $list = iterator_to_array($list); diff --git a/src/Symfony/Component/Intl/Scripts.php b/src/Symfony/Component/Intl/Scripts.php index 9c70b8b59bd87..606f25dee37a9 100644 --- a/src/Symfony/Component/Intl/Scripts.php +++ b/src/Symfony/Component/Intl/Scripts.php @@ -43,7 +43,7 @@ public static function exists(string $script): bool /** * @throws MissingResourceException if the script code does not exist */ - public static function getName(string $script, string $displayLocale = null): string + public static function getName(string $script, ?string $displayLocale = null): string { return self::readEntry(['Names', $script], $displayLocale); } @@ -51,7 +51,7 @@ public static function getName(string $script, string $displayLocale = null): st /** * @return string[] */ - public static function getNames(string $displayLocale = null): array + public static function getNames(?string $displayLocale = null): array { return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale); } diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTestCase.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTestCase.php index fc4bdc28df0eb..f874aab2e8311 100644 --- a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTestCase.php +++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTestCase.php @@ -867,7 +867,7 @@ public function testParseWithNotNullPositionValue() /** * @return NumberFormatter|\NumberFormatter */ - abstract protected static function getNumberFormatter(string $locale = 'en', string $style = null, string $pattern = null); + abstract protected static function getNumberFormatter(string $locale = 'en', ?string $style = null, ?string $pattern = null); abstract protected function getIntlErrorMessage(): string; @@ -878,7 +878,7 @@ abstract protected function getIntlErrorCode(): int; */ abstract protected function isIntlFailure($errorCode): bool; - public static function throwOnWarning(int $errno, string $errstr, string $errfile = null, int $errline = null): bool + public static function throwOnWarning(int $errno, string $errstr, ?string $errfile = null, ?int $errline = null): bool { if ($errno & (\E_WARNING | \E_USER_WARNING)) { throw new \ErrorException($errstr, 0, $errno, $errfile ?? __FILE__, $errline ?? __LINE__); diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php index 3f889b7a611bc..649cc8346afd4 100644 --- a/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php @@ -171,7 +171,7 @@ public function testSetTextAttribute() $formatter->setTextAttribute(NumberFormatter::NEGATIVE_PREFIX, '-'); } - protected static function getNumberFormatter(?string $locale = 'en', string $style = null, string $pattern = null): NumberFormatter + protected static function getNumberFormatter(?string $locale = 'en', ?string $style = null, ?string $pattern = null): NumberFormatter { return new class($locale, $style, $pattern) extends NumberFormatter { }; diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php index 5cef6efb1578f..0a326cb8cee74 100644 --- a/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php @@ -39,7 +39,7 @@ public function testGetTextAttribute() parent::testGetTextAttribute(); } - protected static function getNumberFormatter(?string $locale = 'en', string $style = null, string $pattern = null): \NumberFormatter + protected static function getNumberFormatter(?string $locale = 'en', ?string $style = null, ?string $pattern = null): \NumberFormatter { return new \NumberFormatter($locale, $style, $pattern); } diff --git a/src/Symfony/Component/Intl/Timezones.php b/src/Symfony/Component/Intl/Timezones.php index 265d0ede416cf..245e6b8cf4052 100644 --- a/src/Symfony/Component/Intl/Timezones.php +++ b/src/Symfony/Component/Intl/Timezones.php @@ -49,7 +49,7 @@ public static function exists(string $timezone): bool /** * @throws MissingResourceException if the timezone identifier does not exist or is an alias */ - public static function getName(string $timezone, string $displayLocale = null): string + public static function getName(string $timezone, ?string $displayLocale = null): string { return self::readEntry(['Names', $timezone], $displayLocale); } @@ -57,7 +57,7 @@ public static function getName(string $timezone, string $displayLocale = null): /** * @return string[] */ - public static function getNames(string $displayLocale = null): array + public static function getNames(?string $displayLocale = null): array { return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale); } @@ -66,14 +66,14 @@ public static function getNames(string $displayLocale = null): array * @throws \Exception if the timezone identifier does not exist * @throws RuntimeException if there's no timezone DST transition information available */ - public static function getRawOffset(string $timezone, int $timestamp = null): int + public static function getRawOffset(string $timezone, ?int $timestamp = null): int { $dateTimeImmutable = new \DateTimeImmutable(date('Y-m-d H:i:s', $timestamp ?? time()), new \DateTimeZone($timezone)); return $dateTimeImmutable->getOffset(); } - public static function getGmtOffset(string $timezone, int $timestamp = null, string $displayLocale = null): string + public static function getGmtOffset(string $timezone, ?int $timestamp = null, ?string $displayLocale = null): string { $offset = self::getRawOffset($timezone, $timestamp); $abs = abs($offset); diff --git a/src/Symfony/Component/Intl/Util/GitRepository.php b/src/Symfony/Component/Intl/Util/GitRepository.php index a07419e950470..e5ded4627bb16 100644 --- a/src/Symfony/Component/Intl/Util/GitRepository.php +++ b/src/Symfony/Component/Intl/Util/GitRepository.php @@ -69,7 +69,7 @@ public function getLastAuthoredDate(): \DateTime return new \DateTime($this->getLastLine($this->execInPath('git log -1 --format="%ai"'))); } - public function getLastTag(callable $filter = null): string + public function getLastTag(?callable $filter = null): string { $tags = $this->execInPath('git tag -l --sort=v:refname'); @@ -90,7 +90,7 @@ private function execInPath(string $command): array return self::exec(sprintf('cd %s && %s', escapeshellarg($this->path), $command)); } - private static function exec(string $command, string $customErrorMessage = null): array + private static function exec(string $command, ?string $customErrorMessage = null): array { exec(sprintf('%s 2>&1', $command), $output, $result); diff --git a/src/Symfony/Component/Intl/Util/IcuVersion.php b/src/Symfony/Component/Intl/Util/IcuVersion.php index 13c5d9770f14c..9f03cbf0b96f7 100644 --- a/src/Symfony/Component/Intl/Util/IcuVersion.php +++ b/src/Symfony/Component/Intl/Util/IcuVersion.php @@ -50,7 +50,7 @@ class IcuVersion * * @see normalize() */ - public static function compare(string $version1, string $version2, string $operator, int $precision = null) + public static function compare(string $version1, string $version2, string $operator, ?int $precision = null) { $version1 = self::normalize($version1, $precision); $version2 = self::normalize($version2, $precision); diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php index 8404194d5ee0a..4f0b1700cb283 100644 --- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php +++ b/src/Symfony/Component/Intl/Util/IntlTestHelper.php @@ -30,7 +30,7 @@ class IntlTestHelper /** * Should be called before tests that work fine with the stub implementation. */ - public static function requireIntl(TestCase $testCase, string $minimumIcuVersion = null) + public static function requireIntl(TestCase $testCase, ?string $minimumIcuVersion = null) { if (null === $minimumIcuVersion) { $minimumIcuVersion = Intl::getIcuStubVersion(); @@ -64,7 +64,7 @@ public static function requireIntl(TestCase $testCase, string $minimumIcuVersion * Should be called before tests that require a feature-complete intl * implementation. */ - public static function requireFullIntl(TestCase $testCase, string $minimumIcuVersion = null) + public static function requireFullIntl(TestCase $testCase, ?string $minimumIcuVersion = null) { // We only run tests if the intl extension is loaded... if (!Intl::isExtensionLoaded()) { diff --git a/src/Symfony/Component/Intl/Util/Version.php b/src/Symfony/Component/Intl/Util/Version.php index 736be75e18176..8bb00c14bd282 100644 --- a/src/Symfony/Component/Intl/Util/Version.php +++ b/src/Symfony/Component/Intl/Util/Version.php @@ -40,7 +40,7 @@ class Version * * @see normalize() */ - public static function compare(string $version1, string $version2, string $operator, int $precision = null) + public static function compare(string $version1, string $version2, string $operator, ?int $precision = null) { $version1 = self::normalize($version1, $precision); $version2 = self::normalize($version2, $precision); diff --git a/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php b/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php index 56829dc4ead06..8466b1eb76914 100644 --- a/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php +++ b/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php @@ -34,5 +34,5 @@ public function isBound(); * @throws ConnectionTimeoutException When the connection can't be created because of an LDAP_TIMEOUT error * @throws InvalidCredentialsException When the connection can't be created because of an LDAP_INVALID_CREDENTIALS error */ - public function bind(string $dn = null, string $password = null); + public function bind(?string $dn = null, ?string $password = null); } diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php index 5d87fe1c710af..53509189ad830 100644 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php @@ -73,7 +73,7 @@ public function isBound() * * @param string $password WARNING: When the LDAP server allows unauthenticated binds, a blank $password will always be valid */ - public function bind(string $dn = null, string $password = null) + public function bind(?string $dn = null, ?string $password = null) { if (!$this->connection) { $this->connect(); diff --git a/src/Symfony/Component/Ldap/Ldap.php b/src/Symfony/Component/Ldap/Ldap.php index 30f9910a01a26..f09fbb80bed8e 100644 --- a/src/Symfony/Component/Ldap/Ldap.php +++ b/src/Symfony/Component/Ldap/Ldap.php @@ -32,7 +32,7 @@ public function __construct(AdapterInterface $adapter) /** * {@inheritdoc} */ - public function bind(string $dn = null, string $password = null) + public function bind(?string $dn = null, ?string $password = null) { $this->adapter->getConnection()->bind($dn, $password); } diff --git a/src/Symfony/Component/Ldap/LdapInterface.php b/src/Symfony/Component/Ldap/LdapInterface.php index 16c8a68594123..a02284ce9dbe7 100644 --- a/src/Symfony/Component/Ldap/LdapInterface.php +++ b/src/Symfony/Component/Ldap/LdapInterface.php @@ -30,7 +30,7 @@ interface LdapInterface * * @throws ConnectionException if dn / password could not be bound */ - public function bind(string $dn = null, string $password = null); + public function bind(?string $dn = null, ?string $password = null); /** * Queries a ldap server for entries matching the given criteria. diff --git a/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php b/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php index 228133ce5ea53..a27ffe5ac6a23 100644 --- a/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php +++ b/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php @@ -94,7 +94,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio return $this->authenticator->onAuthenticationFailure($request, $exception); } - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { if (!$this->authenticator instanceof AuthenticationEntryPointInterface) { throw new NotAnEntryPointException(sprintf('Decorated authenticator "%s" does not implement interface "%s".', get_debug_type($this->authenticator), AuthenticationEntryPointInterface::class)); diff --git a/src/Symfony/Component/Ldap/Security/LdapBadge.php b/src/Symfony/Component/Ldap/Security/LdapBadge.php index af18e9817819e..0859fe9a617d6 100644 --- a/src/Symfony/Component/Ldap/Security/LdapBadge.php +++ b/src/Symfony/Component/Ldap/Security/LdapBadge.php @@ -31,7 +31,7 @@ class LdapBadge implements BadgeInterface private $searchPassword; private $queryString; - public function __construct(string $ldapServiceId, string $dnString = '{username}', string $searchDn = '', string $searchPassword = '', string $queryString = null) + public function __construct(string $ldapServiceId, string $dnString = '{username}', string $searchDn = '', string $searchPassword = '', ?string $queryString = null) { $this->ldapServiceId = $ldapServiceId; $this->dnString = $dnString; diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php index 79ee17daef376..6d0b1199c22c3 100644 --- a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php +++ b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php @@ -41,7 +41,7 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa private $passwordAttribute; private $extraFields; - public function __construct(LdapInterface $ldap, string $baseDn, string $searchDn = null, string $searchPassword = null, array $defaultRoles = [], string $uidKey = null, string $filter = null, string $passwordAttribute = null, array $extraFields = []) + public function __construct(LdapInterface $ldap, string $baseDn, ?string $searchDn = null, ?string $searchPassword = null, array $defaultRoles = [], ?string $uidKey = null, ?string $filter = null, ?string $passwordAttribute = null, array $extraFields = []) { if (null === $uidKey) { $uidKey = 'sAMAccountName'; diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php index 154f92ec159bb..ef9871c5ecb09 100644 --- a/src/Symfony/Component/Lock/Lock.php +++ b/src/Symfony/Component/Lock/Lock.php @@ -39,7 +39,7 @@ final class Lock implements SharedLockInterface, LoggerAwareInterface * @param float|null $ttl Maximum expected lock duration in seconds * @param bool $autoRelease Whether to automatically release the lock or not when the lock instance is destroyed */ - public function __construct(Key $key, PersistingStoreInterface $store, float $ttl = null, bool $autoRelease = true) + public function __construct(Key $key, PersistingStoreInterface $store, ?float $ttl = null, bool $autoRelease = true) { $this->store = $store; $this->key = $key; @@ -191,7 +191,7 @@ public function acquireRead(bool $blocking = false): bool /** * {@inheritdoc} */ - public function refresh(float $ttl = null) + public function refresh(?float $ttl = null) { if (null === $ttl) { $ttl = $this->ttl; diff --git a/src/Symfony/Component/Lock/LockInterface.php b/src/Symfony/Component/Lock/LockInterface.php index 31c77abd9fb2d..f03b79626b168 100644 --- a/src/Symfony/Component/Lock/LockInterface.php +++ b/src/Symfony/Component/Lock/LockInterface.php @@ -41,7 +41,7 @@ public function acquire(bool $blocking = false); * @throws LockConflictedException If the lock is acquired by someone else * @throws LockAcquiringException If the lock cannot be refreshed */ - public function refresh(float $ttl = null); + public function refresh(?float $ttl = null); /** * Returns whether or not the lock is acquired. diff --git a/src/Symfony/Component/Lock/NoLock.php b/src/Symfony/Component/Lock/NoLock.php index 074c6c3bdaef1..d6f325e35bb53 100644 --- a/src/Symfony/Component/Lock/NoLock.php +++ b/src/Symfony/Component/Lock/NoLock.php @@ -26,7 +26,7 @@ public function acquire(bool $blocking = false): bool return true; } - public function refresh(float $ttl = null) + public function refresh(?float $ttl = null) { } diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php index c476fd3120ae3..0d4f68166b8a9 100644 --- a/src/Symfony/Component/Lock/Store/FlockStore.php +++ b/src/Symfony/Component/Lock/Store/FlockStore.php @@ -37,7 +37,7 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface * * @throws LockStorageException If the lock directory doesn’t exist or is not writable */ - public function __construct(string $lockPath = null) + public function __construct(?string $lockPath = null) { if (null === $lockPath) { $lockPath = sys_get_temp_dir(); diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php index d645a01932416..f8683c887e903 100644 --- a/src/Symfony/Component/Lock/Store/MongoDbStore.php +++ b/src/Symfony/Component/Lock/Store/MongoDbStore.php @@ -137,10 +137,10 @@ public function __construct($mongo, array $options = [], float $initialTtl = 300 */ private function skimUri(string $uri): string { - if (false === $parsedUrl = parse_url($uri)) { + if (false === $params = parse_url($uri)) { throw new InvalidArgumentException(sprintf('The given MongoDB Connection URI "%s" is invalid.', $uri)); } - $pathDb = ltrim($parsedUrl['path'] ?? '', '/') ?: null; + $pathDb = ltrim($params['path'] ?? '', '/') ?: null; if (null !== $pathDb) { $this->options['database'] = $pathDb; } diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php index e037341e5f05f..5545a99fee56e 100644 --- a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php @@ -81,7 +81,7 @@ public function testAbortAfterExpiration() /** * @dataProvider provideDsnWithSQLite */ - public function testDsnWithSQLite(string $dsn, string $file = null) + public function testDsnWithSQLite(string $dsn, ?string $file = null) { $key = new Key(uniqid(__METHOD__, true)); diff --git a/src/Symfony/Component/Lock/Tests/Store/PdoDbalStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PdoDbalStoreTest.php index ee34366747e07..5d8cdd0d562fa 100644 --- a/src/Symfony/Component/Lock/Tests/Store/PdoDbalStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/PdoDbalStoreTest.php @@ -94,7 +94,7 @@ public function testConfigureSchema() /** * @dataProvider provideDsn */ - public function testDsn(string $dsn, string $file = null) + public function testDsn(string $dsn, ?string $file = null) { $this->expectDeprecation('Since symfony/lock 5.4: Usage of a DBAL Connection with "Symfony\Component\Lock\Store\PdoStore" is deprecated and will be removed in symfony 6.0. Use "Symfony\Component\Lock\Store\DoctrineDbalStore" instead.'); $key = new Key(uniqid(__METHOD__, true)); diff --git a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php index d2960d08bf274..e6683b38c929d 100644 --- a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php @@ -78,7 +78,7 @@ public function testInvalidTtlConstruct() /** * @dataProvider provideDsnWithSQLite */ - public function testDsnWithSQLite(string $dsn, string $file = null) + public function testDsnWithSQLite(string $dsn, ?string $file = null) { $key = new Key(uniqid(__METHOD__, true)); diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php index 6feab92cd2d87..66f9cc4a6914f 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php @@ -39,7 +39,7 @@ class SesApiTransport extends AbstractApiTransport /** * @param string|null $region Amazon SES region */ - public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $accessKey, string $secretKey, ?string $region = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->accessKey = $accessKey; $this->secretKey = $secretKey; diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php index d38e5369c5a5d..656a08668df41 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php @@ -30,7 +30,7 @@ class SesHttpAsyncAwsTransport extends AbstractTransport /** @var SesClient */ protected $sesClient; - public function __construct(SesClient $sesClient, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(SesClient $sesClient, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->sesClient = $sesClient; diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php index 72887e895f0b1..7447406667942 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php @@ -37,7 +37,7 @@ class SesHttpTransport extends AbstractHttpTransport /** * @param string|null $region Amazon SES region */ - public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $accessKey, string $secretKey, ?string $region = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->accessKey = $accessKey; $this->secretKey = $secretKey; diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php index 24811f68ff159..48d004950b7ee 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php @@ -23,7 +23,7 @@ class SesSmtpTransport extends EsmtpTransport /** * @param string|null $region Amazon SES region */ - public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $username, string $password, ?string $region = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct(sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1'), 465, true, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php index 8f9742a2864bd..ea52a19f1b3f0 100644 --- a/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php @@ -20,7 +20,7 @@ */ class GmailSmtpTransport extends EsmtpTransport { - public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $username, string $password, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('smtp.gmail.com', 465, true, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php index 474ff10241291..1d0dcbbf35d4b 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php @@ -34,7 +34,7 @@ class MandrillApiTransport extends AbstractApiTransport private $key; - public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHeadersTrait.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHeadersTrait.php index 73c3dbd010640..faa7e0bee4d88 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHeadersTrait.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHeadersTrait.php @@ -23,7 +23,7 @@ */ trait MandrillHeadersTrait { - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { if ($message instanceof Message) { $this->addMandrillHeaders($message); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php index f6edcdd9645f1..f9c6142ced006 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php @@ -32,7 +32,7 @@ class MandrillHttpTransport extends AbstractHttpTransport private const HOST = 'mandrillapp.com'; private $key; - public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php index ef18b5de4326a..8df0653a679ca 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php @@ -22,7 +22,7 @@ class MandrillSmtpTransport extends EsmtpTransport { use MandrillHeadersTrait; - public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $username, string $password, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('smtp.mandrillapp.com', 587, false, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php index 6d23e44a1692e..e95f212bb75de 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php @@ -37,7 +37,7 @@ class MailgunApiTransport extends AbstractApiTransport private $domain; private $region; - public function __construct(string $key, string $domain, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, string $domain, ?string $region = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; $this->domain = $domain; diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHeadersTrait.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHeadersTrait.php index 9d1603960e74e..be27e4b69cc93 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHeadersTrait.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHeadersTrait.php @@ -23,7 +23,7 @@ */ trait MailgunHeadersTrait { - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { if ($message instanceof Message) { $this->addMailgunHeaders($message); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php index 853991e55c5d6..c621ae5b16a77 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php @@ -36,7 +36,7 @@ class MailgunHttpTransport extends AbstractHttpTransport private $domain; private $region; - public function __construct(string $key, string $domain, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, string $domain, ?string $region = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; $this->domain = $domain; diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php index 5345345cc322a..7e7524893e4b5 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php @@ -22,7 +22,7 @@ class MailgunSmtpTransport extends EsmtpTransport { use MailgunHeadersTrait; - public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $username, string $password, ?string $region = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('us' !== ($region ?: 'us') ? sprintf('smtp.%s.mailgun.org', $region) : 'smtp.mailgun.org', 465, true, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php index d3803ccf54dbb..6453db6b63045 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php @@ -42,7 +42,7 @@ class MailjetApiTransport extends AbstractApiTransport private $privateKey; private $publicKey; - public function __construct(string $publicKey, string $privateKey, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $publicKey, string $privateKey, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->publicKey = $publicKey; $this->privateKey = $privateKey; diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetSmtpTransport.php index e1bb40334f0b6..077b608aba0b6 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetSmtpTransport.php @@ -17,7 +17,7 @@ class MailjetSmtpTransport extends EsmtpTransport { - public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $username, string $password, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('in-v3.mailjet.com', 465, true, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpApiTransport.php b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpApiTransport.php index e4e6bddfc103d..4d5048693d700 100644 --- a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpApiTransport.php @@ -33,7 +33,7 @@ final class OhMySmtpApiTransport extends AbstractApiTransport private $key; - public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; diff --git a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpSmtpTransport.php index 2cd015a4f8ca6..42680d263a77d 100644 --- a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Transport/OhMySmtpSmtpTransport.php @@ -25,7 +25,7 @@ */ final class OhMySmtpSmtpTransport extends EsmtpTransport { - public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $id, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('smtp.ohmysmtp.com', 587, false, $dispatcher, $logger); @@ -33,7 +33,7 @@ public function __construct(string $id, EventDispatcherInterface $dispatcher = n $this->setPassword($id); } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { if ($message instanceof Message) { $this->addOhMySmtpHeaders($message); diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php index 6cad705a651d2..67127d6bf2732 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php @@ -37,7 +37,7 @@ class PostmarkApiTransport extends AbstractApiTransport private $messageStream; - public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php index ced70de4ed6e1..582802dcfd0fd 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php @@ -29,7 +29,7 @@ class PostmarkSmtpTransport extends EsmtpTransport { private $messageStream; - public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $id, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('smtp.postmarkapp.com', 587, false, $dispatcher, $logger); @@ -37,7 +37,7 @@ public function __construct(string $id, EventDispatcherInterface $dispatcher = n $this->setPassword($id); } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { if ($message instanceof Message) { $this->addPostmarkHeaders($message); diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php index f74677463e3ed..6713552c6c155 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php @@ -36,7 +36,7 @@ class SendgridApiTransport extends AbstractApiTransport private $key; - public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php index c83e831f568b7..b76f528358cdc 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php @@ -20,7 +20,7 @@ */ class SendgridSmtpTransport extends EsmtpTransport { - public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('smtp.sendgrid.net', 465, true, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueApiTransport.php index 8d8b6e241e0ac..6eb2ddfe43262 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueApiTransport.php @@ -34,7 +34,7 @@ final class SendinblueApiTransport extends AbstractApiTransport { private $key; - public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->key = $key; diff --git a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueSmtpTransport.php index b0e90230a0fb4..07d953c403be8 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueSmtpTransport.php @@ -20,7 +20,7 @@ */ final class SendinblueSmtpTransport extends EsmtpTransport { - public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $username, string $password, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct('smtp-relay.brevo.com', 465, true, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php b/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php index 07f77b27b0d3d..ba94d9b4efe63 100644 --- a/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php +++ b/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php @@ -32,7 +32,7 @@ public function __construct(MessageLoggerListener $logger) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->data['events'] = $this->events; } diff --git a/src/Symfony/Component/Mailer/Event/MessageEvents.php b/src/Symfony/Component/Mailer/Event/MessageEvents.php index b5266493c9a55..b6b89b39e02b5 100644 --- a/src/Symfony/Component/Mailer/Event/MessageEvents.php +++ b/src/Symfony/Component/Mailer/Event/MessageEvents.php @@ -35,7 +35,7 @@ public function getTransports(): array /** * @return MessageEvent[] */ - public function getEvents(string $name = null): array + public function getEvents(?string $name = null): array { if (null === $name) { return $this->events; @@ -54,7 +54,7 @@ public function getEvents(string $name = null): array /** * @return RawMessage[] */ - public function getMessages(string $name = null): array + public function getMessages(?string $name = null): array { $events = $this->getEvents($name); $messages = []; diff --git a/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php b/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php index b2980bc5cf6bc..db9c0a4e83fac 100644 --- a/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php +++ b/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php @@ -30,7 +30,7 @@ class EnvelopeListener implements EventSubscriberInterface * @param Address|string $sender * @param array $recipients */ - public function __construct($sender = null, array $recipients = null) + public function __construct($sender = null, ?array $recipients = null) { if (null !== $sender) { $this->sender = Address::create($sender); diff --git a/src/Symfony/Component/Mailer/EventListener/MessageListener.php b/src/Symfony/Component/Mailer/EventListener/MessageListener.php index f23c69d91dc74..b654bea6eff34 100644 --- a/src/Symfony/Component/Mailer/EventListener/MessageListener.php +++ b/src/Symfony/Component/Mailer/EventListener/MessageListener.php @@ -43,7 +43,7 @@ class MessageListener implements EventSubscriberInterface private $headerRules = []; private $renderer; - public function __construct(Headers $headers = null, BodyRendererInterface $renderer = null, array $headerRules = self::DEFAULT_RULES) + public function __construct(?Headers $headers = null, ?BodyRendererInterface $renderer = null, array $headerRules = self::DEFAULT_RULES) { $this->headers = $headers; $this->renderer = $renderer; diff --git a/src/Symfony/Component/Mailer/Exception/HttpTransportException.php b/src/Symfony/Component/Mailer/Exception/HttpTransportException.php index c72eb6cf6e3ee..0ba35eec3e3ab 100644 --- a/src/Symfony/Component/Mailer/Exception/HttpTransportException.php +++ b/src/Symfony/Component/Mailer/Exception/HttpTransportException.php @@ -20,7 +20,7 @@ class HttpTransportException extends TransportException { private $response; - public function __construct(?string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null) + public function __construct(?string $message, ResponseInterface $response, int $code = 0, ?\Throwable $previous = null) { if (null === $message) { trigger_deprecation('symfony/mailer', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php index e47a129dc7e90..46acf83ef8ae7 100644 --- a/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php +++ b/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php @@ -58,7 +58,7 @@ class UnsupportedSchemeException extends LogicException ], ]; - public function __construct(Dsn $dsn, string $name = null, array $supported = []) + public function __construct(Dsn $dsn, ?string $name = null, array $supported = []) { $provider = $dsn->getScheme(); if (false !== $pos = strpos($provider, '+')) { diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php index cbdcdf296ef36..f4e7f8c9b85d7 100644 --- a/src/Symfony/Component/Mailer/Mailer.php +++ b/src/Symfony/Component/Mailer/Mailer.php @@ -32,14 +32,14 @@ final class Mailer implements MailerInterface private $bus; private $dispatcher; - public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null) + public function __construct(TransportInterface $transport, ?MessageBusInterface $bus = null, ?EventDispatcherInterface $dispatcher = null) { $this->transport = $transport; $this->bus = $bus; $this->dispatcher = class_exists(Event::class) && $dispatcher instanceof SymfonyEventDispatcherInterface ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; } - public function send(RawMessage $message, Envelope $envelope = null): void + public function send(RawMessage $message, ?Envelope $envelope = null): void { if (null === $this->bus) { $this->transport->send($message, $envelope); diff --git a/src/Symfony/Component/Mailer/MailerInterface.php b/src/Symfony/Component/Mailer/MailerInterface.php index eb44cf640c263..8d9540a3e5e3f 100644 --- a/src/Symfony/Component/Mailer/MailerInterface.php +++ b/src/Symfony/Component/Mailer/MailerInterface.php @@ -26,5 +26,5 @@ interface MailerInterface /** * @throws TransportExceptionInterface */ - public function send(RawMessage $message, Envelope $envelope = null): void; + public function send(RawMessage $message, ?Envelope $envelope = null): void; } diff --git a/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php b/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php index b06ac839c64f7..622408a02e73b 100644 --- a/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php +++ b/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php @@ -22,7 +22,7 @@ class SendEmailMessage private $message; private $envelope; - public function __construct(RawMessage $message, Envelope $envelope = null) + public function __construct(RawMessage $message, ?Envelope $envelope = null) { $this->message = $message; $this->envelope = $envelope; diff --git a/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php b/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php index 59a78123dbf36..0b4d945db989d 100644 --- a/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php +++ b/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php @@ -20,7 +20,7 @@ final class EmailCount extends Constraint private $transport; private $queued; - public function __construct(int $expectedValue, string $transport = null, bool $queued = false) + public function __construct(int $expectedValue, ?string $transport = null, bool $queued = false) { $this->expectedValue = $expectedValue; $this->transport = $transport; diff --git a/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php b/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php index 121643f01a158..bc9635d4c0547 100644 --- a/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php +++ b/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php @@ -77,7 +77,7 @@ public function testCreate(Dsn $dsn, TransportInterface $transport) /** * @dataProvider unsupportedSchemeProvider */ - public function testUnsupportedSchemeException(Dsn $dsn, string $message = null) + public function testUnsupportedSchemeException(Dsn $dsn, ?string $message = null) { $factory = $this->getFactory(); diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php index 50e0f7440dffe..3a9d85e51fb98 100644 --- a/src/Symfony/Component/Mailer/Tests/TransportTest.php +++ b/src/Symfony/Component/Mailer/Tests/TransportTest.php @@ -109,7 +109,7 @@ public function __construct(string $host) $this->host = $host; } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { throw new \BadMethodCallException('This method newer should be called.'); } diff --git a/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php index 2317a0da53918..47e73c9e596c9 100644 --- a/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php +++ b/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php @@ -28,7 +28,7 @@ abstract class AbstractHttpTransport extends AbstractTransport protected $port; protected $client; - public function __construct(HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->client = $client; if (null === $client) { diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php index ae5b0a820787b..f7fd409902470 100644 --- a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php +++ b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php @@ -33,7 +33,7 @@ abstract class AbstractTransport implements TransportInterface private $rate = 0; private $lastSent = 0; - public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { $this->dispatcher = class_exists(Event::class) && $dispatcher instanceof SymfonyEventDispatcherInterface ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; $this->logger = $logger ?? new NullLogger(); @@ -56,7 +56,7 @@ public function setMaxPerSecond(float $rate): self return $this; } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { $message = clone $message; $envelope = null !== $envelope ? clone $envelope : Envelope::create($message); diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php b/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php index e1617d2702134..1f47344f1ee6e 100644 --- a/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php +++ b/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php @@ -25,7 +25,7 @@ abstract class AbstractTransportFactory implements TransportFactoryInterface protected $client; protected $logger; - public function __construct(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null) + public function __construct(?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null, ?LoggerInterface $logger = null) { $this->dispatcher = $dispatcher; $this->client = $client; diff --git a/src/Symfony/Component/Mailer/Transport/Dsn.php b/src/Symfony/Component/Mailer/Transport/Dsn.php index cef6041ef4c20..8272be713697c 100644 --- a/src/Symfony/Component/Mailer/Transport/Dsn.php +++ b/src/Symfony/Component/Mailer/Transport/Dsn.php @@ -25,7 +25,7 @@ final class Dsn private $port; private $options; - public function __construct(string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = []) + public function __construct(string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = []) { $this->scheme = $scheme; $this->host = $host; @@ -37,24 +37,24 @@ public function __construct(string $scheme, string $host, string $user = null, s public static function fromString(string $dsn): self { - if (false === $parsedDsn = parse_url($dsn)) { + if (false === $params = parse_url($dsn)) { throw new InvalidArgumentException('The mailer DSN is invalid.'); } - if (!isset($parsedDsn['scheme'])) { + if (!isset($params['scheme'])) { throw new InvalidArgumentException('The mailer DSN must contain a scheme.'); } - if (!isset($parsedDsn['host'])) { + if (!isset($params['host'])) { throw new InvalidArgumentException('The mailer DSN must contain a host (use "default" by default).'); } - $user = '' !== ($parsedDsn['user'] ?? '') ? urldecode($parsedDsn['user']) : null; - $password = '' !== ($parsedDsn['pass'] ?? '') ? urldecode($parsedDsn['pass']) : null; - $port = $parsedDsn['port'] ?? null; - parse_str($parsedDsn['query'] ?? '', $query); + $user = '' !== ($params['user'] ?? '') ? rawurldecode($params['user']) : null; + $password = '' !== ($params['pass'] ?? '') ? rawurldecode($params['pass']) : null; + $port = $params['port'] ?? null; + parse_str($params['query'] ?? '', $query); - return new self($parsedDsn['scheme'], $parsedDsn['host'], $user, $password, $port, $query); + return new self($params['scheme'], $params['host'], $user, $password, $port, $query); } public function getScheme(): string @@ -77,7 +77,7 @@ public function getPassword(): ?string return $this->password; } - public function getPort(int $default = null): ?int + public function getPort(?int $default = null): ?int { return $this->port ?? $default; } diff --git a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php index 761b57f188b75..2568e48507c4f 100644 --- a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php +++ b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php @@ -46,7 +46,7 @@ public function __construct(array $transports, int $retryPeriod = 60) $this->retryPeriod = $retryPeriod; } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { $exception = null; diff --git a/src/Symfony/Component/Mailer/Transport/SendmailTransport.php b/src/Symfony/Component/Mailer/Transport/SendmailTransport.php index c60f9218cb1dd..22aea4e915d1f 100644 --- a/src/Symfony/Component/Mailer/Transport/SendmailTransport.php +++ b/src/Symfony/Component/Mailer/Transport/SendmailTransport.php @@ -49,7 +49,7 @@ class SendmailTransport extends AbstractTransport * * -f flag will be appended automatically if one is not present. */ - public function __construct(string $command = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(?string $command = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct($dispatcher, $logger); @@ -68,7 +68,7 @@ public function __construct(string $command = null, EventDispatcherInterface $di } } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { if ($this->transport) { return $this->transport->send($message, $envelope); diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php index 1dcb53f152e7a..a223205a31159 100644 --- a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php +++ b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php @@ -30,7 +30,7 @@ class EsmtpTransport extends SmtpTransport private $username = ''; private $password = ''; - public function __construct(string $host = 'localhost', int $port = 0, bool $tls = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $host = 'localhost', int $port = 0, ?bool $tls = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct(null, $dispatcher, $logger); diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php index 92af6aaf648af..b01bb37deb4f5 100644 --- a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php +++ b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php @@ -40,7 +40,7 @@ class SmtpTransport extends AbstractTransport private $stream; private $domain = '[127.0.0.1]'; - public function __construct(AbstractStream $stream = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(?AbstractStream $stream = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null) { parent::__construct($dispatcher, $logger); @@ -130,7 +130,7 @@ public function getLocalDomain(): string return $this->domain; } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { try { $message = parent::send($message, $envelope); diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php index 4cfcd8b5441c1..c53f8b54ee505 100644 --- a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php +++ b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php @@ -74,7 +74,7 @@ public function readLine(): string return ''; } - $line = fgets($this->out); + $line = @fgets($this->out); if ('' === $line || false === $line) { $metas = stream_get_meta_data($this->out); if ($metas['timed_out']) { @@ -83,6 +83,9 @@ public function readLine(): string if ($metas['eof']) { throw new TransportException(sprintf('Connection to "%s" has been closed unexpectedly.', $this->getReadConnectionDescription())); } + if (false === $line) { + throw new TransportException(sprintf('Unable to read from connection to "%s": ', $this->getReadConnectionDescription()).error_get_last()['message']); + } } $this->debug .= sprintf('< %s', $line); diff --git a/src/Symfony/Component/Mailer/Transport/TransportInterface.php b/src/Symfony/Component/Mailer/Transport/TransportInterface.php index ed562cfefde60..25c2e591ef5df 100644 --- a/src/Symfony/Component/Mailer/Transport/TransportInterface.php +++ b/src/Symfony/Component/Mailer/Transport/TransportInterface.php @@ -29,7 +29,7 @@ interface TransportInterface /** * @throws TransportExceptionInterface */ - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage; + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage; public function __toString(): string; } diff --git a/src/Symfony/Component/Mailer/Transport/Transports.php b/src/Symfony/Component/Mailer/Transport/Transports.php index 702fc5c784cd4..63daa38308391 100644 --- a/src/Symfony/Component/Mailer/Transport/Transports.php +++ b/src/Symfony/Component/Mailer/Transport/Transports.php @@ -44,7 +44,7 @@ public function __construct(iterable $transports) } } - public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage + public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage { /** @var Message $message */ if (RawMessage::class === \get_class($message) || !$message->getHeaders()->has('X-Transport')) { diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsTransportTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsTransportTest.php index 8e7b152732b98..303f8e43a8179 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsTransportTest.php +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsTransportTest.php @@ -167,7 +167,7 @@ public function testItConvertsHttpExceptionDuringResetIntoTransportException() $this->transport->reset(); } - private function getTransport(SerializerInterface $serializer = null, Connection $connection = null) + private function getTransport(?SerializerInterface $serializer = null, ?Connection $connection = null) { $serializer = $serializer ?? $this->createMock(SerializerInterface::class); $connection = $connection ?? $this->createMock(Connection::class); @@ -178,7 +178,7 @@ private function getTransport(SerializerInterface $serializer = null, Connection private function createHttpException(): HttpException { $response = $this->createMock(ResponseInterface::class); - $response->method('getInfo')->willReturnCallback(static function (string $type = null) { + $response->method('getInfo')->willReturnCallback(static function (?string $type = null) { $info = [ 'http_code' => 500, 'url' => 'https://symfony.com', diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php index 2abdb5d3b3e67..b49ba5c557acd 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php @@ -17,6 +17,7 @@ use AsyncAws\Sqs\Result\ReceiveMessageResult; use AsyncAws\Sqs\SqsClient; use AsyncAws\Sqs\ValueObject\Message; +use Composer\InstalledVersions; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Symfony\Component\HttpClient\MockHttpClient; @@ -342,6 +343,16 @@ public function testLoggerWithDebugOption() private function getMockedQueueUrlResponse(): MockResponse { + if ($this->isAsyncAwsSqsVersion2Installed()) { + return new MockResponse( + << @@ -357,6 +368,28 @@ private function getMockedQueueUrlResponse(): MockResponse private function getMockedReceiveMessageResponse(): MockResponse { + if ($this->isAsyncAwsSqsVersion2Installed()) { + return new MockResponse(<<configuration['auto_setup']) { $this->setup(); @@ -322,7 +322,8 @@ public function send(string $body, array $headers, int $delay = 0, string $messa $parameters = [ 'QueueUrl' => $this->getQueueUrl(), 'MessageBody' => $body, - 'DelaySeconds' => $delay, + // Maximum delay is 15 minutes. See https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-message-timers.html. + 'DelaySeconds' => min(900, $delay), 'MessageAttributes' => [], 'MessageSystemAttributes' => [], ]; diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json index b076649e7e1f6..4ac4dbdc1f97c 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=7.2.5", "async-aws/core": "^1.5", - "async-aws/sqs": "^1.0", + "async-aws/sqs": "^1.0|^2.0", "symfony/messenger": "^4.3|^5.0|^6.0", "symfony/service-contracts": "^1.1|^2|^3", "psr/log": "^1|^2|^3" diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/AmqpTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/AmqpTransportTest.php index 0223a0396c011..743bd51bac1f3 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/AmqpTransportTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/AmqpTransportTest.php @@ -52,7 +52,7 @@ public function testReceivesMessages() $this->assertSame($decodedMessage, $envelopes[0]->getMessage()); } - private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): AmqpTransport + private function getTransport(?SerializerInterface $serializer = null, ?Connection $connection = null): AmqpTransport { $serializer = $serializer ?? $this->createMock(SerializerInterface::class); $connection = $connection ?? $this->createMock(Connection::class); diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php index 141ab8cdce5e6..3cadcc10f7994 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php @@ -30,7 +30,7 @@ class AmqpReceiver implements QueueReceiverInterface, MessageCountAwareInterface private $serializer; private $connection; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php index 5fdfdffaf15f6..c0c3e9bbea1ec 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php @@ -29,7 +29,7 @@ class AmqpSender implements SenderInterface private $serializer; private $connection; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpStamp.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpStamp.php index 5835bdc091b02..ba096902cbc1a 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpStamp.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpStamp.php @@ -24,7 +24,7 @@ final class AmqpStamp implements NonSendableStampInterface private $attributes; private $isRetryAttempt = false; - public function __construct(string $routingKey = null, int $flags = \AMQP_NOPARAM, array $attributes = []) + public function __construct(?string $routingKey = null, int $flags = \AMQP_NOPARAM, array $attributes = []) { $this->routingKey = $routingKey; $this->flags = $flags; @@ -46,7 +46,7 @@ public function getAttributes(): array return $this->attributes; } - public static function createFromAmqpEnvelope(\AMQPEnvelope $amqpEnvelope, self $previousStamp = null, string $retryRoutingKey = null): self + public static function createFromAmqpEnvelope(\AMQPEnvelope $amqpEnvelope, ?self $previousStamp = null, ?string $retryRoutingKey = null): self { $attr = $previousStamp->attributes ?? []; @@ -79,7 +79,7 @@ public function isRetryAttempt(): bool return $this->isRetryAttempt; } - public static function createWithAttributes(array $attributes, self $previousStamp = null): self + public static function createWithAttributes(array $attributes, ?self $previousStamp = null): self { return new self( $previousStamp->routingKey ?? null, diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php index 9ffda47cee42c..52b529959b2ea 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php @@ -29,7 +29,7 @@ class AmqpTransport implements QueueReceiverInterface, TransportInterface, Setup private $receiver; private $sender; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php index 0357575e3edfb..b0c9fe46f59c3 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php @@ -13,6 +13,7 @@ use Symfony\Component\Messenger\Exception\InvalidArgumentException; use Symfony\Component\Messenger\Exception\LogicException; +use Symfony\Component\Messenger\Exception\TransportException; /** * An AMQP connection. @@ -111,7 +112,7 @@ class Connection */ private $lastActivityTime = 0; - public function __construct(array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null) + public function __construct(array $connectionOptions, array $exchangeOptions, array $queuesOptions, ?AmqpFactory $amqpFactory = null) { if (!\extension_loaded('amqp')) { throw new LogicException(sprintf('You cannot use the "%s" as the "amqp" extension is not installed.', __CLASS__)); @@ -175,26 +176,26 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar * * verify: Enable or disable peer verification. If peer verification is enabled then the common name in the * server certificate must match the server name. Peer verification is enabled by default. */ - public static function fromDsn(string $dsn, array $options = [], AmqpFactory $amqpFactory = null): self + public static function fromDsn(string $dsn, array $options = [], ?AmqpFactory $amqpFactory = null): self { - if (false === $parsedUrl = parse_url($dsn)) { + if (false === $params = parse_url($dsn)) { // this is a valid URI that parse_url cannot handle when you want to pass all parameters as options if (!\in_array($dsn, ['amqp://', 'amqps://'])) { throw new InvalidArgumentException('The given AMQP DSN is invalid.'); } - $parsedUrl = []; + $params = []; } $useAmqps = 0 === strpos($dsn, 'amqps://'); - $pathParts = isset($parsedUrl['path']) ? explode('/', trim($parsedUrl['path'], '/')) : []; + $pathParts = isset($params['path']) ? explode('/', trim($params['path'], '/')) : []; $exchangeName = $pathParts[1] ?? 'messages'; - parse_str($parsedUrl['query'] ?? '', $parsedQuery); + parse_str($params['query'] ?? '', $parsedQuery); $port = $useAmqps ? 5671 : 5672; $amqpOptions = array_replace_recursive([ - 'host' => $parsedUrl['host'] ?? 'localhost', - 'port' => $parsedUrl['port'] ?? $port, + 'host' => $params['host'] ?? 'localhost', + 'port' => $params['port'] ?? $port, 'vhost' => isset($pathParts[0]) ? urldecode($pathParts[0]) : '/', 'exchange' => [ 'name' => $exchangeName, @@ -203,12 +204,12 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am self::validateOptions($amqpOptions); - if (isset($parsedUrl['user'])) { - $amqpOptions['login'] = urldecode($parsedUrl['user']); + if (isset($params['user'])) { + $amqpOptions['login'] = rawurldecode($params['user']); } - if (isset($parsedUrl['pass'])) { - $amqpOptions['password'] = urldecode($parsedUrl['pass']); + if (isset($params['pass'])) { + $amqpOptions['password'] = rawurldecode($params['pass']); } if (!isset($amqpOptions['queues'])) { @@ -297,7 +298,7 @@ private static function hasCaCertConfigured(array $amqpOptions): bool /** * @throws \AMQPException */ - public function publish(string $body, array $headers = [], int $delayInMs = 0, AmqpStamp $amqpStamp = null): void + public function publish(string $body, array $headers = [], int $delayInMs = 0, ?AmqpStamp $amqpStamp = null): void { $this->clearWhenDisconnected(); @@ -333,7 +334,7 @@ public function countMessagesInQueues(): int /** * @throws \AMQPException */ - private function publishWithDelay(string $body, array $headers, int $delay, AmqpStamp $amqpStamp = null) + private function publishWithDelay(string $body, array $headers, int $delay, ?AmqpStamp $amqpStamp = null) { $routingKey = $this->getRoutingKeyForMessage($amqpStamp); $isRetryAttempt = $amqpStamp ? $amqpStamp->isRetryAttempt() : false; @@ -349,7 +350,7 @@ private function publishWithDelay(string $body, array $headers, int $delay, Amqp ); } - private function publishOnExchange(\AMQPExchange $exchange, string $body, string $routingKey = null, array $headers = [], AmqpStamp $amqpStamp = null) + private function publishOnExchange(\AMQPExchange $exchange, string $body, ?string $routingKey = null, array $headers = [], ?AmqpStamp $amqpStamp = null) { $attributes = $amqpStamp ? $amqpStamp->getAttributes() : []; $attributes['headers'] = array_merge($attributes['headers'] ?? [], $headers); @@ -516,8 +517,8 @@ public function channel(): \AMQPChannel static function (): bool { return false; }, - static function (): bool { - return false; + static function () { + throw new TransportException('Message publication failed due to a negative acknowledgment (nack) from the broker.'); } ); } diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/BeanstalkdTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/BeanstalkdTransportTest.php index 5671163982b5e..19184ed6ede91 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/BeanstalkdTransportTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/BeanstalkdTransportTest.php @@ -50,7 +50,7 @@ public function testReceivesMessages() $this->assertSame($decodedMessage, $envelopes[0]->getMessage()); } - private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): BeanstalkdTransport + private function getTransport(?SerializerInterface $serializer = null, ?Connection $connection = null): BeanstalkdTransport { $serializer = $serializer ?? $this->createMock(SerializerInterface::class); $connection = $connection ?? $this->createMock(Connection::class); diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php index 0a5ca05525403..f5415ae4fccae 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php @@ -27,7 +27,7 @@ class BeanstalkdReceiver implements ReceiverInterface, MessageCountAwareInterfac private $connection; private $serializer; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php index 58f02dcca038d..48b11a8519a71 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php @@ -25,7 +25,7 @@ class BeanstalkdSender implements SenderInterface private $connection; private $serializer; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php index 480d6e37f3d25..9a0680872a87b 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php @@ -27,7 +27,7 @@ class BeanstalkdTransport implements TransportInterface, MessageCountAwareInterf private $receiver; private $sender; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php index 751390503234d..13b2b8d882fe0 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php @@ -69,7 +69,7 @@ public function testConfigureSchema() $transport->configureSchema($schema, $dbalConnection); } - private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): DoctrineTransport + private function getTransport(?SerializerInterface $serializer = null, ?Connection $connection = null): DoctrineTransport { $serializer = $serializer ?? $this->createMock(SerializerInterface::class); $connection = $connection ?? $this->createMock(Connection::class); diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php index ed9a57a0ce568..2b77b78f531f4 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php @@ -66,7 +66,7 @@ class Connection implements ResetInterface private $schemaSynchronizer; private $autoSetup; - public function __construct(array $configuration, DBALConnection $driverConnection, SchemaSynchronizer $schemaSynchronizer = null) + public function __construct(array $configuration, DBALConnection $driverConnection, ?SchemaSynchronizer $schemaSynchronizer = null) { $this->configuration = array_replace_recursive(static::DEFAULT_OPTIONS, $configuration); $this->driverConnection = $driverConnection; @@ -86,16 +86,16 @@ public function getConfiguration(): array public static function buildConfiguration(string $dsn, array $options = []): array { - if (false === $components = parse_url($dsn)) { + if (false === $params = parse_url($dsn)) { throw new InvalidArgumentException('The given Doctrine Messenger DSN is invalid.'); } $query = []; - if (isset($components['query'])) { - parse_str($components['query'], $query); + if (isset($params['query'])) { + parse_str($params['query'], $query); } - $configuration = ['connection' => $components['host']]; + $configuration = ['connection' => $params['host']]; $configuration += $query + $options + static::DEFAULT_OPTIONS; $configuration['auto_setup'] = filter_var($configuration['auto_setup'], \FILTER_VALIDATE_BOOLEAN); @@ -302,7 +302,7 @@ public function getMessageCount(): int return $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchOne() : $stmt->fetchColumn(); } - public function findAll(int $limit = null): array + public function findAll(?int $limit = null): array { $queryBuilder = $this->createAvailableMessagesQueryBuilder(); diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php index 69cf0ed6748fb..1448be8f4ffbb 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php @@ -33,7 +33,7 @@ class DoctrineReceiver implements ListableReceiverInterface, MessageCountAwareIn private $connection; private $serializer; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); @@ -107,7 +107,7 @@ public function getMessageCount(): int /** * {@inheritdoc} */ - public function all(int $limit = null): iterable + public function all(?int $limit = null): iterable { try { $doctrineEnvelopes = $this->connection->findAll($limit); diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php index 6e5aa608528c9..32857363326f8 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php @@ -28,7 +28,7 @@ class DoctrineSender implements SenderInterface private $connection; private $serializer; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php index 97bc6fac3feea..fe0b385365d7a 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php @@ -72,7 +72,7 @@ public function getMessageCount(): int /** * {@inheritdoc} */ - public function all(int $limit = null): iterable + public function all(?int $limit = null): iterable { return ($this->receiver ?? $this->getReceiver())->all($limit); } diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php index bd7e43aefa3a9..3617dcab53d71 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php @@ -257,7 +257,7 @@ public function testLazy() ], $message['data']); $connection->reject($message['id']); } finally { - $redis->del('messenger-lazy'); + $redis->unlink('messenger-lazy'); } } @@ -295,14 +295,13 @@ public function testJsonError() } catch (TransportException $e) { $this->assertSame('Malformed UTF-8 characters, possibly incorrectly encoded', $e->getMessage()); } finally { - $redis->del('messenger-json-error'); + $redis->unlink('messenger-json-error'); } } public function testGetNonBlocking() { $redis = new \Redis(); - $connection = Connection::fromDsn('redis://localhost/messenger-getnonblocking', ['delete_after_ack' => true], $redis); try { @@ -311,7 +310,7 @@ public function testGetNonBlocking() $this->assertNotEmpty($message = $connection->get()); $connection->reject($message['id']); } finally { - $redis->del('messenger-getnonblocking'); + $redis->unlink('messenger-getnonblocking'); } } @@ -330,7 +329,7 @@ public function testGetAfterReject() $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['delete_after_ack' => true]); $this->assertNotNull($connection->get()); } finally { - $redis->del('messenger-rejectthenget'); + $redis->unlink('messenger-rejectthenget'); } } diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php index d3a9da9d728e9..04c7b4a706d4d 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php @@ -54,7 +54,7 @@ public function testReceivesMessages() $this->assertSame($decodedMessage, $envelopes[0]->getMessage()); } - private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): RedisTransport + private function getTransport(?SerializerInterface $serializer = null, ?Connection $connection = null): RedisTransport { $serializer = $serializer ?? $this->createMock(SerializerInterface::class); $connection = $connection ?? $this->createMock(Connection::class); diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php index df1edaae55774..16633a354fcfe 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php @@ -155,7 +155,7 @@ private static function initializeRedisCluster(?\RedisCluster $redis, array $hos public static function fromDsn(string $dsn, array $redisOptions = [], $redis = null): self { if (false === strpos($dsn, ',')) { - $parsedUrl = self::parseDsn($dsn, $redisOptions); + $params = self::parseDsn($dsn, $redisOptions); } else { $dsns = explode(',', $dsn); $parsedUrls = array_map(function ($dsn) use (&$redisOptions) { @@ -163,10 +163,10 @@ public static function fromDsn(string $dsn, array $redisOptions = [], $redis = n }, $dsns); // Merge all the URLs, the last one overrides the previous ones - $parsedUrl = array_merge(...$parsedUrls); + $params = array_merge(...$parsedUrls); // Regroup all the hosts in an array interpretable by RedisCluster - $parsedUrl['host'] = array_map(function ($parsedUrl) { + $params['host'] = array_map(function ($parsedUrl) { if (!isset($parsedUrl['host'])) { throw new InvalidArgumentException('Missing host in DSN, it must be defined when using Redis Cluster.'); } @@ -209,7 +209,7 @@ public static function fromDsn(string $dsn, array $redisOptions = [], $redis = n unset($redisOptions['dbindex']); } - $tls = 'rediss' === $parsedUrl['scheme']; + $tls = 'rediss' === $params['scheme']; if (\array_key_exists('tls', $redisOptions)) { trigger_deprecation('symfony/redis-messenger', '5.3', 'Providing "tls" parameter is deprecated, use "rediss://" DSN scheme instead'); $tls = filter_var($redisOptions['tls'], \FILTER_VALIDATE_BOOLEAN); @@ -242,17 +242,17 @@ public static function fromDsn(string $dsn, array $redisOptions = [], $redis = n 'claim_interval' => $claimInterval, ]; - if (isset($parsedUrl['host'])) { - $pass = '' !== ($parsedUrl['pass'] ?? '') ? urldecode($parsedUrl['pass']) : null; - $user = '' !== ($parsedUrl['user'] ?? '') ? urldecode($parsedUrl['user']) : null; + if (isset($params['host'])) { + $user = isset($params['user']) && '' !== $params['user'] ? rawurldecode($params['user']) : null; + $pass = isset($params['pass']) && '' !== $params['pass'] ? rawurldecode($params['pass']) : null; $connectionCredentials = [ - 'host' => $parsedUrl['host'] ?? '127.0.0.1', - 'port' => $parsedUrl['port'] ?? 6379, + 'host' => $params['host'], + 'port' => $params['port'] ?? 6379, // See: https://github.com/phpredis/phpredis/#auth 'auth' => $redisOptions['auth'] ?? (null !== $pass && null !== $user ? [$user, $pass] : ($pass ?? $user)), ]; - $pathParts = explode('/', rtrim($parsedUrl['path'] ?? '', '/')); + $pathParts = explode('/', rtrim($params['path'] ?? '', '/')); $configuration['stream'] = $pathParts[1] ?? $configuration['stream']; $configuration['group'] = $pathParts[2] ?? $configuration['group']; @@ -262,7 +262,7 @@ public static function fromDsn(string $dsn, array $redisOptions = [], $redis = n } } else { $connectionCredentials = [ - 'host' => $parsedUrl['path'], + 'host' => $params['path'], 'port' => 0, ]; } @@ -279,15 +279,15 @@ private static function parseDsn(string $dsn, array &$redisOptions): array $url = str_replace($scheme.':', 'file:', $dsn); } - if (false === $parsedUrl = parse_url($url)) { + if (false === $params = parse_url($url)) { throw new InvalidArgumentException('The given Redis DSN is invalid.'); } - if (isset($parsedUrl['query'])) { - parse_str($parsedUrl['query'], $dsnOptions); + if (isset($params['query'])) { + parse_str($params['query'], $dsnOptions); $redisOptions = array_merge($redisOptions, $dsnOptions); } - return $parsedUrl; + return $params; } private static function validateOptions(array $options): void diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php index 4b80aaa3f7d3b..70d54831c176b 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php @@ -28,7 +28,7 @@ class RedisReceiver implements ReceiverInterface private $connection; private $serializer; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php index 88daa22c5366f..69b44a6ffa1d6 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php @@ -28,7 +28,7 @@ class RedisTransport implements TransportInterface, SetupableTransportInterface private $receiver; private $sender; - public function __construct(Connection $connection, SerializerInterface $serializer = null) + public function __construct(Connection $connection, ?SerializerInterface $serializer = null) { $this->connection = $connection; $this->serializer = $serializer ?? new PhpSerializer(); diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md index ede59fef6ceef..6e219137d90d6 100644 --- a/src/Symfony/Component/Messenger/CHANGELOG.md +++ b/src/Symfony/Component/Messenger/CHANGELOG.md @@ -29,7 +29,6 @@ CHANGELOG * Added factory methods `DelayStamp::delayFor(\DateInterval)` and `DelayStamp::delayUntil(\DateTimeInterface)`. * Removed the exception when dispatching a message with a `DispatchAfterCurrentBusStamp` and not in a context of another dispatch call * Added `WorkerMessageRetriedEvent` - * Added `WorkerMessageReceivedEvent::setEnvelope()` and made event mutable 5.1.0 ----- diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php index b9292dd41ff70..5b60942ffdf06 100644 --- a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php +++ b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php @@ -50,7 +50,7 @@ class ConsumeMessagesCommand extends Command private $resetServicesListener; private $busIds; - public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null, array $receiverNames = [], ResetServicesListener $resetServicesListener = null, array $busIds = []) + public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, ?LoggerInterface $logger = null, array $receiverNames = [], ?ResetServicesListener $resetServicesListener = null, array $busIds = []) { $this->routableBus = $routableBus; $this->receiverLocator = $receiverLocator; diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php index 0ef9984675160..f6ad8a765c69f 100644 --- a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php +++ b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php @@ -41,7 +41,7 @@ class FailedMessagesRetryCommand extends AbstractFailedMessagesCommand private $messageBus; private $logger; - public function __construct(?string $globalReceiverName, $failureTransports, MessageBusInterface $messageBus, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null) + public function __construct(?string $globalReceiverName, $failureTransports, MessageBusInterface $messageBus, EventDispatcherInterface $eventDispatcher, ?LoggerInterface $logger = null) { $this->eventDispatcher = $eventDispatcher; $this->messageBus = $messageBus; diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php index ef1ec4ead010c..e27457eacc616 100644 --- a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php +++ b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php @@ -35,7 +35,7 @@ public function registerBus(string $name, TraceableMessageBus $bus) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { // Noop. Everything is collected live by the traceable buses & cloned as late as possible. } @@ -121,7 +121,7 @@ private function collectMessage(string $busName, array $tracedMessage) return $debugRepresentation; } - public function getExceptionsCount(string $bus = null): int + public function getExceptionsCount(?string $bus = null): int { $count = 0; foreach ($this->getMessages($bus) as $message) { @@ -131,7 +131,7 @@ public function getExceptionsCount(string $bus = null): int return $count; } - public function getMessages(string $bus = null): array + public function getMessages(?string $bus = null): array { if (null === $bus) { return $this->data['messages']; diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php index 49476feb6c331..ad6fd3f6fb98b 100644 --- a/src/Symfony/Component/Messenger/Envelope.php +++ b/src/Symfony/Component/Messenger/Envelope.php @@ -102,7 +102,7 @@ public function last(string $stampFqcn): ?StampInterface /** * @return StampInterface[]|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name */ - public function all(string $stampFqcn = null): array + public function all(?string $stampFqcn = null): array { if (null !== $stampFqcn) { return $this->stamps[$this->resolveAlias($stampFqcn)] ?? []; diff --git a/src/Symfony/Component/Messenger/Event/WorkerMessageReceivedEvent.php b/src/Symfony/Component/Messenger/Event/WorkerMessageReceivedEvent.php index 5b99edcb422d5..284294937cc3c 100644 --- a/src/Symfony/Component/Messenger/Event/WorkerMessageReceivedEvent.php +++ b/src/Symfony/Component/Messenger/Event/WorkerMessageReceivedEvent.php @@ -20,7 +20,7 @@ final class WorkerMessageReceivedEvent extends AbstractWorkerMessageEvent { private $shouldHandle = true; - public function shouldHandle(bool $shouldHandle = null): bool + public function shouldHandle(?bool $shouldHandle = null): bool { if (null !== $shouldHandle) { $this->shouldHandle = $shouldHandle; diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php index dab74b203f795..e87aaeff8a4fe 100644 --- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php +++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php @@ -39,7 +39,7 @@ class SendFailedMessageForRetryListener implements EventSubscriberInterface private $eventDispatcher; private $historySize; - public function __construct(ContainerInterface $sendersLocator, ContainerInterface $retryStrategyLocator, LoggerInterface $logger = null, EventDispatcherInterface $eventDispatcher = null, int $historySize = 10) + public function __construct(ContainerInterface $sendersLocator, ContainerInterface $retryStrategyLocator, ?LoggerInterface $logger = null, ?EventDispatcherInterface $eventDispatcher = null, int $historySize = 10) { $this->sendersLocator = $sendersLocator; $this->retryStrategyLocator = $retryStrategyLocator; diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php index 644f5a614781b..86004b23d807a 100644 --- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php +++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php @@ -33,7 +33,7 @@ class SendFailedMessageToFailureTransportListener implements EventSubscriberInte /** * @param ContainerInterface $failureSenders */ - public function __construct($failureSenders, LoggerInterface $logger = null) + public function __construct($failureSenders, ?LoggerInterface $logger = null) { if (!$failureSenders instanceof ContainerInterface) { trigger_deprecation('symfony/messenger', '5.3', 'Passing a SenderInterface value as 1st argument to "%s()" is deprecated, pass a ServiceLocator instead.', __METHOD__); diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php index 29dc6aaaf2c3b..e0eb6eb029f4a 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php @@ -26,7 +26,7 @@ class StopWorkerOnFailureLimitListener implements EventSubscriberInterface private $logger; private $failedMessages = 0; - public function __construct(int $maximumNumberOfFailures, LoggerInterface $logger = null) + public function __construct(int $maximumNumberOfFailures, ?LoggerInterface $logger = null) { $this->maximumNumberOfFailures = $maximumNumberOfFailures; $this->logger = $logger; diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php index 73350fd0f6844..6f707e7f0643c 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php @@ -25,7 +25,7 @@ class StopWorkerOnMemoryLimitListener implements EventSubscriberInterface private $logger; private $memoryResolver; - public function __construct(int $memoryLimit, LoggerInterface $logger = null, callable $memoryResolver = null) + public function __construct(int $memoryLimit, ?LoggerInterface $logger = null, ?callable $memoryResolver = null) { $this->memoryLimit = $memoryLimit; $this->logger = $logger; diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php index ca71ff10bb870..5aa801c801bba 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php @@ -26,7 +26,7 @@ class StopWorkerOnMessageLimitListener implements EventSubscriberInterface private $logger; private $receivedMessages = 0; - public function __construct(int $maximumNumberOfMessages, LoggerInterface $logger = null) + public function __construct(int $maximumNumberOfMessages, ?LoggerInterface $logger = null) { $this->maximumNumberOfMessages = $maximumNumberOfMessages; $this->logger = $logger; diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php index 0fb3d4002079a..7e4f2195958ac 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php @@ -28,7 +28,7 @@ class StopWorkerOnRestartSignalListener implements EventSubscriberInterface private $logger; private $workerStartedAt; - public function __construct(CacheItemPoolInterface $cachePool, LoggerInterface $logger = null) + public function __construct(CacheItemPoolInterface $cachePool, ?LoggerInterface $logger = null) { $this->cachePool = $cachePool; $this->logger = $logger; diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php index c8655460ebc35..e2dfe2e98a857 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php @@ -22,7 +22,7 @@ class StopWorkerOnSigtermSignalListener implements EventSubscriberInterface { private $logger; - public function __construct(LoggerInterface $logger = null) + public function __construct(?LoggerInterface $logger = null) { $this->logger = $logger; } diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php index 247982f8a8865..c16e714869a77 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php @@ -27,7 +27,7 @@ class StopWorkerOnTimeLimitListener implements EventSubscriberInterface private $logger; private $endTime; - public function __construct(int $timeLimitInSeconds, LoggerInterface $logger = null) + public function __construct(int $timeLimitInSeconds, ?LoggerInterface $logger = null) { $this->timeLimitInSeconds = $timeLimitInSeconds; $this->logger = $logger; diff --git a/src/Symfony/Component/Messenger/Exception/StopWorkerException.php b/src/Symfony/Component/Messenger/Exception/StopWorkerException.php index e53bd32b7c489..c2100c28d8fb4 100644 --- a/src/Symfony/Component/Messenger/Exception/StopWorkerException.php +++ b/src/Symfony/Component/Messenger/Exception/StopWorkerException.php @@ -16,7 +16,7 @@ */ class StopWorkerException extends RuntimeException implements StopWorkerExceptionInterface { - public function __construct(string $message = 'Worker should stop.', \Throwable $previous = null) + public function __construct(string $message = 'Worker should stop.', ?\Throwable $previous = null) { parent::__construct($message, 0, $previous); } diff --git a/src/Symfony/Component/Messenger/Handler/Acknowledger.php b/src/Symfony/Component/Messenger/Handler/Acknowledger.php index eca1609abd354..6b62e5264f722 100644 --- a/src/Symfony/Component/Messenger/Handler/Acknowledger.php +++ b/src/Symfony/Component/Messenger/Handler/Acknowledger.php @@ -26,7 +26,7 @@ class Acknowledger /** * @param \Closure(\Throwable|null, mixed):void|null $ack */ - public function __construct(string $handlerClass, \Closure $ack = null) + public function __construct(string $handlerClass, ?\Closure $ack = null) { $this->handlerClass = $handlerClass; $this->ack = $ack ?? static function () {}; @@ -70,7 +70,7 @@ public function __destruct() } } - private function doAck(\Throwable $e = null, $result = null): void + private function doAck(?\Throwable $e = null, $result = null): void { if (!$ack = $this->ack) { throw new LogicException(sprintf('The acknowledger cannot be called twice by the "%s" batch handler.', $this->handlerClass)); diff --git a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php index 85da9b217f1e8..13f49bdfd4a4b 100644 --- a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php @@ -70,7 +70,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope /** @var AckStamp $ackStamp */ if ($batchHandler && $ackStamp = $envelope->last(AckStamp::class)) { - $ack = new Acknowledger(get_debug_type($batchHandler), static function (\Throwable $e = null, $result = null) use ($envelope, $ackStamp, $handlerDescriptor) { + $ack = new Acknowledger(get_debug_type($batchHandler), static function (?\Throwable $e = null, $result = null) use ($envelope, $ackStamp, $handlerDescriptor) { if (null !== $e) { $e = new HandlerFailedException($envelope, [$e]); } else { diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php index 669fe7652f86a..794310cc19c85 100644 --- a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php @@ -33,7 +33,7 @@ class SendMessageMiddleware implements MiddlewareInterface private $sendersLocator; private $eventDispatcher; - public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null) + public function __construct(SendersLocatorInterface $sendersLocator, ?EventDispatcherInterface $eventDispatcher = null) { $this->sendersLocator = $sendersLocator; $this->eventDispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($eventDispatcher) : $eventDispatcher; diff --git a/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php b/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php index c081830a0607f..4a1b9a101160a 100644 --- a/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php +++ b/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php @@ -66,7 +66,7 @@ public function __construct(int $maxRetries = 3, int $delayMilliseconds = 1000, /** * @param \Throwable|null $throwable The cause of the failed handling */ - public function isRetryable(Envelope $message, \Throwable $throwable = null): bool + public function isRetryable(Envelope $message, ?\Throwable $throwable = null): bool { $retries = RedeliveryStamp::getRetryCountFromEnvelope($message); @@ -76,7 +76,7 @@ public function isRetryable(Envelope $message, \Throwable $throwable = null): bo /** * @param \Throwable|null $throwable The cause of the failed handling */ - public function getWaitingTime(Envelope $message, \Throwable $throwable = null): int + public function getWaitingTime(Envelope $message, ?\Throwable $throwable = null): int { $retries = RedeliveryStamp::getRetryCountFromEnvelope($message); diff --git a/src/Symfony/Component/Messenger/RoutableMessageBus.php b/src/Symfony/Component/Messenger/RoutableMessageBus.php index ece1478892698..190d45c32e65f 100644 --- a/src/Symfony/Component/Messenger/RoutableMessageBus.php +++ b/src/Symfony/Component/Messenger/RoutableMessageBus.php @@ -28,7 +28,7 @@ class RoutableMessageBus implements MessageBusInterface private $busLocator; private $fallbackBus; - public function __construct(ContainerInterface $busLocator, MessageBusInterface $fallbackBus = null) + public function __construct(ContainerInterface $busLocator, ?MessageBusInterface $fallbackBus = null) { $this->busLocator = $busLocator; $this->fallbackBus = $fallbackBus; diff --git a/src/Symfony/Component/Messenger/Stamp/AckStamp.php b/src/Symfony/Component/Messenger/Stamp/AckStamp.php index b94c2c98e395c..e2716e1112ee0 100644 --- a/src/Symfony/Component/Messenger/Stamp/AckStamp.php +++ b/src/Symfony/Component/Messenger/Stamp/AckStamp.php @@ -28,7 +28,7 @@ public function __construct(\Closure $ack) $this->ack = $ack; } - public function ack(Envelope $envelope, \Throwable $e = null): void + public function ack(Envelope $envelope, ?\Throwable $e = null): void { ($this->ack)($envelope, $e); } diff --git a/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php b/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php index 6d7f08bdeaa24..98056719698a6 100644 --- a/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php +++ b/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php @@ -34,7 +34,7 @@ final class ErrorDetailsStamp implements StampInterface /** * @param int|string $exceptionCode */ - public function __construct(string $exceptionClass, $exceptionCode, string $exceptionMessage, FlattenException $flattenException = null) + public function __construct(string $exceptionClass, $exceptionCode, string $exceptionMessage, ?FlattenException $flattenException = null) { $this->exceptionClass = $exceptionClass; $this->exceptionCode = $exceptionCode; diff --git a/src/Symfony/Component/Messenger/Stamp/SentStamp.php b/src/Symfony/Component/Messenger/Stamp/SentStamp.php index eebbfc374e22c..5b7b2ef37d527 100644 --- a/src/Symfony/Component/Messenger/Stamp/SentStamp.php +++ b/src/Symfony/Component/Messenger/Stamp/SentStamp.php @@ -23,7 +23,7 @@ final class SentStamp implements NonSendableStampInterface private $senderClass; private $senderAlias; - public function __construct(string $senderClass, string $senderAlias = null) + public function __construct(string $senderClass, ?string $senderAlias = null) { $this->senderAlias = $senderAlias; $this->senderClass = $senderClass; diff --git a/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php b/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php index 08c3d6adb712d..99fc2944b638e 100644 --- a/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php +++ b/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php @@ -46,7 +46,7 @@ protected function getStackMock(bool $nextIsCalled = true) return new StackMiddleware($nextMiddleware); } - protected function getThrowingStackMock(\Throwable $throwable = null) + protected function getThrowingStackMock(?\Throwable $throwable = null) { $nextMiddleware = $this->createMock(MiddlewareInterface::class); $nextMiddleware diff --git a/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php index 0173052290047..4ff6b66d11f35 100644 --- a/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php +++ b/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php @@ -27,7 +27,7 @@ use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\RoutableMessageBus; use Symfony\Component\Messenger\Stamp\BusNameStamp; -use Symfony\Component\Messenger\Tests\ResettableDummyReceiver; +use Symfony\Component\Messenger\Tests\Fixtures\ResettableDummyReceiver; use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface; class ConsumeMessagesCommandTest extends TestCase diff --git a/src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessageTyped.php b/src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessageTyped.php new file mode 100644 index 0000000000000..5314404094d82 --- /dev/null +++ b/src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessageTyped.php @@ -0,0 +1,18 @@ +message = $message; + } + + public function getMessage(): string + { + return $this->message; + } +} diff --git a/src/Symfony/Component/Messenger/Tests/Fixtures/DummyReceiver.php b/src/Symfony/Component/Messenger/Tests/Fixtures/DummyReceiver.php new file mode 100644 index 0000000000000..277781c2ebd02 --- /dev/null +++ b/src/Symfony/Component/Messenger/Tests/Fixtures/DummyReceiver.php @@ -0,0 +1,64 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Messenger\Tests\Fixtures; + +use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface; + +class DummyReceiver implements ReceiverInterface +{ + private $deliveriesOfEnvelopes; + private $acknowledgedEnvelopes; + private $acknowledgeCount = 0; + private $rejectCount = 0; + + /** + * @param Envelope[][] $deliveriesOfEnvelopes + */ + public function __construct(array $deliveriesOfEnvelopes) + { + $this->deliveriesOfEnvelopes = $deliveriesOfEnvelopes; + } + + public function get(): iterable + { + $val = array_shift($this->deliveriesOfEnvelopes); + + return $val ?? []; + } + + public function ack(Envelope $envelope): void + { + ++$this->acknowledgeCount; + $this->acknowledgedEnvelopes[] = $envelope; + } + + public function reject(Envelope $envelope): void + { + ++$this->rejectCount; + } + + public function getAcknowledgeCount(): int + { + return $this->acknowledgeCount; + } + + public function getRejectCount(): int + { + return $this->rejectCount; + } + + public function getAcknowledgedEnvelopes(): array + { + return $this->acknowledgedEnvelopes; + } +} diff --git a/src/Symfony/Component/Messenger/Tests/Fixtures/ResettableDummyReceiver.php b/src/Symfony/Component/Messenger/Tests/Fixtures/ResettableDummyReceiver.php new file mode 100644 index 0000000000000..3c95c3b0405f1 --- /dev/null +++ b/src/Symfony/Component/Messenger/Tests/Fixtures/ResettableDummyReceiver.php @@ -0,0 +1,29 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Messenger\Tests\Fixtures; + +use Symfony\Contracts\Service\ResetInterface; + +class ResettableDummyReceiver extends DummyReceiver implements ResetInterface +{ + private $hasBeenReset = false; + + public function reset() + { + $this->hasBeenReset = true; + } + + public function hasBeenReset(): bool + { + return $this->hasBeenReset; + } +} diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php index 015ba74406b7a..e8cac901fb3c0 100644 --- a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php +++ b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php @@ -173,7 +173,7 @@ public function testBatchHandler() use BatchHandlerTrait; - public function __invoke(DummyMessage $message, Acknowledger $ack = null) + public function __invoke(DummyMessage $message, ?Acknowledger $ack = null) { return $this->handle($message, $ack); } @@ -198,7 +198,7 @@ private function process(array $jobs): void ])); $ackedMessages = []; - $ack = static function (Envelope $envelope, \Throwable $e = null) use (&$ackedMessages) { + $ack = static function (Envelope $envelope, ?\Throwable $e = null) use (&$ackedMessages) { if (null !== $e) { throw $e; } @@ -227,7 +227,7 @@ public function testBatchHandlerNoAck() $handler = new class() implements BatchHandlerInterface { use BatchHandlerTrait; - public function __invoke(DummyMessage $message, Acknowledger $ack = null) + public function __invoke(DummyMessage $message, ?Acknowledger $ack = null) { return $this->handle($message, $ack); } @@ -247,7 +247,7 @@ private function process(array $jobs): void ])); $error = null; - $ack = static function (Envelope $envelope, \Throwable $e = null) use (&$error) { + $ack = static function (Envelope $envelope, ?\Throwable $e = null) use (&$error) { $error = $e; }; @@ -264,7 +264,7 @@ public function testBatchHandlerNoBatch() use BatchHandlerTrait; - public function __invoke(DummyMessage $message, Acknowledger $ack = null) + public function __invoke(DummyMessage $message, ?Acknowledger $ack = null) { return $this->handle($message, $ack); } diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php index c064139cd3aba..61b38740e8548 100644 --- a/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php +++ b/src/Symfony/Component/Messenger/Tests/Middleware/TraceableMiddlewareTest.php @@ -53,7 +53,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope $stopwatch->expects($this->exactly(2)) ->method('start') - ->willReturnCallback(function (string $name, string $category = null) use (&$series) { + ->willReturnCallback(function (string $name, ?string $category = null) use (&$series) { [$constraint, $expectedCategory] = array_shift($series); $constraint->evaluate($name); @@ -195,7 +195,7 @@ class_exists(TraceableMiddleware::class); ]; $stopwatch->expects($this->exactly(4)) ->method('start') - ->willReturnCallback(function (string $name, string $category = null) use (&$startSeries) { + ->willReturnCallback(function (string $name, ?string $category = null) use (&$startSeries) { [$constraint, $expectedCategory] = array_shift($startSeries); $constraint->evaluate($name); diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php index b31914a9b07f7..07b82519ed75a 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php @@ -16,6 +16,7 @@ use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; +use Symfony\Component\Messenger\Tests\Fixtures\DummyMessageTyped; use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer; class PhpSerializerTest extends TestCase @@ -33,21 +34,21 @@ public function testEncodedIsDecodable() public function testDecodingFailsWithMissingBodyKey() { + $serializer = new PhpSerializer(); + $this->expectException(MessageDecodingFailedException::class); $this->expectExceptionMessage('Encoded envelope should have at least a "body", or maybe you should implement your own serializer'); - $serializer = new PhpSerializer(); - $serializer->decode([]); } public function testDecodingFailsWithBadFormat() { + $serializer = new PhpSerializer(); + $this->expectException(MessageDecodingFailedException::class); $this->expectExceptionMessageMatches('/Could not decode/'); - $serializer = new PhpSerializer(); - $serializer->decode([ 'body' => '{"message": "bar"}', ]); @@ -55,11 +56,11 @@ public function testDecodingFailsWithBadFormat() public function testDecodingFailsWithBadBase64Body() { + $serializer = new PhpSerializer(); + $this->expectException(MessageDecodingFailedException::class); $this->expectExceptionMessageMatches('/Could not decode/'); - $serializer = new PhpSerializer(); - $serializer->decode([ 'body' => 'x', ]); @@ -67,11 +68,11 @@ public function testDecodingFailsWithBadBase64Body() public function testDecodingFailsWithBadClass() { + $serializer = new PhpSerializer(); + $this->expectException(MessageDecodingFailedException::class); $this->expectExceptionMessageMatches('/class "ReceivedSt0mp" not found/'); - $serializer = new PhpSerializer(); - $serializer->decode([ 'body' => 'O:13:"ReceivedSt0mp":0:{}', ]); @@ -99,6 +100,22 @@ public function testNonUtf8IsBase64Encoded() $this->assertTrue((bool) preg_match('//u', $encoded['body']), 'Encodes non-UTF8 payloads'); $this->assertEquals($envelope, $serializer->decode($encoded)); } + + /** + * @requires PHP 7.4 + */ + public function testDecodingFailsForPropertyTypeMismatch() + { + $serializer = new PhpSerializer(); + $encodedEnvelope = $serializer->encode(new Envelope(new DummyMessageTyped('true'))); + // Simulate a change of property type in the code base + $encodedEnvelope['body'] = str_replace('s:4:\"true\"', 'b:1', $encodedEnvelope['body']); + + $this->expectException(MessageDecodingFailedException::class); + $this->expectExceptionMessageMatches('/Could not decode/'); + + $serializer->decode($encodedEnvelope); + } } class DummyPhpSerializerNonSendableStamp implements NonSendableStampInterface diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php index ef86584745747..0b7c447f11285 100644 --- a/src/Symfony/Component/Messenger/Tests/WorkerTest.php +++ b/src/Symfony/Component/Messenger/Tests/WorkerTest.php @@ -38,11 +38,12 @@ use Symfony\Component\Messenger\Stamp\SentStamp; use Symfony\Component\Messenger\Stamp\StampInterface; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; +use Symfony\Component\Messenger\Tests\Fixtures\DummyReceiver; +use Symfony\Component\Messenger\Tests\Fixtures\ResettableDummyReceiver; use Symfony\Component\Messenger\Transport\Receiver\QueueReceiverInterface; use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface; use Symfony\Component\Messenger\Worker; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Service\ResetInterface; /** * @group time-sensitive @@ -513,57 +514,6 @@ public function testFlushBatchOnStop() } } -class DummyReceiver implements ReceiverInterface -{ - private $deliveriesOfEnvelopes; - private $acknowledgedEnvelopes; - private $rejectedEnvelopes; - private $acknowledgeCount = 0; - private $rejectCount = 0; - - /** - * @param Envelope[][] $deliveriesOfEnvelopes - */ - public function __construct(array $deliveriesOfEnvelopes) - { - $this->deliveriesOfEnvelopes = $deliveriesOfEnvelopes; - } - - public function get(): iterable - { - $val = array_shift($this->deliveriesOfEnvelopes); - - return $val ?? []; - } - - public function ack(Envelope $envelope): void - { - ++$this->acknowledgeCount; - $this->acknowledgedEnvelopes[] = $envelope; - } - - public function reject(Envelope $envelope): void - { - ++$this->rejectCount; - $this->rejectedEnvelopes[] = $envelope; - } - - public function getAcknowledgeCount(): int - { - return $this->acknowledgeCount; - } - - public function getRejectCount(): int - { - return $this->rejectCount; - } - - public function getAcknowledgedEnvelopes(): array - { - return $this->acknowledgedEnvelopes; - } -} - class DummyQueueReceiver extends DummyReceiver implements QueueReceiverInterface { public function getFromQueues(array $queueNames): iterable @@ -578,7 +528,7 @@ class DummyBatchHandler implements BatchHandlerInterface public $processedMessages; - public function __invoke(DummyMessage $message, Acknowledger $ack = null) + public function __invoke(DummyMessage $message, ?Acknowledger $ack = null) { return $this->handle($message, $ack); } @@ -597,18 +547,3 @@ private function process(array $jobs): void } } } - -class ResettableDummyReceiver extends DummyReceiver implements ResetInterface -{ - private $hasBeenReset = false; - - public function reset() - { - $this->hasBeenReset = true; - } - - public function hasBeenReset(): bool - { - return $this->hasBeenReset; - } -} diff --git a/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php index eedbb9c89d2d1..d403ae0c5be87 100644 --- a/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php +++ b/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php @@ -51,7 +51,7 @@ class InMemoryTransport implements TransportInterface, ResetInterface */ private $serializer; - public function __construct(SerializerInterface $serializer = null) + public function __construct(?SerializerInterface $serializer = null) { $this->serializer = $serializer; } diff --git a/src/Symfony/Component/Messenger/Transport/Receiver/ListableReceiverInterface.php b/src/Symfony/Component/Messenger/Transport/Receiver/ListableReceiverInterface.php index 897c7a540a490..ede5dc810b47e 100644 --- a/src/Symfony/Component/Messenger/Transport/Receiver/ListableReceiverInterface.php +++ b/src/Symfony/Component/Messenger/Transport/Receiver/ListableReceiverInterface.php @@ -29,7 +29,7 @@ interface ListableReceiverInterface extends ReceiverInterface * * @return Envelope[]|iterable */ - public function all(int $limit = null): iterable; + public function all(?int $limit = null): iterable; /** * Returns the Envelope by id or none. diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php index 5f335d018e600..bacb4a79379df 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php @@ -32,7 +32,7 @@ final class FlattenExceptionNormalizer implements DenormalizerInterface, Context * * @throws InvalidArgumentException */ - public function normalize($object, string $format = null, array $context = []): array + public function normalize($object, ?string $format = null, array $context = []): array { $normalized = [ 'message' => $object->getMessage(), @@ -54,7 +54,7 @@ public function normalize($object, string $format = null, array $context = []): /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null, array $context = []): bool + public function supportsNormalization($data, ?string $format = null, array $context = []): bool { return $data instanceof FlattenException && ($context[Serializer::MESSENGER_SERIALIZATION_CONTEXT] ?? false); } @@ -62,7 +62,7 @@ public function supportsNormalization($data, string $format = null, array $conte /** * {@inheritdoc} */ - public function denormalize($data, string $type, string $format = null, array $context = []): FlattenException + public function denormalize($data, string $type, ?string $format = null, array $context = []): FlattenException { $object = new FlattenException(); @@ -93,7 +93,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool + public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool { return FlattenException::class === $type && ($context[Serializer::MESSENGER_SERIALIZATION_CONTEXT] ?? false); } diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php index e6332b3cc6fb6..17db02965b822 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php @@ -20,9 +20,6 @@ */ class PhpSerializer implements SerializerInterface { - /** - * {@inheritdoc} - */ public function decode(array $encodedEnvelope): Envelope { if (empty($encodedEnvelope['body'])) { @@ -38,9 +35,6 @@ public function decode(array $encodedEnvelope): Envelope return $this->safelyUnserialize($serializeEnvelope); } - /** - * {@inheritdoc} - */ public function encode(Envelope $envelope): array { $envelope = $envelope->withoutStampsOfType(NonSendableStampInterface::class); @@ -62,24 +56,30 @@ private function safelyUnserialize(string $contents) throw new MessageDecodingFailedException('Could not decode an empty message using PHP serialization.'); } - $signalingException = new MessageDecodingFailedException(sprintf('Could not decode message using PHP serialization: %s.', $contents)); $prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback'); - $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) { + $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler) { if (__FILE__ === $file) { - throw $signalingException; + throw new \ErrorException($msg, 0, $type, $file, $line); } return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false; }); try { - $meta = unserialize($contents); + /** @var Envelope */ + $envelope = unserialize($contents); + } catch (\Throwable $e) { + if ($e instanceof MessageDecodingFailedException) { + throw $e; + } + + throw new MessageDecodingFailedException('Could not decode Envelope: '.$e->getMessage(), 0, $e); } finally { restore_error_handler(); ini_set('unserialize_callback_func', $prevUnserializeHandler); } - return $meta; + return $envelope; } /** diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php index 8106506d27e97..dcdf28fd7377d 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php @@ -38,7 +38,7 @@ class Serializer implements SerializerInterface private $format; private $context; - public function __construct(SymfonySerializerInterface $serializer = null, string $format = 'json', array $context = []) + public function __construct(?SymfonySerializerInterface $serializer = null, string $format = 'json', array $context = []) { $this->serializer = $serializer ?? self::create()->serializer; $this->format = $format; diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php index 33358d3d61b4d..bba19aa4d9b63 100644 --- a/src/Symfony/Component/Messenger/Worker.php +++ b/src/Symfony/Component/Messenger/Worker.php @@ -52,7 +52,7 @@ class Worker /** * @param ReceiverInterface[] $receivers Where the key is the transport name */ - public function __construct(array $receivers, MessageBusInterface $bus, EventDispatcherInterface $eventDispatcher = null, LoggerInterface $logger = null) + public function __construct(array $receivers, MessageBusInterface $bus, ?EventDispatcherInterface $eventDispatcher = null, ?LoggerInterface $logger = null) { $this->receivers = $receivers; $this->bus = $bus; @@ -148,7 +148,7 @@ private function handleMessage(Envelope $envelope, string $transportName): void } $acked = false; - $ack = function (Envelope $envelope, \Throwable $e = null) use ($transportName, &$acked) { + $ack = function (Envelope $envelope, ?\Throwable $e = null) use ($transportName, &$acked) { $acked = true; $this->acks[] = [$transportName, $envelope, $e]; }; diff --git a/src/Symfony/Component/Mime/Crypto/SMimeEncrypter.php b/src/Symfony/Component/Mime/Crypto/SMimeEncrypter.php index 9081860d80fbd..e92b37b19a5e7 100644 --- a/src/Symfony/Component/Mime/Crypto/SMimeEncrypter.php +++ b/src/Symfony/Component/Mime/Crypto/SMimeEncrypter.php @@ -26,7 +26,7 @@ final class SMimeEncrypter extends SMime * @param string|string[] $certificate The path (or array of paths) of the file(s) containing the X.509 certificate(s) * @param int|null $cipher A set of algorithms used to encrypt the message. Must be one of these PHP constants: https://www.php.net/manual/en/openssl.ciphers.php */ - public function __construct($certificate, int $cipher = null) + public function __construct($certificate, ?int $cipher = null) { if (!\extension_loaded('openssl')) { throw new \LogicException('PHP extension "openssl" is required to use SMime.'); diff --git a/src/Symfony/Component/Mime/Crypto/SMimeSigner.php b/src/Symfony/Component/Mime/Crypto/SMimeSigner.php index 5b94a454e83a1..94c2bbd6722f9 100644 --- a/src/Symfony/Component/Mime/Crypto/SMimeSigner.php +++ b/src/Symfony/Component/Mime/Crypto/SMimeSigner.php @@ -31,7 +31,7 @@ final class SMimeSigner extends SMime * @param string|null $extraCerts The path of the file containing intermediate certificates (in PEM format) needed by the signing certificate * @param int|null $signOptions Bitwise operator options for openssl_pkcs7_sign() (@see https://secure.php.net/manual/en/openssl.pkcs7.flags.php) */ - public function __construct(string $certificate, string $privateKey, string $privateKeyPassphrase = null, string $extraCerts = null, int $signOptions = null) + public function __construct(string $certificate, string $privateKey, ?string $privateKeyPassphrase = null, ?string $extraCerts = null, ?int $signOptions = null) { if (!\extension_loaded('openssl')) { throw new \LogicException('PHP extension "openssl" is required to use SMime.'); diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php index bd0a476c4f778..5365294a4d720 100644 --- a/src/Symfony/Component/Mime/Email.php +++ b/src/Symfony/Component/Mime/Email.php @@ -121,6 +121,10 @@ public function addFrom(...$addresses) */ public function from(...$addresses) { + if (!$addresses) { + throw new LogicException('"from()" must be called with at least one address.'); + } + return $this->setListAddressHeaderBody('From', $addresses); } @@ -342,7 +346,7 @@ public function getHtmlCharset(): ?string * * @return $this */ - public function attach($body, string $name = null, string $contentType = null) + public function attach($body, ?string $name = null, ?string $contentType = null) { if (!\is_string($body) && !\is_resource($body)) { throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body))); @@ -357,7 +361,7 @@ public function attach($body, string $name = null, string $contentType = null) /** * @return $this */ - public function attachFromPath(string $path, string $name = null, string $contentType = null) + public function attachFromPath(string $path, ?string $name = null, ?string $contentType = null) { $this->cachedBody = null; $this->attachments[] = ['path' => $path, 'name' => $name, 'content-type' => $contentType, 'inline' => false]; @@ -370,7 +374,7 @@ public function attachFromPath(string $path, string $name = null, string $conten * * @return $this */ - public function embed($body, string $name = null, string $contentType = null) + public function embed($body, ?string $name = null, ?string $contentType = null) { if (!\is_string($body) && !\is_resource($body)) { throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body))); @@ -385,7 +389,7 @@ public function embed($body, string $name = null, string $contentType = null) /** * @return $this */ - public function embedFromPath(string $path, string $name = null, string $contentType = null) + public function embedFromPath(string $path, ?string $name = null, ?string $contentType = null) { $this->cachedBody = null; $this->attachments[] = ['path' => $path, 'name' => $name, 'content-type' => $contentType, 'inline' => true]; diff --git a/src/Symfony/Component/Mime/FileinfoMimeTypeGuesser.php b/src/Symfony/Component/Mime/FileinfoMimeTypeGuesser.php index 7964aa1cf7118..1208976bab6d7 100644 --- a/src/Symfony/Component/Mime/FileinfoMimeTypeGuesser.php +++ b/src/Symfony/Component/Mime/FileinfoMimeTypeGuesser.php @@ -28,7 +28,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface * * @see http://www.php.net/manual/en/function.finfo-open.php */ - public function __construct(string $magicFile = null) + public function __construct(?string $magicFile = null) { $this->magicFile = $magicFile; } diff --git a/src/Symfony/Component/Mime/Header/AbstractHeader.php b/src/Symfony/Component/Mime/Header/AbstractHeader.php index 5de9066873edc..d61df570bff73 100644 --- a/src/Symfony/Component/Mime/Header/AbstractHeader.php +++ b/src/Symfony/Component/Mime/Header/AbstractHeader.php @@ -231,7 +231,7 @@ protected function generateTokenLines(string $token): array /** * Generate a list of all tokens in the final header. */ - protected function toTokens(string $string = null): array + protected function toTokens(?string $string = null): array { if (null === $string) { $string = $this->getBodyAsString(); diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php index 8db912520a85c..b1ebf9a2c0b90 100644 --- a/src/Symfony/Component/Mime/Header/Headers.php +++ b/src/Symfony/Component/Mime/Header/Headers.php @@ -190,7 +190,7 @@ public function get(string $name): ?HeaderInterface return array_shift($values); } - public function all(string $name = null): iterable + public function all(?string $name = null): iterable { if (null === $name) { foreach ($this->headers as $name => $collection) { diff --git a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php index e5d4238b47654..22f46a8fac86e 100644 --- a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php +++ b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php @@ -85,7 +85,7 @@ public function getBodyAsString(): string * This doesn't need to be overridden in theory, but it is for implementation * reasons to prevent potential breakage of attributes. */ - protected function toTokens(string $string = null): array + protected function toTokens(?string $string = null): array { $tokens = parent::toTokens(parent::getBodyAsString()); diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php index 651ffd4529ba8..639b26b521b73 100644 --- a/src/Symfony/Component/Mime/Message.php +++ b/src/Symfony/Component/Mime/Message.php @@ -24,7 +24,7 @@ class Message extends RawMessage private $headers; private $body; - public function __construct(Headers $headers = null, AbstractPart $body = null) + public function __construct(?Headers $headers = null, ?AbstractPart $body = null) { $this->headers = $headers ? clone $headers : new Headers(); $this->body = $body; @@ -42,7 +42,7 @@ public function __clone() /** * @return $this */ - public function setBody(AbstractPart $body = null) + public function setBody(?AbstractPart $body = null) { $this->body = $body; @@ -140,7 +140,10 @@ public function generateMessageId(): string if ($this->headers->has('Sender')) { $sender = $this->headers->get('Sender')->getAddress(); } elseif ($this->headers->has('From')) { - $sender = $this->headers->get('From')->getAddresses()[0]; + if (!$froms = $this->headers->get('From')->getAddresses()) { + throw new LogicException('A "From" header must have at least one email address.'); + } + $sender = $froms[0]; } else { throw new LogicException('An email must have a "From" or a "Sender" header.'); } diff --git a/src/Symfony/Component/Mime/Part/DataPart.php b/src/Symfony/Component/Mime/Part/DataPart.php index 4247ce798d868..3219df404ed5c 100644 --- a/src/Symfony/Component/Mime/Part/DataPart.php +++ b/src/Symfony/Component/Mime/Part/DataPart.php @@ -33,7 +33,7 @@ class DataPart extends TextPart /** * @param resource|string $body */ - public function __construct($body, string $filename = null, string $contentType = null, string $encoding = null) + public function __construct($body, ?string $filename = null, ?string $contentType = null, ?string $encoding = null) { unset($this->_parent); @@ -51,7 +51,7 @@ public function __construct($body, string $filename = null, string $contentType $this->setDisposition('attachment'); } - public static function fromPath(string $path, string $name = null, string $contentType = null): self + public static function fromPath(string $path, ?string $name = null, ?string $contentType = null): self { if (null === $contentType) { $ext = strtolower(substr($path, strrpos($path, '.') + 1)); diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php index bfe41c0aab235..fe9ca0222549b 100644 --- a/src/Symfony/Component/Mime/Part/TextPart.php +++ b/src/Symfony/Component/Mime/Part/TextPart.php @@ -42,7 +42,7 @@ class TextPart extends AbstractPart /** * @param resource|string $body */ - public function __construct($body, ?string $charset = 'utf-8', string $subtype = 'plain', string $encoding = null) + public function __construct($body, ?string $charset = 'utf-8', string $subtype = 'plain', ?string $encoding = null) { unset($this->_headers); diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php index d2a311daebecf..ace19601eab3e 100644 --- a/src/Symfony/Component/Mime/RawMessage.php +++ b/src/Symfony/Component/Mime/RawMessage.php @@ -18,6 +18,9 @@ */ class RawMessage implements \Serializable { + /** + * @var iterable|string + */ private $message; /** diff --git a/src/Symfony/Component/Mime/Test/Constraint/EmailAttachmentCount.php b/src/Symfony/Component/Mime/Test/Constraint/EmailAttachmentCount.php index c0adbe3a0c0ce..3243ec608aebf 100644 --- a/src/Symfony/Component/Mime/Test/Constraint/EmailAttachmentCount.php +++ b/src/Symfony/Component/Mime/Test/Constraint/EmailAttachmentCount.php @@ -20,7 +20,7 @@ final class EmailAttachmentCount extends Constraint private $expectedValue; private $transport; - public function __construct(int $expectedValue, string $transport = null) + public function __construct(int $expectedValue, ?string $transport = null) { $this->expectedValue = $expectedValue; $this->transport = $transport; diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php index 516a589180823..a868ae77ff247 100644 --- a/src/Symfony/Component/Mime/Tests/EmailTest.php +++ b/src/Symfony/Component/Mime/Tests/EmailTest.php @@ -15,6 +15,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; +use Symfony\Component\Mime\Exception\LogicException; use Symfony\Component\Mime\Part\DataPart; use Symfony\Component\Mime\Part\Multipart\AlternativePart; use Symfony\Component\Mime\Part\Multipart\MixedPart; @@ -62,6 +63,13 @@ public function testSender() $this->assertSame($fabien, $e->getSender()); } + public function testFromWithNoAddress() + { + $e = new Email(); + $this->expectException(LogicException::class); + $e->from(); + } + public function testFrom() { $e = new Email(); @@ -539,8 +547,7 @@ public function testSymfonySerialize() } ] }, - "body": null, - "message": null + "body": null } EOF; diff --git a/src/Symfony/Component/Mime/Tests/MessageTest.php b/src/Symfony/Component/Mime/Tests/MessageTest.php index 86431903de1bd..308eb8f7179db 100644 --- a/src/Symfony/Component/Mime/Tests/MessageTest.php +++ b/src/Symfony/Component/Mime/Tests/MessageTest.php @@ -13,6 +13,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Mime\Address; +use Symfony\Component\Mime\Exception\LogicException; use Symfony\Component\Mime\Header\Headers; use Symfony\Component\Mime\Header\MailboxListHeader; use Symfony\Component\Mime\Header\UnstructuredHeader; @@ -125,6 +126,14 @@ public function testGetPreparedHeadersHasSenderWhenNeeded() $this->assertEquals('thomas@symfony.com', $message->getPreparedHeaders()->get('Sender')->getAddress()->getAddress()); } + public function testGenerateMessageIdThrowsWhenHasFromButNoAddresses() + { + $message = new Message(); + $message->getHeaders()->addMailboxListHeader('From', []); + $this->expectException(LogicException::class); + $message->generateMessageId(); + } + public function testToString() { $message = new Message(); @@ -245,8 +254,7 @@ public function testSymfonySerialize() ] }, "class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\Multipart\\\\MixedPart" - }, - "message": null + } } EOF; diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json index 195f041a4d1b8..11823efc347dd 100644 --- a/src/Symfony/Component/Mime/composer.json +++ b/src/Symfony/Component/Mime/composer.json @@ -28,14 +28,14 @@ "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" + "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3" }, "conflict": { "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" + "symfony/serializer": "<5.4.35|>=6,<6.3.12|>=6.4,<6.4.3" }, "autoload": { "psr-4": { "Symfony\\Component\\Mime\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/AllMySms/AllMySmsTransport.php b/src/Symfony/Component/Notifier/Bridge/AllMySms/AllMySmsTransport.php index 28508bdde3506..64cfa420292e7 100644 --- a/src/Symfony/Component/Notifier/Bridge/AllMySms/AllMySmsTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/AllMySms/AllMySmsTransport.php @@ -32,7 +32,7 @@ final class AllMySmsTransport extends AbstractTransport private $apiKey; private $from; - public function __construct(string $login, string $apiKey, string $from = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $login, string $apiKey, ?string $from = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->login = $login; $this->apiKey = $apiKey; diff --git a/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportTest.php index 118860c772baa..182b359380472 100644 --- a/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/AllMySms/Tests/AllMySmsTransportTest.php @@ -25,7 +25,7 @@ final class AllMySmsTransportTest extends TransportTestCase /** * @return AllMySmsTransport */ - public static function createTransport(HttpClientInterface $client = null, string $from = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): TransportInterface { return new AllMySmsTransport('login', 'apiKey', $from, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php b/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php index 5743a51424f63..e0dd537700b6f 100644 --- a/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php @@ -29,7 +29,7 @@ final class AmazonSnsTransport extends AbstractTransport { private $snsClient; - public function __construct(SnsClient $snsClient, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(SnsClient $snsClient, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->snsClient = $snsClient; parent::__construct($client, $dispatcher); diff --git a/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportTest.php index 53c2711106f5b..ee45241ac2d4d 100644 --- a/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/AmazonSns/Tests/AmazonSnsTransportTest.php @@ -26,7 +26,7 @@ class AmazonSnsTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new AmazonSnsTransport(new SnsClient(['region' => 'eu-west-3']), $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Clickatell/ClickatellTransport.php b/src/Symfony/Component/Notifier/Bridge/Clickatell/ClickatellTransport.php index cba6d917c03ae..d19ea11bc6a35 100644 --- a/src/Symfony/Component/Notifier/Bridge/Clickatell/ClickatellTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Clickatell/ClickatellTransport.php @@ -31,7 +31,7 @@ final class ClickatellTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $authToken, string $from = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $authToken, ?string $from = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->authToken = $authToken; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php index 376b890a27f60..c21cde487cba8 100644 --- a/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php @@ -29,7 +29,7 @@ final class ClickatellTransportTest extends TransportTestCase /** * @return ClickatellTransport */ - public static function createTransport(HttpClientInterface $client = null, string $from = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): TransportInterface { return new ClickatellTransport('authToken', $from, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransport.php b/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransport.php index c2c9a9a7bfb45..d442fed827a08 100644 --- a/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransport.php @@ -34,7 +34,7 @@ final class DiscordTransport extends AbstractTransport private $token; private $webhookId; - public function __construct(string $token, string $webhookId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $token, string $webhookId, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->webhookId = $webhookId; diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php index 819d24bb45f27..bf4d450dd3fce 100644 --- a/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php @@ -28,7 +28,7 @@ final class DiscordTransportTest extends TransportTestCase /** * @return DiscordTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new DiscordTransport('testToken', 'testWebhookId', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/EsendexTransport.php b/src/Symfony/Component/Notifier/Bridge/Esendex/EsendexTransport.php index f93f16b82ccc2..ebfbb7f96d10b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/EsendexTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/EsendexTransport.php @@ -32,7 +32,7 @@ final class EsendexTransport extends AbstractTransport private $accountReference; private $from; - public function __construct(string $email, string $password, string $accountReference, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $email, string $password, string $accountReference, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->email = $email; $this->password = $password; diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php index 7f30a2118efc6..83ba90cacaa5f 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php @@ -28,7 +28,7 @@ final class EsendexTransportTest extends TransportTestCase /** * @return EsendexTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new EsendexTransport('email', 'password', 'testAccountReference', 'testFrom', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php b/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php index 0dc316fb56171..0d4fc8c0ce684 100644 --- a/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php @@ -32,7 +32,7 @@ final class ExpoTransport extends AbstractTransport /** @var string|null */ private $token; - public function __construct(string $token = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(?string $token = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->client = $client; diff --git a/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportTest.php index 4694537cdbc8f..4b4fcb7024fcd 100644 --- a/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Expo/Tests/ExpoTransportTest.php @@ -28,7 +28,7 @@ final class ExpoTransportTest extends TransportTestCase /** * @return ExpoTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new ExpoTransport('token', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php index 2cc769a25d0f1..3e0c0d9358d17 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php @@ -33,7 +33,7 @@ final class FakeChatEmailTransport extends AbstractTransport private $to; private $from; - public function __construct(MailerInterface $mailer, string $to, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(MailerInterface $mailer, string $to, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->mailer = $mailer; $this->to = $to; diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php index e0448900d0565..34e6208dc0631 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php @@ -29,7 +29,7 @@ final class FakeChatLoggerTransport extends AbstractTransport private $logger; - public function __construct(LoggerInterface $logger, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(LoggerInterface $logger, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->logger = $logger; diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php index d8467665b48fd..5cec6e4bd654a 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php @@ -29,7 +29,7 @@ final class FakeChatTransportFactory extends AbstractTransportFactory protected $mailer; protected $logger; - public function __construct(MailerInterface $mailer, LoggerInterface $logger, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null) + public function __construct(MailerInterface $mailer, LoggerInterface $logger, ?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null) { parent::__construct($dispatcher, $client); diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatEmailTransportTest.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatEmailTransportTest.php index a0048e84baa0b..ea31c8077bc88 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatEmailTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatEmailTransportTest.php @@ -25,7 +25,7 @@ final class FakeChatEmailTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null, string $transportName = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $transportName = null): TransportInterface { $transport = (new FakeChatEmailTransport(new DummyMailer(), 'recipient@email.net', 'sender@email.net', $client ?? new MockHttpClient())); diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatLoggerTransportTest.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatLoggerTransportTest.php index 9e8cb4b2a391a..c9bbbee5d0050 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatLoggerTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatLoggerTransportTest.php @@ -25,7 +25,7 @@ final class FakeChatLoggerTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?LoggerInterface $logger = null): TransportInterface { return new FakeChatLoggerTransport($logger ?? new NullLogger(), $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php index d38acdb1e8238..623a3214f6ec1 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php @@ -34,7 +34,7 @@ final class FakeSmsEmailTransport extends AbstractTransport private $to; private $from; - public function __construct(MailerInterface $mailer, string $to, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(MailerInterface $mailer, string $to, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->mailer = $mailer; $this->to = $to; diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php index e63510b384ef7..11f7d8b9f48a3 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php @@ -29,7 +29,7 @@ final class FakeSmsLoggerTransport extends AbstractTransport private $logger; - public function __construct(LoggerInterface $logger, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(LoggerInterface $logger, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->logger = $logger; diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php index f809ce6ad0787..0bc53f59b50eb 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php @@ -30,7 +30,7 @@ final class FakeSmsTransportFactory extends AbstractTransportFactory protected $mailer; protected $logger; - public function __construct(MailerInterface $mailer, LoggerInterface $logger, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null) + public function __construct(MailerInterface $mailer, LoggerInterface $logger, ?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null) { parent::__construct($dispatcher, $client); diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsEmailTransportTest.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsEmailTransportTest.php index 1539b71778b45..abc94abb23ae6 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsEmailTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsEmailTransportTest.php @@ -24,7 +24,7 @@ final class FakeSmsEmailTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null, string $transportName = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $transportName = null): TransportInterface { $transport = (new FakeSmsEmailTransport(new DummyMailer(), 'recipient@email.net', 'sender@email.net', $client ?? new MockHttpClient())); diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsLoggerTransportTest.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsLoggerTransportTest.php index 1f5707d230073..f84fcaa24de45 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsLoggerTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsLoggerTransportTest.php @@ -24,7 +24,7 @@ final class FakeSmsLoggerTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?LoggerInterface $logger = null): TransportInterface { $transport = (new FakeSmsLoggerTransport($logger ?? new NullLogger(), $client ?? new MockHttpClient())); diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/FirebaseTransport.php b/src/Symfony/Component/Notifier/Bridge/Firebase/FirebaseTransport.php index 70cce2b680c3c..53decdcddc391 100644 --- a/src/Symfony/Component/Notifier/Bridge/Firebase/FirebaseTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Firebase/FirebaseTransport.php @@ -32,7 +32,7 @@ final class FirebaseTransport extends AbstractTransport /** @var string */ private $token; - public function __construct(string $token, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $token, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->client = $client; diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php index 338dd8696414f..aec3fae3192a2 100644 --- a/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php @@ -32,7 +32,7 @@ final class FirebaseTransportTest extends TransportTestCase /** * @return FirebaseTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new FirebaseTransport('username:password', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php index b34f9046b5e2b..101c2ffdac315 100644 --- a/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php @@ -32,7 +32,7 @@ final class FreeMobileTransport extends AbstractTransport private $password; private $phone; - public function __construct(string $login, string $password, string $phone, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $login, string $password, string $phone, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->login = $login; $this->password = $password; diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportTest.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportTest.php index bdaa6152ca252..a19629e87117b 100644 --- a/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportTest.php @@ -25,7 +25,7 @@ final class FreeMobileTransportTest extends TransportTestCase /** * @return FreeMobileTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new FreeMobileTransport('login', 'pass', '0611223344', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransport.php b/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransport.php index 0ed6ec9cb4f9e..54e2839bdde0b 100644 --- a/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransport.php @@ -31,7 +31,7 @@ final class GatewayApiTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $authToken, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->authToken = $authToken; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php index fd5225f0b0d2d..a237e01790614 100644 --- a/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php @@ -31,7 +31,7 @@ final class GatewayApiTransportTest extends TransportTestCase /** * @return GatewayApiTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new GatewayApiTransport('authtoken', 'Symfony', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Gitter/GitterTransport.php b/src/Symfony/Component/Notifier/Bridge/Gitter/GitterTransport.php index b8d88e7f5d88d..ac5fb0eeb7798 100644 --- a/src/Symfony/Component/Notifier/Bridge/Gitter/GitterTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Gitter/GitterTransport.php @@ -31,7 +31,7 @@ final class GitterTransport extends AbstractTransport private $token; private $roomId; - public function __construct(string $token, string $roomId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $token, string $roomId, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->roomId = $roomId; diff --git a/src/Symfony/Component/Notifier/Bridge/Gitter/Tests/GitterTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Gitter/Tests/GitterTransportTest.php index a59fdeca5f670..7fe31b433e3a5 100644 --- a/src/Symfony/Component/Notifier/Bridge/Gitter/Tests/GitterTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Gitter/Tests/GitterTransportTest.php @@ -25,7 +25,7 @@ */ final class GitterTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new GitterTransport('token', '5539a3ee5etest0d3255bfef', $client ?? new MockHttpClient()))->setHost('api.gitter.im'); } diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php index 98d1df16b0266..41666a7cf182e 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php @@ -44,7 +44,7 @@ final class GoogleChatTransport extends AbstractTransport * Subsequent messages with the same thread identifier will be posted into the same thread. * {@see https://developers.google.com/hangouts/chat/reference/rest/v1/spaces.messages/create#query-parameters} */ - public function __construct(string $space, string $accessKey, string $accessToken, string $threadKey = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $space, string $accessKey, string $accessToken, ?string $threadKey = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->space = $space; $this->accessKey = $accessKey; diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php index 9c532eef3faba..c8df301ca96c6 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php @@ -31,7 +31,7 @@ final class GoogleChatTransportTest extends TransportTestCase /** * @return GoogleChatTransport */ - public static function createTransport(HttpClientInterface $client = null, string $threadKey = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $threadKey = null): TransportInterface { return new GoogleChatTransport('My-Space', 'theAccessKey', 'theAccessToken=', $threadKey, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php b/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php index 64bb0f480be20..ce2d7cfaca7cb 100644 --- a/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php @@ -30,7 +30,7 @@ final class InfobipTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $authToken, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->authToken = $authToken; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportTest.php index e60c8bbc88931..22eb515ddb32f 100644 --- a/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/Tests/InfobipTransportTest.php @@ -25,7 +25,7 @@ final class InfobipTransportTest extends TransportTestCase /** * @return InfobipTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new InfobipTransport('authtoken', '0611223344', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Iqsms/IqsmsTransport.php b/src/Symfony/Component/Notifier/Bridge/Iqsms/IqsmsTransport.php index 91240bcea6c53..c7578774e6cc1 100644 --- a/src/Symfony/Component/Notifier/Bridge/Iqsms/IqsmsTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Iqsms/IqsmsTransport.php @@ -32,7 +32,7 @@ final class IqsmsTransport extends AbstractTransport private $password; private $from; - public function __construct(string $login, string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $login, string $password, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->login = $login; $this->password = $password; diff --git a/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportTest.php index a5049c77794b0..6542e7e8e1739 100644 --- a/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Iqsms/Tests/IqsmsTransportTest.php @@ -25,7 +25,7 @@ final class IqsmsTransportTest extends TransportTestCase /** * @return IqsmsTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new IqsmsTransport('login', 'password', 'sender', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php b/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php index 08fec69c2b4fb..9ac3a521cdf9e 100644 --- a/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php @@ -75,7 +75,7 @@ final class LightSmsTransport extends AbstractTransport 999 => 'Unknown Error', ]; - public function __construct(string $login, string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $login, string $password, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->login = $login; $this->password = $password; diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportTest.php index 26a906ab02d77..30afabb01a59e 100644 --- a/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportTest.php @@ -25,7 +25,7 @@ final class LightSmsTransportTest extends TransportTestCase /** * @return LightSmsTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new LightSmsTransport('accountSid', 'authToken', 'from', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/LinkedInTransport.php b/src/Symfony/Component/Notifier/Bridge/LinkedIn/LinkedInTransport.php index e114f77dc52ef..27fa71a714e69 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/LinkedInTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/LinkedInTransport.php @@ -37,7 +37,7 @@ final class LinkedInTransport extends AbstractTransport private $authToken; private $accountId; - public function __construct(string $authToken, string $accountId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $authToken, string $accountId, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->authToken = $authToken; $this->accountId = $accountId; diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareContentShare.php b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareContentShare.php index 1c70a6cde9273..1d73cf86d35d3 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareContentShare.php +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareContentShare.php @@ -52,7 +52,7 @@ final class ShareContentShare extends AbstractLinkedInShare self::LIVE_VIDEO, ]; - public function __construct(string $text, array $attributes = [], string $inferredLocale = null, ShareMediaShare $media = null, string $primaryLandingPageUrl = null, string $shareMediaCategory = self::NONE) + public function __construct(string $text, array $attributes = [], ?string $inferredLocale = null, ?ShareMediaShare $media = null, ?string $primaryLandingPageUrl = null, string $shareMediaCategory = self::NONE) { $this->options['shareCommentary'] = [ 'attributes' => $attributes, diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareMediaShare.php b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareMediaShare.php index f41fb85d45e3c..b350d0b90dc5b 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareMediaShare.php +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Share/ShareMediaShare.php @@ -38,7 +38,7 @@ class ShareMediaShare extends AbstractLinkedInShare self::REGISTER, ]; - public function __construct(string $text, array $attributes = [], string $inferredLocale = null, bool $landingPage = false, string $landingPageTitle = null, string $landingPageUrl = null) + public function __construct(string $text, array $attributes = [], ?string $inferredLocale = null, bool $landingPage = false, ?string $landingPageTitle = null, ?string $landingPageUrl = null) { $this->options['description'] = [ 'text' => $text, diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php index 810db1fc28849..e2768862fd944 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php @@ -30,7 +30,7 @@ final class LinkedInTransportTest extends TransportTestCase /** * @return LinkedInTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new LinkedInTransport('AuthToken', 'AccountId', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Mailjet/MailjetTransport.php b/src/Symfony/Component/Notifier/Bridge/Mailjet/MailjetTransport.php index fc51eb4055ef2..e72faf015dfa3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mailjet/MailjetTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Mailjet/MailjetTransport.php @@ -31,7 +31,7 @@ final class MailjetTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $authToken, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->authToken = $authToken; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php index 970286f8195bd..fa172034ebaec 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mailjet/Tests/MailjetTransportTest.php @@ -25,7 +25,7 @@ final class MailjetTransportTest extends TransportTestCase /** * @return MailjetTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new MailjetTransport('authtoken', 'Mailjet', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php index 34725e26c8014..d06f8fb54b9db 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php @@ -30,7 +30,7 @@ final class MattermostTransport extends AbstractTransport private $channel; private $path; - public function __construct(string $token, string $channel, string $path = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $token, string $channel, ?string $path = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->channel = $channel; diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportTest.php index 0cca6e735e41e..7ae3483e69bef 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportTest.php @@ -28,7 +28,7 @@ final class MattermostTransportTest extends TransportTestCase /** * @return MattermostTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new MattermostTransport('testAccessToken', 'testChannel', null, $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureOptions.php b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureOptions.php index f2a0869333def..c6fee89c05cde 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureOptions.php +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureOptions.php @@ -27,7 +27,7 @@ final class MercureOptions implements MessageOptionsInterface /** * @param string|string[]|null $topics */ - public function __construct($topics = null, bool $private = false, string $id = null, string $type = null, int $retry = null) + public function __construct($topics = null, bool $private = false, ?string $id = null, ?string $type = null, ?int $retry = null) { if (null !== $topics && !\is_array($topics) && !\is_string($topics)) { throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an array of strings, a string or null, "%s" given.', __METHOD__, get_debug_type($topics))); diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php index bebf35acb23c0..1fdc8da906d28 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php @@ -37,7 +37,7 @@ final class MercureTransport extends AbstractTransport /** * @param string|string[]|null $topics */ - public function __construct(HubInterface $hub, string $hubId, $topics = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(HubInterface $hub, string $hubId, $topics = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { if (null !== $topics && !\is_array($topics) && !\is_string($topics)) { throw new \TypeError(sprintf('"%s()" expects parameter 3 to be an array of strings, a string or null, "%s" given.', __METHOD__, get_debug_type($topics))); diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php index f3dc556c52fbf..79c5f917cae16 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php @@ -28,7 +28,7 @@ final class MercureTransportFactory extends AbstractTransportFactory { private $registry; - public function __construct(HubRegistry $registry, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null) + public function __construct(HubRegistry $registry, ?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null) { parent::__construct($dispatcher, $client); diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php index 7ea005c47636a..bfbf86d9dd954 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php @@ -35,7 +35,7 @@ */ final class MercureTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null, HubInterface $hub = null, string $hubId = 'hubId', $topics = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?HubInterface $hub = null, string $hubId = 'hubId', $topics = null): TransportInterface { $hub = $hub ?? new DummyHub(); diff --git a/src/Symfony/Component/Notifier/Bridge/MessageBird/MessageBirdTransport.php b/src/Symfony/Component/Notifier/Bridge/MessageBird/MessageBirdTransport.php index cb56f6a843c0c..58411beccced3 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageBird/MessageBirdTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/MessageBird/MessageBirdTransport.php @@ -31,7 +31,7 @@ final class MessageBirdTransport extends AbstractTransport private $token; private $from; - public function __construct(string $token, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $token, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportTest.php b/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportTest.php index b7a6a054ef709..7df5610f07059 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/MessageBird/Tests/MessageBirdTransportTest.php @@ -25,7 +25,7 @@ final class MessageBirdTransportTest extends TransportTestCase /** * @return MessageBirdTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new MessageBirdTransport('token', 'from', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/MessageMedia/MessageMediaTransport.php b/src/Symfony/Component/Notifier/Bridge/MessageMedia/MessageMediaTransport.php index b05f6e55584f4..0483a4604ca43 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageMedia/MessageMediaTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/MessageMedia/MessageMediaTransport.php @@ -33,7 +33,7 @@ final class MessageMediaTransport extends AbstractTransport private $apiSecret; private $from; - public function __construct(string $apiKey, string $apiSecret, string $from = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $apiKey, string $apiSecret, ?string $from = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->apiKey = $apiKey; $this->apiSecret = $apiSecret; diff --git a/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportTest.php b/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportTest.php index aff1b64c938cd..fcc701663a022 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/MessageMedia/Tests/MessageMediaTransportTest.php @@ -28,7 +28,7 @@ final class MessageMediaTransportTest extends TransportTestCase /** * @return MessageMediaTransport */ - public static function createTransport(HttpClientInterface $client = null, string $from = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): TransportInterface { return new MessageMediaTransport('apiKey', 'apiSecret', $from, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransport.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransport.php index e4c071ee9c1b4..f470ee9ee5038 100644 --- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransport.php @@ -32,7 +32,7 @@ final class MicrosoftTeamsTransport extends AbstractTransport private $path; - public function __construct(string $path, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $path, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->path = $path; diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php index 0864c0717fcc1..c67bdb3e05db7 100644 --- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php @@ -30,7 +30,7 @@ final class MicrosoftTeamsTransportTest extends TransportTestCase /** * @return MicrosoftTeamsTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new MicrosoftTeamsTransport('/testPath', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytTransport.php b/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytTransport.php index e34edafd3aa94..be77e48adc5cc 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytTransport.php @@ -34,7 +34,7 @@ final class MobytTransport extends AbstractTransport private $from; private $typeQuality; - public function __construct(string $accountSid, string $authToken, string $from, string $typeQuality = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $accountSid, string $authToken, string $from, ?string $typeQuality = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->accountSid = $accountSid; $this->authToken = $authToken; diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportTest.php index 4d54df6387d36..e0307f72e4227 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/Tests/MobytTransportTest.php @@ -29,7 +29,7 @@ final class MobytTransportTest extends TransportTestCase /** * @return MobytTransport */ - public static function createTransport(HttpClientInterface $client = null, string $messageType = MobytOptions::MESSAGE_TYPE_QUALITY_LOW): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, string $messageType = MobytOptions::MESSAGE_TYPE_QUALITY_LOW): TransportInterface { return (new MobytTransport('accountSid', 'authToken', 'from', $messageType, $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php b/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php index c69aeb6b4c0f7..1b961c7ce52c4 100644 --- a/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php @@ -36,7 +36,7 @@ final class NexmoTransport extends AbstractTransport private $apiSecret; private $from; - public function __construct(string $apiKey, string $apiSecret, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $apiKey, string $apiSecret, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->apiKey = $apiKey; $this->apiSecret = $apiSecret; diff --git a/src/Symfony/Component/Notifier/Bridge/Nexmo/Tests/NexmoTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Nexmo/Tests/NexmoTransportTest.php index bb0fe4c552e4e..c916da9b1b396 100644 --- a/src/Symfony/Component/Notifier/Bridge/Nexmo/Tests/NexmoTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Nexmo/Tests/NexmoTransportTest.php @@ -28,7 +28,7 @@ final class NexmoTransportTest extends TransportTestCase /** * @return NexmoTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new NexmoTransport('apiKey', 'apiSecret', 'sender', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Octopush/OctopushTransport.php b/src/Symfony/Component/Notifier/Bridge/Octopush/OctopushTransport.php index be41b5c91092e..4283c1e2266d5 100644 --- a/src/Symfony/Component/Notifier/Bridge/Octopush/OctopushTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Octopush/OctopushTransport.php @@ -33,7 +33,7 @@ final class OctopushTransport extends AbstractTransport private $from; private $type; - public function __construct(string $userLogin, string $apiKey, string $from, string $type, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $userLogin, string $apiKey, string $from, string $type, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->userLogin = $userLogin; $this->apiKey = $apiKey; diff --git a/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportTest.php index c24cd9f272bd7..7cea2436fa0a4 100644 --- a/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Octopush/Tests/OctopushTransportTest.php @@ -25,7 +25,7 @@ final class OctopushTransportTest extends TransportTestCase /** * @return OctopushTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new OctopushTransport('userLogin', 'apiKey', 'from', 'type', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransport.php b/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransport.php index c9502dce1f083..e41c26a6cf844 100644 --- a/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransport.php @@ -33,7 +33,7 @@ final class OneSignalTransport extends AbstractTransport private $apiKey; private $defaultRecipientId; - public function __construct(string $appId, string $apiKey, string $defaultRecipientId = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $appId, string $apiKey, ?string $defaultRecipientId = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->appId = $appId; $this->apiKey = $apiKey; diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php index f0d88e7383b65..39169344ab4de 100644 --- a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php @@ -33,7 +33,7 @@ final class OneSignalTransportTest extends TransportTestCase /** * @return OneSignalTransport */ - public static function createTransport(HttpClientInterface $client = null, string $recipientId = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $recipientId = null): TransportInterface { return new OneSignalTransport('9fb175f0-0b32-4e99-ae97-bd228b9eb246', 'api_key', $recipientId, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php index 27ef84e992633..f889c57f0f63c 100644 --- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php @@ -34,7 +34,7 @@ final class OvhCloudTransport extends AbstractTransport private $serviceName; private $sender; - public function __construct(string $applicationKey, string $applicationSecret, string $consumerKey, string $serviceName, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $applicationKey, string $applicationSecret, string $consumerKey, string $serviceName, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->applicationKey = $applicationKey; $this->applicationSecret = $applicationSecret; diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php index d3b90b43c23d0..7a3014d443987 100644 --- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php @@ -27,7 +27,7 @@ final class OvhCloudTransportTest extends TransportTestCase /** * @return OvhCloudTransport */ - public static function createTransport(HttpClientInterface $client = null, string $sender = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $sender = null): TransportInterface { return (new OvhCloudTransport('applicationKey', 'applicationSecret', 'consumerKey', 'serviceName', $client ?? new MockHttpClient()))->setSender($sender); } diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/RocketChatTransport.php b/src/Symfony/Component/Notifier/Bridge/RocketChat/RocketChatTransport.php index 925dcb78a81e9..9ab48686ebd6b 100644 --- a/src/Symfony/Component/Notifier/Bridge/RocketChat/RocketChatTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/RocketChat/RocketChatTransport.php @@ -32,7 +32,7 @@ final class RocketChatTransport extends AbstractTransport private $accessToken; private $chatChannel; - public function __construct(string $accessToken, string $chatChannel = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $accessToken, ?string $chatChannel = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->accessToken = $accessToken; $this->chatChannel = $chatChannel; diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportTest.php b/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportTest.php index 9be71200444ab..31c35873b0308 100644 --- a/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportTest.php @@ -28,7 +28,7 @@ final class RocketChatTransportTest extends TransportTestCase /** * @return RocketChatTransport */ - public static function createTransport(HttpClientInterface $client = null, string $channel = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $channel = null): TransportInterface { return new RocketChatTransport('testAccessToken', $channel, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php b/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php index 66844cbcde437..a45b1d0564240 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php @@ -31,7 +31,7 @@ final class SendinblueTransport extends AbstractTransport private $apiKey; private $sender; - public function __construct(string $apiKey, string $sender, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $apiKey, string $sender, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->apiKey = $apiKey; $this->sender = $sender; diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php index 13dcd1ec14783..aa01a252ce154 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php @@ -27,7 +27,7 @@ final class SendinblueTransportTest extends TransportTestCase /** * @return SendinblueTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new SendinblueTransport('api-key', '0611223344', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/SinchTransport.php b/src/Symfony/Component/Notifier/Bridge/Sinch/SinchTransport.php index 73a86453b619f..26c06656d1053 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sinch/SinchTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Sinch/SinchTransport.php @@ -32,7 +32,7 @@ final class SinchTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $accountSid, string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $accountSid, string $authToken, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->accountSid = $accountSid; $this->authToken = $authToken; diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportTest.php index 4940bb71986e6..3b5ab3131b863 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportTest.php @@ -25,7 +25,7 @@ final class SinchTransportTest extends TransportTestCase /** * @return SinchTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new SinchTransport('accountSid', 'authToken', 'sender', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Block/SlackActionsBlock.php b/src/Symfony/Component/Notifier/Bridge/Slack/Block/SlackActionsBlock.php index 25c4c06338bea..0cae8944f1cc0 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/Block/SlackActionsBlock.php +++ b/src/Symfony/Component/Notifier/Bridge/Slack/Block/SlackActionsBlock.php @@ -24,7 +24,7 @@ public function __construct() /** * @return $this */ - public function button(string $text, string $url, string $style = null): self + public function button(string $text, string $url, ?string $style = null): self { if (25 === \count($this->options['elements'] ?? [])) { throw new \LogicException('Maximum number of buttons should not exceed 25.'); diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php index 9d3099a865bdc..8595f364e866a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php @@ -33,7 +33,7 @@ final class SlackTransport extends AbstractTransport private $accessToken; private $chatChannel; - public function __construct(string $accessToken, string $channel = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $accessToken, ?string $channel = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { if (!preg_match('/^xox(b-|p-|a-2)/', $accessToken)) { throw new InvalidArgumentException('A valid Slack token needs to start with "xoxb-", "xoxp-" or "xoxa-2". See https://api.slack.com/authentication/token-types for further information.'); diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php index 899f2cdbe440c..c1b3f366a4db3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php @@ -30,7 +30,7 @@ final class SlackOptionsTest extends TestCase * @dataProvider toArrayProvider * @dataProvider toArraySimpleOptionsProvider */ - public function testToArray(array $options, array $expected = null) + public function testToArray(array $options, ?array $expected = null) { $this->assertSame($expected ?? $options, (new SlackOptions($options))->toArray()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php index 2a82a6303ce3c..231677c8a251e 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php @@ -32,7 +32,7 @@ final class SlackTransportTest extends TransportTestCase /** * @return SlackTransport */ - public static function createTransport(HttpClientInterface $client = null, string $channel = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $channel = null): TransportInterface { return new SlackTransport('xoxb-TestToken', $channel, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77Transport.php b/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77Transport.php index 523d7daf89527..5e81a8414c250 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77Transport.php +++ b/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77Transport.php @@ -31,7 +31,7 @@ final class Sms77Transport extends AbstractTransport private $apiKey; private $from; - public function __construct(string $apiKey, string $from = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $apiKey, ?string $from = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->apiKey = $apiKey; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php index c028df2b12be5..01a9269b9ef91 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php @@ -25,7 +25,7 @@ final class Sms77TransportTest extends TransportTestCase /** * @return Sms77Transport */ - public static function createTransport(HttpClientInterface $client = null, string $from = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): TransportInterface { return new Sms77Transport('apiKey', $from, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/SmsBiurasTransport.php b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/SmsBiurasTransport.php index 79b3268016f36..dc998ba55e51a 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/SmsBiurasTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/SmsBiurasTransport.php @@ -47,7 +47,7 @@ final class SmsBiurasTransport extends AbstractTransport 999 => 'Unknown Error', ]; - public function __construct(string $uid, string $apiKey, string $from, bool $testMode, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $uid, string $apiKey, string $from, bool $testMode, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->uid = $uid; $this->apiKey = $apiKey; diff --git a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportTest.php b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportTest.php index 5bec5cd016453..bdcf75df7c353 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportTest.php @@ -26,7 +26,7 @@ final class SmsBiurasTransportTest extends TransportTestCase /** * @return SmsBiurasTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new SmsBiurasTransport('uid', 'api_key', 'from', true, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php index e45ae6c0d1c3c..5485c19adae9e 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php @@ -32,7 +32,7 @@ final class SmsapiTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $authToken, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->authToken = $authToken; $this->from = $from; @@ -84,6 +84,9 @@ protected function doSend(MessageInterface $message): SentMessage throw new TransportException(sprintf('Unable to send the SMS: "%s".', $content['message'] ?? 'unknown error'), $response); } - return new SentMessage($message, (string) $this); + $sentMessage = new SentMessage($message, (string) $this); + $sentMessage->setMessageId($content['list'][0]['id'] ?? ''); + + return $sentMessage; } } diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php index 2e50676ac40d4..452ae36090a44 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php @@ -27,7 +27,7 @@ final class SmsapiTransportTest extends TransportTestCase /** * @return SmsapiTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new SmsapiTransport('testToken', 'testFrom', $client ?? new MockHttpClient()))->setHost('test.host'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Smsc/SmscTransport.php b/src/Symfony/Component/Notifier/Bridge/Smsc/SmscTransport.php index 3be143194ac95..6bc6039f237f7 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsc/SmscTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsc/SmscTransport.php @@ -34,7 +34,7 @@ final class SmscTransport extends AbstractTransport private $password; private $from; - public function __construct(string $login, string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $login, string $password, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->login = $login; $this->password = $password; diff --git a/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportTest.php index 382b6b2a8767c..f6a8a10141827 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Smsc/Tests/SmscTransportTest.php @@ -22,7 +22,7 @@ final class SmscTransportTest extends TransportTestCase { - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new SmscTransport('login', 'password', 'MyApp', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/SpotHit/SpotHitTransport.php b/src/Symfony/Component/Notifier/Bridge/SpotHit/SpotHitTransport.php index c7d8f129dcce5..d40be561dcaf9 100644 --- a/src/Symfony/Component/Notifier/Bridge/SpotHit/SpotHitTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/SpotHit/SpotHitTransport.php @@ -36,7 +36,7 @@ final class SpotHitTransport extends AbstractTransport private $token; private $from; - public function __construct(string $token, string $from = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $token, ?string $from = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportTest.php b/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportTest.php index e3e60fe3c7083..9e65ec667ea76 100644 --- a/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/SpotHit/Tests/SpotHitTransportTest.php @@ -25,7 +25,7 @@ final class SpotHitTransportTest extends TransportTestCase /** * @return SpotHitTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new SpotHitTransport('api_token', 'MyCompany', $client ?? new MockHttpClient()))->setHost('host.test'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php index 5b5cad8e0fb8c..7945b41e08c73 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php @@ -36,7 +36,7 @@ final class TelegramTransport extends AbstractTransport private $token; private $chatChannel; - public function __construct(string $token, string $channel = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $token, ?string $channel = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->token = $token; $this->chatChannel = $channel; diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php index 1ad87524ea452..047ebb2bf4125 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php @@ -28,7 +28,7 @@ final class TelegramTransportTest extends TransportTestCase /** * @return TelegramTransport */ - public static function createTransport(HttpClientInterface $client = null, string $channel = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, ?string $channel = null): TransportInterface { return new TelegramTransport('token', $channel, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Telnyx/TelnyxTransport.php b/src/Symfony/Component/Notifier/Bridge/Telnyx/TelnyxTransport.php index 6c1799e0c2c10..314e579d4c636 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telnyx/TelnyxTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Telnyx/TelnyxTransport.php @@ -33,7 +33,7 @@ final class TelnyxTransport extends AbstractTransport private $from; private $messagingProfileId; - public function __construct(string $apiKey, string $from, ?string $messagingProfileId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $apiKey, string $from, ?string $messagingProfileId, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->apiKey = $apiKey; $this->from = $from; diff --git a/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportTest.php index 5a0e4f75bc122..87e91f38c00d2 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Telnyx/Tests/TelnyxTransportTest.php @@ -25,7 +25,7 @@ final class TelnyxTransportTest extends TransportTestCase /** * @return TelnyxTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new TelnyxTransport('api_key', 'from', 'messaging_profile_id', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php index 1206ce02b0979..e191a0e48e0ad 100644 --- a/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php @@ -29,7 +29,7 @@ final class TurboSmsTransportTest extends TransportTestCase /** * @return TurboSmsTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new TurboSmsTransport('authToken', 'sender', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/TurboSms/TurboSmsTransport.php b/src/Symfony/Component/Notifier/Bridge/TurboSms/TurboSmsTransport.php index 140bc5e9bee67..e0cdd0c7144bd 100644 --- a/src/Symfony/Component/Notifier/Bridge/TurboSms/TurboSmsTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/TurboSms/TurboSmsTransport.php @@ -37,7 +37,7 @@ final class TurboSmsTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $authToken, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->assertValidFrom($from); diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php index e48e41f4d4040..c6ac91c89a579 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php @@ -27,7 +27,7 @@ final class TwilioTransportTest extends TransportTestCase /** * @return TwilioTransport */ - public static function createTransport(HttpClientInterface $client = null, string $from = 'from'): TransportInterface + public static function createTransport(?HttpClientInterface $client = null, string $from = 'from'): TransportInterface { return new TwilioTransport('accountSid', 'authToken', $from, $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php index 2c1be638ad1d9..f3f4ec51df9bb 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php @@ -33,7 +33,7 @@ final class TwilioTransport extends AbstractTransport private $authToken; private $from; - public function __construct(string $accountSid, string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $accountSid, string $authToken, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->accountSid = $accountSid; $this->authToken = $authToken; diff --git a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php index f2b403fc80e68..13a0fd7368073 100644 --- a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php @@ -25,7 +25,7 @@ final class VonageTransportTest extends TransportTestCase /** * @return VonageTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new VonageTransport('apiKey', 'apiSecret', 'sender', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransport.php b/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransport.php index f47f41a70fefc..41177ba4c84ba 100644 --- a/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransport.php @@ -33,7 +33,7 @@ final class VonageTransport extends AbstractTransport private $apiSecret; private $from; - public function __construct(string $apiKey, string $apiSecret, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $apiKey, string $apiSecret, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->apiKey = $apiKey; $this->apiSecret = $apiSecret; diff --git a/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportTest.php index de1acba8189b8..6c4237e7c47c3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Yunpian/Tests/YunpianTransportTest.php @@ -25,7 +25,7 @@ final class YunpianTransportTest extends TransportTestCase /** * @return YunpianTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return new YunpianTransport('api_key', $client ?? new MockHttpClient()); } diff --git a/src/Symfony/Component/Notifier/Bridge/Yunpian/YunpianTransport.php b/src/Symfony/Component/Notifier/Bridge/Yunpian/YunpianTransport.php index 949f72cfebf86..cbe696201c877 100644 --- a/src/Symfony/Component/Notifier/Bridge/Yunpian/YunpianTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Yunpian/YunpianTransport.php @@ -30,7 +30,7 @@ class YunpianTransport extends AbstractTransport private $apiKey; - public function __construct(string $apiKey, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $apiKey, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->apiKey = $apiKey; diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportTest.php index 9dcb7547c207c..3083352f3f9c5 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/Tests/ZulipTransportTest.php @@ -25,7 +25,7 @@ final class ZulipTransportTest extends TransportTestCase /** * @return ZulipTransport */ - public static function createTransport(HttpClientInterface $client = null): TransportInterface + public static function createTransport(?HttpClientInterface $client = null): TransportInterface { return (new ZulipTransport('testEmail', 'testToken', 'testChannel', $client ?? new MockHttpClient()))->setHost('test.host'); } diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipOptions.php b/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipOptions.php index c2388d52c0bf9..cfe9000700f21 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipOptions.php +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipOptions.php @@ -24,7 +24,7 @@ final class ZulipOptions implements MessageOptionsInterface /** @var string|null */ private $recipient; - public function __construct(string $topic = null, string $recipient = null) + public function __construct(?string $topic = null, ?string $recipient = null) { $this->topic = $topic; $this->recipient = $recipient; diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipTransport.php b/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipTransport.php index c95b6f9097dd6..5c7d1811ca704 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/ZulipTransport.php @@ -31,7 +31,7 @@ final class ZulipTransport extends AbstractTransport private $token; private $channel; - public function __construct(string $email, string $token, string $channel, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(string $email, string $token, string $channel, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->email = $email; $this->token = $token; diff --git a/src/Symfony/Component/Notifier/Channel/AbstractChannel.php b/src/Symfony/Component/Notifier/Channel/AbstractChannel.php index a83a51da4115c..735535b130559 100644 --- a/src/Symfony/Component/Notifier/Channel/AbstractChannel.php +++ b/src/Symfony/Component/Notifier/Channel/AbstractChannel.php @@ -23,7 +23,7 @@ abstract class AbstractChannel implements ChannelInterface protected $transport; protected $bus; - public function __construct(TransportInterface $transport = null, MessageBusInterface $bus = null) + public function __construct(?TransportInterface $transport = null, ?MessageBusInterface $bus = null) { if (null === $transport && null === $bus) { throw new LogicException(sprintf('"%s" needs a Transport or a Bus but both cannot be "null".', static::class)); diff --git a/src/Symfony/Component/Notifier/Channel/BrowserChannel.php b/src/Symfony/Component/Notifier/Channel/BrowserChannel.php index 0201e0f1382b0..6cc5910be473c 100644 --- a/src/Symfony/Component/Notifier/Channel/BrowserChannel.php +++ b/src/Symfony/Component/Notifier/Channel/BrowserChannel.php @@ -27,7 +27,7 @@ public function __construct(RequestStack $stack) $this->stack = $stack; } - public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void + public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void { if (null === $request = $this->stack->getCurrentRequest()) { return; diff --git a/src/Symfony/Component/Notifier/Channel/ChannelInterface.php b/src/Symfony/Component/Notifier/Channel/ChannelInterface.php index ab3115230d79d..ae072aa99cb3f 100644 --- a/src/Symfony/Component/Notifier/Channel/ChannelInterface.php +++ b/src/Symfony/Component/Notifier/Channel/ChannelInterface.php @@ -19,7 +19,7 @@ */ interface ChannelInterface { - public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void; + public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void; public function supports(Notification $notification, RecipientInterface $recipient): bool; } diff --git a/src/Symfony/Component/Notifier/Channel/ChatChannel.php b/src/Symfony/Component/Notifier/Channel/ChatChannel.php index ea41c2e4fa443..0646865a5981f 100644 --- a/src/Symfony/Component/Notifier/Channel/ChatChannel.php +++ b/src/Symfony/Component/Notifier/Channel/ChatChannel.php @@ -21,7 +21,7 @@ */ class ChatChannel extends AbstractChannel { - public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void + public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void { $message = null; if ($notification instanceof ChatNotificationInterface) { diff --git a/src/Symfony/Component/Notifier/Channel/EmailChannel.php b/src/Symfony/Component/Notifier/Channel/EmailChannel.php index 69caaad1ae480..58fc48bbaedcc 100644 --- a/src/Symfony/Component/Notifier/Channel/EmailChannel.php +++ b/src/Symfony/Component/Notifier/Channel/EmailChannel.php @@ -33,7 +33,7 @@ class EmailChannel implements ChannelInterface private $from; private $envelope; - public function __construct(TransportInterface $transport = null, MessageBusInterface $bus = null, string $from = null, Envelope $envelope = null) + public function __construct(?TransportInterface $transport = null, ?MessageBusInterface $bus = null, ?string $from = null, ?Envelope $envelope = null) { if (null === $transport && null === $bus) { throw new LogicException(sprintf('"%s" needs a Transport or a Bus but both cannot be "null".', static::class)); @@ -45,7 +45,7 @@ public function __construct(TransportInterface $transport = null, MessageBusInte $this->envelope = $envelope; } - public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void + public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void { $message = null; if ($notification instanceof EmailNotificationInterface) { diff --git a/src/Symfony/Component/Notifier/Channel/PushChannel.php b/src/Symfony/Component/Notifier/Channel/PushChannel.php index e3b95af7859cc..112ab88d85aba 100644 --- a/src/Symfony/Component/Notifier/Channel/PushChannel.php +++ b/src/Symfony/Component/Notifier/Channel/PushChannel.php @@ -21,7 +21,7 @@ */ class PushChannel extends AbstractChannel { - public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void + public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void { $message = null; if ($notification instanceof PushNotificationInterface) { diff --git a/src/Symfony/Component/Notifier/Channel/SmsChannel.php b/src/Symfony/Component/Notifier/Channel/SmsChannel.php index ebed8010d5334..50c35a64b0c2a 100644 --- a/src/Symfony/Component/Notifier/Channel/SmsChannel.php +++ b/src/Symfony/Component/Notifier/Channel/SmsChannel.php @@ -22,7 +22,7 @@ */ class SmsChannel extends AbstractChannel { - public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void + public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void { $message = null; if ($notification instanceof SmsNotificationInterface) { diff --git a/src/Symfony/Component/Notifier/Chatter.php b/src/Symfony/Component/Notifier/Chatter.php index 2949e19ec987e..7c6a72d05bf38 100644 --- a/src/Symfony/Component/Notifier/Chatter.php +++ b/src/Symfony/Component/Notifier/Chatter.php @@ -29,7 +29,7 @@ final class Chatter implements ChatterInterface private $bus; private $dispatcher; - public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null) + public function __construct(TransportInterface $transport, ?MessageBusInterface $bus = null, ?EventDispatcherInterface $dispatcher = null) { $this->transport = $transport; $this->bus = $bus; diff --git a/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php b/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php index 0a0a70c990d69..777115ade5719 100644 --- a/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php +++ b/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php @@ -32,7 +32,7 @@ public function __construct(NotificationLoggerListener $logger) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->data['events'] = $this->logger->getEvents(); } diff --git a/src/Symfony/Component/Notifier/Event/NotificationEvents.php b/src/Symfony/Component/Notifier/Event/NotificationEvents.php index 4ed3e6fa78c05..148c6bbb6399e 100644 --- a/src/Symfony/Component/Notifier/Event/NotificationEvents.php +++ b/src/Symfony/Component/Notifier/Event/NotificationEvents.php @@ -35,7 +35,7 @@ public function getTransports(): array /** * @return MessageEvent[] */ - public function getEvents(string $name = null): array + public function getEvents(?string $name = null): array { if (null === $name) { return $this->events; @@ -54,7 +54,7 @@ public function getEvents(string $name = null): array /** * @return MessageInterface[] */ - public function getMessages(string $name = null): array + public function getMessages(?string $name = null): array { $events = $this->getEvents($name); $messages = []; diff --git a/src/Symfony/Component/Notifier/Exception/IncompleteDsnException.php b/src/Symfony/Component/Notifier/Exception/IncompleteDsnException.php index e3907ec99703f..5861bbefe9612 100644 --- a/src/Symfony/Component/Notifier/Exception/IncompleteDsnException.php +++ b/src/Symfony/Component/Notifier/Exception/IncompleteDsnException.php @@ -18,7 +18,7 @@ class IncompleteDsnException extends InvalidArgumentException { private $dsn; - public function __construct(string $message, string $dsn = null, \Throwable $previous = null) + public function __construct(string $message, ?string $dsn = null, ?\Throwable $previous = null) { $this->dsn = $dsn; if ($dsn) { diff --git a/src/Symfony/Component/Notifier/Exception/MissingRequiredOptionException.php b/src/Symfony/Component/Notifier/Exception/MissingRequiredOptionException.php index 12062ddfe1a03..a799498482090 100644 --- a/src/Symfony/Component/Notifier/Exception/MissingRequiredOptionException.php +++ b/src/Symfony/Component/Notifier/Exception/MissingRequiredOptionException.php @@ -16,7 +16,7 @@ */ class MissingRequiredOptionException extends IncompleteDsnException { - public function __construct(string $option, string $dsn = null, \Throwable $previous = null) + public function __construct(string $option, ?string $dsn = null, ?\Throwable $previous = null) { $message = sprintf('The option "%s" is required but missing.', $option); diff --git a/src/Symfony/Component/Notifier/Exception/TransportException.php b/src/Symfony/Component/Notifier/Exception/TransportException.php index ad4e389481643..60316b19fd986 100644 --- a/src/Symfony/Component/Notifier/Exception/TransportException.php +++ b/src/Symfony/Component/Notifier/Exception/TransportException.php @@ -21,7 +21,7 @@ class TransportException extends RuntimeException implements TransportExceptionI private $response; private $debug = ''; - public function __construct(string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null) + public function __construct(string $message, ResponseInterface $response, int $code = 0, ?\Throwable $previous = null) { $this->response = $response; $this->debug .= $response->getInfo('debug') ?? ''; diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php index ebe0cef610dfd..e10bcecf13b80 100644 --- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php +++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php @@ -201,7 +201,7 @@ class UnsupportedSchemeException extends LogicException /** * @param string[] $supported */ - public function __construct(Dsn $dsn, string $name = null, array $supported = [], \Throwable $previous = null) + public function __construct(Dsn $dsn, ?string $name = null, array $supported = [], ?\Throwable $previous = null) { $provider = $dsn->getScheme(); if (false !== $pos = strpos($provider, '+')) { diff --git a/src/Symfony/Component/Notifier/Message/ChatMessage.php b/src/Symfony/Component/Notifier/Message/ChatMessage.php index d7c028a7c90a3..090842f33eea8 100644 --- a/src/Symfony/Component/Notifier/Message/ChatMessage.php +++ b/src/Symfony/Component/Notifier/Message/ChatMessage.php @@ -23,7 +23,7 @@ final class ChatMessage implements MessageInterface private $options; private $notification; - public function __construct(string $subject, MessageOptionsInterface $options = null) + public function __construct(string $subject, ?MessageOptionsInterface $options = null) { $this->subject = $subject; $this->options = $options; diff --git a/src/Symfony/Component/Notifier/Message/EmailMessage.php b/src/Symfony/Component/Notifier/Message/EmailMessage.php index 13524885f91e9..d82130d57860f 100644 --- a/src/Symfony/Component/Notifier/Message/EmailMessage.php +++ b/src/Symfony/Component/Notifier/Message/EmailMessage.php @@ -28,7 +28,7 @@ final class EmailMessage implements MessageInterface private $message; private $envelope; - public function __construct(RawMessage $message, Envelope $envelope = null) + public function __construct(RawMessage $message, ?Envelope $envelope = null) { $this->message = $message; $this->envelope = $envelope; diff --git a/src/Symfony/Component/Notifier/Message/PushMessage.php b/src/Symfony/Component/Notifier/Message/PushMessage.php index de6588cae30ea..c9a37467a306b 100644 --- a/src/Symfony/Component/Notifier/Message/PushMessage.php +++ b/src/Symfony/Component/Notifier/Message/PushMessage.php @@ -24,7 +24,7 @@ final class PushMessage implements MessageInterface private $options; private $notification; - public function __construct(string $subject, string $content, MessageOptionsInterface $options = null) + public function __construct(string $subject, string $content, ?MessageOptionsInterface $options = null) { $this->subject = $subject; $this->content = $content; diff --git a/src/Symfony/Component/Notifier/Notification/ChatNotificationInterface.php b/src/Symfony/Component/Notifier/Notification/ChatNotificationInterface.php index 7b42fac5fe8c1..396c455859ac9 100644 --- a/src/Symfony/Component/Notifier/Notification/ChatNotificationInterface.php +++ b/src/Symfony/Component/Notifier/Notification/ChatNotificationInterface.php @@ -19,5 +19,5 @@ */ interface ChatNotificationInterface { - public function asChatMessage(RecipientInterface $recipient, string $transport = null): ?ChatMessage; + public function asChatMessage(RecipientInterface $recipient, ?string $transport = null): ?ChatMessage; } diff --git a/src/Symfony/Component/Notifier/Notification/EmailNotificationInterface.php b/src/Symfony/Component/Notifier/Notification/EmailNotificationInterface.php index 55660427ab01e..d2aac4775d05e 100644 --- a/src/Symfony/Component/Notifier/Notification/EmailNotificationInterface.php +++ b/src/Symfony/Component/Notifier/Notification/EmailNotificationInterface.php @@ -19,5 +19,5 @@ */ interface EmailNotificationInterface { - public function asEmailMessage(EmailRecipientInterface $recipient, string $transport = null): ?EmailMessage; + public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): ?EmailMessage; } diff --git a/src/Symfony/Component/Notifier/Notification/PushNotificationInterface.php b/src/Symfony/Component/Notifier/Notification/PushNotificationInterface.php index 949dc4893bb77..fa416a90f8cf7 100644 --- a/src/Symfony/Component/Notifier/Notification/PushNotificationInterface.php +++ b/src/Symfony/Component/Notifier/Notification/PushNotificationInterface.php @@ -16,5 +16,5 @@ interface PushNotificationInterface { - public function asPushMessage(RecipientInterface $recipient, string $transport = null): ?PushMessage; + public function asPushMessage(RecipientInterface $recipient, ?string $transport = null): ?PushMessage; } diff --git a/src/Symfony/Component/Notifier/Notification/SmsNotificationInterface.php b/src/Symfony/Component/Notifier/Notification/SmsNotificationInterface.php index 02db67ac2a6f3..a9ba53a48628c 100644 --- a/src/Symfony/Component/Notifier/Notification/SmsNotificationInterface.php +++ b/src/Symfony/Component/Notifier/Notification/SmsNotificationInterface.php @@ -19,5 +19,5 @@ */ interface SmsNotificationInterface { - public function asSmsMessage(SmsRecipientInterface $recipient, string $transport = null): ?SmsMessage; + public function asSmsMessage(SmsRecipientInterface $recipient, ?string $transport = null): ?SmsMessage; } diff --git a/src/Symfony/Component/Notifier/Notifier.php b/src/Symfony/Component/Notifier/Notifier.php index 1042f63abb550..c972ef499f2f9 100644 --- a/src/Symfony/Component/Notifier/Notifier.php +++ b/src/Symfony/Component/Notifier/Notifier.php @@ -33,7 +33,7 @@ final class Notifier implements NotifierInterface /** * @param ChannelInterface[]|ContainerInterface $channels */ - public function __construct($channels, ChannelPolicyInterface $policy = null) + public function __construct($channels, ?ChannelPolicyInterface $policy = null) { $this->channels = $channels; $this->policy = $policy; diff --git a/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php b/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php index 706cdea506656..7b1eaf21a6d32 100644 --- a/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php +++ b/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php @@ -86,7 +86,7 @@ public function testCreate(string $expected, string $dsn) /** * @dataProvider unsupportedSchemeProvider */ - public function testUnsupportedSchemeException(string $dsn, string $message = null) + public function testUnsupportedSchemeException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); @@ -103,7 +103,7 @@ public function testUnsupportedSchemeException(string $dsn, string $message = nu /** * @dataProvider incompleteDsnProvider */ - public function testIncompleteDsnException(string $dsn, string $message = null) + public function testIncompleteDsnException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); @@ -120,7 +120,7 @@ public function testIncompleteDsnException(string $dsn, string $message = null) /** * @dataProvider missingRequiredOptionProvider */ - public function testMissingRequiredOptionException(string $dsn, string $message = null) + public function testMissingRequiredOptionException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); diff --git a/src/Symfony/Component/Notifier/Test/TransportTestCase.php b/src/Symfony/Component/Notifier/Test/TransportTestCase.php index 0b80836d73aee..d53c33139ccd9 100644 --- a/src/Symfony/Component/Notifier/Test/TransportTestCase.php +++ b/src/Symfony/Component/Notifier/Test/TransportTestCase.php @@ -27,7 +27,7 @@ abstract class TransportTestCase extends TestCase protected const CUSTOM_HOST = 'host.test'; protected const CUSTOM_PORT = 42; - abstract public static function createTransport(HttpClientInterface $client = null): TransportInterface; + abstract public static function createTransport(?HttpClientInterface $client = null): TransportInterface; /** * @return iterable @@ -55,7 +55,7 @@ public function testToString(string $expected, TransportInterface $transport) /** * @dataProvider supportedMessagesProvider */ - public function testSupportedMessages(MessageInterface $message, TransportInterface $transport = null) + public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null) { if (null === $transport) { $transport = $this->createTransport(); @@ -67,7 +67,7 @@ public function testSupportedMessages(MessageInterface $message, TransportInterf /** * @dataProvider unsupportedMessagesProvider */ - public function testUnsupportedMessages(MessageInterface $message, TransportInterface $transport = null) + public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null) { if (null === $transport) { $transport = $this->createTransport(); @@ -79,7 +79,7 @@ public function testUnsupportedMessages(MessageInterface $message, TransportInte /** * @dataProvider unsupportedMessagesProvider */ - public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, TransportInterface $transport = null) + public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null) { if (null === $transport) { $transport = $this->createTransport(); diff --git a/src/Symfony/Component/Notifier/Tests/Channel/AbstractChannelTest.php b/src/Symfony/Component/Notifier/Tests/Channel/AbstractChannelTest.php index f704bb0401efd..ae93ba2732d85 100644 --- a/src/Symfony/Component/Notifier/Tests/Channel/AbstractChannelTest.php +++ b/src/Symfony/Component/Notifier/Tests/Channel/AbstractChannelTest.php @@ -32,7 +32,7 @@ public function testChannelCannotBeConstructedWithoutTransportAndBus() class DummyChannel extends AbstractChannel { - public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void + public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void { return; } diff --git a/src/Symfony/Component/Notifier/Tests/Event/FailedMessageEventTest.php b/src/Symfony/Component/Notifier/Tests/Event/FailedMessageEventTest.php index cd53bd64b6e0c..fcf1e4199f731 100644 --- a/src/Symfony/Component/Notifier/Tests/Event/FailedMessageEventTest.php +++ b/src/Symfony/Component/Notifier/Tests/Event/FailedMessageEventTest.php @@ -58,7 +58,7 @@ public function testFailedMessageEventIsDisptachIfError() $transport = new class($clientMock, $eventDispatcherMock) extends AbstractTransport { public $exception; - public function __construct($client, EventDispatcherInterface $dispatcher = null) + public function __construct($client, ?EventDispatcherInterface $dispatcher = null) { $this->exception = new NullTransportException(); parent::__construct($client, $dispatcher); diff --git a/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php b/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php index 3d4ddf62963bb..6055020010a4f 100644 --- a/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php +++ b/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php @@ -22,7 +22,7 @@ class DummyMailer implements MailerInterface { private $sentMessage = null; - public function send(RawMessage $message, Envelope $envelope = null): void + public function send(RawMessage $message, ?Envelope $envelope = null): void { $this->sentMessage = $message; } diff --git a/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php b/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php index a75f1608d8090..5b9a183ae21e3 100644 --- a/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php +++ b/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php @@ -21,7 +21,7 @@ final class DsnTest extends TestCase /** * @dataProvider constructProvider */ - public function testConstruct(string $dsnString, string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [], string $path = null) + public function testConstruct(string $dsnString, string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [], ?string $path = null) { $dsn = new Dsn($dsnString); $this->assertSame($dsnString, $dsn->getOriginalDsn()); @@ -172,7 +172,7 @@ public static function invalidDsnProvider(): iterable /** * @dataProvider getOptionProvider */ - public function testGetOption($expected, string $dsnString, string $option, string $default = null) + public function testGetOption($expected, string $dsnString, string $option, ?string $default = null) { $dsn = new Dsn($dsnString); diff --git a/src/Symfony/Component/Notifier/Texter.php b/src/Symfony/Component/Notifier/Texter.php index f0c526ad5d438..167296362be90 100644 --- a/src/Symfony/Component/Notifier/Texter.php +++ b/src/Symfony/Component/Notifier/Texter.php @@ -29,7 +29,7 @@ final class Texter implements TexterInterface private $bus; private $dispatcher; - public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null) + public function __construct(TransportInterface $transport, ?MessageBusInterface $bus = null, ?EventDispatcherInterface $dispatcher = null) { $this->transport = $transport; $this->bus = $bus; diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php index dea527d51eb25..39505a98a04e5 100644 --- a/src/Symfony/Component/Notifier/Transport.php +++ b/src/Symfony/Component/Notifier/Transport.php @@ -108,14 +108,14 @@ class Transport private $factories; - public static function fromDsn(string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface + public static function fromDsn(string $dsn, ?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null): TransportInterface { $factory = new self(self::getDefaultFactories($dispatcher, $client)); return $factory->fromString($dsn); } - public static function fromDsns(array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface + public static function fromDsns(array $dsns, ?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null): TransportInterface { $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client))); @@ -182,7 +182,7 @@ private function createFromDsns(array $dsns): array /** * @return TransportFactoryInterface[] */ - private static function getDefaultFactories(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): iterable + private static function getDefaultFactories(?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null): iterable { foreach (self::FACTORY_CLASSES as $factoryClass) { if (class_exists($factoryClass)) { diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php index def3861948d18..189d049c61152 100644 --- a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php +++ b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php @@ -36,7 +36,7 @@ abstract class AbstractTransport implements TransportInterface protected $host; protected $port; - public function __construct(HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) + public function __construct(?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null) { $this->client = $client; if (null === $client) { diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php index f983c480e9ee8..efe02fdef6577 100644 --- a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php +++ b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php @@ -26,7 +26,7 @@ abstract class AbstractTransportFactory implements TransportFactoryInterface protected $dispatcher; protected $client; - public function __construct(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null) + public function __construct(?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null) { $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; $this->client = $client; diff --git a/src/Symfony/Component/Notifier/Transport/Dsn.php b/src/Symfony/Component/Notifier/Transport/Dsn.php index 6f4c3577a8c1a..3557905b2f6cd 100644 --- a/src/Symfony/Component/Notifier/Transport/Dsn.php +++ b/src/Symfony/Component/Notifier/Transport/Dsn.php @@ -33,25 +33,25 @@ public function __construct(string $dsn) { $this->originalDsn = $dsn; - if (false === $parsedDsn = parse_url($dsn)) { + if (false === $params = parse_url($dsn)) { throw new InvalidArgumentException('The notifier DSN is invalid.'); } - if (!isset($parsedDsn['scheme'])) { + if (!isset($params['scheme'])) { throw new InvalidArgumentException('The notifier DSN must contain a scheme.'); } - $this->scheme = $parsedDsn['scheme']; + $this->scheme = $params['scheme']; - if (!isset($parsedDsn['host'])) { + if (!isset($params['host'])) { throw new InvalidArgumentException('The notifier DSN must contain a host (use "default" by default).'); } - $this->host = $parsedDsn['host']; + $this->host = $params['host']; - $this->user = '' !== ($parsedDsn['user'] ?? '') ? urldecode($parsedDsn['user']) : null; - $this->password = '' !== ($parsedDsn['pass'] ?? '') ? urldecode($parsedDsn['pass']) : null; - $this->port = $parsedDsn['port'] ?? null; - $this->path = $parsedDsn['path'] ?? null; - parse_str($parsedDsn['query'] ?? '', $this->options); + $this->user = '' !== ($params['user'] ?? '') ? rawurldecode($params['user']) : null; + $this->password = '' !== ($params['pass'] ?? '') ? rawurldecode($params['pass']) : null; + $this->port = $params['port'] ?? null; + $this->path = $params['path'] ?? null; + parse_str($params['query'] ?? '', $this->options); } public function getScheme(): string @@ -74,7 +74,7 @@ public function getPassword(): ?string return $this->password; } - public function getPort(int $default = null): ?int + public function getPort(?int $default = null): ?int { return $this->port ?? $default; } diff --git a/src/Symfony/Component/Notifier/Transport/NullTransport.php b/src/Symfony/Component/Notifier/Transport/NullTransport.php index 5d340740207a1..a32a88357fa96 100644 --- a/src/Symfony/Component/Notifier/Transport/NullTransport.php +++ b/src/Symfony/Component/Notifier/Transport/NullTransport.php @@ -27,7 +27,7 @@ class NullTransport implements TransportInterface { private $dispatcher; - public function __construct(EventDispatcherInterface $dispatcher = null) + public function __construct(?EventDispatcherInterface $dispatcher = null) { $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; } diff --git a/src/Symfony/Component/PasswordHasher/Exception/InvalidPasswordException.php b/src/Symfony/Component/PasswordHasher/Exception/InvalidPasswordException.php index 30b09d8c35319..c70a4d5561531 100644 --- a/src/Symfony/Component/PasswordHasher/Exception/InvalidPasswordException.php +++ b/src/Symfony/Component/PasswordHasher/Exception/InvalidPasswordException.php @@ -16,7 +16,7 @@ */ class InvalidPasswordException extends \RuntimeException implements ExceptionInterface { - public function __construct(string $message = 'Invalid password.', int $code = 0, \Throwable $previous = null) + public function __construct(string $message = 'Invalid password.', int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); } diff --git a/src/Symfony/Component/PasswordHasher/Hasher/MessageDigestPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/MessageDigestPasswordHasher.php index 56110495b6ef2..0dd18b276bdde 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/MessageDigestPasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/MessageDigestPasswordHasher.php @@ -48,7 +48,7 @@ public function __construct(string $algorithm = 'sha512', bool $encodeHashAsBase $this->iterations = $iterations; } - public function hash(string $plainPassword, string $salt = null): string + public function hash(string $plainPassword, ?string $salt = null): string { if ($this->isPasswordTooLong($plainPassword)) { throw new InvalidPasswordException(); @@ -69,7 +69,7 @@ public function hash(string $plainPassword, string $salt = null): string return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest); } - public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool + public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool { if (\strlen($hashedPassword) !== $this->hashLength || false !== strpos($hashedPassword, '$')) { return false; diff --git a/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php index 3b1240840858f..0fb91d047bbc2 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php @@ -33,12 +33,12 @@ public function __construct(PasswordHasherInterface $bestHasher, PasswordHasherI $this->extraHashers = $extraHashers; } - public function hash(string $plainPassword, string $salt = null): string + public function hash(string $plainPassword, ?string $salt = null): string { return $this->bestHasher->hash($plainPassword, $salt); } - public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool + public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool { if ($this->bestHasher->verify($hashedPassword, $plainPassword, $salt)) { return true; diff --git a/src/Symfony/Component/PasswordHasher/Hasher/NativePasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/NativePasswordHasher.php index 8933faa96ccc5..16c358a93e4e7 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/NativePasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/NativePasswordHasher.php @@ -31,7 +31,7 @@ final class NativePasswordHasher implements PasswordHasherInterface /** * @param string|null $algorithm An algorithm supported by password_hash() or null to use the best available algorithm */ - public function __construct(int $opsLimit = null, int $memLimit = null, int $cost = null, string $algorithm = null) + public function __construct(?int $opsLimit = null, ?int $memLimit = null, ?int $cost = null, ?string $algorithm = null) { $cost = $cost ?? 13; $opsLimit = $opsLimit ?? max(4, \defined('SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE') ? \SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE : 4); diff --git a/src/Symfony/Component/PasswordHasher/Hasher/Pbkdf2PasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/Pbkdf2PasswordHasher.php index 2fc762cb4e870..b43057306a536 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/Pbkdf2PasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/Pbkdf2PasswordHasher.php @@ -59,7 +59,7 @@ public function __construct(string $algorithm = 'sha512', bool $encodeHashAsBase $this->iterations = $iterations; } - public function hash(string $plainPassword, string $salt = null): string + public function hash(string $plainPassword, ?string $salt = null): string { if ($this->isPasswordTooLong($plainPassword)) { throw new InvalidPasswordException(); @@ -74,7 +74,7 @@ public function hash(string $plainPassword, string $salt = null): string return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest); } - public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool + public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool { if (\strlen($hashedPassword) !== $this->encodedLength || false !== strpos($hashedPassword, '$')) { return false; diff --git a/src/Symfony/Component/PasswordHasher/Hasher/PlaintextPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/PlaintextPasswordHasher.php index d9a0557a4e031..bafe6bce898c7 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/PlaintextPasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/PlaintextPasswordHasher.php @@ -38,7 +38,7 @@ public function __construct(bool $ignorePasswordCase = false) /** * {@inheritdoc} */ - public function hash(string $plainPassword, string $salt = null): string + public function hash(string $plainPassword, ?string $salt = null): string { if ($this->isPasswordTooLong($plainPassword)) { throw new InvalidPasswordException(); @@ -47,7 +47,7 @@ public function hash(string $plainPassword, string $salt = null): string return $this->mergePasswordAndSalt($plainPassword, $salt); } - public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool + public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool { if ($this->isPasswordTooLong($plainPassword)) { return false; diff --git a/src/Symfony/Component/PasswordHasher/Hasher/SodiumPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/SodiumPasswordHasher.php index 2a22b82baf121..6001df3f46c3f 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/SodiumPasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/SodiumPasswordHasher.php @@ -29,7 +29,7 @@ final class SodiumPasswordHasher implements PasswordHasherInterface private $opsLimit; private $memLimit; - public function __construct(int $opsLimit = null, int $memLimit = null) + public function __construct(?int $opsLimit = null, ?int $memLimit = null) { if (!self::isSupported()) { throw new LogicException('Libsodium is not available. You should either install the sodium extension or use a different password hasher.'); diff --git a/src/Symfony/Component/PasswordHasher/LegacyPasswordHasherInterface.php b/src/Symfony/Component/PasswordHasher/LegacyPasswordHasherInterface.php index 7897b006dd102..f50a3e9e49b08 100644 --- a/src/Symfony/Component/PasswordHasher/LegacyPasswordHasherInterface.php +++ b/src/Symfony/Component/PasswordHasher/LegacyPasswordHasherInterface.php @@ -27,10 +27,10 @@ interface LegacyPasswordHasherInterface extends PasswordHasherInterface * * @throws InvalidPasswordException If the plain password is invalid, e.g. excessively long */ - public function hash(string $plainPassword, string $salt = null): string; + public function hash(string $plainPassword, ?string $salt = null): string; /** * Checks that a plain password and a salt match a password hash. */ - public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool; + public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool; } diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php index eb8f06292436a..f392c962e3130 100644 --- a/src/Symfony/Component/Process/ExecutableFinder.php +++ b/src/Symfony/Component/Process/ExecutableFinder.php @@ -46,7 +46,7 @@ public function addSuffix(string $suffix) * * @return string|null */ - public function find(string $name, string $default = null, array $extraDirs = []) + public function find(string $name, ?string $default = null, array $extraDirs = []) { if (\ini_get('open_basedir')) { $searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs); diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php index 240665f32a024..0c45b5245cd33 100644 --- a/src/Symfony/Component/Process/InputStream.php +++ b/src/Symfony/Component/Process/InputStream.php @@ -30,7 +30,7 @@ class InputStream implements \IteratorAggregate /** * Sets a callback that is called when the write buffer becomes empty. */ - public function onEmpty(callable $onEmpty = null) + public function onEmpty(?callable $onEmpty = null) { $this->onEmpty = $onEmpty; } diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php index bed6c3dc89d75..45dbcca4337c2 100644 --- a/src/Symfony/Component/Process/PhpExecutableFinder.php +++ b/src/Symfony/Component/Process/PhpExecutableFinder.php @@ -35,7 +35,7 @@ public function find(bool $includeArgs = true) { if ($php = getenv('PHP_BINARY')) { if (!is_executable($php)) { - $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v'; + $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --'; if ($php = strtok(exec($command.' '.escapeshellarg($php)), \PHP_EOL)) { if (!is_executable($php)) { return false; diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php index 2bc338e5e2313..3a1d147c87fbe 100644 --- a/src/Symfony/Component/Process/PhpProcess.php +++ b/src/Symfony/Component/Process/PhpProcess.php @@ -32,7 +32,7 @@ class PhpProcess extends Process * @param int $timeout The timeout in seconds * @param array|null $php Path to the PHP binary to use with any additional arguments */ - public function __construct(string $script, string $cwd = null, array $env = null, int $timeout = 60, array $php = null) + public function __construct(string $script, ?string $cwd = null, ?array $env = null, int $timeout = 60, ?array $php = null) { if (null === $php) { $executableFinder = new PhpExecutableFinder(); @@ -53,7 +53,7 @@ public function __construct(string $script, string $cwd = null, array $env = nul /** * {@inheritdoc} */ - public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60) + public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60) { throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class)); } @@ -61,7 +61,7 @@ public static function fromShellCommandline(string $command, string $cwd = null, /** * {@inheritdoc} */ - public function start(callable $callback = null, array $env = []) + public function start(?callable $callback = null, array $env = []) { if (null === $this->getCommandLine()) { throw new RuntimeException('Unable to find the PHP executable.'); diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 30ebeb6b58e18..2b6ed9efa9e27 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -140,7 +140,7 @@ class Process implements \IteratorAggregate * * @throws LogicException When proc_open is not installed */ - public function __construct(array $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60) + public function __construct(array $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60) { if (!\function_exists('proc_open')) { throw new LogicException('The Process class relies on proc_open, which is not available on your PHP installation.'); @@ -189,7 +189,7 @@ public function __construct(array $command, string $cwd = null, array $env = nul * * @throws LogicException When proc_open is not installed */ - public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60) + public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60) { $process = new static([], $cwd, $env, $input, $timeout); $process->commandline = $command; @@ -247,7 +247,7 @@ public function __clone() * * @final */ - public function run(callable $callback = null, array $env = []): int + public function run(?callable $callback = null, array $env = []): int { $this->start($callback, $env); @@ -266,7 +266,7 @@ public function run(callable $callback = null, array $env = []): int * * @final */ - public function mustRun(callable $callback = null, array $env = []): self + public function mustRun(?callable $callback = null, array $env = []): self { if (0 !== $this->run($callback, $env)) { throw new ProcessFailedException($this); @@ -294,7 +294,7 @@ public function mustRun(callable $callback = null, array $env = []): self * @throws RuntimeException When process is already running * @throws LogicException In case a callback is provided and output has been disabled */ - public function start(callable $callback = null, array $env = []) + public function start(?callable $callback = null, array $env = []) { if ($this->isRunning()) { throw new RuntimeException('Process is already running.'); @@ -385,7 +385,7 @@ public function start(callable $callback = null, array $env = []) * * @final */ - public function restart(callable $callback = null, array $env = []): self + public function restart(?callable $callback = null, array $env = []): self { if ($this->isRunning()) { throw new RuntimeException('Process is already running.'); @@ -412,7 +412,7 @@ public function restart(callable $callback = null, array $env = []): self * @throws ProcessSignaledException When process stopped after receiving signal * @throws LogicException When process is not yet started */ - public function wait(callable $callback = null) + public function wait(?callable $callback = null) { $this->requireProcessIsStarted(__FUNCTION__); @@ -914,7 +914,7 @@ public function getStatus() * * @return int|null The exit-code of the process or null if it's not running */ - public function stop(float $timeout = 10, int $signal = null) + public function stop(float $timeout = 10, ?int $signal = null) { $timeoutMicro = microtime(true) + $timeout; if ($this->isRunning()) { @@ -1310,7 +1310,7 @@ private function getDescriptors(): array * * @return \Closure */ - protected function buildCallback(callable $callback = null) + protected function buildCallback(?callable $callback = null) { if ($this->outputDisabled) { return function ($type, $data) use ($callback): bool { diff --git a/src/Symfony/Component/Process/Tests/ErrorProcessInitiator.php b/src/Symfony/Component/Process/Tests/ErrorProcessInitiator.php index 541680224d740..0b75add63cf01 100644 --- a/src/Symfony/Component/Process/Tests/ErrorProcessInitiator.php +++ b/src/Symfony/Component/Process/Tests/ErrorProcessInitiator.php @@ -25,7 +25,7 @@ while (!str_contains($process->getOutput(), 'ready')) { usleep(1000); } - $process->signal(\SIGSTOP); + $process->isRunning() && $process->signal(\SIGSTOP); $process->wait(); return $process->getExitCode(); diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php index 804937999a5f6..daf842e1f9889 100644 --- a/src/Symfony/Component/Process/Tests/ProcessTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessTest.php @@ -1558,7 +1558,7 @@ public function testNotTerminableInputPipe() * @param string|array $commandline * @param mixed $input */ - private function getProcess($commandline, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process + private function getProcess($commandline, ?string $cwd = null, ?array $env = null, $input = null, ?int $timeout = 60): Process { if (\is_string($commandline)) { $process = Process::fromShellCommandline($commandline, $cwd, $env, $input, $timeout); @@ -1573,7 +1573,7 @@ private function getProcess($commandline, string $cwd = null, array $env = null, return self::$process = $process; } - private function getProcessForCode(string $code, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process + private function getProcessForCode(string $code, ?string $cwd = null, ?array $env = null, $input = null, ?int $timeout = 60): Process { return $this->getProcess([self::$phpBin, '-r', $code], $cwd, $env, $input, $timeout); } diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 1d9ed71d58ee5..359aaa701918f 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -94,7 +94,7 @@ class PropertyAccessor implements PropertyAccessorInterface * @param PropertyReadInfoExtractorInterface $readInfoExtractor * @param PropertyWriteInfoExtractorInterface $writeInfoExtractor */ - public function __construct($magicMethods = self::MAGIC_GET | self::MAGIC_SET, $throw = self::THROW_ON_INVALID_PROPERTY_PATH, CacheItemPoolInterface $cacheItemPool = null, $readInfoExtractor = null, $writeInfoExtractor = null) + public function __construct($magicMethods = self::MAGIC_GET | self::MAGIC_SET, $throw = self::THROW_ON_INVALID_PROPERTY_PATH, ?CacheItemPoolInterface $cacheItemPool = null, $readInfoExtractor = null, $writeInfoExtractor = null) { if (\is_bool($magicMethods)) { trigger_deprecation('symfony/property-access', '5.2', 'Passing a boolean as the first argument to "%s()" is deprecated. Pass a combination of bitwise flags instead (i.e an integer).', __METHOD__); @@ -242,7 +242,7 @@ public function setValue(&$objectOrArray, $propertyPath, $value) } } - private static function throwInvalidArgumentException(string $message, array $trace, int $i, string $propertyPath, \Throwable $previous = null): void + private static function throwInvalidArgumentException(string $message, array $trace, int $i, string $propertyPath, ?\Throwable $previous = null): void { if (!isset($trace[$i]['file']) || __FILE__ !== $trace[$i]['file']) { return; @@ -726,7 +726,7 @@ private function getPropertyPath($propertyPath): PropertyPath * * @throws \LogicException When the Cache Component isn't available */ - public static function createCache(string $namespace, int $defaultLifetime, string $version, LoggerInterface $logger = null) + public static function createCache(string $namespace, int $defaultLifetime, string $version, ?LoggerInterface $logger = null) { if (!class_exists(ApcuAdapter::class)) { throw new \LogicException(sprintf('The Symfony Cache component must be installed to use "%s()".', __METHOD__)); diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php index 68c1984c6dc53..fe1c232830bee 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php @@ -239,7 +239,7 @@ public function isExceptionOnInvalidPropertyPath() * * @return $this */ - public function setCacheItemPool(CacheItemPoolInterface $cacheItemPool = null) + public function setCacheItemPool(?CacheItemPoolInterface $cacheItemPool = null) { $this->cacheItemPool = $cacheItemPool; diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php index b521f6ad1a6d7..9af1000b8198c 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php @@ -136,7 +136,7 @@ public function replace(int $offset, int $length, $path, int $pathOffset = 0, in * * @throws OutOfBoundsException If the offset is invalid */ - public function replaceByIndex(int $offset, string $name = null) + public function replaceByIndex(int $offset, ?string $name = null) { if (!isset($this->elements[$offset])) { throw new OutOfBoundsException(sprintf('The offset "%s" is not within the property path.', $offset)); @@ -154,7 +154,7 @@ public function replaceByIndex(int $offset, string $name = null) * * @throws OutOfBoundsException If the offset is invalid */ - public function replaceByProperty(int $offset, string $name = null) + public function replaceByProperty(int $offset, ?string $name = null) { if (!isset($this->elements[$offset])) { throw new OutOfBoundsException(sprintf('The offset "%s" is not within the property path.', $offset)); diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php index 2cecfcf8b3306..ff23bb40783e4 100644 --- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php +++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php @@ -57,7 +57,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property * @param string[]|null $accessorPrefixes * @param string[]|null $arrayMutatorPrefixes */ - public function __construct(DocBlockFactoryInterface $docBlockFactory = null, array $mutatorPrefixes = null, array $accessorPrefixes = null, array $arrayMutatorPrefixes = null) + public function __construct(?DocBlockFactoryInterface $docBlockFactory = null, ?array $mutatorPrefixes = null, ?array $accessorPrefixes = null, ?array $arrayMutatorPrefixes = null) { if (!class_exists(DocBlockFactory::class)) { throw new \LogicException(sprintf('Unable to use the "%s" class as the "phpdocumentor/reflection-docblock" package is not installed. Try running composer require "phpdocumentor/reflection-docblock".', __CLASS__)); diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php index a964b5036893b..2f169690bff12 100644 --- a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php +++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php @@ -58,7 +58,7 @@ final class PhpStanExtractor implements PropertyTypeExtractorInterface, Construc * @param list|null $accessorPrefixes * @param list|null $arrayMutatorPrefixes */ - public function __construct(array $mutatorPrefixes = null, array $accessorPrefixes = null, array $arrayMutatorPrefixes = null) + public function __construct(?array $mutatorPrefixes = null, ?array $accessorPrefixes = null, ?array $arrayMutatorPrefixes = null) { if (!class_exists(ContextFactory::class)) { throw new \LogicException(sprintf('Unable to use the "%s" class as the "phpdocumentor/type-resolver" package is not installed. Try running composer require "phpdocumentor/type-resolver".', __CLASS__)); diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php index 4da5912381f97..29a91f904041f 100644 --- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php +++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php @@ -83,7 +83,7 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp * @param string[]|null $accessorPrefixes * @param string[]|null $arrayMutatorPrefixes */ - public function __construct(array $mutatorPrefixes = null, array $accessorPrefixes = null, array $arrayMutatorPrefixes = null, bool $enableConstructorExtraction = true, int $accessFlags = self::ALLOW_PUBLIC, InflectorInterface $inflector = null, int $magicMethodsFlags = self::ALLOW_MAGIC_GET | self::ALLOW_MAGIC_SET) + public function __construct(?array $mutatorPrefixes = null, ?array $accessorPrefixes = null, ?array $arrayMutatorPrefixes = null, bool $enableConstructorExtraction = true, int $accessFlags = self::ALLOW_PUBLIC, ?InflectorInterface $inflector = null, int $magicMethodsFlags = self::ALLOW_MAGIC_GET | self::ALLOW_MAGIC_SET) { $this->mutatorPrefixes = $mutatorPrefixes ?? self::$defaultMutatorPrefixes; $this->accessorPrefixes = $accessorPrefixes ?? self::$defaultAccessorPrefixes; diff --git a/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php b/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php index 32f2f330eafcb..3ec00e6c3f5d8 100644 --- a/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php +++ b/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php @@ -20,7 +20,7 @@ */ final class NameScopeFactory { - public function create(string $calledClassName, string $declaringClassName = null): NameScope + public function create(string $calledClassName, ?string $declaringClassName = null): NameScope { $declaringClassName = $declaringClassName ?? $calledClassName; diff --git a/src/Symfony/Component/PropertyInfo/PropertyWriteInfo.php b/src/Symfony/Component/PropertyInfo/PropertyWriteInfo.php index b4e33b24084fa..ce3d8e04e23e0 100644 --- a/src/Symfony/Component/PropertyInfo/PropertyWriteInfo.php +++ b/src/Symfony/Component/PropertyInfo/PropertyWriteInfo.php @@ -38,7 +38,7 @@ final class PropertyWriteInfo private $removerInfo; private $errors = []; - public function __construct(string $type = self::TYPE_NONE, string $name = null, string $visibility = null, bool $static = null) + public function __construct(string $type = self::TYPE_NONE, ?string $name = null, ?string $visibility = null, ?bool $static = null) { $this->type = $type; $this->name = $name; diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php index b3489d9fb0c10..8ec2a567e984a 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php @@ -41,7 +41,7 @@ protected function setUp(): void /** * @dataProvider typesProvider */ - public function testExtract($property, array $type = null, $shortDescription, $longDescription) + public function testExtract($property, ?array $type, $shortDescription, $longDescription) { $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property)); $this->assertSame($shortDescription, $this->extractor->getShortDescription('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property)); @@ -76,7 +76,7 @@ public function testInvalid($property, $shortDescription, $longDescription) /** * @dataProvider typesWithNoPrefixesProvider */ - public function testExtractTypesWithNoPrefixes($property, array $type = null) + public function testExtractTypesWithNoPrefixes($property, ?array $type = null) { $noPrefixExtractor = new PhpDocExtractor(null, [], [], []); @@ -157,7 +157,7 @@ public static function typesProvider() /** * @dataProvider provideCollectionTypes */ - public function testExtractCollection($property, array $type = null, $shortDescription, $longDescription) + public function testExtractCollection($property, ?array $type, $shortDescription, $longDescription) { if (!class_exists(Collection::class)) { $this->markTestSkipped('Collections are not implemented in current phpdocumentor/type-resolver version'); @@ -223,7 +223,7 @@ public static function provideCollectionTypes() /** * @dataProvider typesWithCustomPrefixesProvider */ - public function testExtractTypesWithCustomPrefixes($property, array $type = null) + public function testExtractTypesWithCustomPrefixes($property, ?array $type = null) { $customExtractor = new PhpDocExtractor(null, ['add', 'remove'], ['is', 'can']); @@ -432,7 +432,7 @@ protected static function isPhpDocumentorV5() /** * @dataProvider constructorTypesProvider */ - public function testExtractConstructorTypes($property, array $type = null) + public function testExtractConstructorTypes($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy', $property)); } diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php index c607f2abc3761..d8fa9b9192c51 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php @@ -49,7 +49,7 @@ protected function setUp(): void /** * @dataProvider typesProvider */ - public function testExtract($property, array $type = null) + public function testExtract($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property)); } @@ -80,7 +80,7 @@ public function testInvalid($property) /** * @dataProvider typesWithNoPrefixesProvider */ - public function testExtractTypesWithNoPrefixes($property, array $type = null) + public function testExtractTypesWithNoPrefixes($property, ?array $type = null) { $noPrefixExtractor = new PhpStanExtractor([], [], []); @@ -135,7 +135,7 @@ public static function typesProvider() /** * @dataProvider provideCollectionTypes */ - public function testExtractCollection($property, array $type = null) + public function testExtractCollection($property, ?array $type = null) { $this->testExtract($property, $type); } @@ -191,7 +191,7 @@ public static function provideCollectionTypes() /** * @dataProvider typesWithCustomPrefixesProvider */ - public function testExtractTypesWithCustomPrefixes($property, array $type = null) + public function testExtractTypesWithCustomPrefixes($property, ?array $type = null) { $customExtractor = new PhpStanExtractor(['add', 'remove'], ['is', 'can']); @@ -349,7 +349,7 @@ public static function propertiesParentTypeProvider(): array /** * @dataProvider constructorTypesProvider */ - public function testExtractConstructorTypes($property, array $type = null) + public function testExtractConstructorTypes($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy', $property)); } diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php index c8bb2758f2b50..d3d57514a02c9 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php @@ -208,7 +208,7 @@ public function testGetPropertiesWithNoPrefixes() /** * @dataProvider typesProvider */ - public function testExtractors($property, array $type = null) + public function testExtractors($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property, [])); } @@ -235,7 +235,7 @@ public static function typesProvider() /** * @dataProvider php7TypesProvider */ - public function testExtractPhp7Type(string $class, string $property, array $type = null) + public function testExtractPhp7Type(string $class, string $property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypes($class, $property, [])); } @@ -256,7 +256,7 @@ public static function php7TypesProvider() /** * @dataProvider php71TypesProvider */ - public function testExtractPhp71Type($property, array $type = null) + public function testExtractPhp71Type($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php71Dummy', $property, [])); } @@ -277,7 +277,7 @@ public static function php71TypesProvider() * * @requires PHP 8 */ - public function testExtractPhp80Type($property, array $type = null) + public function testExtractPhp80Type($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php80Dummy', $property, [])); } @@ -301,7 +301,7 @@ public static function php80TypesProvider() * * @requires PHP 8.1 */ - public function testExtractPhp81Type($property, array $type = null) + public function testExtractPhp81Type($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php81Dummy', $property, [])); } @@ -327,7 +327,7 @@ public function testReadonlyPropertiesAreNotWriteable() * * @requires PHP 8.2 */ - public function testExtractPhp82Type($property, array $type = null) + public function testExtractPhp82Type($property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php82Dummy', $property, [])); } @@ -472,7 +472,7 @@ public static function getInitializableProperties(): array /** * @dataProvider constructorTypesProvider */ - public function testExtractTypeConstructor(string $class, string $property, array $type = null) + public function testExtractTypeConstructor(string $class, string $property, ?array $type = null) { /* Check that constructor extractions works by default, and if passed in via context. Check that null is returned if constructor extraction is disabled */ @@ -663,7 +663,7 @@ public function testGetWriteInfoReadonlyProperties() /** * @dataProvider extractConstructorTypesProvider */ - public function testExtractConstructorTypes(string $property, array $type = null) + public function testExtractConstructorTypes(string $property, ?array $type = null) { $this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy', $property)); } diff --git a/src/Symfony/Component/PropertyInfo/Type.php b/src/Symfony/Component/PropertyInfo/Type.php index 5c1b5c1248920..44fa36ff20171 100644 --- a/src/Symfony/Component/PropertyInfo/Type.php +++ b/src/Symfony/Component/PropertyInfo/Type.php @@ -76,7 +76,7 @@ class Type * * @throws \InvalidArgumentException */ - public function __construct(string $builtinType, bool $nullable = false, string $class = null, bool $collection = false, $collectionKeyType = null, $collectionValueType = null) + public function __construct(string $builtinType, bool $nullable = false, ?string $class = null, bool $collection = false, $collectionKeyType = null, $collectionValueType = null) { if (!\in_array($builtinType, self::$builtinTypes)) { throw new \InvalidArgumentException(sprintf('"%s" is not a valid PHP type.', $builtinType)); diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php index 44a4614985563..6020be0b80a3c 100644 --- a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php +++ b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php @@ -102,7 +102,7 @@ public function getTypes(DocType $varType): array /** * Creates a {@see Type} from a PHPDoc type. */ - private function createType(DocType $type, bool $nullable, string $docType = null): ?Type + private function createType(DocType $type, bool $nullable, ?string $docType = null): ?Type { $docType = $docType ?? (string) $type; diff --git a/src/Symfony/Component/RateLimiter/CompoundLimiter.php b/src/Symfony/Component/RateLimiter/CompoundLimiter.php index f9a166211a472..2026cd0a6195d 100644 --- a/src/Symfony/Component/RateLimiter/CompoundLimiter.php +++ b/src/Symfony/Component/RateLimiter/CompoundLimiter.php @@ -31,7 +31,7 @@ public function __construct(array $limiters) $this->limiters = $limiters; } - public function reserve(int $tokens = 1, float $maxTime = null): Reservation + public function reserve(int $tokens = 1, ?float $maxTime = null): Reservation { throw new ReserveNotSupportedException(__CLASS__); } diff --git a/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php b/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php index 4c18f6e81e726..5230f1b7986c0 100644 --- a/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php +++ b/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php @@ -20,7 +20,7 @@ class MaxWaitDurationExceededException extends \RuntimeException { private $rateLimit; - public function __construct(string $message, RateLimit $rateLimit, int $code = 0, \Throwable $previous = null) + public function __construct(string $message, RateLimit $rateLimit, int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php b/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php index 7bf39beeca302..62db29a41192d 100644 --- a/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php +++ b/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php @@ -20,7 +20,7 @@ class RateLimitExceededException extends \RuntimeException { private $rateLimit; - public function __construct(RateLimit $rateLimit, int $code = 0, \Throwable $previous = null) + public function __construct(RateLimit $rateLimit, int $code = 0, ?\Throwable $previous = null) { parent::__construct('Rate Limit Exceeded', $code, $previous); diff --git a/src/Symfony/Component/RateLimiter/Exception/ReserveNotSupportedException.php b/src/Symfony/Component/RateLimiter/Exception/ReserveNotSupportedException.php index cb7a306004045..07a0fac1052e4 100644 --- a/src/Symfony/Component/RateLimiter/Exception/ReserveNotSupportedException.php +++ b/src/Symfony/Component/RateLimiter/Exception/ReserveNotSupportedException.php @@ -16,7 +16,7 @@ */ class ReserveNotSupportedException extends \BadMethodCallException { - public function __construct(string $limiterClass, int $code = 0, \Throwable $previous = null) + public function __construct(string $limiterClass, int $code = 0, ?\Throwable $previous = null) { parent::__construct(sprintf('Reserving tokens is not supported by "%s".', $limiterClass), $code, $previous); } diff --git a/src/Symfony/Component/RateLimiter/LimiterInterface.php b/src/Symfony/Component/RateLimiter/LimiterInterface.php index 6f0ae7db0678f..f95cf8c464476 100644 --- a/src/Symfony/Component/RateLimiter/LimiterInterface.php +++ b/src/Symfony/Component/RateLimiter/LimiterInterface.php @@ -33,7 +33,7 @@ interface LimiterInterface * @throws ReserveNotSupportedException if this limiter implementation doesn't support reserving tokens * @throws \InvalidArgumentException if $tokens is larger than the maximum burst size */ - public function reserve(int $tokens = 1, float $maxTime = null): Reservation; + public function reserve(int $tokens = 1, ?float $maxTime = null): Reservation; /** * Use this method if you intend to drop if the required number diff --git a/src/Symfony/Component/RateLimiter/Policy/FixedWindowLimiter.php b/src/Symfony/Component/RateLimiter/Policy/FixedWindowLimiter.php index 298cd1ba24321..a584d898535be 100644 --- a/src/Symfony/Component/RateLimiter/Policy/FixedWindowLimiter.php +++ b/src/Symfony/Component/RateLimiter/Policy/FixedWindowLimiter.php @@ -34,7 +34,7 @@ final class FixedWindowLimiter implements LimiterInterface */ private $interval; - public function __construct(string $id, int $limit, \DateInterval $interval, StorageInterface $storage, LockInterface $lock = null) + public function __construct(string $id, int $limit, \DateInterval $interval, StorageInterface $storage, ?LockInterface $lock = null) { if ($limit < 1) { throw new \InvalidArgumentException(sprintf('Cannot set the limit of "%s" to 0, as that would never accept any hit.', __CLASS__)); @@ -47,7 +47,7 @@ public function __construct(string $id, int $limit, \DateInterval $interval, Sto $this->interval = TimeUtil::dateIntervalToSeconds($interval); } - public function reserve(int $tokens = 1, float $maxTime = null): Reservation + public function reserve(int $tokens = 1, ?float $maxTime = null): Reservation { if ($tokens > $this->limit) { throw new \InvalidArgumentException(sprintf('Cannot reserve more tokens (%d) than the size of the rate limiter (%d).', $tokens, $this->limit)); diff --git a/src/Symfony/Component/RateLimiter/Policy/NoLimiter.php b/src/Symfony/Component/RateLimiter/Policy/NoLimiter.php index 4878e4abde7a8..56339d372ad95 100644 --- a/src/Symfony/Component/RateLimiter/Policy/NoLimiter.php +++ b/src/Symfony/Component/RateLimiter/Policy/NoLimiter.php @@ -25,7 +25,7 @@ */ final class NoLimiter implements LimiterInterface { - public function reserve(int $tokens = 1, float $maxTime = null): Reservation + public function reserve(int $tokens = 1, ?float $maxTime = null): Reservation { return new Reservation(microtime(true), new RateLimit(\PHP_INT_MAX, new \DateTimeImmutable(), true, \PHP_INT_MAX)); } diff --git a/src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php b/src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php index 0d9d1bca73a94..f4416339944a4 100644 --- a/src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php +++ b/src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php @@ -42,7 +42,7 @@ final class SlidingWindowLimiter implements LimiterInterface */ private $interval; - public function __construct(string $id, int $limit, \DateInterval $interval, StorageInterface $storage, LockInterface $lock = null) + public function __construct(string $id, int $limit, \DateInterval $interval, StorageInterface $storage, ?LockInterface $lock = null) { $this->storage = $storage; $this->lock = $lock ?? new NoLock(); @@ -51,7 +51,7 @@ public function __construct(string $id, int $limit, \DateInterval $interval, Sto $this->interval = TimeUtil::dateIntervalToSeconds($interval); } - public function reserve(int $tokens = 1, float $maxTime = null): Reservation + public function reserve(int $tokens = 1, ?float $maxTime = null): Reservation { throw new ReserveNotSupportedException(__CLASS__); } diff --git a/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php b/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php index 0b13063b975e4..37384f51b5b60 100644 --- a/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php +++ b/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php @@ -44,7 +44,7 @@ final class TokenBucket implements LimiterStateInterface * @param Rate $rate the fill rate and time of this bucket * @param float|null $timer the current timer of the bucket, defaulting to microtime(true) */ - public function __construct(string $id, int $initialTokens, Rate $rate, float $timer = null) + public function __construct(string $id, int $initialTokens, Rate $rate, ?float $timer = null) { if ($initialTokens < 1) { throw new \InvalidArgumentException(sprintf('Cannot set the limit of "%s" to 0, as that would never accept any hit.', TokenBucketLimiter::class)); diff --git a/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php b/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php index dd00346671362..d17887c8fa3c1 100644 --- a/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php +++ b/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php @@ -29,7 +29,7 @@ final class TokenBucketLimiter implements LimiterInterface private $maxBurst; private $rate; - public function __construct(string $id, int $maxBurst, Rate $rate, StorageInterface $storage, LockInterface $lock = null) + public function __construct(string $id, int $maxBurst, Rate $rate, StorageInterface $storage, ?LockInterface $lock = null) { $this->id = $id; $this->maxBurst = $maxBurst; @@ -51,7 +51,7 @@ public function __construct(string $id, int $maxBurst, Rate $rate, StorageInterf * @throws MaxWaitDurationExceededException if $maxTime is set and the process needs to wait longer than its value (in seconds) * @throws \InvalidArgumentException if $tokens is larger than the maximum burst size */ - public function reserve(int $tokens = 1, float $maxTime = null): Reservation + public function reserve(int $tokens = 1, ?float $maxTime = null): Reservation { if ($tokens > $this->maxBurst) { throw new \InvalidArgumentException(sprintf('Cannot reserve more tokens (%d) than the burst size of the rate limiter (%d).', $tokens, $this->maxBurst)); diff --git a/src/Symfony/Component/RateLimiter/Policy/Window.php b/src/Symfony/Component/RateLimiter/Policy/Window.php index 39248a53d7f7c..c4b5ccca94d51 100644 --- a/src/Symfony/Component/RateLimiter/Policy/Window.php +++ b/src/Symfony/Component/RateLimiter/Policy/Window.php @@ -30,7 +30,7 @@ final class Window implements LimiterStateInterface */ private $timer; - public function __construct(string $id, int $intervalInSeconds, int $windowSize, float $timer = null) + public function __construct(string $id, int $intervalInSeconds, int $windowSize, ?float $timer = null) { $this->id = $id; $this->intervalInSeconds = $intervalInSeconds; @@ -48,7 +48,7 @@ public function getExpirationTime(): ?int return $this->intervalInSeconds; } - public function add(int $hits = 1, float $now = null) + public function add(int $hits = 1, ?float $now = null) { $now = $now ?? microtime(true); if (($now - $this->timer) > $this->intervalInSeconds) { diff --git a/src/Symfony/Component/RateLimiter/RateLimiterFactory.php b/src/Symfony/Component/RateLimiter/RateLimiterFactory.php index 70d805550e319..b0c48855d4b10 100644 --- a/src/Symfony/Component/RateLimiter/RateLimiterFactory.php +++ b/src/Symfony/Component/RateLimiter/RateLimiterFactory.php @@ -31,7 +31,7 @@ final class RateLimiterFactory private $storage; private $lockFactory; - public function __construct(array $config, StorageInterface $storage, LockFactory $lockFactory = null) + public function __construct(array $config, StorageInterface $storage, ?LockFactory $lockFactory = null) { $this->storage = $storage; $this->lockFactory = $lockFactory; @@ -42,7 +42,7 @@ public function __construct(array $config, StorageInterface $storage, LockFactor $this->config = $options->resolve($config); } - public function create(string $key = null): LimiterInterface + public function create(?string $key = null): LimiterInterface { $id = $this->config['id'].'-'.$key; $lock = $this->lockFactory ? $this->lockFactory->createLock($id) : new NoLock(); diff --git a/src/Symfony/Component/RateLimiter/Tests/Policy/TokenBucketLimiterTest.php b/src/Symfony/Component/RateLimiter/Tests/Policy/TokenBucketLimiterTest.php index 3b7b579c0cf77..b6bb2dbb65432 100644 --- a/src/Symfony/Component/RateLimiter/Tests/Policy/TokenBucketLimiterTest.php +++ b/src/Symfony/Component/RateLimiter/Tests/Policy/TokenBucketLimiterTest.php @@ -154,7 +154,7 @@ public function testBucketRefilledWithStrictFrequency() } } - private function createLimiter($initialTokens = 10, Rate $rate = null) + private function createLimiter($initialTokens = 10, ?Rate $rate = null) { return new TokenBucketLimiter('test', $initialTokens, $rate ?? Rate::perSecond(10), $this->storage); } diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php index 81563df2020d7..957344f015940 100644 --- a/src/Symfony/Component/Routing/Annotation/Route.php +++ b/src/Symfony/Component/Routing/Annotation/Route.php @@ -49,20 +49,20 @@ class Route public function __construct( $data = [], $path = null, - string $name = null, + ?string $name = null, array $requirements = [], array $options = [], array $defaults = [], - string $host = null, + ?string $host = null, $methods = [], $schemes = [], - string $condition = null, - int $priority = null, - string $locale = null, - string $format = null, - bool $utf8 = null, - bool $stateless = null, - string $env = null + ?string $condition = null, + ?int $priority = null, + ?string $locale = null, + ?string $format = null, + ?bool $utf8 = null, + ?bool $stateless = null, + ?string $env = null ) { if (\is_string($data)) { $data = ['path' => $data]; diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php index 1449cdb92e0f1..64bf9cacdc30b 100644 --- a/src/Symfony/Component/Routing/CompiledRoute.php +++ b/src/Symfony/Component/Routing/CompiledRoute.php @@ -37,7 +37,7 @@ class CompiledRoute implements \Serializable * @param array $hostVariables An array of host variables * @param array $variables An array of variables (variables defined in the path and in the host patterns) */ - public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = []) + public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, ?string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = []) { $this->staticPrefix = $staticPrefix; $this->regex = $regex; diff --git a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php index 27cf2125e2b8e..a73e1e6e32254 100644 --- a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php +++ b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php @@ -25,7 +25,7 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn /** * @param string[] $allowedMethods */ - public function __construct(array $allowedMethods, ?string $message = '', int $code = 0, \Throwable $previous = null) + public function __construct(array $allowedMethods, ?string $message = '', int $code = 0, ?\Throwable $previous = null) { if (null === $message) { trigger_deprecation('symfony/routing', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__); diff --git a/src/Symfony/Component/Routing/Generator/CompiledUrlGenerator.php b/src/Symfony/Component/Routing/Generator/CompiledUrlGenerator.php index 8cbbf8f702bfc..8af3ae78e20a3 100644 --- a/src/Symfony/Component/Routing/Generator/CompiledUrlGenerator.php +++ b/src/Symfony/Component/Routing/Generator/CompiledUrlGenerator.php @@ -23,7 +23,7 @@ class CompiledUrlGenerator extends UrlGenerator private $compiledRoutes = []; private $defaultLocale; - public function __construct(array $compiledRoutes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null) + public function __construct(array $compiledRoutes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null) { $this->compiledRoutes = $compiledRoutes; $this->context = $context; diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php index d27b000045c16..4419e9efd3e6c 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -82,7 +82,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt '%7C' => '|', ]; - public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null) + public function __construct(RouteCollection $routes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null) { $this->routes = $routes; $this->context = $context; diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php index ad5af5c942351..c0bcb47137607 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php @@ -85,7 +85,7 @@ abstract class AnnotationClassLoader implements LoaderInterface */ protected $defaultRouteIndex = 0; - public function __construct(Reader $reader = null, string $env = null) + public function __construct(?Reader $reader = null, ?string $env = null) { $this->reader = $reader; $this->env = $env; @@ -108,7 +108,7 @@ public function setRouteAnnotationClass(string $class) * * @throws \InvalidArgumentException When route can't be parsed */ - public function load($class, string $type = null) + public function load($class, ?string $type = null) { if (!class_exists($class)) { throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class)); @@ -239,7 +239,7 @@ protected function addRoute(RouteCollection $collection, object $annot, array $g /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return \is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || 'annotation' === $type); } diff --git a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php index ae825a39f77e7..8cd60f8273cc0 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php @@ -32,7 +32,7 @@ class AnnotationDirectoryLoader extends AnnotationFileLoader * * @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed */ - public function load($path, string $type = null) + public function load($path, ?string $type = null) { if (!is_dir($dir = $this->locator->locate($path))) { return parent::supports($path, $type) ? parent::load($path, $type) : new RouteCollection(); @@ -74,7 +74,7 @@ function (\SplFileInfo $current) { /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { if ('annotation' === $type) { return true; diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php index 27af66ee693f4..a1d70c0fb8494 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php @@ -47,7 +47,7 @@ public function __construct(FileLocatorInterface $locator, AnnotationClassLoader * * @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed */ - public function load($file, string $type = null) + public function load($file, ?string $type = null) { $path = $this->locator->locate($file); @@ -70,7 +70,7 @@ public function load($file, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'annotation' === $type); } diff --git a/src/Symfony/Component/Routing/Loader/ClosureLoader.php b/src/Symfony/Component/Routing/Loader/ClosureLoader.php index 42f950f50f8a8..a5081ca28e06a 100644 --- a/src/Symfony/Component/Routing/Loader/ClosureLoader.php +++ b/src/Symfony/Component/Routing/Loader/ClosureLoader.php @@ -31,7 +31,7 @@ class ClosureLoader extends Loader * * @return RouteCollection */ - public function load($closure, string $type = null) + public function load($closure, ?string $type = null) { return $closure($this->env); } @@ -39,7 +39,7 @@ public function load($closure, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return $resource instanceof \Closure && (!$type || 'closure' === $type); } diff --git a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php index 09274ccdc718b..ec59f7ee9ffd4 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php @@ -28,7 +28,7 @@ class CollectionConfigurator private $parentPrefixes; private $host; - public function __construct(RouteCollection $parent, string $name, self $parentConfigurator = null, array $parentPrefixes = null) + public function __construct(RouteCollection $parent, string $name, ?self $parentConfigurator = null, ?array $parentPrefixes = null) { $this->parent = $parent; $this->name = $name; diff --git a/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php index bb6ce267a78a7..fcd1c2157f910 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php @@ -24,7 +24,7 @@ class RouteConfigurator protected $parentConfigurator; - public function __construct(RouteCollection $collection, RouteCollection $route, string $name = '', CollectionConfigurator $parentConfigurator = null, array $prefixes = null) + public function __construct(RouteCollection $collection, RouteCollection $route, string $name = '', ?CollectionConfigurator $parentConfigurator = null, ?array $prefixes = null) { $this->collection = $collection; $this->route = $route; diff --git a/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php index 4687bf6817f6a..620b2d586e216 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php @@ -26,7 +26,7 @@ class RoutingConfigurator private $file; private $env; - public function __construct(RouteCollection $collection, PhpFileLoader $loader, string $path, string $file, string $env = null) + public function __construct(RouteCollection $collection, PhpFileLoader $loader, string $path, string $file, ?string $env = null) { $this->collection = $collection; $this->loader = $loader; @@ -38,7 +38,7 @@ public function __construct(RouteCollection $collection, PhpFileLoader $loader, /** * @param string|string[]|null $exclude Glob patterns to exclude from the import */ - final public function import($resource, string $type = null, bool $ignoreErrors = false, $exclude = null): ImportConfigurator + final public function import($resource, ?string $type = null, bool $ignoreErrors = false, $exclude = null): ImportConfigurator { $this->loader->setCurrentDir(\dirname($this->path)); diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/LocalizedRouteTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/LocalizedRouteTrait.php index 4734a4eac041b..44fb047a9aa79 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/Traits/LocalizedRouteTrait.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/LocalizedRouteTrait.php @@ -27,7 +27,7 @@ trait LocalizedRouteTrait * * @param string|array $path the path, or the localized paths of the route */ - final protected function createLocalizedRoute(RouteCollection $collection, string $name, $path, string $namePrefix = '', array $prefixes = null): RouteCollection + final protected function createLocalizedRoute(RouteCollection $collection, string $name, $path, string $namePrefix = '', ?array $prefixes = null): RouteCollection { $paths = []; diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php index 27053bcaf546b..0b19573ec40b1 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php @@ -29,6 +29,7 @@ final protected function addPrefix(RouteCollection $routes, $prefix, bool $trail } foreach ($routes->all() as $name => $route) { if (null === $locale = $route->getDefault('_locale')) { + $priority = $routes->getPriority($name) ?? 0; $routes->remove($name); foreach ($prefix as $locale => $localePrefix) { $localizedRoute = clone $route; @@ -36,13 +37,13 @@ final protected function addPrefix(RouteCollection $routes, $prefix, bool $trail $localizedRoute->setRequirement('_locale', preg_quote($locale)); $localizedRoute->setDefault('_canonical_route', $name); $localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath())); - $routes->add($name.'.'.$locale, $localizedRoute); + $routes->add($name.'.'.$locale, $localizedRoute, $priority); } } elseif (!isset($prefix[$locale])) { throw new \InvalidArgumentException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale)); } else { $route->setPath($prefix[$locale].(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath())); - $routes->add($name, $route); + $routes->add($name, $route, $routes->getPriority($name) ?? 0); } } diff --git a/src/Symfony/Component/Routing/Loader/ContainerLoader.php b/src/Symfony/Component/Routing/Loader/ContainerLoader.php index d8730aec61479..a03d465247d97 100644 --- a/src/Symfony/Component/Routing/Loader/ContainerLoader.php +++ b/src/Symfony/Component/Routing/Loader/ContainerLoader.php @@ -22,7 +22,7 @@ class ContainerLoader extends ObjectLoader { private $container; - public function __construct(ContainerInterface $container, string $env = null) + public function __construct(ContainerInterface $container, ?string $env = null) { $this->container = $container; parent::__construct($env); @@ -31,7 +31,7 @@ public function __construct(ContainerInterface $container, string $env = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return 'service' === $type && \is_string($resource); } diff --git a/src/Symfony/Component/Routing/Loader/DirectoryLoader.php b/src/Symfony/Component/Routing/Loader/DirectoryLoader.php index c0f3491774757..24cf185d67eca 100644 --- a/src/Symfony/Component/Routing/Loader/DirectoryLoader.php +++ b/src/Symfony/Component/Routing/Loader/DirectoryLoader.php @@ -20,7 +20,7 @@ class DirectoryLoader extends FileLoader /** * {@inheritdoc} */ - public function load($file, string $type = null) + public function load($file, ?string $type = null) { $path = $this->locator->locate($file); @@ -49,7 +49,7 @@ public function load($file, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { // only when type is forced to directory, not to conflict with AnnotationLoader diff --git a/src/Symfony/Component/Routing/Loader/GlobFileLoader.php b/src/Symfony/Component/Routing/Loader/GlobFileLoader.php index 780fb15dc7795..9c2f4ed4fafa2 100644 --- a/src/Symfony/Component/Routing/Loader/GlobFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/GlobFileLoader.php @@ -24,7 +24,7 @@ class GlobFileLoader extends FileLoader /** * {@inheritdoc} */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { $collection = new RouteCollection(); @@ -40,7 +40,7 @@ public function load($resource, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return 'glob' === $type; } diff --git a/src/Symfony/Component/Routing/Loader/ObjectLoader.php b/src/Symfony/Component/Routing/Loader/ObjectLoader.php index 062453908c948..d212f8e8baee7 100644 --- a/src/Symfony/Component/Routing/Loader/ObjectLoader.php +++ b/src/Symfony/Component/Routing/Loader/ObjectLoader.php @@ -40,7 +40,7 @@ abstract protected function getObject(string $id); * * @return RouteCollection */ - public function load($resource, string $type = null) + public function load($resource, ?string $type = null) { if (!preg_match('/^[^\:]+(?:::(?:[^\:]+))?$/', $resource)) { throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the %s route loader: use the format "object_id::method" or "object_id" if your object class has an "__invoke" method.', $resource, \is_string($type) ? '"'.$type.'"' : 'object')); diff --git a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php index 39ac812734be4..3f1cf9cd13252 100644 --- a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php @@ -35,7 +35,7 @@ class PhpFileLoader extends FileLoader * * @return RouteCollection */ - public function load($file, string $type = null) + public function load($file, ?string $type = null) { $path = $this->locator->locate($file); $this->setCurrentDir(\dirname($path)); @@ -62,7 +62,7 @@ public function load($file, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'php' === $type); } diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php index 220153364f17b..85bb0ee8c99aa 100644 --- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php @@ -45,7 +45,7 @@ class XmlFileLoader extends FileLoader * @throws \InvalidArgumentException when the file cannot be loaded or when the XML cannot be * parsed because it does not validate against the scheme */ - public function load($file, string $type = null) + public function load($file, ?string $type = null) { $path = $this->locator->locate($file); @@ -102,7 +102,7 @@ protected function parseNode(RouteCollection $collection, \DOMElement $node, str /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return \is_string($resource) && 'xml' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'xml' === $type); } diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php index ae98a314e8305..1087817bb03ca 100644 --- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php @@ -48,7 +48,7 @@ class YamlFileLoader extends FileLoader * * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid */ - public function load($file, string $type = null) + public function load($file, ?string $type = null) { $path = $this->locator->locate($file); @@ -117,7 +117,7 @@ public function load($file, string $type = null) /** * {@inheritdoc} */ - public function supports($resource, string $type = null) + public function supports($resource, ?string $type = null) { return \is_string($resource) && \in_array(pathinfo($resource, \PATHINFO_EXTENSION), ['yml', 'yaml'], true) && (!$type || 'yaml' === $type); } diff --git a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php index d07f420933764..a43888b3ef867 100644 --- a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php +++ b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php @@ -27,5 +27,5 @@ interface RedirectableUrlMatcherInterface * * @return array */ - public function redirect(string $path, string $route, string $scheme = null); + public function redirect(string $path, string $route, ?string $scheme = null); } diff --git a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php index 9e8c4c42df044..cddfe0254e992 100644 --- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php @@ -152,7 +152,7 @@ protected function matchCollection(string $pathinfo, RouteCollection $routes) return []; } - private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, string $name = null, Route $route = null) + private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, ?string $name = null, ?Route $route = null) { $this->traces[] = [ 'log' => $log, diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php index b1219f844b7c0..95faead6e8582 100644 --- a/src/Symfony/Component/Routing/RouteCollection.php +++ b/src/Symfony/Component/Routing/RouteCollection.php @@ -395,4 +395,9 @@ public function getAlias(string $name): ?Alias { return $this->aliases[$name] ?? null; } + + public function getPriority(string $name): ?int + { + return $this->priorities[$name] ?? null; + } } diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php index d7eed31eb8eb4..04a443972a9cf 100644 --- a/src/Symfony/Component/Routing/RouteCollectionBuilder.php +++ b/src/Symfony/Component/Routing/RouteCollectionBuilder.php @@ -43,7 +43,7 @@ class RouteCollectionBuilder private $methods; private $resources = []; - public function __construct(LoaderInterface $loader = null) + public function __construct(?LoaderInterface $loader = null) { $this->loader = $loader; } @@ -59,7 +59,7 @@ public function __construct(LoaderInterface $loader = null) * * @throws LoaderLoadException */ - public function import($resource, string $prefix = '/', string $type = null) + public function import($resource, string $prefix = '/', ?string $type = null) { /** @var RouteCollection[] $collections */ $collections = $this->load($resource, $type); @@ -92,7 +92,7 @@ public function import($resource, string $prefix = '/', string $type = null) * * @return Route */ - public function add(string $path, string $controller, string $name = null) + public function add(string $path, string $controller, ?string $name = null) { $route = new Route($path); $route->setDefault('_controller', $controller); @@ -125,7 +125,7 @@ public function mount(string $prefix, self $builder) * * @return $this */ - public function addRoute(Route $route, string $name = null) + public function addRoute(Route $route, ?string $name = null) { if (null === $name) { // used as a flag to know which routes will need a name later @@ -337,7 +337,7 @@ private function generateRouteName(Route $route): string * * @throws LoaderLoadException If no loader is found */ - private function load($resource, string $type = null): array + private function load($resource, ?string $type = null): array { if (null === $this->loader) { throw new \BadMethodCallException('Cannot import other routing resources: you must pass a LoaderInterface when constructing RouteCollectionBuilder.'); diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php index 25b9456afc5d1..48ec1018056f6 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php @@ -97,7 +97,7 @@ class Router implements RouterInterface, RequestMatcherInterface /** * @param mixed $resource The main resource to load */ - public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, string $defaultLocale = null) + public function __construct(LoaderInterface $loader, $resource, array $options = [], ?RequestContext $context = null, ?LoggerInterface $logger = null, ?string $defaultLocale = null) { $this->loader = $loader; $this->resource = $resource; diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/RouteWithPriorityController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/RouteWithPriorityController.php new file mode 100644 index 0000000000000..1625589cee49d --- /dev/null +++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/RouteWithPriorityController.php @@ -0,0 +1,22 @@ + $value) { diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php index 1130204bf6887..f58ec949986e7 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php @@ -18,7 +18,7 @@ class AnnotationClassLoaderWithAnnotationsTest extends AnnotationClassLoaderTestCase { - protected function setUp(string $env = null): void + protected function setUp(?string $env = null): void { $reader = new AnnotationReader(); $this->loader = new class($reader, $env) extends AnnotationClassLoader { diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php index 5ff377aa6b754..135701a45e378 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php @@ -19,7 +19,7 @@ */ class AnnotationClassLoaderWithAttributesTest extends AnnotationClassLoaderTestCase { - protected function setUp(string $env = null): void + protected function setUp(?string $env = null): void { $this->loader = new class(null, $env) extends AnnotationClassLoader { protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void diff --git a/src/Symfony/Component/Routing/Tests/Loader/ClosureLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ClosureLoaderTest.php index da8ad090dd4d8..85ecd8769169a 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/ClosureLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/ClosureLoaderTest.php @@ -36,7 +36,7 @@ public function testLoad() $loader = new ClosureLoader('some-env'); $route = new Route('/'); - $routes = $loader->load(function (string $env = null) use ($route) { + $routes = $loader->load(function (?string $env = null) use ($route) { $this->assertSame('some-env', $env); $routes = new RouteCollection(); diff --git a/src/Symfony/Component/Routing/Tests/Loader/ContainerLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ContainerLoaderTest.php index 6a3e4c516c6c4..e4f9923861e35 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/ContainerLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/ContainerLoaderTest.php @@ -20,7 +20,7 @@ class ContainerLoaderTest extends TestCase /** * @dataProvider supportsProvider */ - public function testSupports(bool $expected, string $type = null) + public function testSupports(bool $expected, ?string $type = null) { $this->assertSame($expected, (new ContainerLoader(new Container()))->supports('foo', $type)); } diff --git a/src/Symfony/Component/Routing/Tests/Loader/FileLocatorStub.php b/src/Symfony/Component/Routing/Tests/Loader/FileLocatorStub.php index 063c1b32fb6c2..82b48026a84d4 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/FileLocatorStub.php +++ b/src/Symfony/Component/Routing/Tests/Loader/FileLocatorStub.php @@ -15,7 +15,7 @@ class FileLocatorStub implements FileLocatorInterface { - public function locate(string $name, string $currentPath = null, bool $first = true) + public function locate(string $name, ?string $currentPath = null, bool $first = true) { if (str_starts_with($name, 'http')) { return $name; diff --git a/src/Symfony/Component/Routing/Tests/Loader/GlobFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/GlobFileLoaderTest.php index 29e659300ca88..6e95174fe27ed 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/GlobFileLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/GlobFileLoaderTest.php @@ -38,7 +38,7 @@ public function testLoadAddsTheGlobResourceToTheContainer() class GlobFileLoaderWithoutImport extends GlobFileLoader { - public function import($resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null, $exclude = null) + public function import($resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null, $exclude = null) { return new RouteCollection(); } diff --git a/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php index 498e1fab6e775..51f7045a12163 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php @@ -98,7 +98,7 @@ class TestObjectLoader extends ObjectLoader { public $loaderMap = []; - public function supports($resource, string $type = null): bool + public function supports($resource, ?string $type = null): bool { return 'service'; } @@ -114,13 +114,13 @@ class TestObjectLoaderRouteService private $collection; private $env; - public function __construct($collection, string $env = null) + public function __construct($collection, ?string $env = null) { $this->collection = $collection; $this->env = $env; } - public function loadRoutes(TestObjectLoader $loader, string $env = null) + public function loadRoutes(TestObjectLoader $loader, ?string $env = null) { if ($this->env !== $env) { throw new \InvalidArgumentException(sprintf('Expected env "%s", "%s" given.', $this->env, $env)); diff --git a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php index a81a6b2faced7..25a2b473c05fe 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php @@ -11,9 +11,12 @@ namespace Symfony\Component\Routing\Tests\Loader; +use Doctrine\Common\Annotations\AnnotationReader; use PHPUnit\Framework\TestCase; use Symfony\Component\Config\FileLocator; +use Symfony\Component\Config\Loader\LoaderResolver; use Symfony\Component\Config\Resource\FileResource; +use Symfony\Component\Routing\Loader\AnnotationClassLoader; use Symfony\Component\Routing\Loader\YamlFileLoader; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; @@ -458,4 +461,27 @@ public function testImportingAliases() $this->assertEquals($expectedRoutes('yaml'), $routes); } + + public function testPriorityWithPrefix() + { + new LoaderResolver([ + $loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/localized')), + new class(new AnnotationReader(), null) extends AnnotationClassLoader { + protected function configureRoute( + Route $route, + \ReflectionClass $class, + \ReflectionMethod $method, + object $annot + ): void { + $route->setDefault('_controller', $class->getName().'::'.$method->getName()); + } + }, + ]); + + $routes = $loader->load('localized-prefix.yml'); + + $this->assertSame(2, $routes->getPriority('important.cs')); + $this->assertSame(2, $routes->getPriority('important.en')); + $this->assertSame(1, $routes->getPriority('also_important')); + } } diff --git a/src/Symfony/Component/Routing/Tests/Matcher/CompiledRedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/CompiledRedirectableUrlMatcherTest.php index 2dcadc27e5cc3..9e94a1d0374b7 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/CompiledRedirectableUrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/CompiledRedirectableUrlMatcherTest.php @@ -19,7 +19,7 @@ class CompiledRedirectableUrlMatcherTest extends RedirectableUrlMatcherTest { - protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + protected function getUrlMatcher(RouteCollection $routes, ?RequestContext $context = null) { $dumper = new CompiledUrlMatcherDumper($routes); $compiledRoutes = $dumper->getCompiledRoutes(); @@ -33,7 +33,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex class TestCompiledRedirectableUrlMatcher extends CompiledUrlMatcher implements RedirectableUrlMatcherInterface { - public function redirect(string $path, string $route, string $scheme = null): array + public function redirect(string $path, string $route, ?string $scheme = null): array { return []; } diff --git a/src/Symfony/Component/Routing/Tests/Matcher/CompiledUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/CompiledUrlMatcherTest.php index c8cd40cc26430..fd8e694e64c1b 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/CompiledUrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/CompiledUrlMatcherTest.php @@ -18,7 +18,7 @@ class CompiledUrlMatcherTest extends UrlMatcherTest { - protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + protected function getUrlMatcher(RouteCollection $routes, ?RequestContext $context = null) { $dumper = new CompiledUrlMatcherDumper($routes); diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php index ffab6780ce156..97c067196eb03 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php @@ -503,7 +503,7 @@ public function testGenerateDumperMatcherWithObject() class TestCompiledUrlMatcher extends CompiledUrlMatcher implements RedirectableUrlMatcherInterface { - public function redirect(string $path, string $route, string $scheme = null): array + public function redirect(string $path, string $route, ?string $scheme = null): array { return []; } diff --git a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php index 1f3774b5b4e69..d1fd035d12aed 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php @@ -209,7 +209,7 @@ public function testTrailingRequirementWithDefaultA() $this->assertEquals(['_route' => 'a', 'a' => 'aaa'], $matcher->match('/fr-fr/')); } - protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + protected function getUrlMatcher(RouteCollection $routes, ?RequestContext $context = null) { return $this->getMockForAbstractClass(RedirectableUrlMatcher::class, [$routes, $context ?? new RequestContext()]); } diff --git a/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php index b33e93caa1a8d..f5a58fe9de2e4 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php @@ -119,7 +119,7 @@ public function testRoutesWithConditions() $this->assertEquals('Route matches!', $traces[0]['log']); } - protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + protected function getUrlMatcher(RouteCollection $routes, ?RequestContext $context = null) { return new TraceableUrlMatcher($routes, $context ?? new RequestContext()); } diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php index fd82e4835ffcb..974c455330981 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php @@ -941,7 +941,7 @@ public function testRestrictiveTrailingRequirementWithStaticRouteAfter() $this->assertEquals(['_route' => 'a', '_' => '/'], $matcher->match('/hello/')); } - protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) + protected function getUrlMatcher(RouteCollection $routes, ?RequestContext $context = null) { return new UrlMatcher($routes, $context ?? new RequestContext()); } diff --git a/src/Symfony/Component/Runtime/GenericRuntime.php b/src/Symfony/Component/Runtime/GenericRuntime.php index c88832f821a77..fa9364881363e 100644 --- a/src/Symfony/Component/Runtime/GenericRuntime.php +++ b/src/Symfony/Component/Runtime/GenericRuntime.php @@ -86,7 +86,7 @@ public function __construct(array $options = []) /** * {@inheritdoc} */ - public function getResolver(callable $callable, \ReflectionFunction $reflector = null): ResolverInterface + public function getResolver(callable $callable, ?\ReflectionFunction $reflector = null): ResolverInterface { if (!$callable instanceof \Closure) { $callable = \Closure::fromCallable($callable); diff --git a/src/Symfony/Component/Runtime/Runner/Symfony/ConsoleApplicationRunner.php b/src/Symfony/Component/Runtime/Runner/Symfony/ConsoleApplicationRunner.php index 430ce57989ba4..ee8a762e8e1f1 100644 --- a/src/Symfony/Component/Runtime/Runner/Symfony/ConsoleApplicationRunner.php +++ b/src/Symfony/Component/Runtime/Runner/Symfony/ConsoleApplicationRunner.php @@ -27,7 +27,7 @@ class ConsoleApplicationRunner implements RunnerInterface private $input; private $output; - public function __construct(Application $application, ?string $defaultEnv, InputInterface $input, OutputInterface $output = null) + public function __construct(Application $application, ?string $defaultEnv, InputInterface $input, ?OutputInterface $output = null) { $this->application = $application; $this->defaultEnv = $defaultEnv; diff --git a/src/Symfony/Component/Runtime/RuntimeInterface.php b/src/Symfony/Component/Runtime/RuntimeInterface.php index 757468c746317..f151757e98f21 100644 --- a/src/Symfony/Component/Runtime/RuntimeInterface.php +++ b/src/Symfony/Component/Runtime/RuntimeInterface.php @@ -23,7 +23,7 @@ interface RuntimeInterface * * The callable itself should return an object that represents the application to pass to the getRunner() method. */ - public function getResolver(callable $callable, \ReflectionFunction $reflector = null): ResolverInterface; + public function getResolver(callable $callable, ?\ReflectionFunction $reflector = null): ResolverInterface; /** * Returns a callable that knows how to run the passed object and that returns its exit status as int. diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php index 2978c16aa888b..e95b360b2955f 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php +++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php @@ -22,7 +22,7 @@ */ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterface { - public function isAuthenticated(TokenInterface $token = null): bool + public function isAuthenticated(?TokenInterface $token = null): bool { return $token && $token->getUser() // @deprecated since Symfony 5.4, TokenInterface::isAuthenticated() and AnonymousToken no longer exists in 6.0 @@ -32,7 +32,7 @@ public function isAuthenticated(TokenInterface $token = null): bool /** * {@inheritdoc} */ - public function isAnonymous(TokenInterface $token = null/* , $deprecation = true */) + public function isAnonymous(?TokenInterface $token = null/* , $deprecation = true */) { if (1 === \func_num_args() || false !== func_get_arg(1)) { trigger_deprecation('symfony/security-core', '5.4', 'The "%s()" method is deprecated, use "isAuthenticated()" or "isFullFledged()" if you want to check if the request is (fully) authenticated.', __METHOD__); @@ -44,7 +44,7 @@ public function isAnonymous(TokenInterface $token = null/* , $deprecation = true /** * {@inheritdoc} */ - public function isRememberMe(TokenInterface $token = null) + public function isRememberMe(?TokenInterface $token = null) { return $token && $token instanceof RememberMeToken; } @@ -52,7 +52,7 @@ public function isRememberMe(TokenInterface $token = null) /** * {@inheritdoc} */ - public function isFullFledged(TokenInterface $token = null) + public function isFullFledged(?TokenInterface $token = null) { return $token && !$this->isAnonymous($token, false) && !$this->isRememberMe($token); } diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php index 1122ffef629af..ccacbe9df8214 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php @@ -32,7 +32,7 @@ interface AuthenticationTrustResolverInterface * * @deprecated since Symfony 5.4, use !isAuthenticated() instead */ - public function isAnonymous(TokenInterface $token = null); + public function isAnonymous(?TokenInterface $token = null); /** * Resolves whether the passed token implementation is authenticated @@ -40,12 +40,12 @@ public function isAnonymous(TokenInterface $token = null); * * @return bool */ - public function isRememberMe(TokenInterface $token = null); + public function isRememberMe(?TokenInterface $token = null); /** * Resolves whether the passed token implementation is fully authenticated. * * @return bool */ - public function isFullFledged(TokenInterface $token = null); + public function isFullFledged(?TokenInterface $token = null); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php index b479324498854..9050e1cf0f524 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php @@ -43,7 +43,7 @@ public function getToken() /** * {@inheritdoc} */ - public function setToken(TokenInterface $token = null) + public function setToken(?TokenInterface $token = null) { if ($token) { // ensure any initializer is called diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php index 1077a9bb54dbe..1b40c2d0ac1fe 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php @@ -32,5 +32,5 @@ public function getToken(); * * @param TokenInterface|null $token A TokenInterface token, or null if no further authentication information should be stored */ - public function setToken(TokenInterface $token = null); + public function setToken(?TokenInterface $token = null); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php index 27398059dd975..698c3be2c3865 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php @@ -50,7 +50,7 @@ public function getToken(): ?TokenInterface /** * {@inheritdoc} */ - public function setToken(TokenInterface $token = null): void + public function setToken(?TokenInterface $token = null): void { $this->storage->setToken($token); diff --git a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php index 6d9ad0acdb796..d92df677765e5 100644 --- a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php +++ b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php @@ -32,7 +32,7 @@ class ExpressionLanguage extends BaseExpressionLanguage /** * {@inheritdoc} */ - public function __construct(CacheItemPoolInterface $cache = null, array $providers = []) + public function __construct(?CacheItemPoolInterface $cache = null, array $providers = []) { // prepend the default provider to let users override it easily array_unshift($providers, new ExpressionLanguageProvider()); diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php index 16280725cd7a0..c22def8bf6948 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php @@ -31,7 +31,7 @@ class ExpressionVoter implements CacheableVoterInterface private $authChecker; private $roleHierarchy; - public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, RoleHierarchyInterface $roleHierarchy = null) + public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, ?RoleHierarchyInterface $roleHierarchy = null) { $this->expressionLanguage = $expressionLanguage; $this->trustResolver = $trustResolver; diff --git a/src/Symfony/Component/Security/Core/Encoder/NativePasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/NativePasswordEncoder.php index bc135bb17817d..eef5e62b127cf 100644 --- a/src/Symfony/Component/Security/Core/Encoder/NativePasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/NativePasswordEncoder.php @@ -31,7 +31,7 @@ final class NativePasswordEncoder implements PasswordEncoderInterface, SelfSalti /** * @param string|null $algo An algorithm supported by password_hash() or null to use the stronger available algorithm */ - public function __construct(int $opsLimit = null, int $memLimit = null, int $cost = null, string $algo = null) + public function __construct(?int $opsLimit = null, ?int $memLimit = null, ?int $cost = null, ?string $algo = null) { $this->hasher = new NativePasswordHasher($opsLimit, $memLimit, $cost, $algo); } diff --git a/src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php b/src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php index a8546a4c4fd97..4a4b9c0b138bb 100644 --- a/src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php +++ b/src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php @@ -29,12 +29,12 @@ public function __construct(PasswordEncoderInterface $passwordEncoder) $this->passwordEncoder = $passwordEncoder; } - public function hash(string $plainPassword, string $salt = null): string + public function hash(string $plainPassword, ?string $salt = null): string { return $this->passwordEncoder->encodePassword($plainPassword, $salt); } - public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool + public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool { return $this->passwordEncoder->isPasswordValid($hashedPassword, $plainPassword, $salt); } diff --git a/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php index d2d71f482b68e..d63f54509d968 100644 --- a/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php @@ -28,7 +28,7 @@ final class SodiumPasswordEncoder implements PasswordEncoderInterface, SelfSalti { use LegacyEncoderTrait; - public function __construct(int $opsLimit = null, int $memLimit = null) + public function __construct(?int $opsLimit = null, ?int $memLimit = null) { $this->hasher = new SodiumPasswordHasher($opsLimit, $memLimit); } diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php index 0e59dc4077a91..f07cbfc0477ac 100644 --- a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php +++ b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php @@ -21,7 +21,7 @@ class AccessDeniedException extends RuntimeException private $attributes = []; private $subject; - public function __construct(string $message = 'Access Denied.', \Throwable $previous = null) + public function __construct(string $message = 'Access Denied.', ?\Throwable $previous = null) { parent::__construct($message, 403, $previous); } diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php index ad03f0d324f3b..6e038f2e5ef0f 100644 --- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php +++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php @@ -26,7 +26,7 @@ class AuthenticationException extends RuntimeException private $token; - public function __construct(string $message = '', int $code = 0, \Throwable $previous = null) + public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null) { unset($this->serialized); parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php index 3594b9bd5efd3..f3b752b726744 100644 --- a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php +++ b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php @@ -27,7 +27,7 @@ class CustomUserMessageAccountStatusException extends AccountStatusException private $messageData = []; - public function __construct(string $message = '', array $messageData = [], int $code = 0, \Throwable $previous = null) + public function __construct(string $message = '', array $messageData = [], int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php index 799d7e0caf37c..193b54614e08f 100644 --- a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php +++ b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php @@ -26,7 +26,7 @@ class CustomUserMessageAuthenticationException extends AuthenticationException private $messageData = []; - public function __construct(string $message = '', array $messageData = [], int $code = 0, \Throwable $previous = null) + public function __construct(string $message = '', array $messageData = [], int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); diff --git a/src/Symfony/Component/Security/Core/Exception/LogoutException.php b/src/Symfony/Component/Security/Core/Exception/LogoutException.php index 7058c6244b272..20efdd267de36 100644 --- a/src/Symfony/Component/Security/Core/Exception/LogoutException.php +++ b/src/Symfony/Component/Security/Core/Exception/LogoutException.php @@ -18,7 +18,7 @@ */ class LogoutException extends RuntimeException { - public function __construct(string $message = 'Logout Exception', \Throwable $previous = null) + public function __construct(string $message = 'Logout Exception', ?\Throwable $previous = null) { parent::__construct($message, 403, $previous); } diff --git a/src/Symfony/Component/Security/Core/Exception/TooManyLoginAttemptsAuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/TooManyLoginAttemptsAuthenticationException.php index 0df80e5ee2d19..b6981ecd3c242 100644 --- a/src/Symfony/Component/Security/Core/Exception/TooManyLoginAttemptsAuthenticationException.php +++ b/src/Symfony/Component/Security/Core/Exception/TooManyLoginAttemptsAuthenticationException.php @@ -21,7 +21,7 @@ class TooManyLoginAttemptsAuthenticationException extends AuthenticationExceptio { private $threshold; - public function __construct(int $threshold = null) + public function __construct(?int $threshold = null) { $this->threshold = $threshold; } diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.af.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.af.xlf index 4fc8b1426e381..014111dff1262 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.af.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.af.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -70,6 +70,10 @@ Invalid or expired login link. Ongeldige of vervalde aanmeldskakel. + + Too many failed login attempts, please try again in %minutes% minute. + Te veel mislukte aanmeldpogings, probeer asseblief weer oor %minutes% minuut. + diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf index 11b20016016e3..4871bc6676620 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. عدد كبير جدا من محاولات الدخول الفاشلة، يرجى اعادة المحاولة بعد %minutes% دقيقة. - - Too many failed login attempts, please try again in %minutes% minutes. - عدد كبير جدا من محاولات الدخول الفاشلة، يرجى اعادة المحاولة بعد %minutes% دقيقة. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf index ca4401adad3e5..29d26c4fbb784 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Həddindən artıq uğursuz giriş cəhdi, lütfən %minutes% dəqiqə ərzində yenidən yoxlayın. - - Too many failed login attempts, please try again in %minutes% minutes. - Həddindən artıq uğursuz giriş cəhdi, lütfən %minutes% dəqiqə ərzində yenidən yoxlayın. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf index 0647f45279a43..f9dd10d472fcf 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Занадта шмат няўдалых спроб уваходу ў сістэму, паспрабуйце спробу праз %minutes% хвіліну. - - Too many failed login attempts, please try again in %minutes% minutes. - Занадта шмат няўдалых спроб уваходу ў сістэму, паспрабуйце спробу праз %minutes% хвілін. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf index 1d45b28c5045e..8c04364db7166 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.bg.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -71,13 +71,9 @@ Невалиден или изтекъл линк за вход. - Too many failed login attempts, please try again in %minutes% minute. - Твърде много неуспешни опити за вход, моля опитайте отново след %minutes% минута. - - - Too many failed login attempts, please try again in %minutes% minutes. - Твърде много неуспешни опити за вход, моля опитайте отново след %minutes% минути. - + Too many failed login attempts, please try again in %minutes% minute. + Твърде много неуспешни опити за вход, моля опитайте отново след %minutes% минута. + diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.bs.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.bs.xlf index 15fe823d8f911..d3fde1a5d2f01 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.bs.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.bs.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Previše neuspjelih pokušaja prijave, pokušajte ponovo za %minutes% minuta. - - Too many failed login attempts, please try again in %minutes% minutes. - Previše neuspjelih pokušaja prijave, pokušajte ponovo za %minutes% minuta. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf index 212ca70c922e3..1450b8d0d4581 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ca.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Massa intents d'inici de sessió fallits, torneu-ho a provar en %minutes% minut. - - Too many failed login attempts, please try again in %minutes% minutes. - Massa intents d'inici de sessió fallits, torneu-ho a provar en %minutes% minuts. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf index 13ace0de12daa..2572e628a8a68 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minutu. - - Too many failed login attempts, please try again in %minutes% minutes. - Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minut. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.cy.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.cy.xlf new file mode 100644 index 0000000000000..b701c291c5049 --- /dev/null +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.cy.xlf @@ -0,0 +1,79 @@ + + + + + + An authentication exception occurred. + Digwyddodd eithriad dilysu. + + + Authentication credentials could not be found. + Ni ellid dod o hyd i ddogfennau dilysu. + + + Authentication request could not be processed due to a system problem. + Ni ellid prosesu cais dilysu oherwydd problem gyda'r system. + + + Invalid credentials. + Dogfennau annilys. + + + Cookie has already been used by someone else. + Mae rhywun arall eisoes wedi defnyddio'r cwcis. + + + Not privileged to request the resource. + Heb y fraint i ofyn am yr adnodd. + + + Invalid CSRF token. + Tocyn CSRF annilys. + + + No authentication provider found to support the authentication token. + Heb ddod o hyd i ddarparwr dilysu i gefnogi'r tocyn dilysu. + + + No session available, it either timed out or cookies are not enabled. + Dim sesiwn ar gael, naill ai mae wedi dod i ben neu nid yw cwcis wedi'u galluogi. + + + No token could be found. + Heb ddod o hyd i docyn. + + + Username could not be found. + Heb ddod o hyd i enw defnyddiwr. + + + Account has expired. + Mae'r cyfrif wedi dod i ben. + + + Credentials have expired. + Mae'r dogfennau wedi dod i ben. + + + Account is disabled. + Mae'r cyfrif wedi'i analluogi. + + + Account is locked. + Mae'r cyfrif wedi'i gloi. + + + Too many failed login attempts, please try again later. + Gormod o ymdrechion mewngofnodi wedi methu, ceisiwch eto'n hwyrach. + + + Invalid or expired login link. + Dolen mewngofnodi annilys neu wedi dod i ben. + + + Too many failed login attempts, please try again in %minutes% minute. + Gormod o ymdrechion mewngofnodi wedi methu, ceisiwch eto ymhen %minutes% munud. + + + + diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf index 9b8ca4c68b2a3..bfa65ee21f2d1 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. For mange fejlede login forsøg, prøv igen om %minutes% minut. - - Too many failed login attempts, please try again in %minutes% minutes. - For mange fejlede login forsøg, prøv igen om %minutes% minutter. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf index dc7a875e31fb0..76cb737ae25f3 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in einer Minute noch einmal. - - Too many failed login attempts, please try again in %minutes% minutes. - Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in %minutes% Minuten noch einmal. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf index 1cf4fb23bdaf0..bebd2a486a3e7 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Πολλαπλές αποτυχημένες απόπειρες σύνδεσης, παρακαλούμε ξαναδοκιμάστε σε %minutes% λεπτό. - - Too many failed login attempts, please try again in %minutes% minutes. - Πολλαπλές αποτυχημένες απόπειρες σύνδεσης, παρακαλούμε ξαναδοκιμάστε σε %minutes% λεπτά. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf index e7bc7c7082f6f..589ca1babed5a 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.en.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Too many failed login attempts, please try again in %minutes% minute. - - Too many failed login attempts, please try again in %minutes% minutes. - Too many failed login attempts, please try again in %minutes% minutes. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf index 2aec10587a712..971b97e69829a 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minuto. - - Too many failed login attempts, please try again in %minutes% minutes. - Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minutos. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.et.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.et.xlf index cc2b16ae853dc..e09c718d9e302 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.et.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.et.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Liiga palju ebaõnnestunud autentimise katseid, palun proovi uuesti %minutes% minuti pärast. - - Too many failed login attempts, please try again in %minutes% minutes. - Liiga palju ebaõnnestunud autentimise katseid, palun proovi uuesti %minutes% minuti pärast. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf index cfcdd1b02c44d..7b294c2249969 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Saioa hasteko huts gehiegi egin dira, saiatu berriro minutu %minutes% geroago. - - Too many failed login attempts, please try again in %minutes% minutes. - Saioa hasteko huts gehiegi egin dira, saiatu berriro %minutes% minututan. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf index 1127901bdfe5e..d5ab89f6a264d 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.fa.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. تلاش‌های ناموفق زیادی برای ورود صورت گرفته است، لطفاً %minutes% دقیقه دیگر دوباره امتحان کنید. - - Too many failed login attempts, please try again in %minutes% minutes. - تلاش‌های ناموفق زیادی برای ورود صورت گرفته است، لطفاً %minutes% دقیقه دیگر دوباره امتحان کنید. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.fi.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.fi.xlf index d0e94545e7ca9..c50d484633250 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.fi.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.fi.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Liian monta epäonnistunutta kirjautumisyritystä, yritä uudelleen %minutes% minuutin kuluttua. - - Too many failed login attempts, please try again in %minutes% minutes. - Liian monta epäonnistunutta kirjautumisyritystä, yritä uudelleen %minutes% minuutin kuluttua. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf index 38fec553b016d..4594e8eaac409 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.fr.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Plusieurs tentatives de connexion ont échoué, veuillez réessayer dans %minutes% minute. - - Too many failed login attempts, please try again in %minutes% minutes. - Plusieurs tentatives de connexion ont échoué, veuillez réessayer dans %minutes% minutes. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf index f552a6864665b..5ec7187aaf43a 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.gl.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Demasiados intentos de inicio de sesión errados, por favor, ténteo de novo en %minutes% minuto. - - Too many failed login attempts, please try again in %minutes% minutes. - Demasiados intentos de inicio de sesión errados, por favor, ténteo de novo en %minutes% minutos. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf index facba0ff8034d..f1294d0c9e272 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. יותר מדי ניסיונות כניסה כושלים, אנא נסה שוב בוד %minutes% דקה. - - Too many failed login attempts, please try again in %minutes% minutes. - יותר מדי ניסיונות כניסה כושלים, אנא נסה שוב בוד %minutes% דקות. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf index d46be51682e36..b61f133ad9ad0 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Previše neuspjelih pokušaja prijave, molim pokušajte ponovo za %minutes% minutu. - - Too many failed login attempts, please try again in %minutes% minutes. - Previše neuspjelih pokušaja prijave, molim pokušajte ponovo za %minutes% minutu.|Previše neuspjelih pokušaja prijave, molim pokušajte ponovo za %minutes% minute.|Previše neuspjelih pokušaja prijave, molim pokušajte ponovo za %minutes% minuta. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf index 4587e8a96aadc..6262acf50915b 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Túl sok sikertelen bejelentkezési kísérlet, kérjük próbálja újra %minutes% perc múlva. - - Too many failed login attempts, please try again in %minutes% minutes. - Túl sok sikertelen bejelentkezési kísérlet, kérjük próbálja újra %minutes% perc múlva. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf index e7e32020e9adb..e58ce08b739b4 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Մուտքի չափազանց շատ անհաջող փորձեր: Խնդրում ենք կրկին փորձել %minutes րոպե: - - Too many failed login attempts, please try again in %minutes% minutes. - Մուտքի չափազանց շատ անհաջող փորձեր: Խնդրում ենք կրկին փորձել %minutes րոպե: - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf index 119e2d0cd70fb..477e91bc16cf2 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.id.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Terlalu banyak percobaan login yang salah, silahkan coba lagi dalam %minutes% menit. - - Too many failed login attempts, please try again in %minutes% minutes. - Terlalu banyak percobaan login yang salah, silahkan coba lagi dalam %minutes% menit. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf index d9d879944f7ef..4100dbd11b1f0 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Troppi tentativi di login falliti, riprova tra %minutes% minuto. - - Too many failed login attempts, please try again in %minutes% minutes. - Troppi tentativi di login falliti, riprova tra %minutes% minuti. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf index d28315293f14d..f344b570129b7 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. ログイン試行回数が多すぎます。%minutes%分後に再度お試しください。 - - Too many failed login attempts, please try again in %minutes% minutes. - ログイン試行回数が多すぎます。%minutes%分後に再度お試しください。 - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf index 0bbeac0507810..ae0a4fd760540 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Zu vill fehlgeschloen Loginversich, w. e. g. probéiert nach am %minutes% Minutt. - - Too many failed login attempts, please try again in %minutes% minutes. - Zu vill fehlgeschloen Loginversich, w. e. g. probéiert nach an %minutes% Minutten. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf index b4daa08b4967b..19e553a04bfb5 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.lt.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Per daug nepavykusių prisijungimo bandymų, pabandykite dar kartą po %minutes% minutės. - - Too many failed login attempts, please try again in %minutes% minutes. - Per daug nepavykusių prisijungimo bandymų, pabandykite dar kartą po %minutes% minutės.|Per daug nepavykusių prisijungimo bandymų, pabandykite dar kartą po %minutes% minučių.|Per daug nepavykusių prisijungimo bandymų, pabandykite dar kartą po %minutes% minučių. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf index 0833b026f3961..45775be0335ee 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.lv.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Pārāk daudz nesekmīgu autentifikācijas mēģinājumu, lūdzu mēģiniet vēlreiz pēc %minutes% minūtes. - - Too many failed login attempts, please try again in %minutes% minutes. - Pārāk daudz nesekmīgu autentifikācijas mēģinājumu, lūdzu mēģiniet vēlreiz pēc %minutes% minūtēm. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.mk.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.mk.xlf index 051affcf8b241..e82e31cefab7c 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.mk.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.mk.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Премногу неуспешни обиди за најавување, обидете се повторно за %minutes% минута. - - Too many failed login attempts, please try again in %minutes% minutes. - Премногу неуспешни обиди за најавување, обидете се повторно за %minutes% минути. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.mn.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.mn.xlf index 7310e660a4479..3a14608923612 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.mn.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.mn.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -35,7 +35,7 @@ Нэвтрэх токенг дэмжих нэвтрэх эрхийн хангагч олдсонгүй. - No available, it either timed out or cookies are not enabled. + No session available, it either timed out or cookies are not enabled. Хэрэглэгчийн session олдсонгүй, хугацаа нь дууссан эсвэл күүки идэвхижүүлээгүй байна. @@ -70,6 +70,10 @@ Invalid or expired login link. Буруу эсвэл хугацаа нь дууссан нэвтрэх зам. + + Too many failed login attempts, please try again in %minutes% minute. + Нэвтрэх оролдлого ихээр амжилтгүй болсон, %minutes% минутын дараа дахин оролдоно уу. + diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.my.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.my.xlf index df593f0e0b82b..066dae7673d92 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.my.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.my.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -72,10 +72,6 @@ Too many failed login attempts, please try again in %minutes% minute. - Too many failed login attempts, please try again in %minutes% minute. - - - Too many failed login attempts, please try again in %minutes% minutes. Login ၀င်ရန်ကြိုးစားမှုများလွန်းပါသည်၊ ကျေးဇူးပြု၍ နောက် %minutes% မှထပ်မံကြိုးစားပါ။ diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.nb.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.nb.xlf index 7e75773798bf3..549bcbf65d488 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.nb.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.nb.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutt. - - Too many failed login attempts, please try again in %minutes% minutes. - For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutter. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf index b07c785799514..418e1409d1458 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Te veel onjuiste inlogpogingen, probeer het opnieuw over %minutes% minuut. - - Too many failed login attempts, please try again in %minutes% minutes. - Te veel onjuiste inlogpogingen, probeer het opnieuw over %minutes% minuten. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf index 1c8e065d71d70..db49db3992bfe 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -70,14 +70,10 @@ Invalid or expired login link. Innloggingslenka er ugyldig eller utgjengen. - + Too many failed login attempts, please try again in %minutes% minute. For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutt. - - Too many failed login attempts, please try again in %minutes% minutes. - For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutter. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf index 7e75773798bf3..549bcbf65d488 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutt. - - Too many failed login attempts, please try again in %minutes% minutes. - For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutter. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf index 430f9f27805c2..4833f59db16af 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Zbyt wiele nieudanych prób logowania, spróbuj ponownie po upływie %minutes% minut. - - Too many failed login attempts, please try again in %minutes% minutes. - Zbyt wiele nieudanych prób logowania, spróbuj ponownie po upływie %minutes% minut. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf index e4034ae4a0339..20fd523d3516d 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Demasiadas tentativas de login, tente novamente num minuto. - - Too many failed login attempts, please try again in %minutes% minutes. - Demasiadas tentativas de login, tente novamente em %minutes% minutos. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf index 438ae862b10db..f15b3a8909720 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Muitas tentativas de login inválidas, por favor, tente novamente em um minuto. - - Too many failed login attempts, please try again in %minutes% minutes. - Muitas tentativas de login inválidas, por favor, tente novamente em %minutes% minutos. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf index 9324a8649d1a1..07bb782e68312 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -70,14 +70,10 @@ Invalid or expired login link. Link de autentificare invalid sau expirat. - + Too many failed login attempts, please try again in %minutes% minute. Prea multe încercări nereușite, încearcă din nou în %minutes% minut. - - Too many failed login attempts, please try again in %minutes% minutes. - Prea multe încercări nereușite, încearcă din nou în %minutes% minute. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf index 4a3124f262126..05003efcc2b77 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Слишком много неудачных попыток входа в систему, повторите попытку через %minutes% минуту. - - Too many failed login attempts, please try again in %minutes% minutes. - Слишком много неудачных попыток входа в систему, повторите попытку через %minutes% мин. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf index 8e06befafdf33..5d67a2454d049 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sk.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Príliš veľa neúspešných pokusov o prihlásenie. Skúste to znova o %minutes% minútu. - - Too many failed login attempts, please try again in %minutes% minutes. - Príliš veľa neúspešných pokusov o prihlásenie. Skúste to znova o %minutes% minút. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf index 6466e58d5aada..218864b42680f 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sl.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Preveč neuspelih poskusov prijave, poskusite znova čez %minutes% minuto. - - Too many failed login attempts, please try again in %minutes% minutes. - Preveč neuspelih poskusov prijave, poskusite znova čez %minutes% minut. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sq.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sq.xlf index 03e13708af4b9..905ac7b6ec58b 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.sq.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sq.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -70,6 +70,10 @@ Invalid or expired login link. Link hyrje i pavlefshëm ose i skaduar. + + Too many failed login attempts, please try again in %minutes% minute. + Shumë përpjekje të dështuara për identifikim; provo sërish pas %minutes% minutë. + diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf index 97549bd71834f..0a18dff55678a 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Превише неуспешних покушаја пријављивања, молим покушајте поново за %minutes% минут. - - Too many failed login attempts, please try again in %minutes% minutes. - Превише неуспешних покушаја пријављивања, молим покушајте поново за %minutes% минута. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf index f3de5de5f02b8..79403cb97d1d5 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Previše neuspešnih pokušaja prijavljivanja, molim pokušajte ponovo za %minutes% minut. - - Too many failed login attempts, please try again in %minutes% minutes. - Previše neuspešnih pokušaja prijavljivanja, molim pokušajte ponovo za %minutes% minuta. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf index 6d7b248499bb3..7604431130b9a 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.sv.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. För många misslyckade inloggningsförsök, försök igen om %minutes% minut. - - Too many failed login attempts, please try again in %minutes% minutes. - För många misslyckade inloggningsförsök, försök igen om %minutes% minuter. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf index 658fcbf99eae4..4e066754de340 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.th.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. มีความพยายามเข้าสู่ระบบล้มเหลวมากเกินไป โปรดลองอีกครั้งใน %minutes% นาที - - Too many failed login attempts, please try again in %minutes% minutes. - มีความพยายามเข้าสู่ระบบล้มเหลวมากเกินไป โปรดลองอีกครั้งใน %minutes% นาที - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf index eed0c7edf1875..4c8d455eeeb68 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Napakaraming nabigong mga pagtatangka sa pag-login, pakisubukan ulit sa% minuto% minuto. - - Too many failed login attempts, please try again in %minutes% minute. - Napakaraming nabigong mga pagtatangka sa pag-login, pakisubukan ulit sa% minuto% minuto. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf index 3466f8fe4ac8b..da131b5faa332 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Çok fazla başarısız giriş denemesi, lütfen %minutes% dakika sonra tekrar deneyin. - - Too many failed login attempts, please try again in %minutes% minutes. - Çok fazla başarısız giriş denemesi, lütfen %minutes% dakika sonra tekrar deneyin. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.uk.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.uk.xlf index 6d5cff426d568..48bb6960373ae 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.uk.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.uk.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Забагато невдалих спроб входу. Будь ласка, спробуйте знову через %minutes% хвилину. - - Too many failed login attempts, please try again in %minutes% minutes. - Забагато невдалих спроб входу. Будь ласка, спробуйте знову через %minutes% хв. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ur.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ur.xlf index 8fd59b691b8ee..070c9bbfd48a1 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.ur.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ur.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. منٹ باد %minutes% لاگ ان کی بہت زیادہ ناکام کوششیں ہو چکی ہیں، براۓ کرم دوبارھ کوشيش کريں - - Too many failed login attempts, please try again in %minutes% minutes. - منٹ باد %minutes% لاگ ان کی بہت زیادہ ناکام کوششیں ہو چکی ہیں، براۓ کرم دوبارھ کوشيش کريں - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.uz.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.uz.xlf index 2b66d1be424ba..574f46c36c663 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.uz.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.uz.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Kirish uchun muvaffaqiyatsiz urinishlar, %minutes% daqiqadan so'ng qayta urinib ko'ring. - - Too many failed login attempts, please try again in %minutes% minutes. - Kirish uchun muvaffaqiyatsiz urinishlar, %minutes% daqiqadan so'ng qayta urinib ko'ring. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf index 5ad00a69b9a5c..cca3cfd7dd834 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. Quá nhiều lần thử đăng nhập không thành công, vui lòng thử lại sau %minutes% phút. - - Too many failed login attempts, please try again in %minutes% minutes. - Quá nhiều lần thử đăng nhập không thành công, vui lòng thử lại sau %minutes% phút. - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf index 6c4934ed86964..1d218426793da 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.zh_CN.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. 登入失败的次数过多，请在%minutes%分钟后再试。 - - Too many failed login attempts, please try again in %minutes% minutes. - 登入失败的次数过多，请在%minutes%分钟后再试。 - diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.zh_TW.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.zh_TW.xlf index fd305879388c3..43372798665d2 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.zh_TW.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.zh_TW.xlf @@ -1,6 +1,6 @@ - - - + + + An authentication exception occurred. @@ -74,10 +74,6 @@ Too many failed login attempts, please try again in %minutes% minute. 登錄失敗的次數過多，請在%minutes%分鐘後再試。 - - Too many failed login attempts, please try again in %minutes% minutes. - 登錄失敗的次數過多，請在%minutes%分鐘後再試。 - diff --git a/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php b/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php index f604dd208bb17..da4bfdbd7b560 100644 --- a/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php +++ b/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php @@ -35,7 +35,7 @@ class SignatureHasher * @param ExpiredSignatureStorage|null $expiredSignaturesStorage If provided, secures a sequence of hashes that are expired * @param int|null $maxUses Used together with $expiredSignatureStorage to allow a maximum usage of a hash */ - public function __construct(PropertyAccessorInterface $propertyAccessor, array $signatureProperties, string $secret, ExpiredSignatureStorage $expiredSignaturesStorage = null, int $maxUses = null) + public function __construct(PropertyAccessorInterface $propertyAccessor, array $signatureProperties, string $secret, ?ExpiredSignatureStorage $expiredSignaturesStorage = null, ?int $maxUses = null) { $this->propertyAccessor = $propertyAccessor; $this->signatureProperties = $signatureProperties; diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php index 1c767e1d886f2..88eb4d10b30a4 100644 --- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php +++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php @@ -359,7 +359,7 @@ class ConcreteToken extends AbstractToken { private $credentials = 'credentials_value'; - public function __construct(array $roles = [], UserInterface $user = null) + public function __construct(array $roles = [], ?UserInterface $user = null) { parent::__construct($roles); diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php index f9de213906159..0bd47065138cf 100644 --- a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php +++ b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php @@ -23,7 +23,7 @@ class UserPassword extends Constraint public $message = 'This value should be the user\'s current password.'; public $service = 'security.validator.user_password'; - public function __construct(array $options = null, string $message = null, string $service = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?string $service = null, ?array $groups = null, $payload = null) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index 2270a04c7416b..3a700ac936a71 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -31,7 +31,7 @@ "symfony/expression-language": "^4.4|^5.0|^6.0", "symfony/http-foundation": "^5.3|^6.0", "symfony/ldap": "^4.4|^5.0|^6.0", - "symfony/translation": "^4.4|^5.0|^6.0", + "symfony/translation": "^5.4.35|~6.3.12|^6.4.3", "symfony/validator": "^5.2|^6.0", "psr/log": "^1|^2|^3" }, @@ -40,6 +40,7 @@ "symfony/http-foundation": "<5.3", "symfony/security-guard": "<4.4", "symfony/ldap": "<4.4", + "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3", "symfony/validator": "<5.2" }, "suggest": { diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php index 14c05592d3241..642b9703b4126 100644 --- a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php +++ b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php @@ -37,7 +37,7 @@ class CsrfTokenManager implements CsrfTokenManagerInterface * * RequestStack: generates a namespace using the current main request * * callable: uses the result of this callable (must return a string) */ - public function __construct(TokenGeneratorInterface $generator = null, TokenStorageInterface $storage = null, $namespace = null) + public function __construct(?TokenGeneratorInterface $generator = null, ?TokenStorageInterface $storage = null, $namespace = null) { $this->generator = $generator ?? new UriSafeTokenGenerator(); $this->storage = $storage ?? new NativeSessionTokenStorage(); diff --git a/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php b/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php index f31d7a31faab5..cbd037886e4dd 100644 --- a/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php @@ -61,7 +61,7 @@ public function supportsRememberMe() * * @return Response */ - public function start(Request $request, AuthenticationException $authException = null) + public function start(Request $request, ?AuthenticationException $authException = null) { $url = $this->getLoginUrl(); diff --git a/src/Symfony/Component/Security/Guard/Authenticator/GuardBridgeAuthenticator.php b/src/Symfony/Component/Security/Guard/Authenticator/GuardBridgeAuthenticator.php index 5d447b49d5eaf..6310e6eaa1686 100644 --- a/src/Symfony/Component/Security/Guard/Authenticator/GuardBridgeAuthenticator.php +++ b/src/Symfony/Component/Security/Guard/Authenticator/GuardBridgeAuthenticator.php @@ -53,7 +53,7 @@ public function __construct(GuardAuthenticatorInterface $guard, UserProviderInte $this->userProvider = $userProvider; } - public function start(Request $request, AuthenticationException $authException = null) + public function start(Request $request, ?AuthenticationException $authException = null) { return $this->guard->start($request, $authException); } diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php index a9765a603e2d0..cf6cb80e569e2 100644 --- a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php +++ b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php @@ -56,7 +56,7 @@ class GuardAuthenticationListener extends AbstractListener * @param string $providerKey The provider (i.e. firewall) key * @param iterable $guardAuthenticators The authenticators, with keys that match what's passed to GuardAuthenticationProvider */ - public function __construct(GuardAuthenticatorHandler $guardHandler, AuthenticationManagerInterface $authenticationManager, string $providerKey, iterable $guardAuthenticators, LoggerInterface $logger = null, bool $hideUserNotFoundExceptions = true, TokenStorageInterface $tokenStorage = null) + public function __construct(GuardAuthenticatorHandler $guardHandler, AuthenticationManagerInterface $authenticationManager, string $providerKey, iterable $guardAuthenticators, ?LoggerInterface $logger = null, bool $hideUserNotFoundExceptions = true, ?TokenStorageInterface $tokenStorage = null) { if (empty($providerKey)) { throw new \InvalidArgumentException('$providerKey must not be empty.'); @@ -223,7 +223,7 @@ public function setRememberMeServices(RememberMeServicesInterface $rememberMeSer * Checks to see if remember me is supported in the authenticator and * on the firewall. If it is, the RememberMeServicesInterface is notified. */ - private function triggerRememberMe(AuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, Response $response = null) + private function triggerRememberMe(AuthenticatorInterface $guardAuthenticator, Request $request, TokenInterface $token, ?Response $response = null) { if (null === $this->rememberMeServices) { if (null !== $this->logger) { diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php index f4466653735c3..291dd03e0953f 100644 --- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php +++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php @@ -46,7 +46,7 @@ class GuardAuthenticatorHandler /** * @param array $statelessProviderKeys An array of provider/firewall keys that are "stateless" and so do not need the session migrated on success */ - public function __construct(TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher = null, array $statelessProviderKeys = []) + public function __construct(TokenStorageInterface $tokenStorage, ?EventDispatcherInterface $eventDispatcher = null, array $statelessProviderKeys = []) { $this->tokenStorage = $tokenStorage; $this->dispatcher = $eventDispatcher; @@ -56,7 +56,7 @@ public function __construct(TokenStorageInterface $tokenStorage, EventDispatcher /** * Authenticates the given token in the system. */ - public function authenticateWithToken(TokenInterface $token, Request $request, string $providerKey = null, TokenInterface $previousToken = null) + public function authenticateWithToken(TokenInterface $token, Request $request, ?string $providerKey = null, ?TokenInterface $previousToken = null) { $this->migrateSession($request, $token, $providerKey, 3 < \func_num_args() ? $previousToken : $this->tokenStorage->getToken()); $this->tokenStorage->setToken($token); diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php index f87283f33494a..c01e3f33aa1f1 100644 --- a/src/Symfony/Component/Security/Http/AccessMap.php +++ b/src/Symfony/Component/Security/Http/AccessMap.php @@ -28,7 +28,7 @@ class AccessMap implements AccessMapInterface * @param array $attributes An array of attributes to pass to the access decision manager (like roles) * @param string|null $channel The channel to enforce (http, https, or null) */ - public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], string $channel = null) + public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], ?string $channel = null) { $this->map[] = [$requestMatcher, $attributes, $channel]; } diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php index c7d6bfe4864ae..ab3aa886e9dc9 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php @@ -59,10 +59,10 @@ public function getLastUsername() $request = $this->getRequest(); if ($request->attributes->has(Security::LAST_USERNAME)) { - return $request->attributes->get(Security::LAST_USERNAME, ''); + return $request->attributes->get(Security::LAST_USERNAME) ?? ''; } - return $request->hasSession() ? $request->getSession()->get(Security::LAST_USERNAME, '') : ''; + return $request->hasSession() ? ($request->getSession()->get(Security::LAST_USERNAME) ?? '') : ''; } /** diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php index f78ce0b4f16a8..7fb99b87ab2fd 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php @@ -58,7 +58,7 @@ class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthent /** * @param iterable $authenticators */ - public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = []) + public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, ?LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = []) { $this->authenticators = $authenticators; $this->tokenStorage = $tokenStorage; diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php index 823e5113fddcb..2d1fa8c8e0c09 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php @@ -42,7 +42,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle 'failure_path_parameter' => '_failure_path', ]; - public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], LoggerInterface $logger = null) + public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null) { $this->httpKernel = $httpKernel; $this->httpUtils = $httpUtils; diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php index 9da121b28474b..d2d847408d850 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php @@ -46,7 +46,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle /** * @param array $options Options for processing a successful authentication attempt */ - public function __construct(HttpUtils $httpUtils, array $options = [], LoggerInterface $logger = null) + public function __construct(HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null) { $this->httpUtils = $httpUtils; $this->logger = $logger; diff --git a/src/Symfony/Component/Security/Http/Authenticator/AbstractLoginFormAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AbstractLoginFormAuthenticator.php index c234cb4df4868..f737b065c7b93 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/AbstractLoginFormAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/AbstractLoginFormAuthenticator.php @@ -62,7 +62,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio * Override to control what happens when the user hits a secure page * but isn't logged in yet. */ - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { $url = $this->getLoginUrl($request); diff --git a/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php index e28d669530d71..993b21914024f 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php @@ -42,7 +42,7 @@ abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthe private $firewallName; private $logger; - public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, LoggerInterface $logger = null) + public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, ?LoggerInterface $logger = null) { $this->userProvider = $userProvider; $this->tokenStorage = $tokenStorage; diff --git a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php index 40ee23a273aaf..8149ed4b39ce8 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php @@ -86,7 +86,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio return $this->authenticator->onAuthenticationFailure($request, $exception); } - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { if (!$this->authenticator instanceof AuthenticationEntryPointInterface) { throw new NotAnEntryPointException(); diff --git a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php index 1893b00fe22fb..3279067f50f7a 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php @@ -169,7 +169,7 @@ public function setHttpKernel(HttpKernelInterface $httpKernel): void $this->httpKernel = $httpKernel; } - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { if (!$this->options['use_forward']) { return parent::start($request, $authException); diff --git a/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php index 892fce40fe817..45f6e31f61f40 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php @@ -38,14 +38,14 @@ class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEn private $userProvider; private $logger; - public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null) + public function __construct(string $realmName, UserProviderInterface $userProvider, ?LoggerInterface $logger = null) { $this->realmName = $realmName; $this->userProvider = $userProvider; $this->logger = $logger; } - public function start(Request $request, AuthenticationException $authException = null): Response + public function start(Request $request, ?AuthenticationException $authException = null): Response { $response = new Response(); $response->headers->set('WWW-Authenticate', sprintf('Basic realm="%s"', $this->realmName)); diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php index 30da36aac08a4..105d04b9e635e 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php @@ -58,7 +58,7 @@ class JsonLoginAuthenticator implements InteractiveAuthenticatorInterface */ private $translator; - public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], PropertyAccessorInterface $propertyAccessor = null) + public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, ?AuthenticationSuccessHandlerInterface $successHandler = null, ?AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], ?PropertyAccessorInterface $propertyAccessor = null) { $this->options = array_merge(['username_path' => 'username', 'password_path' => 'password'], $options); $this->httpUtils = $httpUtils; diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php index 34881463df930..8870444ad3d9c 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php +++ b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php @@ -32,7 +32,7 @@ class PasswordUpgradeBadge implements BadgeInterface * @param string $plaintextPassword The presented password, used in the rehash * @param PasswordUpgraderInterface|null $passwordUpgrader The password upgrader, defaults to the UserProvider if null */ - public function __construct(string $plaintextPassword, PasswordUpgraderInterface $passwordUpgrader = null) + public function __construct(string $plaintextPassword, ?PasswordUpgraderInterface $passwordUpgrader = null) { $this->plaintextPassword = $plaintextPassword; $this->passwordUpgrader = $passwordUpgrader; diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php index 5e8dbdc700e0d..90f02865418ae 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php +++ b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php @@ -44,7 +44,7 @@ class UserBadge implements BadgeInterface * is thrown). If this is not set, the default user provider will be used with * $userIdentifier as username. */ - public function __construct(string $userIdentifier, callable $userLoader = null) + public function __construct(string $userIdentifier, ?callable $userLoader = null) { $this->userIdentifier = $userIdentifier; $this->userLoader = $userLoader; diff --git a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php index f2571baac81f4..e514815995640 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php @@ -50,7 +50,7 @@ class RememberMeAuthenticator implements InteractiveAuthenticatorInterface private $cookieName; private $logger; - public function __construct(RememberMeHandlerInterface $rememberMeHandler, string $secret, TokenStorageInterface $tokenStorage, string $cookieName, LoggerInterface $logger = null) + public function __construct(RememberMeHandlerInterface $rememberMeHandler, string $secret, TokenStorageInterface $tokenStorage, string $cookieName, ?LoggerInterface $logger = null) { $this->rememberMeHandler = $rememberMeHandler; $this->secret = $secret; diff --git a/src/Symfony/Component/Security/Http/Authenticator/RemoteUserAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/RemoteUserAuthenticator.php index d856b54b00c48..140b6c271efbe 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/RemoteUserAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/RemoteUserAuthenticator.php @@ -32,7 +32,7 @@ class RemoteUserAuthenticator extends AbstractPreAuthenticatedAuthenticator { private $userKey; - public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'REMOTE_USER', LoggerInterface $logger = null) + public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'REMOTE_USER', ?LoggerInterface $logger = null) { parent::__construct($userProvider, $tokenStorage, $firewallName, $logger); diff --git a/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php b/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php index 79e6883f824dc..8f30a23993a66 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php @@ -31,7 +31,7 @@ class X509Authenticator extends AbstractPreAuthenticatedAuthenticator private $userKey; private $credentialsKey; - public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'SSL_CLIENT_S_DN_Email', string $credentialsKey = 'SSL_CLIENT_S_DN', LoggerInterface $logger = null) + public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'SSL_CLIENT_S_DN_Email', string $credentialsKey = 'SSL_CLIENT_S_DN', ?LoggerInterface $logger = null) { parent::__construct($userProvider, $tokenStorage, $firewallName, $logger); diff --git a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php b/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php index 91271d14a3d98..5e5be9ab9de7c 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php @@ -42,5 +42,5 @@ interface AuthenticationEntryPointInterface * * @return Response */ - public function start(Request $request, AuthenticationException $authException = null); + public function start(Request $request, ?AuthenticationException $authException = null); } diff --git a/src/Symfony/Component/Security/Http/EntryPoint/BasicAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/BasicAuthenticationEntryPoint.php index 53a029360b79d..e658ed9e3fe73 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/BasicAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/BasicAuthenticationEntryPoint.php @@ -37,7 +37,7 @@ public function __construct(string $realmName) /** * {@inheritdoc} */ - public function start(Request $request, AuthenticationException $authException = null) + public function start(Request $request, ?AuthenticationException $authException = null) { $response = new Response(); $response->headers->set('WWW-Authenticate', sprintf('Basic realm="%s"', $this->realmName)); diff --git a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php index 32cc5a0e06db0..ca4dba5cf5852 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php @@ -48,7 +48,7 @@ public function __construct(HttpKernelInterface $kernel, HttpUtils $httpUtils, s /** * {@inheritdoc} */ - public function start(Request $request, AuthenticationException $authException = null) + public function start(Request $request, ?AuthenticationException $authException = null) { if ($this->useForward) { $subRequest = $this->httpUtils->createRequest($request, $this->loginPath); diff --git a/src/Symfony/Component/Security/Http/EntryPoint/RetryAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/RetryAuthenticationEntryPoint.php index 55e86f96d6f4b..0a31f5a42d1a8 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/RetryAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/RetryAuthenticationEntryPoint.php @@ -41,7 +41,7 @@ public function __construct(int $httpPort = 80, int $httpsPort = 443) /** * {@inheritdoc} */ - public function start(Request $request, AuthenticationException $authException = null) + public function start(Request $request, ?AuthenticationException $authException = null) { $scheme = $request->isSecure() ? 'http' : 'https'; if ('http' === $scheme && 80 != $this->httpPort) { diff --git a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php index 1d58c1d4df241..e058ced6c1c91 100644 --- a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php +++ b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php @@ -39,7 +39,7 @@ class LoginFailureEvent extends Event /** * @param Passport|null $passport */ - public function __construct(AuthenticationException $exception, AuthenticatorInterface $authenticator, Request $request, ?Response $response, string $firewallName, PassportInterface $passport = null) + public function __construct(AuthenticationException $exception, AuthenticatorInterface $authenticator, Request $request, ?Response $response, string $firewallName, ?PassportInterface $passport = null) { if (null !== $passport && !$passport instanceof Passport) { trigger_deprecation('symfony/security-http', '5.4', 'Not passing an instance of "%s" or "null" as "$passport" argument of "%s()" is deprecated, "%s" given.', Passport::class, __METHOD__, get_debug_type($passport)); diff --git a/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php b/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php index 27a8621af02fb..ee68de9a23015 100644 --- a/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php +++ b/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php @@ -45,7 +45,7 @@ class LoginSuccessEvent extends Event /** * @param Passport $passport */ - public function __construct(AuthenticatorInterface $authenticator, PassportInterface $passport, TokenInterface $authenticatedToken, Request $request, ?Response $response, string $firewallName, TokenInterface $previousToken = null) + public function __construct(AuthenticatorInterface $authenticator, PassportInterface $passport, TokenInterface $authenticatedToken, Request $request, ?Response $response, string $firewallName, ?TokenInterface $previousToken = null) { if (!$passport instanceof Passport) { trigger_deprecation('symfony/security-http', '5.4', 'Not passing an instance of "%s" as "$passport" argument of "%s()" is deprecated, "%s" given.', Passport::class, __METHOD__, get_debug_type($passport)); diff --git a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php index 1bea6c8528644..e1f1bd0805db5 100644 --- a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php +++ b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php @@ -27,7 +27,7 @@ final class SwitchUserEvent extends Event private $targetUser; private $token; - public function __construct(Request $request, UserInterface $targetUser, TokenInterface $token = null) + public function __construct(Request $request, UserInterface $targetUser, ?TokenInterface $token = null) { $this->request = $request; $this->targetUser = $targetUser; diff --git a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php index cd738cceadce7..1eba75d900655 100644 --- a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php @@ -38,7 +38,7 @@ class CheckRememberMeConditionsListener implements EventSubscriberInterface private $options; private $logger; - public function __construct(array $options = [], LoggerInterface $logger = null) + public function __construct(array $options = [], ?LoggerInterface $logger = null) { $this->options = $options + ['always_remember_me' => false, 'remember_me_parameter' => '_remember_me']; $this->logger = $logger; diff --git a/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php b/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php index 510eca6548749..06ac19f695cdb 100644 --- a/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php @@ -37,7 +37,7 @@ class RememberMeListener implements EventSubscriberInterface private $rememberMeHandler; private $logger; - public function __construct(RememberMeHandlerInterface $rememberMeHandler, LoggerInterface $logger = null) + public function __construct(RememberMeHandlerInterface $rememberMeHandler, ?LoggerInterface $logger = null) { $this->rememberMeHandler = $rememberMeHandler; $this->logger = $logger; diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php index 6ff49cb0d595d..45df2d01935ba 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php @@ -70,7 +70,7 @@ abstract class AbstractAuthenticationListener extends AbstractListener /** * @throws \InvalidArgumentException */ - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, string $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = [], LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, string $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = [], ?LoggerInterface $logger = null, ?EventDispatcherInterface $dispatcher = null) { if (empty($providerKey)) { throw new \InvalidArgumentException('$providerKey must not be empty.'); diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index bc59e4e365536..7a8b2129e2452 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -47,7 +47,7 @@ abstract class AbstractPreAuthenticatedListener extends AbstractListener private $dispatcher; private $sessionStrategy; - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, ?LoggerInterface $logger = null, ?EventDispatcherInterface $dispatcher = null) { $this->tokenStorage = $tokenStorage; $this->authenticationManager = $authenticationManager; diff --git a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php index 8f175ae7987a4..235edaa36ea1e 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php @@ -39,7 +39,7 @@ class AnonymousAuthenticationListener extends AbstractListener private $authenticationManager; private $logger; - public function __construct(TokenStorageInterface $tokenStorage, string $secret, LoggerInterface $logger = null, AuthenticationManagerInterface $authenticationManager = null) + public function __construct(TokenStorageInterface $tokenStorage, string $secret, ?LoggerInterface $logger = null, ?AuthenticationManagerInterface $authenticationManager = null) { $this->tokenStorage = $tokenStorage; $this->secret = $secret; diff --git a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php index cb02f0120ee68..5db4d3ff659b4 100644 --- a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php @@ -43,7 +43,7 @@ class BasicAuthenticationListener extends AbstractListener private $ignoreFailure; private $sessionStrategy; - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, AuthenticationEntryPointInterface $authenticationEntryPoint, LoggerInterface $logger = null) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, AuthenticationEntryPointInterface $authenticationEntryPoint, ?LoggerInterface $logger = null) { if (empty($providerKey)) { throw new \InvalidArgumentException('$providerKey must not be empty.'); diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index e09af80d76be9..9b3c129bbf657 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -60,7 +60,7 @@ class ContextListener extends AbstractListener /** * @param iterable $userProviders */ - public function __construct(TokenStorageInterface $tokenStorage, iterable $userProviders, string $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, AuthenticationTrustResolverInterface $trustResolver = null, callable $sessionTrackerEnabler = null) + public function __construct(TokenStorageInterface $tokenStorage, iterable $userProviders, string $contextKey, ?LoggerInterface $logger = null, ?EventDispatcherInterface $dispatcher = null, ?AuthenticationTrustResolverInterface $trustResolver = null, ?callable $sessionTrackerEnabler = null) { if (empty($contextKey)) { throw new \InvalidArgumentException('$contextKey must not be empty.'); diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php index 32a1b60d60452..6ff46c55dfbf5 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php @@ -57,7 +57,7 @@ class ExceptionListener private $httpUtils; private $stateless; - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationTrustResolverInterface $trustResolver, HttpUtils $httpUtils, string $firewallName, AuthenticationEntryPointInterface $authenticationEntryPoint = null, string $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null, LoggerInterface $logger = null, bool $stateless = false) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationTrustResolverInterface $trustResolver, HttpUtils $httpUtils, string $firewallName, ?AuthenticationEntryPointInterface $authenticationEntryPoint = null, ?string $errorPage = null, ?AccessDeniedHandlerInterface $accessDeniedHandler = null, ?LoggerInterface $logger = null, bool $stateless = false) { $this->tokenStorage = $tokenStorage; $this->accessDeniedHandler = $accessDeniedHandler; diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index 6189cba4f384c..e91d23df2f8c9 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -46,7 +46,7 @@ class LogoutListener extends AbstractListener * @param EventDispatcherInterface $eventDispatcher * @param array $options An array of options to process a logout attempt */ - public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, $eventDispatcher, array $options = [], CsrfTokenManagerInterface $csrfTokenManager = null) + public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, $eventDispatcher, array $options = [], ?CsrfTokenManagerInterface $csrfTokenManager = null) { if (!$eventDispatcher instanceof EventDispatcherInterface) { trigger_deprecation('symfony/security-http', '5.1', 'Passing a logout success handler to "%s" is deprecated, pass an instance of "%s" instead.', __METHOD__, EventDispatcherInterface::class); diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php index fe59505a5fedc..53fec687f7c4d 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php @@ -45,7 +45,7 @@ class RememberMeListener extends AbstractListener private $catchExceptions = true; private $sessionStrategy; - public function __construct(TokenStorageInterface $tokenStorage, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, bool $catchExceptions = true, SessionAuthenticationStrategyInterface $sessionStrategy = null) + public function __construct(TokenStorageInterface $tokenStorage, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, ?LoggerInterface $logger = null, ?EventDispatcherInterface $dispatcher = null, bool $catchExceptions = true, ?SessionAuthenticationStrategyInterface $sessionStrategy = null) { $this->tokenStorage = $tokenStorage; $this->rememberMeServices = $rememberMeServices; diff --git a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php index d4b0389784d26..bde314120c7fa 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php @@ -32,7 +32,7 @@ class RemoteUserAuthenticationListener extends AbstractPreAuthenticatedListener { private $userKey; - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, string $userKey = 'REMOTE_USER', LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, string $userKey = 'REMOTE_USER', ?LoggerInterface $logger = null, ?EventDispatcherInterface $dispatcher = null) { parent::__construct($tokenStorage, $authenticationManager, $providerKey, $logger, $dispatcher); diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php index 250d9ef215aee..52a4ac3cbb74b 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php @@ -52,7 +52,7 @@ class SwitchUserListener extends AbstractListener private $dispatcher; private $stateless; - public function __construct(TokenStorageInterface $tokenStorage, UserProviderInterface $provider, UserCheckerInterface $userChecker, string $firewallName, AccessDecisionManagerInterface $accessDecisionManager, LoggerInterface $logger = null, string $usernameParameter = '_switch_user', string $role = 'ROLE_ALLOWED_TO_SWITCH', EventDispatcherInterface $dispatcher = null, bool $stateless = false) + public function __construct(TokenStorageInterface $tokenStorage, UserProviderInterface $provider, UserCheckerInterface $userChecker, string $firewallName, AccessDecisionManagerInterface $accessDecisionManager, ?LoggerInterface $logger = null, string $usernameParameter = '_switch_user', string $role = 'ROLE_ALLOWED_TO_SWITCH', ?EventDispatcherInterface $dispatcher = null, bool $stateless = false) { if ('' === $firewallName) { throw new \InvalidArgumentException('$firewallName must not be empty.'); diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php index ad98464dbe3a2..eecc6571a8bcd 100644 --- a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php @@ -43,7 +43,7 @@ class UsernamePasswordFormAuthenticationListener extends AbstractAuthenticationL { private $csrfTokenManager; - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, string $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = [], LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, CsrfTokenManagerInterface $csrfTokenManager = null) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, string $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = [], ?LoggerInterface $logger = null, ?EventDispatcherInterface $dispatcher = null, ?CsrfTokenManagerInterface $csrfTokenManager = null) { parent::__construct($tokenStorage, $authenticationManager, $sessionStrategy, $httpUtils, $providerKey, $successHandler, $failureHandler, array_merge([ 'username_parameter' => '_username', diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php index 13025ce6241e4..f057d10e640db 100644 --- a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php @@ -65,7 +65,7 @@ class UsernamePasswordJsonAuthenticationListener extends AbstractListener */ private $translator; - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, HttpUtils $httpUtils, string $providerKey, AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], LoggerInterface $logger = null, EventDispatcherInterface $eventDispatcher = null, PropertyAccessorInterface $propertyAccessor = null) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, HttpUtils $httpUtils, string $providerKey, ?AuthenticationSuccessHandlerInterface $successHandler = null, ?AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], ?LoggerInterface $logger = null, ?EventDispatcherInterface $eventDispatcher = null, ?PropertyAccessorInterface $propertyAccessor = null) { $this->tokenStorage = $tokenStorage; $this->authenticationManager = $authenticationManager; diff --git a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php index 07a287e5450f2..1ae5f667f1d19 100644 --- a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php @@ -32,7 +32,7 @@ class X509AuthenticationListener extends AbstractPreAuthenticatedListener private $userKey; private $credentialKey; - public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, string $userKey = 'SSL_CLIENT_S_DN_Email', string $credentialKey = 'SSL_CLIENT_S_DN', LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null) + public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, string $providerKey, string $userKey = 'SSL_CLIENT_S_DN_Email', string $credentialKey = 'SSL_CLIENT_S_DN', ?LoggerInterface $logger = null, ?EventDispatcherInterface $dispatcher = null) { parent::__construct($tokenStorage, $authenticationManager, $providerKey, $logger, $dispatcher); diff --git a/src/Symfony/Component/Security/Http/FirewallMap.php b/src/Symfony/Component/Security/Http/FirewallMap.php index cc9d853e96b42..a0636cc8b25fa 100644 --- a/src/Symfony/Component/Security/Http/FirewallMap.php +++ b/src/Symfony/Component/Security/Http/FirewallMap.php @@ -32,7 +32,7 @@ class FirewallMap implements FirewallMapInterface /** * @param list $listeners */ - public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null) + public function add(?RequestMatcherInterface $requestMatcher = null, array $listeners = [], ?ExceptionListener $exceptionListener = null, ?LogoutListener $logoutListener = null) { $this->map[] = [$requestMatcher, $listeners, $exceptionListener, $logoutListener]; } diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php index ee15ce965e38e..ef91d6230b589 100644 --- a/src/Symfony/Component/Security/Http/HttpUtils.php +++ b/src/Symfony/Component/Security/Http/HttpUtils.php @@ -39,7 +39,7 @@ class HttpUtils * * @throws \InvalidArgumentException */ - public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatcher = null, string $domainRegexp = null, string $secureDomainRegexp = null) + public function __construct(?UrlGeneratorInterface $urlGenerator = null, $urlMatcher = null, ?string $domainRegexp = null, ?string $secureDomainRegexp = null) { $this->urlGenerator = $urlGenerator; if (null !== $urlMatcher && !$urlMatcher instanceof UrlMatcherInterface && !$urlMatcher instanceof RequestMatcherInterface) { diff --git a/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php b/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php index b560e553a3d1f..512b6efc7294a 100644 --- a/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php +++ b/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php @@ -36,12 +36,12 @@ public function __construct(RequestStack $requestStack, FirewallMap $firewallMap $this->firewallMap = $firewallMap; } - public function generateExitPath(string $targetUri = null): string + public function generateExitPath(?string $targetUri = null): string { return $this->buildExitPath($targetUri); } - public function generateExitUrl(string $targetUri = null): string + public function generateExitUrl(?string $targetUri = null): string { if (null === $request = $this->requestStack->getCurrentRequest()) { return ''; @@ -55,7 +55,7 @@ private function isImpersonatedUser(): bool return $this->tokenStorage->getToken() instanceof SwitchUserToken; } - private function buildExitPath(string $targetUri = null): string + private function buildExitPath(?string $targetUri = null): string { if (null === ($request = $this->requestStack->getCurrentRequest()) || !$this->isImpersonatedUser()) { return ''; diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php index 15e3c7f25e009..00ba82d019276 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php +++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php @@ -44,7 +44,7 @@ public function __construct(UrlGeneratorInterface $urlGenerator, UserProviderInt ], $options); } - public function createLoginLink(UserInterface $user, Request $request = null): LoginLinkDetails + public function createLoginLink(UserInterface $user, ?Request $request = null): LoginLinkDetails { $expires = time() + $this->options['lifetime']; $expiresAt = new \DateTimeImmutable('@'.$expires); diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandlerInterface.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandlerInterface.php index b0ee6ef5de9dc..9fbe5c725ee3d 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandlerInterface.php @@ -24,7 +24,7 @@ interface LoginLinkHandlerInterface /** * Generate a link that can be used to authenticate as the given user. */ - public function createLoginLink(UserInterface $user, Request $request = null): LoginLinkDetails; + public function createLoginLink(UserInterface $user, ?Request $request = null): LoginLinkDetails; /** * Validates if this request contains a login link and returns the associated User. diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php index 85cdd7931bbf3..1fbe75c9fa859 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php +++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php @@ -37,7 +37,7 @@ public function __construct(LoginLinkDetails $loginLinkDetails, string $subject, $this->loginLinkDetails = $loginLinkDetails; } - public function asEmailMessage(EmailRecipientInterface $recipient, string $transport = null): ?EmailMessage + public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): ?EmailMessage { if (!class_exists(NotificationEmail::class)) { throw new \LogicException(sprintf('The "%s" method requires "symfony/twig-bridge:>4.4".', __METHOD__)); @@ -53,7 +53,7 @@ public function asEmailMessage(EmailRecipientInterface $recipient, string $trans return new EmailMessage($email); } - public function asSmsMessage(SmsRecipientInterface $recipient, string $transport = null): ?SmsMessage + public function asSmsMessage(SmsRecipientInterface $recipient, ?string $transport = null): ?SmsMessage { return new SmsMessage($recipient->getPhone(), $this->getDefaultContent('link').' '.$this->loginLinkDetails->getUrl()); } diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php index 163946793be03..bded7475d5c35 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php @@ -34,7 +34,7 @@ class LogoutUrlGenerator /** @var string|null */ private $currentFirewallContext; - public function __construct(RequestStack $requestStack = null, UrlGeneratorInterface $router = null, TokenStorageInterface $tokenStorage = null) + public function __construct(?RequestStack $requestStack = null, ?UrlGeneratorInterface $router = null, ?TokenStorageInterface $tokenStorage = null) { $this->requestStack = $requestStack; $this->router = $router; @@ -50,7 +50,7 @@ public function __construct(RequestStack $requestStack = null, UrlGeneratorInter * @param string|null $csrfParameter The CSRF token parameter name * @param string|null $context The listener context */ - public function registerListener(string $key, string $logoutPath, ?string $csrfTokenId, ?string $csrfParameter, CsrfTokenManagerInterface $csrfTokenManager = null, string $context = null) + public function registerListener(string $key, string $logoutPath, ?string $csrfTokenId, ?string $csrfParameter, ?CsrfTokenManagerInterface $csrfTokenManager = null, ?string $context = null) { $this->listeners[$key] = [$logoutPath, $csrfTokenId, $csrfParameter, $csrfTokenManager, $context]; } @@ -60,7 +60,7 @@ public function registerListener(string $key, string $logoutPath, ?string $csrfT * * @return string */ - public function getLogoutPath(string $key = null) + public function getLogoutPath(?string $key = null) { return $this->generateLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_PATH); } @@ -70,12 +70,12 @@ public function getLogoutPath(string $key = null) * * @return string */ - public function getLogoutUrl(string $key = null) + public function getLogoutUrl(?string $key = null) { return $this->generateLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_URL); } - public function setCurrentFirewall(?string $key, string $context = null) + public function setCurrentFirewall(?string $key, ?string $context = null) { $this->currentFirewallName = $key; $this->currentFirewallContext = $context; diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php index d9c9d8327a197..c76049fb1f773 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php @@ -28,7 +28,7 @@ abstract class AbstractRememberMeHandler implements RememberMeHandlerInterface protected $options; protected $logger; - public function __construct(UserProviderInterface $userProvider, RequestStack $requestStack, array $options = [], LoggerInterface $logger = null) + public function __construct(UserProviderInterface $userProvider, RequestStack $requestStack, array $options = [], ?LoggerInterface $logger = null) { $this->userProvider = $userProvider; $this->requestStack = $requestStack; diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index f18a4c2f969bd..84a7950c58643 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -54,7 +54,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * @throws \InvalidArgumentException */ - public function __construct(iterable $userProviders, string $secret, string $firewallName, array $options = [], LoggerInterface $logger = null) + public function __construct(iterable $userProviders, string $secret, string $firewallName, array $options = [], ?LoggerInterface $logger = null) { if (empty($secret)) { throw new \InvalidArgumentException('$secret must not be empty.'); @@ -173,7 +173,7 @@ public function logout(Request $request, Response $response, TokenInterface $tok * Implementation for RememberMeServicesInterface. Deletes the cookie when * an attempted authentication fails. */ - final public function loginFail(Request $request, \Exception $exception = null) + final public function loginFail(Request $request, ?\Exception $exception = null) { $this->cancelCookie($request); $this->onLoginFail($request, $exception); @@ -225,7 +225,7 @@ final public function loginSuccess(Request $request, Response $response, TokenIn */ abstract protected function processAutoLoginCookie(array $cookieParts, Request $request); - protected function onLoginFail(Request $request, \Exception $exception = null) + protected function onLoginFail(Request $request, ?\Exception $exception = null) { } diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php index 6e43dbf5feec7..2b8759a2f070e 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php +++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php @@ -35,7 +35,7 @@ final class PersistentRememberMeHandler extends AbstractRememberMeHandler private $tokenProvider; private $tokenVerifier; - public function __construct(TokenProviderInterface $tokenProvider, string $secret, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, LoggerInterface $logger = null, TokenVerifierInterface $tokenVerifier = null) + public function __construct(TokenProviderInterface $tokenProvider, string $secret, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, ?LoggerInterface $logger = null, ?TokenVerifierInterface $tokenVerifier = null) { parent::__construct($userProvider, $requestStack, $options, $logger); diff --git a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php index 239cad7225e1c..b97d17da6e15e 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php +++ b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php @@ -62,7 +62,7 @@ public function autoLogin(Request $request); * * This method needs to take care of invalidating the cookie. */ - public function loginFail(Request $request, \Exception $exception = null); + public function loginFail(Request $request, ?\Exception $exception = null); /** * Called whenever an interactive authentication attempt is successful diff --git a/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php index 7fe048471ab61..0ccc856ecfc2b 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php +++ b/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php @@ -34,7 +34,7 @@ final class SignatureRememberMeHandler extends AbstractRememberMeHandler { private $signatureHasher; - public function __construct(SignatureHasher $signatureHasher, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, LoggerInterface $logger = null) + public function __construct(SignatureHasher $signatureHasher, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, ?LoggerInterface $logger = null) { parent::__construct($userProvider, $requestStack, $options, $logger); diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php index 73691058d0ce6..f7688ca1327a3 100644 --- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php +++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php @@ -34,7 +34,7 @@ class SessionAuthenticationStrategy implements SessionAuthenticationStrategyInte private $strategy; private $csrfTokenStorage = null; - public function __construct(string $strategy, ClearableTokenStorageInterface $csrfTokenStorage = null) + public function __construct(string $strategy, ?ClearableTokenStorageInterface $csrfTokenStorage = null) { $this->strategy = $strategy; diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticationUtilsTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticationUtilsTest.php new file mode 100644 index 0000000000000..7474570ee4dbf --- /dev/null +++ b/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticationUtilsTest.php @@ -0,0 +1,127 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Security\Http\Tests\Authentication; + +use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\RequestStack; +use Symfony\Component\HttpFoundation\Session\Session; +use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; +use Symfony\Component\Security\Core\Exception\AuthenticationException; +use Symfony\Component\Security\Core\Security; +use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; + +class AuthenticationUtilsTest extends TestCase +{ + public function testLastAuthenticationErrorWhenRequestHasAttribute() + { + $authenticationError = new AuthenticationException(); + $request = Request::create('/'); + $request->attributes->set(Security::AUTHENTICATION_ERROR, $authenticationError); + + $requestStack = new RequestStack(); + $requestStack->push($request); + + $utils = new AuthenticationUtils($requestStack); + $this->assertSame($authenticationError, $utils->getLastAuthenticationError()); + } + + public function testLastAuthenticationErrorInSession() + { + $authenticationError = new AuthenticationException(); + + $request = Request::create('/'); + + $session = new Session(new MockArraySessionStorage()); + $session->set(Security::AUTHENTICATION_ERROR, $authenticationError); + $request->setSession($session); + + $requestStack = new RequestStack(); + $requestStack->push($request); + + $utils = new AuthenticationUtils($requestStack); + $this->assertSame($authenticationError, $utils->getLastAuthenticationError()); + $this->assertFalse($session->has(Security::AUTHENTICATION_ERROR)); + } + + public function testLastAuthenticationErrorInSessionWithoutClearing() + { + $authenticationError = new AuthenticationException(); + + $request = Request::create('/'); + + $session = new Session(new MockArraySessionStorage()); + $session->set(Security::AUTHENTICATION_ERROR, $authenticationError); + $request->setSession($session); + + $requestStack = new RequestStack(); + $requestStack->push($request); + + $utils = new AuthenticationUtils($requestStack); + $this->assertSame($authenticationError, $utils->getLastAuthenticationError(false)); + $this->assertTrue($session->has(Security::AUTHENTICATION_ERROR)); + } + + public function testLastUserNameIsDefinedButNull() + { + $request = Request::create('/'); + $request->attributes->set(Security::LAST_USERNAME, null); + + $requestStack = new RequestStack(); + $requestStack->push($request); + + $utils = new AuthenticationUtils($requestStack); + $this->assertSame('', $utils->getLastUsername()); + } + + public function testLastUserNameIsDefined() + { + $request = Request::create('/'); + $request->attributes->set(Security::LAST_USERNAME, 'user'); + + $requestStack = new RequestStack(); + $requestStack->push($request); + + $utils = new AuthenticationUtils($requestStack); + $this->assertSame('user', $utils->getLastUsername()); + } + + public function testLastUserNameIsDefinedInSessionButNull() + { + $request = Request::create('/'); + + $session = new Session(new MockArraySessionStorage()); + $session->set(Security::LAST_USERNAME, null); + $request->setSession($session); + + $requestStack = new RequestStack(); + $requestStack->push($request); + + $utils = new AuthenticationUtils($requestStack); + $this->assertSame('', $utils->getLastUsername()); + } + + public function testLastUserNameIsDefinedInSession() + { + $request = Request::create('/'); + + $session = new Session(new MockArraySessionStorage()); + $session->set(Security::LAST_USERNAME, 'user'); + $request->setSession($session); + + $requestStack = new RequestStack(); + $requestStack->push($request); + + $utils = new AuthenticationUtils($requestStack); + $this->assertSame('user', $utils->getLastUsername()); + } +} diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php index f1eddd09c723b..c2c6682f2f145 100644 --- a/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php @@ -365,7 +365,7 @@ private static function createDummySupportsAuthenticator(?bool $supports = true) return new DummySupportsAuthenticator($supports); } - private function createManager($authenticators, $firewallName = 'main', $eraseCredentials = true, array $requiredBadges = [], LoggerInterface $logger = null) + private function createManager($authenticators, $firewallName = 'main', $eraseCredentials = true, array $requiredBadges = [], ?LoggerInterface $logger = null) { return new AuthenticatorManager($authenticators, $this->tokenStorage, $this->eventDispatcher, $firewallName, $logger, $eraseCredentials, true, $requiredBadges); } diff --git a/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php b/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php index 4bf7e729086a4..cf71fa02d6813 100644 --- a/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php @@ -111,6 +111,6 @@ public function testIntegrationNoUser() $tokenStorage = new TokenStorage(); $argumentResolver = new ArgumentResolver(null, [new UserValueResolver($tokenStorage), new DefaultValueResolver()]); - $this->assertSame([null], $argumentResolver->getArguments(Request::create('/'), function (UserInterface $user = null) {})); + $this->assertSame([null], $argumentResolver->getArguments(Request::create('/'), function (?UserInterface $user = null) {})); } } diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php index a0e4904c20329..bb3ee9c4df0c0 100644 --- a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php @@ -94,7 +94,7 @@ private function createLoginSuccessfulEvent(PassportInterface $passport) return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), $passport, $this->createMock(TokenInterface::class), $this->request, $this->response, 'main_firewall'); } - private function createPassport(array $badges = null) + private function createPassport(?array $badges = null) { return new SelfValidatingPassport(new UserBadge('test', function ($username) { return new User($username, null); }), $badges ?? [new RememberMeBadge()]); } diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php index 8851f5b34c8aa..0a9233964be81 100644 --- a/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php @@ -64,7 +64,7 @@ public function testCredentialsInvalid() $this->listener->clearCookie(); } - private function createLoginSuccessfulEvent(PassportInterface $passport = null) + private function createLoginSuccessfulEvent(?PassportInterface $passport = null) { if (null === $passport) { $passport = $this->createPassport(); @@ -73,7 +73,7 @@ private function createLoginSuccessfulEvent(PassportInterface $passport = null) return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), $passport, $this->createMock(TokenInterface::class), $this->request, $this->response, 'main_firewall'); } - private function createPassport(array $badges = null) + private function createPassport(?array $badges = null) { if (null === $badges) { $badge = new RememberMeBadge(); diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php index 58905eaf62d1a..4d748592aad5f 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php @@ -449,7 +449,7 @@ protected function runSessionOnKernelResponse($newToken, $original = null) return $session; } - private function handleEventWithPreviousSession($userProviders, UserInterface $user = null, RememberMeServicesInterface $rememberMeServices = null) + private function handleEventWithPreviousSession($userProviders, ?UserInterface $user = null, ?RememberMeServicesInterface $rememberMeServices = null) { $tokenUser = $user ?? new InMemoryUser('foo', 'bar'); $session = new Session(new MockArraySessionStorage()); @@ -533,7 +533,7 @@ class SupportingUserProvider implements UserProviderInterface { private $refreshedUser; - public function __construct(InMemoryUser $refreshedUser = null) + public function __construct(?InMemoryUser $refreshedUser = null) { $this->refreshedUser = $refreshedUser; } diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php index f05ce5f4315e7..4e245b8ae7d89 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php @@ -92,7 +92,7 @@ public function testExceptionWhenEntryPointReturnsBadValue() /** * @dataProvider getAccessDeniedExceptionProvider */ - public function testAccessDeniedExceptionFullFledgedAndWithoutAccessDeniedHandlerAndWithoutErrorPage(\Exception $exception, \Exception $eventException = null) + public function testAccessDeniedExceptionFullFledgedAndWithoutAccessDeniedHandlerAndWithoutErrorPage(\Exception $exception, ?\Exception $eventException = null) { $event = $this->createEvent($exception); @@ -106,7 +106,7 @@ public function testAccessDeniedExceptionFullFledgedAndWithoutAccessDeniedHandle /** * @dataProvider getAccessDeniedExceptionProvider */ - public function testAccessDeniedExceptionFullFledgedAndWithoutAccessDeniedHandlerAndWithErrorPage(\Exception $exception, \Exception $eventException = null) + public function testAccessDeniedExceptionFullFledgedAndWithoutAccessDeniedHandlerAndWithErrorPage(\Exception $exception, ?\Exception $eventException = null) { $kernel = $this->createMock(HttpKernelInterface::class); $kernel->expects($this->once())->method('handle')->willReturn(new Response('Unauthorized', 401)); @@ -129,7 +129,7 @@ public function testAccessDeniedExceptionFullFledgedAndWithoutAccessDeniedHandle /** * @dataProvider getAccessDeniedExceptionProvider */ - public function testAccessDeniedExceptionFullFledgedAndWithAccessDeniedHandlerAndWithoutErrorPage(\Exception $exception, \Exception $eventException = null) + public function testAccessDeniedExceptionFullFledgedAndWithAccessDeniedHandlerAndWithoutErrorPage(\Exception $exception, ?\Exception $eventException = null) { $event = $this->createEvent($exception); @@ -146,7 +146,7 @@ public function testAccessDeniedExceptionFullFledgedAndWithAccessDeniedHandlerAn /** * @dataProvider getAccessDeniedExceptionProvider */ - public function testAccessDeniedExceptionNotFullFledged(\Exception $exception, \Exception $eventException = null) + public function testAccessDeniedExceptionNotFullFledged(\Exception $exception, ?\Exception $eventException = null) { $event = $this->createEvent($exception); @@ -194,7 +194,7 @@ public static function getAccessDeniedExceptionProvider() ]; } - private function createEntryPoint(Response $response = null) + private function createEntryPoint(?Response $response = null) { $entryPoint = $this->createMock(AuthenticationEntryPointInterface::class); $entryPoint->expects($this->once())->method('start')->willReturn($response ?? new Response('OK')); @@ -219,7 +219,7 @@ private function createEvent(\Exception $exception, $kernel = null) return new ExceptionEvent($kernel, Request::create('/'), HttpKernelInterface::MAIN_REQUEST, $exception); } - private function createExceptionListener(TokenStorageInterface $tokenStorage = null, AuthenticationTrustResolverInterface $trustResolver = null, HttpUtils $httpUtils = null, AuthenticationEntryPointInterface $authenticationEntryPoint = null, $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null) + private function createExceptionListener(?TokenStorageInterface $tokenStorage = null, ?AuthenticationTrustResolverInterface $trustResolver = null, ?HttpUtils $httpUtils = null, ?AuthenticationEntryPointInterface $authenticationEntryPoint = null, $errorPage = null, ?AccessDeniedHandlerInterface $accessDeniedHandler = null) { return new ExceptionListener( $tokenStorage ?? $this->createMock(TokenStorageInterface::class), diff --git a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php index 6574a6841d974..ee5952e6130b3 100644 --- a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php @@ -57,7 +57,7 @@ protected function setUp(): void * * @dataProvider provideCreateLoginLinkData */ - public function testCreateLoginLink($user, array $extraProperties, Request $request = null) + public function testCreateLoginLink($user, array $extraProperties, ?Request $request = null) { $this->router->expects($this->once()) ->method('generate') diff --git a/src/Symfony/Component/Semaphore/Semaphore.php b/src/Symfony/Component/Semaphore/Semaphore.php index 47e3efe155a1a..af9ac0e551a2e 100644 --- a/src/Symfony/Component/Semaphore/Semaphore.php +++ b/src/Symfony/Component/Semaphore/Semaphore.php @@ -96,7 +96,7 @@ public function acquire(): bool /** * {@inheritdoc} */ - public function refresh(float $ttlInSecond = null) + public function refresh(?float $ttlInSecond = null) { if (null === $ttlInSecond) { $ttlInSecond = $this->ttlInSecond; diff --git a/src/Symfony/Component/Semaphore/SemaphoreInterface.php b/src/Symfony/Component/Semaphore/SemaphoreInterface.php index 42cf0db73a6c8..98d767935e89b 100644 --- a/src/Symfony/Component/Semaphore/SemaphoreInterface.php +++ b/src/Symfony/Component/Semaphore/SemaphoreInterface.php @@ -35,7 +35,7 @@ public function acquire(): bool; * * @throws SemaphoreExpiredException If the semaphore has expired */ - public function refresh(float $ttlInSecond = null); + public function refresh(?float $ttlInSecond = null); /** * Returns whether or not the semaphore is acquired. diff --git a/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php b/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php index d01287bfd398a..6bf061833ff96 100644 --- a/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php +++ b/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php @@ -40,7 +40,7 @@ class DiscriminatorMap * * @throws InvalidArgumentException */ - public function __construct($typeProperty, array $mapping = null) + public function __construct($typeProperty, ?array $mapping = null) { if (\is_array($typeProperty)) { trigger_deprecation('symfony/serializer', '5.3', 'Passing an array as first argument to "%s" is deprecated. Use named arguments instead.', __METHOD__); diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php index d460331a3dd51..288c449125603 100644 --- a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php @@ -27,7 +27,7 @@ class JsonEncoder implements EncoderInterface, DecoderInterface JsonDecode::ASSOCIATIVE => true, ]; - public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null, array $defaultContext = []) + public function __construct(?JsonEncode $encodingImpl = null, ?JsonDecode $decodingImpl = null, array $defaultContext = []) { $this->defaultContext = array_merge($this->defaultContext, $defaultContext); $this->encodingImpl = $encodingImpl ?? new JsonEncode($this->defaultContext); diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index ef3f30ba05791..86ab8a70baf36 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -360,7 +360,7 @@ private function addXmlNamespaces(array $data, \DOMNode $node, \DOMDocument $doc * * @throws NotEncodableValueException */ - private function buildXml(\DOMNode $parentNode, $data, string $format, array $context, string $xmlRootNodeName = null): bool + private function buildXml(\DOMNode $parentNode, $data, string $format, array $context, ?string $xmlRootNodeName = null): bool { $append = true; $removeEmptyTags = $context[self::REMOVE_EMPTY_TAGS] ?? $this->defaultContext[self::REMOVE_EMPTY_TAGS] ?? false; @@ -436,7 +436,7 @@ private function buildXml(\DOMNode $parentNode, $data, string $format, array $co * * @param array|object $data */ - private function appendNode(\DOMNode $parentNode, $data, string $format, array $context, string $nodeName, string $key = null): bool + private function appendNode(\DOMNode $parentNode, $data, string $format, array $context, string $nodeName, ?string $key = null): bool { $dom = $parentNode instanceof \DOMDocument ? $parentNode : $parentNode->ownerDocument; $node = $dom->createElement($nodeName); diff --git a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php index c688c228330d9..7291c6278820b 100644 --- a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php @@ -40,7 +40,7 @@ class YamlEncoder implements EncoderInterface, DecoderInterface self::YAML_FLAGS => 0, ]; - public function __construct(Dumper $dumper = null, Parser $parser = null, array $defaultContext = []) + public function __construct(?Dumper $dumper = null, ?Parser $parser = null, array $defaultContext = []) { if (!class_exists(Dumper::class)) { throw new RuntimeException('The YamlEncoder class requires the "Yaml" component. Install "symfony/yaml" to use it.'); diff --git a/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php b/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php index 37cfb556ff9b5..cee352d499449 100644 --- a/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php +++ b/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php @@ -20,7 +20,7 @@ class ExtraAttributesException extends RuntimeException { private $extraAttributes; - public function __construct(array $extraAttributes, \Throwable $previous = null) + public function __construct(array $extraAttributes, ?\Throwable $previous = null) { $msg = sprintf('Extra attributes are not allowed ("%s" %s unknown).', implode('", "', $extraAttributes), \count($extraAttributes) > 1 ? 'are' : 'is'); diff --git a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php index fe984a291f074..2f6ca569c5266 100644 --- a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php +++ b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php @@ -21,7 +21,7 @@ class MissingConstructorArgumentsException extends RuntimeException */ private $missingArguments; - public function __construct(string $message, int $code = 0, \Throwable $previous = null, array $missingArguments = []) + public function __construct(string $message, int $code = 0, ?\Throwable $previous = null, array $missingArguments = []) { $this->missingArguments = $missingArguments; diff --git a/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php b/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php index e601e5043e2e9..7b2a1c7bcda1f 100644 --- a/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php +++ b/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php @@ -26,7 +26,7 @@ class NotNormalizableValueException extends UnexpectedValueException * safely to your user. In other words, avoid catching other exceptions and * passing their message directly to this class. */ - public static function createForUnexpectedDataType(string $message, $data, array $expectedTypes, string $path = null, bool $useMessageForUser = false, int $code = 0, \Throwable $previous = null): self + public static function createForUnexpectedDataType(string $message, $data, array $expectedTypes, ?string $path = null, bool $useMessageForUser = false, int $code = 0, ?\Throwable $previous = null): self { $self = new self($message, $code, $previous); diff --git a/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php b/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php index 1f9fc6f7c15ba..2e7bf4c05d04e 100644 --- a/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php +++ b/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php @@ -21,7 +21,7 @@ final class ObjectPropertyListExtractor implements ObjectPropertyListExtractorIn private $propertyListExtractor; private $objectClassResolver; - public function __construct(PropertyListExtractorInterface $propertyListExtractor, callable $objectClassResolver = null) + public function __construct(PropertyListExtractorInterface $propertyListExtractor, ?callable $objectClassResolver = null) { $this->propertyListExtractor = $propertyListExtractor; $this->objectClassResolver = $objectClassResolver; diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php index 36d1e92b66f39..0823a11b02e44 100644 --- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php +++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php @@ -127,7 +127,7 @@ public function getMaxDepth() /** * {@inheritdoc} */ - public function setSerializedName(string $serializedName = null) + public function setSerializedName(?string $serializedName = null) { $this->serializedName = $serializedName; } diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php index 9e5a1ae2d1797..57ce746db1c2a 100644 --- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php +++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php @@ -54,7 +54,7 @@ public function getMaxDepth(); /** * Sets the serialization name for this attribute. */ - public function setSerializedName(string $serializedName = null); + public function setSerializedName(?string $serializedName = null); /** * Gets the serialization name for this attribute. diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php index 65b42ceba7539..51c9347426463 100644 --- a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php +++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php @@ -51,7 +51,7 @@ class ClassMetadata implements ClassMetadataInterface /** * Constructs a metadata for the given class. */ - public function __construct(string $class, ClassDiscriminatorMapping $classDiscriminatorMapping = null) + public function __construct(string $class, ?ClassDiscriminatorMapping $classDiscriminatorMapping = null) { $this->name = $class; $this->classDiscriminatorMapping = $classDiscriminatorMapping; @@ -118,7 +118,7 @@ public function getClassDiscriminatorMapping(): ?ClassDiscriminatorMapping /** * {@inheritdoc} */ - public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null) + public function setClassDiscriminatorMapping(?ClassDiscriminatorMapping $mapping = null) { $this->classDiscriminatorMapping = $mapping; } diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php index e0a445d6a2ce1..0c6b869003cb2 100644 --- a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php +++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php @@ -53,5 +53,5 @@ public function getReflectionClass(): \ReflectionClass; public function getClassDiscriminatorMapping(): ?ClassDiscriminatorMapping; - public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null); + public function setClassDiscriminatorMapping(?ClassDiscriminatorMapping $mapping = null); } diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php index d6bef3c421a4a..4d0e1768d21a4 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php @@ -43,7 +43,7 @@ class AnnotationLoader implements LoaderInterface private $reader; - public function __construct(Reader $reader = null) + public function __construct(?Reader $reader = null) { $this->reader = $reader; } diff --git a/src/Symfony/Component/Serializer/NameConverter/AdvancedNameConverterInterface.php b/src/Symfony/Component/Serializer/NameConverter/AdvancedNameConverterInterface.php index 0b277d40ea513..9e9ee2a37ada0 100644 --- a/src/Symfony/Component/Serializer/NameConverter/AdvancedNameConverterInterface.php +++ b/src/Symfony/Component/Serializer/NameConverter/AdvancedNameConverterInterface.php @@ -21,10 +21,10 @@ interface AdvancedNameConverterInterface extends NameConverterInterface /** * {@inheritdoc} */ - public function normalize(string $propertyName, string $class = null, string $format = null, array $context = []); + public function normalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []); /** * {@inheritdoc} */ - public function denormalize(string $propertyName, string $class = null, string $format = null, array $context = []); + public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []); } diff --git a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php index 4060e5ac327db..8c9953c96c8a5 100644 --- a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php +++ b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php @@ -25,7 +25,7 @@ class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface * @param array|null $attributes The list of attributes to rename or null for all attributes * @param bool $lowerCamelCase Use lowerCamelCase style */ - public function __construct(array $attributes = null, bool $lowerCamelCase = true) + public function __construct(?array $attributes = null, bool $lowerCamelCase = true) { $this->attributes = $attributes; $this->lowerCamelCase = $lowerCamelCase; diff --git a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php index 7ce17cc399374..a27c82756a447 100644 --- a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php +++ b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php @@ -32,7 +32,7 @@ final class MetadataAwareNameConverter implements AdvancedNameConverterInterface private static $attributesMetadataCache = []; - public function __construct(ClassMetadataFactoryInterface $metadataFactory, NameConverterInterface $fallbackNameConverter = null) + public function __construct(ClassMetadataFactoryInterface $metadataFactory, ?NameConverterInterface $fallbackNameConverter = null) { $this->metadataFactory = $metadataFactory; $this->fallbackNameConverter = $fallbackNameConverter; @@ -41,7 +41,7 @@ public function __construct(ClassMetadataFactoryInterface $metadataFactory, Name /** * {@inheritdoc} */ - public function normalize(string $propertyName, string $class = null, string $format = null, array $context = []): string + public function normalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string { if (null === $class) { return $this->normalizeFallback($propertyName, $class, $format, $context); @@ -57,7 +57,7 @@ public function normalize(string $propertyName, string $class = null, string $fo /** * {@inheritdoc} */ - public function denormalize(string $propertyName, string $class = null, string $format = null, array $context = []): string + public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string { if (null === $class) { return $this->denormalizeFallback($propertyName, $class, $format, $context); @@ -85,7 +85,7 @@ private function getCacheValueForNormalization(string $propertyName, string $cla return $attributesMetadata[$propertyName]->getSerializedName() ?? null; } - private function normalizeFallback(string $propertyName, string $class = null, string $format = null, array $context = []): string + private function normalizeFallback(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string { return $this->fallbackNameConverter ? $this->fallbackNameConverter->normalize($propertyName, $class, $format, $context) : $propertyName; } @@ -100,7 +100,7 @@ private function getCacheValueForDenormalization(string $propertyName, string $c return self::$attributesMetadataCache[$cacheKey][$propertyName] ?? null; } - private function denormalizeFallback(string $propertyName, string $class = null, string $format = null, array $context = []): string + private function denormalizeFallback(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string { return $this->fallbackNameConverter ? $this->fallbackNameConverter->denormalize($propertyName, $class, $format, $context) : $propertyName; } diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index 0d0181ae84da9..8643aa98ce624 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -137,7 +137,7 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn /** * Sets the {@link ClassMetadataFactoryInterface} to use. */ - public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, array $defaultContext = []) + public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory = null, ?NameConverterInterface $nameConverter = null, array $defaultContext = []) { $this->classMetadataFactory = $classMetadataFactory; $this->nameConverter = $nameConverter; @@ -197,7 +197,7 @@ protected function isCircularReference(object $object, array &$context) * * @throws CircularReferenceException */ - protected function handleCircularReference(object $object, string $format = null, array $context = []) + protected function handleCircularReference(object $object, ?string $format = null, array $context = []) { $circularReferenceHandler = $context[self::CIRCULAR_REFERENCE_HANDLER] ?? $this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER]; if ($circularReferenceHandler) { @@ -269,7 +269,7 @@ protected function getGroups(array $context): array * * @return bool */ - protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []) + protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []) { $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES]; if (\in_array($attribute, $ignoredAttributes)) { @@ -330,7 +330,7 @@ protected function getConstructor(array &$data, string $class, array &$context, * @throws RuntimeException * @throws MissingConstructorArgumentsException */ - protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, string $format = null) + protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, ?string $format = null) { if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) { unset($context[self::OBJECT_TO_POPULATE]); @@ -372,7 +372,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex $variadicParameters[$parameterKey] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $context, $format); } - $params = array_merge($params, $variadicParameters); + $params = array_merge(array_values($params), $variadicParameters); $unsetKeys[] = $key; } } elseif ($allowed && !$ignored && (isset($data[$key]) || \array_key_exists($key, $data))) { @@ -414,7 +414,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex sprintf('Failed to create object because the class misses the "%s" property.', $constructorParameter->name), $data, ['unknown'], - $objectDeserializationPath, + $context['deserialization_path'], true ); $context['not_normalizable_value_exceptions'][] = $exception; @@ -473,7 +473,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex /** * @internal */ - protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, string $parameterName, $parameterData, array $context, string $format = null) + protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, string $parameterName, $parameterData, array $context, ?string $format = null) { try { if (($parameterType = $parameter->getType()) instanceof \ReflectionNamedType && !$parameterType->isBuiltin()) { diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php index cd24de5840f5b..4b03fa9ddb116 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php @@ -115,7 +115,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer */ protected $classDiscriminatorResolver; - public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = []) + public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory = null, ?NameConverterInterface $nameConverter = null, ?PropertyTypeExtractorInterface $propertyTypeExtractor = null, ?ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, ?callable $objectClassResolver = null, array $defaultContext = []) { parent::__construct($classMetadataFactory, $nameConverter, $defaultContext); @@ -137,7 +137,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return \is_object($data) && !$data instanceof \Traversable; } @@ -145,7 +145,7 @@ public function supportsNormalization($data, string $format = null) /** * {@inheritdoc} */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (!isset($context['cache_key'])) { $context['cache_key'] = $this->getCacheKey($format, $context); @@ -269,7 +269,7 @@ private function getAttributeMetadata($objectOrClass, string $attribute): ?Attri /** * {@inheritdoc} */ - protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, string $format = null) + protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, ?string $format = null) { if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) { unset($context[self::OBJECT_TO_POPULATE]); @@ -337,19 +337,19 @@ protected function getAttributes(object $object, ?string $format, array $context * * @return string[] */ - abstract protected function extractAttributes(object $object, string $format = null, array $context = []); + abstract protected function extractAttributes(object $object, ?string $format = null, array $context = []); /** * Gets the attribute value. * * @return mixed */ - abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []); + abstract protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []); /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type)); } @@ -357,7 +357,7 @@ public function supportsDenormalization($data, string $type, string $format = nu /** * {@inheritdoc} */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if (!isset($context['cache_key'])) { $context['cache_key'] = $this->getCacheKey($format, $context); @@ -437,7 +437,7 @@ public function denormalize($data, string $type, string $format = null, array $c sprintf('Failed to denormalize attribute "%s" value for class "%s": '.$e->getMessage(), $attribute, $type), $data, ['unknown'], - $context['deserialization_path'] ?? null, + $attributeContext['deserialization_path'] ?? null, false, $e->getCode(), $e @@ -460,7 +460,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * Sets attribute value. */ - abstract protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []); + abstract protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []); /** * Validates the submitted data and denormalizes it. @@ -669,7 +669,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri /** * @internal */ - protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, string $parameterName, $parameterData, array $context, string $format = null) + protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, string $parameterName, $parameterData, array $context, ?string $format = null) { if ($parameter->isVariadic() || null === $this->propertyTypeExtractor || null === $types = $this->getTypes($class->getName(), $parameterName)) { return parent::denormalizeParameter($class, $parameter, $parameterName, $parameterData, $context, $format); @@ -781,7 +781,11 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str protected function createChildContext(array $parentContext, string $attribute, ?string $format): array { $context = parent::createChildContext($parentContext, $attribute, $format); - $context['cache_key'] = $this->getCacheKey($format, $context); + if ($context['cache_key'] ?? false) { + $context['cache_key'] .= '-'.$attribute; + } elseif (false !== ($context['cache_key'] ?? null)) { + $context['cache_key'] = $this->getCacheKey($format, $context); + } return $context; } diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php index 1420523c0ef05..248a8bb6694c3 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php @@ -35,7 +35,7 @@ class ArrayDenormalizer implements ContextAwareDenormalizerInterface, Denormaliz * * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []): array + public function denormalize($data, string $type, ?string $format = null, array $context = []): array { if (null === $this->denormalizer) { throw new BadMethodCallException('Please set a denormalizer before calling denormalize()!'); @@ -68,7 +68,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool + public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool { if (null === $this->denormalizer) { throw new BadMethodCallException(sprintf('The nested denormalizer needs to be set to allow "%s()" to be used.', __METHOD__)); diff --git a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php index 995033516c052..8f3e55a1ffa9f 100644 --- a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php @@ -29,7 +29,7 @@ final class BackedEnumNormalizer implements NormalizerInterface, DenormalizerInt * * @throws InvalidArgumentException */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (!$object instanceof \BackedEnum) { throw new InvalidArgumentException('The data must belong to a backed enumeration.'); @@ -41,7 +41,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null): bool + public function supportsNormalization($data, ?string $format = null): bool { return $data instanceof \BackedEnum; } @@ -51,7 +51,7 @@ public function supportsNormalization($data, string $format = null): bool * * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if (!is_subclass_of($type, \BackedEnum::class)) { throw new InvalidArgumentException('The data must belong to a backed enumeration.'); @@ -75,7 +75,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null): bool + public function supportsDenormalization($data, string $type, ?string $format = null): bool { return is_subclass_of($type, \BackedEnum::class); } diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php index 9236126908e9b..dd9f859c2d27b 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php @@ -33,7 +33,7 @@ class ConstraintViolationListNormalizer implements NormalizerInterface, Cacheabl private $defaultContext; private $nameConverter; - public function __construct(array $defaultContext = [], NameConverterInterface $nameConverter = null) + public function __construct(array $defaultContext = [], ?NameConverterInterface $nameConverter = null) { $this->defaultContext = $defaultContext; $this->nameConverter = $nameConverter; @@ -44,7 +44,7 @@ public function __construct(array $defaultContext = [], NameConverterInterface $ * * @return array */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (\array_key_exists(self::PAYLOAD_FIELDS, $context)) { $payloadFieldsToSerialize = $context[self::PAYLOAD_FIELDS]; @@ -109,7 +109,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return $data instanceof ConstraintViolationListInterface; } diff --git a/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php index c875de1b5287a..9682cf5a4f503 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php @@ -23,5 +23,5 @@ interface ContextAwareDenormalizerInterface extends DenormalizerInterface * * @param array $context options that denormalizers have access to */ - public function supportsDenormalization($data, string $type, string $format = null, array $context = []); + public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []); } diff --git a/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php index ff0bb3a21d4fc..f20d5c991a3f4 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php @@ -23,5 +23,5 @@ interface ContextAwareNormalizerInterface extends NormalizerInterface * * @param array $context options that normalizers have access to */ - public function supportsNormalization($data, string $format = null, array $context = []); + public function supportsNormalization($data, ?string $format = null, array $context = []); } diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php index ebe2f0f69798b..ae37783c95cf6 100644 --- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php @@ -25,7 +25,7 @@ class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, Se /** * {@inheritdoc} */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { return $object->normalize($this->serializer, $format, $context); } @@ -33,7 +33,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { $object = $this->extractObjectToPopulate($type, $context) ?? new $type(); $object->denormalize($this->serializer, $data, $format, $context); @@ -49,7 +49,7 @@ public function denormalize($data, string $type, string $format = null, array $c * * @return bool */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return $data instanceof NormalizableInterface; } @@ -63,7 +63,7 @@ public function supportsNormalization($data, string $format = null) * * @return bool */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return is_subclass_of($type, DenormalizableInterface::class); } diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php index f338c49f851c7..79042c292fde3 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php @@ -36,7 +36,7 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C */ private $mimeTypeGuesser; - public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null) + public function __construct(?MimeTypeGuesserInterface $mimeTypeGuesser = null) { if (!$mimeTypeGuesser && class_exists(MimeTypes::class)) { $mimeTypeGuesser = MimeTypes::getDefault(); @@ -50,7 +50,7 @@ public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null) * * @return string */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (!$object instanceof \SplFileInfo) { throw new InvalidArgumentException('The object must be an instance of "\SplFileInfo".'); @@ -76,7 +76,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return $data instanceof \SplFileInfo; } @@ -93,7 +93,7 @@ public function supportsNormalization($data, string $format = null) * @throws InvalidArgumentException * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if (null === $data || !preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) { throw NotNormalizableValueException::createForUnexpectedDataType('The provided "data:" URI is not valid.', $data, ['string'], $context['deserialization_path'] ?? null, true); @@ -122,7 +122,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return isset(self::SUPPORTED_TYPES[$type]); } diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php index 93128d35bdcd4..4a09f2e8b72fd 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php @@ -40,7 +40,7 @@ public function __construct(array $defaultContext = []) * * @throws InvalidArgumentException */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (!$object instanceof \DateInterval) { throw new InvalidArgumentException('The object must be an instance of "\DateInterval".'); @@ -52,7 +52,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return $data instanceof \DateInterval; } @@ -72,7 +72,7 @@ public function hasCacheableSupportsMethod(): bool * * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if (!\is_string($data)) { throw NotNormalizableValueException::createForUnexpectedDataType('Data expected to be a string.', $data, ['string'], $context['deserialization_path'] ?? null, true); @@ -121,7 +121,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return \DateInterval::class === $type; } diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php index 3b8b7fe1f0e95..b4357b566aa30 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php @@ -54,7 +54,7 @@ public function setDefaultContext(array $defaultContext): void * * @throws InvalidArgumentException */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (!$object instanceof \DateTimeInterface) { throw new InvalidArgumentException('The object must implement the "\DateTimeInterface".'); @@ -74,7 +74,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return $data instanceof \DateTimeInterface; } @@ -86,7 +86,7 @@ public function supportsNormalization($data, string $format = null) * * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if (\is_int($data) || \is_float($data)) { switch ($context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY] ?? null) { @@ -136,7 +136,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return isset(self::SUPPORTED_TYPES[$type]); } diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php index 7d63b76098481..4974603694d64 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php @@ -29,7 +29,7 @@ class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterfa * * @throws InvalidArgumentException */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (!$object instanceof \DateTimeZone) { throw new InvalidArgumentException('The object must be an instance of "\DateTimeZone".'); @@ -41,7 +41,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return $data instanceof \DateTimeZone; } @@ -53,7 +53,7 @@ public function supportsNormalization($data, string $format = null) * * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if ('' === $data || null === $data) { throw NotNormalizableValueException::createForUnexpectedDataType('The data is either an empty string or null, you should pass a string that can be parsed as a DateTimeZone.', $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true); @@ -69,7 +69,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return \DateTimeZone::class === $type; } diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php index 05c08112ead21..3cf07de928c89 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php @@ -34,5 +34,5 @@ interface DenormalizableInterface * differently based on different input formats * @param array $context Options for denormalizing */ - public function denormalize(DenormalizerInterface $denormalizer, $data, string $format = null, array $context = []); + public function denormalize(DenormalizerInterface $denormalizer, $data, ?string $format = null, array $context = []); } diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php index e3f7113b1dd93..4f8f49f7c63d6 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php @@ -44,7 +44,7 @@ interface DenormalizerInterface * @throws RuntimeException Occurs if the class cannot be instantiated * @throws ExceptionInterface Occurs for all the other cases of errors */ - public function denormalize($data, string $type, string $format = null, array $context = []); + public function denormalize($data, string $type, ?string $format = null, array $context = []); /** * Checks whether the given class is supported for denormalization by this normalizer. @@ -55,5 +55,5 @@ public function denormalize($data, string $type, string $format = null, array $c * * @return bool */ - public function supportsDenormalization($data, string $type, string $format = null); + public function supportsDenormalization($data, string $type, ?string $format = null); } diff --git a/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php index c23507207e125..81ce6de3a5c57 100644 --- a/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php @@ -25,7 +25,7 @@ final class FormErrorNormalizer implements NormalizerInterface, CacheableSupport /** * {@inheritdoc} */ - public function normalize($object, string $format = null, array $context = []): array + public function normalize($object, ?string $format = null, array $context = []): array { $data = [ 'title' => $context[self::TITLE] ?? 'Validation Failed', @@ -44,7 +44,7 @@ public function normalize($object, string $format = null, array $context = []): /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null): bool + public function supportsNormalization($data, ?string $format = null): bool { return $data instanceof FormInterface && $data->isSubmitted() && !$data->isValid(); } diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php index 484a8fd4b7aae..8d749b4e1d489 100644 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php @@ -41,7 +41,7 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return parent::supportsNormalization($data, $format) && $this->supports(\get_class($data)); } @@ -49,7 +49,7 @@ public function supportsNormalization($data, string $format = null) /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return parent::supportsDenormalization($data, $type, $format) && $this->supports($type); } @@ -98,7 +98,7 @@ private function isGetMethod(\ReflectionMethod $method): bool /** * {@inheritdoc} */ - protected function extractAttributes(object $object, string $format = null, array $context = []) + protected function extractAttributes(object $object, ?string $format = null, array $context = []) { $reflectionObject = new \ReflectionObject($object); $reflectionMethods = $reflectionObject->getMethods(\ReflectionMethod::IS_PUBLIC); @@ -122,7 +122,7 @@ protected function extractAttributes(object $object, string $format = null, arra /** * {@inheritdoc} */ - protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []) { $ucfirsted = ucfirst($attribute); @@ -147,7 +147,7 @@ protected function getAttributeValue(object $object, string $attribute, string $ /** * {@inheritdoc} */ - protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []) + protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []) { $setter = 'set'.ucfirst($attribute); $key = \get_class($object).':'.$setter; diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php index 5032dce47b284..74f23fde9bc80 100644 --- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php @@ -24,7 +24,7 @@ class JsonSerializableNormalizer extends AbstractNormalizer /** * {@inheritdoc} */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if ($this->isCircularReference($object, $context)) { return $this->handleCircularReference($object, $format, $context); @@ -44,7 +44,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return $data instanceof \JsonSerializable; } @@ -52,7 +52,7 @@ public function supportsNormalization($data, string $format = null) /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return false; } @@ -60,7 +60,7 @@ public function supportsDenormalization($data, string $type, string $format = nu /** * {@inheritdoc} */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { throw new LogicException(sprintf('Cannot denormalize with "%s".', \JsonSerializable::class)); } diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php index 9dd9605a73ddd..a1e131835ab00 100644 --- a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php @@ -17,6 +17,7 @@ use Symfony\Component\Mime\Header\UnstructuredHeader; use Symfony\Component\Mime\Message; use Symfony\Component\Mime\Part\AbstractPart; +use Symfony\Component\Mime\RawMessage; use Symfony\Component\Serializer\SerializerAwareInterface; use Symfony\Component\Serializer\SerializerInterface; @@ -52,7 +53,7 @@ public function setSerializer(SerializerInterface $serializer) /** * {@inheritdoc} */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if ($object instanceof Headers) { $ret = []; @@ -63,21 +64,24 @@ public function normalize($object, string $format = null, array $context = []) return $ret; } + $ret = $this->normalizer->normalize($object, $format, $context); + if ($object instanceof AbstractPart) { - $ret = $this->normalizer->normalize($object, $format, $context); $ret['class'] = \get_class($object); unset($ret['seekable'], $ret['cid'], $ret['handle']); + } - return $ret; + if ($object instanceof RawMessage && \array_key_exists('message', $ret) && null === $ret['message']) { + unset($ret['message']); } - return $this->normalizer->normalize($object, $format, $context); + return $ret; } /** * {@inheritdoc} */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if (Headers::class === $type) { $ret = []; @@ -102,7 +106,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null): bool + public function supportsNormalization($data, ?string $format = null): bool { return $data instanceof Message || $data instanceof Headers || $data instanceof HeaderInterface || $data instanceof Address || $data instanceof AbstractPart; } @@ -110,7 +114,7 @@ public function supportsNormalization($data, string $format = null): bool /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null): bool + public function supportsDenormalization($data, string $type, ?string $format = null): bool { return is_a($type, Message::class, true) || Headers::class === $type || AbstractPart::class === $type; } diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php index ce4af8be5ea07..5a8dc28970238 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php @@ -35,5 +35,5 @@ interface NormalizableInterface * * @return array|string|int|float|bool */ - public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = []); + public function normalize(NormalizerInterface $normalizer, ?string $format = null, array $context = []); } diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php index b282f1dd61f91..87f8f1d8b8aa7 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php @@ -36,7 +36,7 @@ interface NormalizerInterface * @throws LogicException Occurs when the normalizer is not called in an expected context * @throws ExceptionInterface Occurs for all the other cases of errors */ - public function normalize($object, string $format = null, array $context = []); + public function normalize($object, ?string $format = null, array $context = []); /** * Checks whether the given class is supported for normalization by this normalizer. @@ -46,5 +46,5 @@ public function normalize($object, string $format = null, array $context = []); * * @return bool */ - public function supportsNormalization($data, string $format = null); + public function supportsNormalization($data, ?string $format = null); } diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php index eb3d9716a13ef..cbbade546a1c9 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php @@ -32,7 +32,7 @@ class ObjectNormalizer extends AbstractObjectNormalizer private $objectClassResolver; - public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = []) + public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory = null, ?NameConverterInterface $nameConverter = null, ?PropertyAccessorInterface $propertyAccessor = null, ?PropertyTypeExtractorInterface $propertyTypeExtractor = null, ?ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, ?callable $objectClassResolver = null, array $defaultContext = []) { if (!class_exists(PropertyAccess::class)) { throw new LogicException('The ObjectNormalizer class requires the "PropertyAccess" component. Install "symfony/property-access" to use it.'); @@ -58,7 +58,7 @@ public function hasCacheableSupportsMethod(): bool /** * {@inheritdoc} */ - protected function extractAttributes(object $object, string $format = null, array $context = []) + protected function extractAttributes(object $object, ?string $format = null, array $context = []) { if (\stdClass::class === \get_class($object)) { return array_keys((array) $object); @@ -124,7 +124,7 @@ protected function extractAttributes(object $object, string $format = null, arra /** * {@inheritdoc} */ - protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []) { $discriminatorProperty = null; if (null !== $this->classDiscriminatorResolver && null !== $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object)) { @@ -139,7 +139,7 @@ protected function getAttributeValue(object $object, string $attribute, string $ /** * {@inheritdoc} */ - protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []) + protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []) { try { $this->propertyAccessor->setValue($object, $attribute, $value); diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php b/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php index 6a0d324ce0691..adb519f457af2 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php @@ -21,7 +21,7 @@ trait ObjectToPopulateTrait * @param string|null $key They in which to look for the object to populate. * Keeps backwards compatibility with `AbstractNormalizer`. */ - protected function extractObjectToPopulate(string $class, array $context, string $key = null): ?object + protected function extractObjectToPopulate(string $class, array $context, ?string $key = null): ?object { $key = $key ?? AbstractNormalizer::OBJECT_TO_POPULATE; diff --git a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php index 6fdd2773a3608..0cc47cdf862b5 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php @@ -41,7 +41,7 @@ public function __construct(bool $debug = false, array $defaultContext = []) * * @return array */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { if (!$object instanceof FlattenException) { throw new InvalidArgumentException(sprintf('The object must implement "%s".', FlattenException::class)); @@ -67,7 +67,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null): bool + public function supportsNormalization($data, ?string $format = null): bool { return $data instanceof FlattenException; } diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php index 03060344690b1..15e60a968caea 100644 --- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php @@ -35,7 +35,7 @@ class PropertyNormalizer extends AbstractObjectNormalizer /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization($data, ?string $format = null) { return parent::supportsNormalization($data, $format) && $this->supports(\get_class($data)); } @@ -43,7 +43,7 @@ public function supportsNormalization($data, string $format = null) /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization($data, string $type, ?string $format = null) { return parent::supportsDenormalization($data, $type, $format) && $this->supports($type); } @@ -82,7 +82,7 @@ private function supports(string $class): bool /** * {@inheritdoc} */ - protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []) + protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []) { if (!parent::isAllowedAttribute($classOrObject, $attribute, $format, $context)) { return false; @@ -103,7 +103,7 @@ protected function isAllowedAttribute($classOrObject, string $attribute, string /** * {@inheritdoc} */ - protected function extractAttributes(object $object, string $format = null, array $context = []) + protected function extractAttributes(object $object, ?string $format = null, array $context = []) { $reflectionObject = new \ReflectionObject($object); $attributes = []; @@ -124,7 +124,7 @@ protected function extractAttributes(object $object, string $format = null, arra /** * {@inheritdoc} */ - protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []) { try { $reflectionProperty = $this->getReflectionProperty($object, $attribute); @@ -158,7 +158,7 @@ protected function getAttributeValue(object $object, string $attribute, string $ /** * {@inheritdoc} */ - protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []) + protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []) { try { $reflectionProperty = $this->getReflectionProperty($object, $attribute); diff --git a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php index 81e60a3494537..70b5e158d5d2b 100644 --- a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php @@ -40,7 +40,7 @@ public function __construct(array $defaultContext = []) * * @param AbstractUid $object */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { switch ($context[self::NORMALIZATION_FORMAT_KEY] ?? $this->defaultContext[self::NORMALIZATION_FORMAT_KEY]) { case self::NORMALIZATION_FORMAT_CANONICAL: @@ -59,7 +59,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null): bool + public function supportsNormalization($data, ?string $format = null): bool { return $data instanceof AbstractUid; } @@ -67,7 +67,7 @@ public function supportsNormalization($data, string $format = null): bool /** * {@inheritdoc} */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { try { return AbstractUid::class !== $type ? $type::fromString($data) : Uuid::fromString($data); @@ -85,7 +85,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null): bool + public function supportsDenormalization($data, string $type, ?string $format = null): bool { return is_a($type, AbstractUid::class, true); } diff --git a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php index 9e9880d901167..8a38538f08ee1 100644 --- a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php @@ -27,7 +27,7 @@ final class UnwrappingDenormalizer implements DenormalizerInterface, SerializerA private $propertyAccessor; - public function __construct(PropertyAccessorInterface $propertyAccessor = null) + public function __construct(?PropertyAccessorInterface $propertyAccessor = null) { $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor(); } @@ -35,7 +35,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null) /** * {@inheritdoc} */ - public function denormalize($data, $class, string $format = null, array $context = []) + public function denormalize($data, $class, ?string $format = null, array $context = []) { $propertyPath = $context[self::UNWRAP_PATH]; $context['unwrapped'] = true; @@ -54,7 +54,7 @@ public function denormalize($data, $class, string $format = null, array $context /** * {@inheritdoc} */ - public function supportsDenormalization($data, $type, string $format = null, array $context = []): bool + public function supportsDenormalization($data, $type, ?string $format = null, array $context = []): bool { return \array_key_exists(self::UNWRAP_PATH, $context) && !isset($context['unwrapped']); } diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index 607dc9963d417..d814a8aef94e2 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -154,7 +154,7 @@ final public function deserialize($data, string $type, string $format, array $co /** * {@inheritdoc} */ - public function normalize($data, string $format = null, array $context = []) + public function normalize($data, ?string $format = null, array $context = []) { // If a normalizer supports the given data, use it if ($normalizer = $this->getNormalizer($data, $format, $context)) { @@ -199,7 +199,7 @@ public function normalize($data, string $format = null, array $context = []) * @throws NotNormalizableValueException * @throws PartialDenormalizationException Occurs when one or more properties of $type fails to denormalize */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { if (isset($context[DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS], $context['not_normalizable_value_exceptions'])) { throw new LogicException('Passing a value for "not_normalizable_value_exceptions" context key is not allowed.'); @@ -254,7 +254,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null, array $context = []) + public function supportsNormalization($data, ?string $format = null, array $context = []) { return null !== $this->getNormalizer($data, $format, $context); } @@ -262,7 +262,7 @@ public function supportsNormalization($data, string $format = null, array $conte /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null, array $context = []) + public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []) { return isset(self::SCALAR_TYPES[$type]) || null !== $this->getDenormalizer($data, $type, $format, $context); } diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyWithWithVariadicParameterConstructor.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyWithWithVariadicParameterConstructor.php new file mode 100644 index 0000000000000..7b3819ac9f034 --- /dev/null +++ b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyWithWithVariadicParameterConstructor.php @@ -0,0 +1,44 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Serializer\Tests\Fixtures; + +class DummyWithWithVariadicParameterConstructor +{ + private $foo; + + private $bar; + + private $baz; + + public function __construct(string $foo, int $bar = 1, Dummy ...$baz) + { + $this->foo = $foo; + $this->bar = $bar; + $this->baz = $baz; + } + + public function getFoo(): string + { + return $this->foo; + } + + public function getBar(): int + { + return $this->bar; + } + + /** @return Dummy[] */ + public function getBaz(): array + { + return $this->baz; + } +} diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php index 2500327815cf1..ae627d96a0cc1 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php @@ -29,6 +29,7 @@ use Symfony\Component\Serializer\Tests\Fixtures\AbstractNormalizerDummy; use Symfony\Component\Serializer\Tests\Fixtures\Annotations\IgnoreDummy; use Symfony\Component\Serializer\Tests\Fixtures\Dummy; +use Symfony\Component\Serializer\Tests\Fixtures\DummyWithWithVariadicParameterConstructor; use Symfony\Component\Serializer\Tests\Fixtures\NullableConstructorArgumentDummy; use Symfony\Component\Serializer\Tests\Fixtures\NullableOptionalConstructorArgumentDummy; use Symfony\Component\Serializer\Tests\Fixtures\StaticConstructorDummy; @@ -247,6 +248,25 @@ public static function getNormalizer() yield [new ObjectNormalizer(null, null, null, $extractor)]; } + public function testVariadicConstructorDenormalization() + { + $data = [ + 'foo' => 'woo', + 'baz' => [ + ['foo' => null, 'bar' => null, 'baz' => null, 'qux' => null], + ['foo' => null, 'bar' => null, 'baz' => null, 'qux' => null], + ], + ]; + + $normalizer = new ObjectNormalizer(); + $normalizer->setSerializer(new Serializer([$normalizer])); + + $expected = new DummyWithWithVariadicParameterConstructor('woo', 1, new Dummy(), new Dummy()); + $actual = $normalizer->denormalize($data, DummyWithWithVariadicParameterConstructor::class); + + $this->assertEquals($expected, $actual); + } + public static function getNormalizerWithCustomNameConverter() { $extractor = new PhpDocExtractor(); diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php index 4e781c5d81175..5adc3d4eef74d 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php @@ -473,17 +473,17 @@ protected function getAllowedAttributes($classOrObject, array $context, bool $at return ['foo']; } - protected function extractAttributes(object $object, string $format = null, array $context = []): array + protected function extractAttributes(object $object, ?string $format = null, array $context = []): array { return []; } - protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []) { return $object->$attribute; } - protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []) + protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []) { } }; @@ -548,30 +548,140 @@ public function testDenormalizeUntypedStringObject() $this->assertEquals(new DummyWithStringObject(new DummyString()), $actual); $this->assertEquals('', $actual->value->value); } + + public function testProvidingContextCacheKeyGeneratesSameChildContextCacheKey() + { + $foobar = new Dummy(); + $foobar->foo = new EmptyDummy(); + $foobar->bar = 'bar'; + $foobar->baz = 'baz'; + + $normalizer = new class() extends AbstractObjectNormalizerDummy { + public $childContextCacheKey; + + protected function extractAttributes(object $object, string $format = null, array $context = []): array + { + return array_keys((array) $object); + } + + protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + { + return $object->{$attribute}; + } + + protected function createChildContext(array $parentContext, string $attribute, ?string $format): array + { + $childContext = parent::createChildContext($parentContext, $attribute, $format); + $this->childContextCacheKey = $childContext['cache_key']; + + return $childContext; + } + }; + + $serializer = new Serializer([$normalizer]); + + $serializer->normalize($foobar, null, ['cache_key' => 'hardcoded', 'iri' => '/dummy/1']); + $firstChildContextCacheKey = $normalizer->childContextCacheKey; + + $serializer->normalize($foobar, null, ['cache_key' => 'hardcoded', 'iri' => '/dummy/2']); + $secondChildContextCacheKey = $normalizer->childContextCacheKey; + + $this->assertSame($firstChildContextCacheKey, $secondChildContextCacheKey); + } + + public function testChildContextKeepsOriginalContextCacheKey() + { + $foobar = new Dummy(); + $foobar->foo = new EmptyDummy(); + $foobar->bar = 'bar'; + $foobar->baz = 'baz'; + + $normalizer = new class() extends AbstractObjectNormalizerDummy { + public $childContextCacheKey; + + protected function extractAttributes(object $object, string $format = null, array $context = []): array + { + return array_keys((array) $object); + } + + protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + { + return $object->{$attribute}; + } + + protected function createChildContext(array $parentContext, string $attribute, ?string $format): array + { + $childContext = parent::createChildContext($parentContext, $attribute, $format); + $this->childContextCacheKey = $childContext['cache_key']; + + return $childContext; + } + }; + + $serializer = new Serializer([$normalizer]); + $serializer->normalize($foobar, null, ['cache_key' => 'hardcoded', 'iri' => '/dummy/1']); + + $this->assertSame('hardcoded-foo', $normalizer->childContextCacheKey); + } + + public function testChildContextCacheKeyStaysFalseWhenOriginalCacheKeyIsFalse() + { + $foobar = new Dummy(); + $foobar->foo = new EmptyDummy(); + $foobar->bar = 'bar'; + $foobar->baz = 'baz'; + + $normalizer = new class() extends AbstractObjectNormalizerDummy { + public $childContextCacheKey; + + protected function extractAttributes(object $object, string $format = null, array $context = []): array + { + return array_keys((array) $object); + } + + protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + { + return $object->{$attribute}; + } + + protected function createChildContext(array $parentContext, string $attribute, ?string $format): array + { + $childContext = parent::createChildContext($parentContext, $attribute, $format); + $this->childContextCacheKey = $childContext['cache_key']; + + return $childContext; + } + }; + + $serializer = new Serializer([$normalizer]); + $serializer->normalize($foobar, null, ['cache_key' => false]); + + $this->assertFalse($normalizer->childContextCacheKey); + } } class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer { - protected function extractAttributes(object $object, string $format = null, array $context = []): array + protected function extractAttributes(object $object, ?string $format = null, array $context = []): array { return []; } - protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []) { } - protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []) + protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []) { $object->$attribute = $value; } - protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []): bool + protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool { return \in_array($attribute, ['foo', 'baz', 'quux', 'value']); } - public function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, string $format = null): object + public function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, ?string $format = null): object { return parent::instantiateObject($data, $class, $context, $reflectionClass, $allowedAttributes, $format); } @@ -595,15 +705,15 @@ public function __construct() parent::__construct(new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()))); } - protected function extractAttributes(object $object, string $format = null, array $context = []): array + protected function extractAttributes(object $object, ?string $format = null, array $context = []): array { } - protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []) { } - protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []) + protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []) { $object->$attribute = $value; } @@ -691,7 +801,7 @@ public function deserialize($data, string $type, string $format, array $context { } - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { foreach ($this->normalizers as $normalizer) { if ($normalizer instanceof DenormalizerInterface && $normalizer->supportsDenormalization($data, $type, $format, $context)) { @@ -702,7 +812,7 @@ public function denormalize($data, string $type, string $format = null, array $c return null; } - public function supportsDenormalization($data, string $type, string $format = null): bool + public function supportsDenormalization($data, string $type, ?string $format = null): bool { return true; } @@ -710,25 +820,25 @@ public function supportsDenormalization($data, string $type, string $format = nu class AbstractObjectNormalizerCollectionDummy extends AbstractObjectNormalizer { - protected function extractAttributes(object $object, string $format = null, array $context = []): array + protected function extractAttributes(object $object, ?string $format = null, array $context = []): array { } - protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []) + protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []) { } - protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []) + protected function setAttributeValue(object $object, string $attribute, $value, ?string $format = null, array $context = []) { $object->$attribute = $value; } - protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []): bool + protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool { return true; } - public function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, string $format = null): object + public function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, ?string $format = null): object { return parent::instantiateObject($data, $class, $context, $reflectionClass, $allowedAttributes, $format); } @@ -754,7 +864,7 @@ class ArrayDenormalizerDummy implements DenormalizerInterface, SerializerAwareIn * * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { $serializer = $this->serializer; $type = substr($type, 0, -2); @@ -769,7 +879,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool + public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool { return str_ends_with($type, '[]') && $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context); diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php index 4dd1779489c81..510451cc57a3e 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php @@ -111,7 +111,7 @@ public function testNormalizeWithNameConverter() /** * @dataProvider payloadFieldsProvider */ - public function testNormalizePayloadFields($fields, array $expected = null) + public function testNormalizePayloadFields($fields, ?array $expected = null) { $constraint = new NotNull(); $constraint->payload = ['severity' => 'warning', 'anotherField2' => 'aValue']; diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php index 19ad3f547c412..d484f8b8a7c71 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php @@ -20,7 +20,7 @@ class CallbacksObject */ public $foo; - public function __construct($bar = null, string $foo = null) + public function __construct($bar = null, ?string $foo = null) { $this->bar = $bar; $this->foo = $foo; diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php index a909274ebd1dd..36957ac5c0a3f 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php @@ -91,7 +91,7 @@ protected function setUp(): void $this->createNormalizer(); } - private function createNormalizer(array $defaultContext = [], ClassMetadataFactoryInterface $classMetadataFactory = null) + private function createNormalizer(array $defaultContext = [], ?ClassMetadataFactoryInterface $classMetadataFactory = null) { $this->serializer = $this->createMock(ObjectSerializerNormalizer::class); $this->normalizer = new ObjectNormalizer($classMetadataFactory, null, null, null, null, null, $defaultContext); @@ -789,12 +789,12 @@ public function testDenormalizeFalsePseudoType() public function testAdvancedNameConverter() { $nameConverter = new class() implements AdvancedNameConverterInterface { - public function normalize(string $propertyName, string $class = null, string $format = null, array $context = []): string + public function normalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string { return sprintf('%s-%s-%s-%s', $propertyName, $class, $format, $context['foo']); } - public function denormalize(string $propertyName, string $class = null, string $format = null, array $context = []): string + public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string { return sprintf('%s-%s-%s-%s', $propertyName, $class, $format, $context['foo']); } @@ -1047,7 +1047,7 @@ public function __get($name) class FormatAndContextAwareNormalizer extends ObjectNormalizer { - protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []): bool + protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool { if (\in_array($attribute, ['foo', 'bar']) && 'foo_and_bar_included' === $format) { return true; @@ -1103,7 +1103,7 @@ class DummyWithConstructorObjectAndDefaultValue private $foo; private $inner; - public function __construct($foo = 'a', ObjectInner $inner = null) + public function __construct($foo = 'a', ?ObjectInner $inner = null) { $this->foo = $foo; $this->inner = $inner; diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php index 68c8c532c998c..6639c76d62d1d 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php @@ -23,14 +23,14 @@ class TestDenormalizer implements DenormalizerInterface /** * {@inheritdoc} */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, ?string $format = null, array $context = []) { } /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null): bool + public function supportsDenormalization($data, string $type, ?string $format = null): bool { return true; } diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php index 75a999485bec6..84b806941898a 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php @@ -23,7 +23,7 @@ class TestNormalizer implements NormalizerInterface /** * {@inheritdoc} */ - public function normalize($object, string $format = null, array $context = []) + public function normalize($object, ?string $format = null, array $context = []) { return null; } @@ -31,7 +31,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null): bool + public function supportsNormalization($data, ?string $format = null): bool { return true; } diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php index 447e0f882a8c5..921d3fd010ef8 100644 --- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php +++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php @@ -1049,7 +1049,7 @@ public function testCollectDenormalizationErrors(?ClassMetadataFactory $classMet 'expectedTypes' => [ 'unknown', ], - 'path' => 'php74FullWithConstructor', + 'path' => 'php74FullWithConstructor.constructorArgument', 'useMessageForUser' => true, 'message' => 'Failed to create object because the class misses the "constructorArgument" property.', ], @@ -1186,6 +1186,75 @@ public function testCollectDenormalizationErrors2(?ClassMetadataFactory $classMe $this->assertSame($expected, $exceptionsAsArray); } + /** + * @requires PHP 7.4 + */ + public function testCollectDenormalizationErrorsWithoutTypeExtractor() + { + $json = ' + { + "string": [], + "int": [], + "float": [] + }'; + + $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]); + + try { + $serializer->deserialize($json, Php74Full::class, 'json', [ + DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS => true, + ]); + + $this->fail(); + } catch (\Throwable $th) { + $this->assertInstanceOf(PartialDenormalizationException::class, $th); + } + + $this->assertInstanceOf(Php74Full::class, $th->getData()); + + $exceptionsAsArray = array_map(function (NotNormalizableValueException $e): array { + return [ + 'currentType' => $e->getCurrentType(), + 'expectedTypes' => $e->getExpectedTypes(), + 'path' => $e->getPath(), + 'useMessageForUser' => $e->canUseMessageForUser(), + 'message' => $e->getMessage(), + ]; + }, $th->getErrors()); + + $expected = [ + [ + 'currentType' => 'array', + 'expectedTypes' => [ + 'unknown', + ], + 'path' => 'string', + 'useMessageForUser' => false, + 'message' => 'Failed to denormalize attribute "string" value for class "Symfony\\Component\\Serializer\\Tests\\Fixtures\\Php74Full": Expected argument of type "string", "array" given at property path "string".', + ], + [ + 'currentType' => 'array', + 'expectedTypes' => [ + 'unknown', + ], + 'path' => 'int', + 'useMessageForUser' => false, + 'message' => 'Failed to denormalize attribute "int" value for class "Symfony\\Component\\Serializer\\Tests\\Fixtures\\Php74Full": Expected argument of type "int", "array" given at property path "int".', + ], + [ + 'currentType' => 'array', + 'expectedTypes' => [ + 'unknown', + ], + 'path' => 'float', + 'useMessageForUser' => false, + 'message' => 'Failed to denormalize attribute "float" value for class "Symfony\\Component\\Serializer\\Tests\\Fixtures\\Php74Full": Expected argument of type "float", "array" given at property path "float".', + ], + ]; + + $this->assertSame($expected, $exceptionsAsArray); + } + /** * @dataProvider provideCollectDenormalizationErrors * @@ -1241,7 +1310,7 @@ public function testCollectDenormalizationErrorsWithConstructor(?ClassMetadataFa 'expectedTypes' => [ 'unknown', ], - 'path' => null, + 'path' => 'string', 'useMessageForUser' => true, 'message' => 'Failed to create object because the class misses the "string" property.', ], @@ -1250,7 +1319,7 @@ public function testCollectDenormalizationErrorsWithConstructor(?ClassMetadataFa 'expectedTypes' => [ 'unknown', ], - 'path' => null, + 'path' => 'int', 'useMessageForUser' => true, 'message' => 'Failed to create object because the class misses the "int" property.', ], @@ -1300,7 +1369,7 @@ public function testCollectDenormalizationErrorsWithInvalidConstructorTypes() [ 'currentType' => 'string', 'expectedTypes' => [ - 0 => 'bool', + 'bool', ], 'path' => 'bool', 'useMessageForUser' => false, @@ -1309,7 +1378,7 @@ public function testCollectDenormalizationErrorsWithInvalidConstructorTypes() [ 'currentType' => 'bool', 'expectedTypes' => [ - 0 => 'int', + 'int', ], 'path' => 'int', 'useMessageForUser' => false, @@ -1481,7 +1550,7 @@ public function testPartialDenormalizationWithMissingConstructorTypes() 'expectedTypes' => [ 'unknown', ], - 'path' => null, + 'path' => 'two', 'useMessageForUser' => true, 'message' => 'Failed to create object because the class misses the "two" property.', ], diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index 3ec14ae0fc313..ec5e37a3ff1d0 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -33,7 +33,7 @@ "symfony/http-foundation": "^4.4|^5.0|^6.0", "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/mime": "^4.4|^5.0|^6.0", - "symfony/property-access": "^5.4|^6.0", + "symfony/property-access": "^5.4.26|^6.3", "symfony/property-info": "^5.4.24|^6.2.11", "symfony/uid": "^5.3|^6.0", "symfony/validator": "^4.4|^5.0|^6.0", diff --git a/src/Symfony/Component/Stopwatch/Section.php b/src/Symfony/Component/Stopwatch/Section.php index 56cdc6f125396..958e8821fb470 100644 --- a/src/Symfony/Component/Stopwatch/Section.php +++ b/src/Symfony/Component/Stopwatch/Section.php @@ -47,7 +47,7 @@ class Section * @param float|null $origin Set the origin of the events in this section, use null to set their origin to their start time * @param bool $morePrecision If true, time is stored as float to keep the original microsecond precision */ - public function __construct(float $origin = null, bool $morePrecision = false) + public function __construct(?float $origin = null, bool $morePrecision = false) { $this->origin = $origin; $this->morePrecision = $morePrecision; diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php index 2f46c5998176a..e521789558fc2 100644 --- a/src/Symfony/Component/Stopwatch/Stopwatch.php +++ b/src/Symfony/Component/Stopwatch/Stopwatch.php @@ -62,7 +62,7 @@ public function getSections() * * @throws \LogicException When the section to re-open is not reachable */ - public function openSection(string $id = null) + public function openSection(?string $id = null) { $current = end($this->activeSections); @@ -101,7 +101,7 @@ public function stopSection(string $id) * * @return StopwatchEvent */ - public function start(string $name, string $category = null) + public function start(string $name, ?string $category = null) { return end($this->activeSections)->startEvent($name, $category); } diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php index 945bc7029f194..b9be5a98db88e 100644 --- a/src/Symfony/Component/Stopwatch/StopwatchEvent.php +++ b/src/Symfony/Component/Stopwatch/StopwatchEvent.php @@ -56,7 +56,7 @@ class StopwatchEvent * * @throws \InvalidArgumentException When the raw time is not valid */ - public function __construct(float $origin, string $category = null, bool $morePrecision = false, string $name = null) + public function __construct(float $origin, ?string $category = null, bool $morePrecision = false, ?string $name = null) { $this->origin = $this->formatTime($origin); $this->category = \is_string($category) ? $category : 'default'; diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php index a0a801e69ab0b..d3240ca4d7700 100644 --- a/src/Symfony/Component/String/AbstractString.php +++ b/src/Symfony/Component/String/AbstractString.php @@ -399,7 +399,7 @@ public function isEmpty(): bool /** * @return static */ - abstract public function join(array $strings, string $lastGlue = null): self; + abstract public function join(array $strings, ?string $lastGlue = null): self; public function jsonSerialize(): string { @@ -477,7 +477,7 @@ abstract public function reverse(): self; /** * @return static */ - abstract public function slice(int $start = 0, int $length = null): self; + abstract public function slice(int $start = 0, ?int $length = null): self; /** * @return static @@ -487,12 +487,12 @@ abstract public function snake(): self; /** * @return static */ - abstract public function splice(string $replacement, int $start = 0, int $length = null): self; + abstract public function splice(string $replacement, int $start = 0, ?int $length = null): self; /** * @return static[] */ - public function split(string $delimiter, int $limit = null, int $flags = null): array + public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array { if (null === $flags) { throw new \TypeError('Split behavior when $flags is null must be implemented by child classes.'); @@ -560,7 +560,7 @@ public function startsWith($prefix): bool */ abstract public function title(bool $allWords = false): self; - public function toByteString(string $toEncoding = null): ByteString + public function toByteString(?string $toEncoding = null): ByteString { $b = new ByteString(); diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php index 80b8326aee722..52123f507733b 100644 --- a/src/Symfony/Component/String/AbstractUnicodeString.php +++ b/src/Symfony/Component/String/AbstractUnicodeString.php @@ -203,7 +203,7 @@ public function folded(bool $compat = true): parent return $str; } - public function join(array $strings, string $lastGlue = null): parent + public function join(array $strings, ?string $lastGlue = null): parent { $str = clone $this; diff --git a/src/Symfony/Component/String/ByteString.php b/src/Symfony/Component/String/ByteString.php index 626d8c1bb31fe..05170da801c0e 100644 --- a/src/Symfony/Component/String/ByteString.php +++ b/src/Symfony/Component/String/ByteString.php @@ -42,7 +42,7 @@ public function __construct(string $string = '') * Copyright (c) 2004-2020, Facebook, Inc. (https://www.facebook.com/) */ - public static function fromRandom(int $length = 16, string $alphabet = null): self + public static function fromRandom(int $length = 16, ?string $alphabet = null): self { if ($length <= 0) { throw new InvalidArgumentException(sprintf('A strictly positive length is expected, "%d" given.', $length)); @@ -213,7 +213,7 @@ public function isUtf8(): bool return '' === $this->string || preg_match('//u', $this->string); } - public function join(array $strings, string $lastGlue = null): parent + public function join(array $strings, ?string $lastGlue = null): parent { $str = clone $this; @@ -356,7 +356,7 @@ public function reverse(): parent return $str; } - public function slice(int $start = 0, int $length = null): parent + public function slice(int $start = 0, ?int $length = null): parent { $str = clone $this; $str->string = (string) substr($this->string, $start, $length ?? \PHP_INT_MAX); @@ -372,7 +372,7 @@ public function snake(): parent return $str; } - public function splice(string $replacement, int $start = 0, int $length = null): parent + public function splice(string $replacement, int $start = 0, ?int $length = null): parent { $str = clone $this; $str->string = substr_replace($this->string, $replacement, $start, $length ?? \PHP_INT_MAX); @@ -380,7 +380,7 @@ public function splice(string $replacement, int $start = 0, int $length = null): return $str; } - public function split(string $delimiter, int $limit = null, int $flags = null): array + public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array { if (1 > $limit = $limit ?? \PHP_INT_MAX) { throw new InvalidArgumentException('Split limit must be a positive integer.'); @@ -426,12 +426,12 @@ public function title(bool $allWords = false): parent return $str; } - public function toUnicodeString(string $fromEncoding = null): UnicodeString + public function toUnicodeString(?string $fromEncoding = null): UnicodeString { return new UnicodeString($this->toCodePointString($fromEncoding)->string); } - public function toCodePointString(string $fromEncoding = null): CodePointString + public function toCodePointString(?string $fromEncoding = null): CodePointString { $u = new CodePointString(); diff --git a/src/Symfony/Component/String/CodePointString.php b/src/Symfony/Component/String/CodePointString.php index 8ab9209413b50..55c2aefebb484 100644 --- a/src/Symfony/Component/String/CodePointString.php +++ b/src/Symfony/Component/String/CodePointString.php @@ -194,7 +194,7 @@ public function replace(string $from, string $to): AbstractString return $str; } - public function slice(int $start = 0, int $length = null): AbstractString + public function slice(int $start = 0, ?int $length = null): AbstractString { $str = clone $this; $str->string = mb_substr($this->string, $start, $length, 'UTF-8'); @@ -202,7 +202,7 @@ public function slice(int $start = 0, int $length = null): AbstractString return $str; } - public function splice(string $replacement, int $start = 0, int $length = null): AbstractString + public function splice(string $replacement, int $start = 0, ?int $length = null): AbstractString { if (!preg_match('//u', $replacement)) { throw new InvalidArgumentException('Invalid UTF-8 string.'); @@ -216,7 +216,7 @@ public function splice(string $replacement, int $start = 0, int $length = null): return $str; } - public function split(string $delimiter, int $limit = null, int $flags = null): array + public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array { if (1 > $limit = $limit ?? \PHP_INT_MAX) { throw new InvalidArgumentException('Split limit must be a positive integer.'); diff --git a/src/Symfony/Component/String/Inflector/EnglishInflector.php b/src/Symfony/Component/String/Inflector/EnglishInflector.php index e1bcd87b2ce65..30b18a3814faf 100644 --- a/src/Symfony/Component/String/Inflector/EnglishInflector.php +++ b/src/Symfony/Component/String/Inflector/EnglishInflector.php @@ -166,6 +166,9 @@ final class EnglishInflector implements InflectorInterface // Fourth entry: Whether the suffix may succeed a consonant // Fifth entry: plural suffix, normal + // axes (axis) + ['sixa', 4, false, false, 'axes'], + // criterion (criteria) ['airetirc', 8, false, false, 'criterion'], @@ -384,6 +387,9 @@ final class EnglishInflector implements InflectorInterface // traffic 'ciffart', + + // aircraft + 'tfarcria', ]; /** diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php index 5aecfeb5fcd7d..5eb7fc125387d 100644 --- a/src/Symfony/Component/String/Slugger/AsciiSlugger.php +++ b/src/Symfony/Component/String/Slugger/AsciiSlugger.php @@ -69,7 +69,7 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface /** * @param array|\Closure|null $symbolsMap */ - public function __construct(string $defaultLocale = null, $symbolsMap = null) + public function __construct(?string $defaultLocale = null, $symbolsMap = null) { if (null !== $symbolsMap && !\is_array($symbolsMap) && !$symbolsMap instanceof \Closure) { throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be array, Closure or null, "%s" given.', __METHOD__, \gettype($symbolsMap))); @@ -98,7 +98,7 @@ public function getLocale() /** * {@inheritdoc} */ - public function slug(string $string, string $separator = '-', string $locale = null): AbstractUnicodeString + public function slug(string $string, string $separator = '-', ?string $locale = null): AbstractUnicodeString { $locale = $locale ?? $this->defaultLocale; diff --git a/src/Symfony/Component/String/Slugger/SluggerInterface.php b/src/Symfony/Component/String/Slugger/SluggerInterface.php index c679ed9331040..dd0d58102c6ea 100644 --- a/src/Symfony/Component/String/Slugger/SluggerInterface.php +++ b/src/Symfony/Component/String/Slugger/SluggerInterface.php @@ -23,5 +23,5 @@ interface SluggerInterface /** * Creates a slug for the given string and locale, using appropriate transliteration when needed. */ - public function slug(string $string, string $separator = '-', string $locale = null): AbstractUnicodeString; + public function slug(string $string, string $separator = '-', ?string $locale = null): AbstractUnicodeString; } diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php index 5d3127329c459..8bde9bc8b3df3 100644 --- a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php +++ b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php @@ -46,7 +46,7 @@ public function testCreateFromEmptyString() /** * @dataProvider provideBytesAt */ - public function testBytesAt(array $expected, string $string, int $offset, int $form = null) + public function testBytesAt(array $expected, string $string, int $offset, ?int $form = null) { if (2 !== grapheme_strlen('च्छे') && 'नमस्ते' === $string) { $this->markTestSkipped('Skipping due to issue ICU-21661.'); @@ -319,7 +319,7 @@ public static function provideIndexOfLastIgnoreCase(): array /** * @dataProvider provideSplit */ - public function testSplit(string $string, string $delimiter, array $chunks, ?int $limit, int $flags = null) + public function testSplit(string $string, string $delimiter, array $chunks, ?int $limit, ?int $flags = null) { $this->assertEquals($chunks, static::createFromString($string)->split($delimiter, $limit, $flags)); } @@ -595,7 +595,7 @@ public static function provideTitle() /** * @dataProvider provideSlice */ - public function testSlice(string $expected, string $origin, int $start, int $length = null) + public function testSlice(string $expected, string $origin, int $start, ?int $length = null) { $this->assertEquals( static::createFromString($expected), @@ -623,7 +623,7 @@ public static function provideSlice() /** * @dataProvider provideSplice */ - public function testSplice(string $expected, int $start, int $length = null) + public function testSplice(string $expected, int $start, ?int $length = null) { $this->assertEquals( static::createFromString($expected), @@ -1083,7 +1083,7 @@ public static function provideSnake() /** * @dataProvider provideStartsWith */ - public function testStartsWith(bool $expected, string $origin, $prefix, int $form = null) + public function testStartsWith(bool $expected, string $origin, $prefix, ?int $form = null) { $instance = static::createFromString($origin); $instance = $form ? $instance->normalize($form) : $instance; @@ -1137,7 +1137,7 @@ public static function provideStartsWithIgnoreCase() /** * @dataProvider provideEndsWith */ - public function testEndsWith(bool $expected, string $origin, $suffix, int $form = null) + public function testEndsWith(bool $expected, string $origin, $suffix, ?int $form = null) { $instance = static::createFromString($origin); $instance = $form ? $instance->normalize($form) : $instance; diff --git a/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php b/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php index 83b7d03d30f79..49e44f8cf1bac 100644 --- a/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php +++ b/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php @@ -80,7 +80,7 @@ public static function provideBytesAt(): array /** * @dataProvider provideCodePointsAt */ - public function testCodePointsAt(array $expected, string $string, int $offset, int $form = null) + public function testCodePointsAt(array $expected, string $string, int $offset, ?int $form = null) { if (2 !== grapheme_strlen('च्छे') && 'नमस्ते' === $string) { $this->markTestSkipped('Skipping due to issue ICU-21661.'); diff --git a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php index cf66bf05b660c..378592282e883 100644 --- a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php +++ b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php @@ -178,6 +178,7 @@ public static function pluralizeProvider() ['access', 'accesses'], ['address', 'addresses'], ['agenda', 'agendas'], + ['aircraft', 'aircraft'], ['alumnus', 'alumni'], ['analysis', 'analyses'], ['antenna', 'antennas'], // antennae @@ -185,6 +186,7 @@ public static function pluralizeProvider() ['arch', 'arches'], ['atlas', 'atlases'], ['axe', 'axes'], + ['axis', 'axes'], ['baby', 'babies'], ['bacterium', 'bacteria'], ['base', 'bases'], diff --git a/src/Symfony/Component/String/Tests/Slugger/AsciiSluggerTest.php b/src/Symfony/Component/String/Tests/Slugger/AsciiSluggerTest.php index 89b5887a4099f..7656c334e9aa5 100644 --- a/src/Symfony/Component/String/Tests/Slugger/AsciiSluggerTest.php +++ b/src/Symfony/Component/String/Tests/Slugger/AsciiSluggerTest.php @@ -38,7 +38,7 @@ public static function provideSlugTests(): iterable } /** @dataProvider provideSlugTests */ - public function testSlug(string $expected, string $string, string $separator = '-', string $locale = null) + public function testSlug(string $expected, string $string, string $separator = '-', ?string $locale = null) { $slugger = new AsciiSlugger(); diff --git a/src/Symfony/Component/String/UnicodeString.php b/src/Symfony/Component/String/UnicodeString.php index 9b906c6fc2964..7d5b567ccaa5e 100644 --- a/src/Symfony/Component/String/UnicodeString.php +++ b/src/Symfony/Component/String/UnicodeString.php @@ -184,7 +184,7 @@ public function indexOfLast($needle, int $offset = 0): ?int return false === $i ? null : $i; } - public function join(array $strings, string $lastGlue = null): AbstractString + public function join(array $strings, ?string $lastGlue = null): AbstractString { $str = parent::join($strings, $lastGlue); normalizer_is_normalized($str->string) ?: $str->string = normalizer_normalize($str->string); @@ -264,7 +264,7 @@ public function replaceMatches(string $fromRegexp, $to): AbstractString return $str; } - public function slice(int $start = 0, int $length = null): AbstractString + public function slice(int $start = 0, ?int $length = null): AbstractString { $str = clone $this; @@ -276,7 +276,7 @@ public function slice(int $start = 0, int $length = null): AbstractString return $str; } - public function splice(string $replacement, int $start = 0, int $length = null): AbstractString + public function splice(string $replacement, int $start = 0, ?int $length = null): AbstractString { $str = clone $this; @@ -295,7 +295,7 @@ public function splice(string $replacement, int $start = 0, int $length = null): return $str; } - public function split(string $delimiter, int $limit = null, int $flags = null): array + public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array { if (1 > $limit = $limit ?? 2147483647) { throw new InvalidArgumentException('Split limit must be a positive integer.'); diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php index 4253f6b59b4bc..a22c8ebaac09a 100644 --- a/src/Symfony/Component/Templating/PhpEngine.php +++ b/src/Symfony/Component/Templating/PhpEngine.php @@ -244,7 +244,7 @@ public function setHelpers(array $helpers) $this->addHelpers($helpers); } - public function set(HelperInterface $helper, string $alias = null) + public function set(HelperInterface $helper, ?string $alias = null) { $this->helpers[$helper->getName()] = $helper; if (null !== $alias) { diff --git a/src/Symfony/Component/Templating/TemplateReference.php b/src/Symfony/Component/Templating/TemplateReference.php index ab370b2c299ab..95bd078b9b8c3 100644 --- a/src/Symfony/Component/Templating/TemplateReference.php +++ b/src/Symfony/Component/Templating/TemplateReference.php @@ -20,7 +20,7 @@ class TemplateReference implements TemplateReferenceInterface { protected $parameters; - public function __construct(string $name = null, string $engine = null) + public function __construct(?string $name = null, ?string $engine = null) { $this->parameters = [ 'name' => $name, diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php index fb2b5f31c4eec..0a0bc0ee6396c 100644 --- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php +++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php @@ -42,7 +42,7 @@ class XliffLintCommand extends Command private $isReadableProvider; private $requireStrictFileNames; - public function __construct(string $name = null, callable $directoryIteratorProvider = null, callable $isReadableProvider = null, bool $requireStrictFileNames = true) + public function __construct(?string $name = null, ?callable $directoryIteratorProvider = null, ?callable $isReadableProvider = null, bool $requireStrictFileNames = true) { parent::__construct($name); @@ -111,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output) return $this->display($io, $filesInfo); } - private function validate(string $content, string $file = null): array + private function validate(string $content, ?string $file = null): array { $errors = []; diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php index 379130a44b0f5..12c1d04aec6c9 100644 --- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php +++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php @@ -48,7 +48,7 @@ public function lateCollect() /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { $this->data['locale'] = $this->translator->getLocale(); $this->data['fallback_locales'] = $this->translator->getFallbackLocales(); diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php index ea5a2dd5e7abb..6de5e22a3e4a2 100644 --- a/src/Symfony/Component/Translation/DataCollectorTranslator.php +++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php @@ -43,7 +43,7 @@ public function __construct(TranslatorInterface $translator) /** * {@inheritdoc} */ - public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null) + public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null) { $trans = $this->translator->trans($id = (string) $id, $parameters, $domain, $locale); $this->collectMessage($locale, $domain, $id, $trans, $parameters); @@ -70,7 +70,7 @@ public function getLocale() /** * {@inheritdoc} */ - public function getCatalogue(string $locale = null) + public function getCatalogue(?string $locale = null) { return $this->translator->getCatalogue($locale); } diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php index f7dbdcddf5fab..a480b3f2330b6 100644 --- a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php @@ -196,7 +196,7 @@ private function dumpXliff2(string $defaultLocale, MessageCatalogue $messages, ? return $dom->saveXML(); } - private function hasMetadataArrayInfo(string $key, array $metadata = null): bool + private function hasMetadataArrayInfo(string $key, ?array $metadata = null): bool { return is_iterable($metadata[$key] ?? null); } diff --git a/src/Symfony/Component/Translation/Exception/IncompleteDsnException.php b/src/Symfony/Component/Translation/Exception/IncompleteDsnException.php index cb0ce027eb77c..b304bde018807 100644 --- a/src/Symfony/Component/Translation/Exception/IncompleteDsnException.php +++ b/src/Symfony/Component/Translation/Exception/IncompleteDsnException.php @@ -13,7 +13,7 @@ class IncompleteDsnException extends InvalidArgumentException { - public function __construct(string $message, string $dsn = null, \Throwable $previous = null) + public function __construct(string $message, ?string $dsn = null, ?\Throwable $previous = null) { if ($dsn) { $message = sprintf('Invalid "%s" provider DSN: ', $dsn).$message; diff --git a/src/Symfony/Component/Translation/Exception/MissingRequiredOptionException.php b/src/Symfony/Component/Translation/Exception/MissingRequiredOptionException.php index 2b5f808065eee..46152e254cefc 100644 --- a/src/Symfony/Component/Translation/Exception/MissingRequiredOptionException.php +++ b/src/Symfony/Component/Translation/Exception/MissingRequiredOptionException.php @@ -16,7 +16,7 @@ */ class MissingRequiredOptionException extends IncompleteDsnException { - public function __construct(string $option, string $dsn = null, \Throwable $previous = null) + public function __construct(string $option, ?string $dsn = null, ?\Throwable $previous = null) { $message = sprintf('The option "%s" is required but missing.', $option); diff --git a/src/Symfony/Component/Translation/Exception/ProviderException.php b/src/Symfony/Component/Translation/Exception/ProviderException.php index 571920da3b37d..8b909fe2713f3 100644 --- a/src/Symfony/Component/Translation/Exception/ProviderException.php +++ b/src/Symfony/Component/Translation/Exception/ProviderException.php @@ -21,7 +21,7 @@ class ProviderException extends RuntimeException implements ProviderExceptionInt private $response; private $debug; - public function __construct(string $message, ResponseInterface $response, int $code = 0, \Exception $previous = null) + public function __construct(string $message, ResponseInterface $response, int $code = 0, ?\Exception $previous = null) { $this->response = $response; $this->debug = $response->getInfo('debug') ?? ''; diff --git a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php index 7fbaa8f04d08f..800c4cdb63ec3 100644 --- a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php +++ b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php @@ -31,7 +31,7 @@ class UnsupportedSchemeException extends LogicException ], ]; - public function __construct(Dsn $dsn, string $name = null, array $supported = []) + public function __construct(Dsn $dsn, ?string $name = null, array $supported = []) { $provider = $dsn->getScheme(); if (false !== $pos = strpos($provider, '+')) { diff --git a/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php b/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php index d114cc738ab12..c0699461db3a0 100644 --- a/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php +++ b/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php @@ -93,7 +93,7 @@ public static function parse(string $str) * * @return string */ - public static function parseEscapeSequences(string $str, string $quote = null) + public static function parseEscapeSequences(string $str, ?string $quote = null) { if (null !== $quote) { $str = str_replace('\\'.$quote, $quote, $str); diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php index 04079648338c8..3449a84a5ec53 100644 --- a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php +++ b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php @@ -28,7 +28,7 @@ class MessageFormatter implements MessageFormatterInterface, IntlFormatterInterf /** * @param TranslatorInterface|null $translator An identity translator to use as selector for pluralization */ - public function __construct(TranslatorInterface $translator = null, IntlFormatterInterface $intlFormatter = null) + public function __construct(?TranslatorInterface $translator = null, ?IntlFormatterInterface $intlFormatter = null) { $this->translator = $translator ?? new IdentityTranslator(); $this->intlFormatter = $intlFormatter ?? new IntlFormatter(); diff --git a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php index 6b7834e675a4b..88e13373887a0 100644 --- a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php @@ -75,7 +75,7 @@ public function load($resource, string $locale, string $domain = 'messages') * * @return array */ - protected function flatten(\ResourceBundle $rb, array &$messages = [], string $path = null) + protected function flatten(\ResourceBundle $rb, array &$messages = [], ?string $path = null) { foreach ($rb as $key => $value) { $nodePath = $path ? $path.'.'.$key : $key; diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php index 5c9794a54d09d..fae07dbe3d958 100644 --- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -111,6 +111,10 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s continue; } + if (isset($translation->target) && 'needs-translation' === (string) $translation->target->attributes()['state']) { + continue; + } + $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source; // If the xlf file has another encoding specified, try to convert it because // simple_xml will always return utf-8 encoded values @@ -190,7 +194,7 @@ private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, s /** * Convert a UTF8 string to the specified encoding. */ - private function utf8ToCharset(string $content, string $encoding = null): string + private function utf8ToCharset(string $content, ?string $encoding = null): string { if ('UTF-8' !== $encoding && !empty($encoding)) { return mb_convert_encoding($content, $encoding, 'UTF-8'); @@ -199,7 +203,7 @@ private function utf8ToCharset(string $content, string $encoding = null): string return $content; } - private function parseNotesMetadata(\SimpleXMLElement $noteElement = null, string $encoding = null): array + private function parseNotesMetadata(?\SimpleXMLElement $noteElement = null, ?string $encoding = null): array { $notes = []; diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php index 6ccd482895a3a..d0932b667b939 100644 --- a/src/Symfony/Component/Translation/LoggingTranslator.php +++ b/src/Symfony/Component/Translation/LoggingTranslator.php @@ -40,7 +40,7 @@ public function __construct(TranslatorInterface $translator, LoggerInterface $lo /** * {@inheritdoc} */ - public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null) + public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null) { $trans = $this->translator->trans($id = (string) $id, $parameters, $domain, $locale); $this->log($id, $domain, $locale); @@ -73,7 +73,7 @@ public function getLocale() /** * {@inheritdoc} */ - public function getCatalogue(string $locale = null) + public function getCatalogue(?string $locale = null) { return $this->translator->getCatalogue($locale); } diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php index 9da3b7f00f5dd..2e00b645ee1f0 100644 --- a/src/Symfony/Component/Translation/MessageCatalogue.php +++ b/src/Symfony/Component/Translation/MessageCatalogue.php @@ -63,7 +63,7 @@ public function getDomains() /** * {@inheritdoc} */ - public function all(string $domain = null) + public function all(?string $domain = null) { if (null !== $domain) { // skip messages merge if intl-icu requested explicitly diff --git a/src/Symfony/Component/Translation/MessageCatalogueInterface.php b/src/Symfony/Component/Translation/MessageCatalogueInterface.php index 965bf008f8ca4..d532a1e48a1ae 100644 --- a/src/Symfony/Component/Translation/MessageCatalogueInterface.php +++ b/src/Symfony/Component/Translation/MessageCatalogueInterface.php @@ -45,7 +45,7 @@ public function getDomains(); * * @return array */ - public function all(string $domain = null); + public function all(?string $domain = null); /** * Sets a message translation. diff --git a/src/Symfony/Component/Translation/Provider/Dsn.php b/src/Symfony/Component/Translation/Provider/Dsn.php index 792b8dc1dcc8a..d29b202d19c8c 100644 --- a/src/Symfony/Component/Translation/Provider/Dsn.php +++ b/src/Symfony/Component/Translation/Provider/Dsn.php @@ -33,25 +33,25 @@ public function __construct(string $dsn) { $this->originalDsn = $dsn; - if (false === $parsedDsn = parse_url($dsn)) { + if (false === $params = parse_url($dsn)) { throw new InvalidArgumentException('The translation provider DSN is invalid.'); } - if (!isset($parsedDsn['scheme'])) { + if (!isset($params['scheme'])) { throw new InvalidArgumentException('The translation provider DSN must contain a scheme.'); } - $this->scheme = $parsedDsn['scheme']; + $this->scheme = $params['scheme']; - if (!isset($parsedDsn['host'])) { + if (!isset($params['host'])) { throw new InvalidArgumentException('The translation provider DSN must contain a host (use "default" by default).'); } - $this->host = $parsedDsn['host']; + $this->host = $params['host']; - $this->user = '' !== ($parsedDsn['user'] ?? '') ? urldecode($parsedDsn['user']) : null; - $this->password = '' !== ($parsedDsn['pass'] ?? '') ? urldecode($parsedDsn['pass']) : null; - $this->port = $parsedDsn['port'] ?? null; - $this->path = $parsedDsn['path'] ?? null; - parse_str($parsedDsn['query'] ?? '', $this->options); + $this->user = '' !== ($params['user'] ?? '') ? rawurldecode($params['user']) : null; + $this->password = '' !== ($params['pass'] ?? '') ? rawurldecode($params['pass']) : null; + $this->port = $params['port'] ?? null; + $this->path = $params['path'] ?? null; + parse_str($params['query'] ?? '', $this->options); } public function getScheme(): string @@ -74,7 +74,7 @@ public function getPassword(): ?string return $this->password; } - public function getPort(int $default = null): ?int + public function getPort(?int $default = null): ?int { return $this->port ?? $default; } diff --git a/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php b/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php index c769bdad0d531..5396eb546474f 100644 --- a/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php +++ b/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php @@ -86,7 +86,7 @@ public function __construct(TranslatorInterface $translator, array $options = [] /** * {@inheritdoc} */ - public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string + public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string { $trans = ''; $visibleText = ''; @@ -123,7 +123,7 @@ private function getParts(string $originalTrans): array return [[true, true, $originalTrans]]; } - $html = mb_encode_numericentity($originalTrans, [0x80, 0xFFFF, 0, 0xFFFF], mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8'); + $html = mb_encode_numericentity($originalTrans, [0x80, 0x10FFFF, 0, 0x1FFFFF], mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8'); $useInternalErrors = libxml_use_internal_errors(true); diff --git a/src/Symfony/Component/Translation/Resources/functions.php b/src/Symfony/Component/Translation/Resources/functions.php index 901d2f87efcdd..0d2a037a2c1ec 100644 --- a/src/Symfony/Component/Translation/Resources/functions.php +++ b/src/Symfony/Component/Translation/Resources/functions.php @@ -15,7 +15,7 @@ /** * @author Nate Wiebe */ - function t(string $message, array $parameters = [], string $domain = null): TranslatableMessage + function t(string $message, array $parameters = [], ?string $domain = null): TranslatableMessage { return new TranslatableMessage($message, $parameters, $domain); } diff --git a/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php b/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php index 5df82ebe227da..b8438149dbf25 100644 --- a/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php +++ b/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php @@ -89,7 +89,7 @@ public function testCreate(string $expected, string $dsn) /** * @dataProvider unsupportedSchemeProvider */ - public function testUnsupportedSchemeException(string $dsn, string $message = null) + public function testUnsupportedSchemeException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); @@ -106,7 +106,7 @@ public function testUnsupportedSchemeException(string $dsn, string $message = nu /** * @dataProvider incompleteDsnProvider */ - public function testIncompleteDsnException(string $dsn, string $message = null) + public function testIncompleteDsnException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); diff --git a/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php b/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php index 54593be96710d..af641372e5ff3 100644 --- a/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php +++ b/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php @@ -21,7 +21,7 @@ final class DsnTest extends TestCase /** * @dataProvider constructProvider */ - public function testConstruct(string $dsnString, string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [], string $path = null) + public function testConstruct(string $dsnString, string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [], ?string $path = null) { $dsn = new Dsn($dsnString); $this->assertSame($dsnString, $dsn->getOriginalDsn()); @@ -172,7 +172,7 @@ public static function invalidDsnProvider(): iterable /** * @dataProvider getOptionProvider */ - public function testGetOption($expected, string $dsnString, string $option, string $default = null) + public function testGetOption($expected, string $dsnString, string $option, ?string $default = null) { $dsn = new Dsn($dsnString); diff --git a/src/Symfony/Component/Translation/Tests/PseudoLocalizationTranslatorTest.php b/src/Symfony/Component/Translation/Tests/PseudoLocalizationTranslatorTest.php index e69e669c205af..d8490a5554d46 100644 --- a/src/Symfony/Component/Translation/Tests/PseudoLocalizationTranslatorTest.php +++ b/src/Symfony/Component/Translation/Tests/PseudoLocalizationTranslatorTest.php @@ -44,6 +44,7 @@ public static function provideTrans(): array ['

ƀåŕ

', '

bar

', self::getIsolatedOptions(['parse_html' => true, 'accents' => true])], ['

″≤″

', '

"<"

', self::getIsolatedOptions(['parse_html' => true, 'accents' => true])], ['Symfony is an Open Source, community-driven project with thousands of contributors. ~~~~~~~ ~~ ~~~~ ~~~~~~~ ~~~~~~~ ~~ ~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~ ~~ ~~~', 'Symfony is an Open Source, community-driven project with thousands of contributors.', self::getIsolatedOptions(['expansion_factor' => 2.0])], + ['

👇👇👇👇👇👇👇

', '

👇👇👇👇👇👇👇

', self::getIsolatedOptions(['parse_html' => true])], ]; } diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resources.xlf index b0e59880f8894..a294cd2bdcc15 100644 --- a/src/Symfony/Component/Translation/Tests/fixtures/resources.xlf +++ b/src/Symfony/Component/Translation/Tests/fixtures/resources.xlf @@ -18,6 +18,10 @@ with note + + skipped + skipped + diff --git a/src/Symfony/Component/Translation/TranslatableMessage.php b/src/Symfony/Component/Translation/TranslatableMessage.php index 282d289c079c9..4e53d60790ca3 100644 --- a/src/Symfony/Component/Translation/TranslatableMessage.php +++ b/src/Symfony/Component/Translation/TranslatableMessage.php @@ -23,7 +23,7 @@ class TranslatableMessage implements TranslatableInterface private $parameters; private $domain; - public function __construct(string $message, array $parameters = [], string $domain = null) + public function __construct(string $message, array $parameters = [], ?string $domain = null) { $this->message = $message; $this->parameters = $parameters; @@ -50,7 +50,7 @@ public function getDomain(): ?string return $this->domain; } - public function trans(TranslatorInterface $translator, string $locale = null): string + public function trans(TranslatorInterface $translator, ?string $locale = null): string { return $translator->trans($this->getMessage(), array_map( static function ($parameter) use ($translator, $locale) { diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index dc0626093f278..9270e51dc438a 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -89,7 +89,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA /** * @throws InvalidArgumentException If a locale contains invalid characters */ - public function __construct(string $locale, MessageFormatterInterface $formatter = null, string $cacheDir = null, bool $debug = false, array $cacheVary = []) + public function __construct(string $locale, ?MessageFormatterInterface $formatter = null, ?string $cacheDir = null, bool $debug = false, array $cacheVary = []) { $this->setLocale($locale); @@ -127,7 +127,7 @@ public function addLoader(string $format, LoaderInterface $loader) * * @throws InvalidArgumentException If the locale contains invalid characters */ - public function addResource(string $format, $resource, string $locale, string $domain = null) + public function addResource(string $format, $resource, string $locale, ?string $domain = null) { if (null === $domain) { $domain = 'messages'; @@ -194,7 +194,7 @@ public function getFallbackLocales(): array /** * {@inheritdoc} */ - public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null) + public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null) { if (null === $id || '' === $id) { return ''; @@ -229,7 +229,7 @@ public function trans(?string $id, array $parameters = [], string $domain = null /** * {@inheritdoc} */ - public function getCatalogue(string $locale = null) + public function getCatalogue(?string $locale = null) { if (!$locale) { $locale = $this->getLocale(); diff --git a/src/Symfony/Component/Translation/TranslatorBag.php b/src/Symfony/Component/Translation/TranslatorBag.php index 6a4df3c3ceaa3..c8ae1a2fa85cb 100644 --- a/src/Symfony/Component/Translation/TranslatorBag.php +++ b/src/Symfony/Component/Translation/TranslatorBag.php @@ -38,7 +38,7 @@ public function addBag(TranslatorBagInterface $bag): void /** * {@inheritdoc} */ - public function getCatalogue(string $locale = null): MessageCatalogueInterface + public function getCatalogue(?string $locale = null): MessageCatalogueInterface { if (null === $locale || !isset($this->catalogues[$locale])) { $this->catalogues[$locale] = new MessageCatalogue($locale); diff --git a/src/Symfony/Component/Translation/TranslatorBagInterface.php b/src/Symfony/Component/Translation/TranslatorBagInterface.php index 4228977352f29..3fc3bda397e4b 100644 --- a/src/Symfony/Component/Translation/TranslatorBagInterface.php +++ b/src/Symfony/Component/Translation/TranslatorBagInterface.php @@ -31,5 +31,5 @@ interface TranslatorBagInterface * * @throws InvalidArgumentException If the locale contains invalid characters */ - public function getCatalogue(string $locale = null); + public function getCatalogue(?string $locale = null); } diff --git a/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php b/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php index 5c6c9b73c3e68..f7f8f1cf8e4e0 100644 --- a/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php +++ b/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php @@ -34,7 +34,7 @@ class GenerateUlidCommand extends Command private $factory; - public function __construct(UlidFactory $factory = null) + public function __construct(?UlidFactory $factory = null) { $this->factory = $factory ?? new UlidFactory(); diff --git a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php index d218b227aa7a4..df0e7f0d002fd 100644 --- a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php +++ b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php @@ -29,7 +29,7 @@ class GenerateUuidCommand extends Command private $factory; - public function __construct(UuidFactory $factory = null) + public function __construct(?UuidFactory $factory = null) { $this->factory = $factory ?? new UuidFactory(); diff --git a/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php b/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php index 4337dbb303fa7..df25c8252c0a4 100644 --- a/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php +++ b/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php @@ -20,7 +20,7 @@ class TimeBasedUuidFactory private $class; private $node; - public function __construct(string $class, Uuid $node = null) + public function __construct(string $class, ?Uuid $node = null) { $this->class = $class; $this->node = $node; @@ -29,7 +29,7 @@ public function __construct(string $class, Uuid $node = null) /** * @return UuidV6|UuidV1 */ - public function create(\DateTimeInterface $time = null): Uuid + public function create(?\DateTimeInterface $time = null): Uuid { $class = $this->class; diff --git a/src/Symfony/Component/Uid/Factory/UlidFactory.php b/src/Symfony/Component/Uid/Factory/UlidFactory.php index 40cb7837178a9..9dd9d004c8207 100644 --- a/src/Symfony/Component/Uid/Factory/UlidFactory.php +++ b/src/Symfony/Component/Uid/Factory/UlidFactory.php @@ -15,7 +15,7 @@ class UlidFactory { - public function create(\DateTimeInterface $time = null): Ulid + public function create(?\DateTimeInterface $time = null): Ulid { return new Ulid(null === $time ? null : Ulid::generate($time)); } diff --git a/src/Symfony/Component/Uid/Ulid.php b/src/Symfony/Component/Uid/Ulid.php index bda82ef6856c9..79d298ccfac2b 100644 --- a/src/Symfony/Component/Uid/Ulid.php +++ b/src/Symfony/Component/Uid/Ulid.php @@ -25,7 +25,7 @@ class Ulid extends AbstractUid private static $time = ''; private static $rand = []; - public function __construct(string $ulid = null) + public function __construct(?string $ulid = null) { if (null === $ulid) { $this->uid = static::generate(); @@ -143,7 +143,7 @@ public function getDateTime(): \DateTimeImmutable return \DateTimeImmutable::createFromFormat('U.u', substr_replace($time, '.', -3, 0)); } - public static function generate(\DateTimeInterface $time = null): string + public static function generate(?\DateTimeInterface $time = null): string { if (null === $mtime = $time) { $time = microtime(false); diff --git a/src/Symfony/Component/Uid/UuidV1.php b/src/Symfony/Component/Uid/UuidV1.php index 3b8cd5e3fc87a..9e92ff0661ba3 100644 --- a/src/Symfony/Component/Uid/UuidV1.php +++ b/src/Symfony/Component/Uid/UuidV1.php @@ -22,7 +22,7 @@ class UuidV1 extends Uuid private static $clockSeq; - public function __construct(string $uuid = null) + public function __construct(?string $uuid = null) { if (null === $uuid) { $this->uid = uuid_create(static::TYPE); @@ -41,7 +41,7 @@ public function getNode(): string return uuid_mac($this->uid); } - public static function generate(\DateTimeInterface $time = null, Uuid $node = null): string + public static function generate(?\DateTimeInterface $time = null, ?Uuid $node = null): string { $uuid = !$time || !$node ? uuid_create(static::TYPE) : parent::NIL; diff --git a/src/Symfony/Component/Uid/UuidV4.php b/src/Symfony/Component/Uid/UuidV4.php index 9724b67de2c59..9b96ef345296c 100644 --- a/src/Symfony/Component/Uid/UuidV4.php +++ b/src/Symfony/Component/Uid/UuidV4.php @@ -20,7 +20,7 @@ class UuidV4 extends Uuid { protected const TYPE = 4; - public function __construct(string $uuid = null) + public function __construct(?string $uuid = null) { if (null === $uuid) { $uuid = random_bytes(16); diff --git a/src/Symfony/Component/Uid/UuidV6.php b/src/Symfony/Component/Uid/UuidV6.php index bf307ef41916a..b090bedef7c72 100644 --- a/src/Symfony/Component/Uid/UuidV6.php +++ b/src/Symfony/Component/Uid/UuidV6.php @@ -24,7 +24,7 @@ class UuidV6 extends Uuid private static $node; - public function __construct(string $uuid = null) + public function __construct(?string $uuid = null) { if (null === $uuid) { $this->uid = static::generate(); @@ -43,7 +43,7 @@ public function getNode(): string return substr($this->uid, 24); } - public static function generate(\DateTimeInterface $time = null, Uuid $node = null): string + public static function generate(?\DateTimeInterface $time = null, ?Uuid $node = null): string { $uuidV1 = UuidV1::generate($time, $node); $uuid = substr($uuidV1, 15, 3).substr($uuidV1, 9, 4).$uuidV1[0].'-'.substr($uuidV1, 1, 4).'-6'.substr($uuidV1, 5, 3).substr($uuidV1, 18, 6); diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php index 27ddcb8891309..dac13e2ea86fb 100644 --- a/src/Symfony/Component/Validator/Constraint.php +++ b/src/Symfony/Component/Validator/Constraint.php @@ -108,7 +108,7 @@ public static function getErrorName(string $errorCode) * array, but getDefaultOption() returns * null */ - public function __construct($options = null, array $groups = null, $payload = null) + public function __construct($options = null, ?array $groups = null, $payload = null) { unset($this->groups); // enable lazy initialization diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php index 33aa42a1be37a..e25fb2a827fed 100644 --- a/src/Symfony/Component/Validator/ConstraintViolation.php +++ b/src/Symfony/Component/Validator/ConstraintViolation.php @@ -49,7 +49,7 @@ class ConstraintViolation implements ConstraintViolationInterface * caused the violation * @param mixed $cause The cause of the violation */ - public function __construct($message, ?string $messageTemplate, array $parameters, $root, ?string $propertyPath, $invalidValue, int $plural = null, string $code = null, Constraint $constraint = null, $cause = null) + public function __construct($message, ?string $messageTemplate, array $parameters, $root, ?string $propertyPath, $invalidValue, ?int $plural = null, ?string $code = null, ?Constraint $constraint = null, $cause = null) { if (!\is_string($message) && !(\is_object($message) && method_exists($message, '__toString'))) { throw new \TypeError('Constraint violation message should be a string or an object which implements the __toString() method.'); diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php index d492655d93161..e4db8edc0ead2 100644 --- a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php +++ b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php @@ -33,7 +33,7 @@ abstract class AbstractComparison extends Constraint * * @param mixed $value the value to compare or a set of options */ - public function __construct($value = null, $propertyPath = null, string $message = null, array $groups = null, $payload = null, array $options = []) + public function __construct($value = null, $propertyPath = null, ?string $message = null, ?array $groups = null, $payload = null, array $options = []) { if (\is_array($value)) { $options = array_merge($value, $options); diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php index c3a117d2cffb1..b179fe81095dd 100644 --- a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php +++ b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php @@ -29,7 +29,7 @@ abstract class AbstractComparisonValidator extends ConstraintValidator { private $propertyAccessor; - public function __construct(PropertyAccessorInterface $propertyAccessor = null) + public function __construct(?PropertyAccessorInterface $propertyAccessor = null) { $this->propertyAccessor = $propertyAccessor; } diff --git a/src/Symfony/Component/Validator/Constraints/All.php b/src/Symfony/Component/Validator/Constraints/All.php index 5b4297647da32..f1bece0a1f211 100644 --- a/src/Symfony/Component/Validator/Constraints/All.php +++ b/src/Symfony/Component/Validator/Constraints/All.php @@ -22,7 +22,7 @@ class All extends Composite { public $constraints = []; - public function __construct($constraints = null, array $groups = null, $payload = null) + public function __construct($constraints = null, ?array $groups = null, $payload = null) { parent::__construct($constraints ?? [], $groups, $payload); } diff --git a/src/Symfony/Component/Validator/Constraints/AtLeastOneOf.php b/src/Symfony/Component/Validator/Constraints/AtLeastOneOf.php index f01ed9cf4cff9..853bf398cede2 100644 --- a/src/Symfony/Component/Validator/Constraints/AtLeastOneOf.php +++ b/src/Symfony/Component/Validator/Constraints/AtLeastOneOf.php @@ -31,7 +31,7 @@ class AtLeastOneOf extends Composite public $messageCollection = 'Each element of this collection should satisfy its own set of constraints.'; public $includeInternalMessages = true; - public function __construct($constraints = null, array $groups = null, $payload = null, string $message = null, string $messageCollection = null, bool $includeInternalMessages = null) + public function __construct($constraints = null, ?array $groups = null, $payload = null, ?string $message = null, ?string $messageCollection = null, ?bool $includeInternalMessages = null) { parent::__construct($constraints ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Bic.php b/src/Symfony/Component/Validator/Constraints/Bic.php index 1cd98b41d262a..52216eeedf57d 100644 --- a/src/Symfony/Component/Validator/Constraints/Bic.php +++ b/src/Symfony/Component/Validator/Constraints/Bic.php @@ -52,7 +52,7 @@ class Bic extends Constraint * * @param string|PropertyPathInterface|null $ibanPropertyPath */ - public function __construct(array $options = null, string $message = null, string $iban = null, $ibanPropertyPath = null, string $ibanMessage = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?string $iban = null, $ibanPropertyPath = null, ?string $ibanMessage = null, ?array $groups = null, $payload = null) { if (!class_exists(Countries::class)) { throw new LogicException('The Intl component is required to use the Bic constraint. Try running "composer require symfony/intl".'); diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php index 6c038067b7940..5e9d76621ae3e 100644 --- a/src/Symfony/Component/Validator/Constraints/BicValidator.php +++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php @@ -58,7 +58,7 @@ class BicValidator extends ConstraintValidator private $propertyAccessor; - public function __construct(PropertyAccessor $propertyAccessor = null) + public function __construct(?PropertyAccessor $propertyAccessor = null) { $this->propertyAccessor = $propertyAccessor; } diff --git a/src/Symfony/Component/Validator/Constraints/Blank.php b/src/Symfony/Component/Validator/Constraints/Blank.php index a9ee5259a18bf..c1073e96bbcd0 100644 --- a/src/Symfony/Component/Validator/Constraints/Blank.php +++ b/src/Symfony/Component/Validator/Constraints/Blank.php @@ -30,7 +30,7 @@ class Blank extends Constraint public $message = 'This value should be blank.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Callback.php b/src/Symfony/Component/Validator/Constraints/Callback.php index 7b9c3c37c8361..260b85ad284ab 100644 --- a/src/Symfony/Component/Validator/Constraints/Callback.php +++ b/src/Symfony/Component/Validator/Constraints/Callback.php @@ -32,7 +32,7 @@ class Callback extends Constraint * * @param array|string|callable $callback The callback or a set of options */ - public function __construct($callback = null, array $groups = null, $payload = null, array $options = []) + public function __construct($callback = null, ?array $groups = null, $payload = null, array $options = []) { // Invocation through annotations with an array parameter only if (\is_array($callback) && 1 === \count($callback) && isset($callback['value'])) { diff --git a/src/Symfony/Component/Validator/Constraints/CardScheme.php b/src/Symfony/Component/Validator/Constraints/CardScheme.php index e9d66b9bbe523..eb003bc2f7614 100644 --- a/src/Symfony/Component/Validator/Constraints/CardScheme.php +++ b/src/Symfony/Component/Validator/Constraints/CardScheme.php @@ -54,7 +54,7 @@ class CardScheme extends Constraint * * @param array|string $schemes The schemes to validate against or a set of options */ - public function __construct($schemes, string $message = null, array $groups = null, $payload = null, array $options = []) + public function __construct($schemes, ?string $message = null, ?array $groups = null, $payload = null, array $options = []) { if (\is_array($schemes) && \is_string(key($schemes))) { $options = array_merge($schemes, $options); diff --git a/src/Symfony/Component/Validator/Constraints/Cascade.php b/src/Symfony/Component/Validator/Constraints/Cascade.php index 2458d5c31642b..13ab3aea72b77 100644 --- a/src/Symfony/Component/Validator/Constraints/Cascade.php +++ b/src/Symfony/Component/Validator/Constraints/Cascade.php @@ -23,7 +23,7 @@ #[\Attribute(\Attribute::TARGET_CLASS)] class Cascade extends Constraint { - public function __construct(array $options = null) + public function __construct(?array $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__)); diff --git a/src/Symfony/Component/Validator/Constraints/Choice.php b/src/Symfony/Component/Validator/Constraints/Choice.php index b5bcc6d3d9864..b8224e4a17a8c 100644 --- a/src/Symfony/Component/Validator/Constraints/Choice.php +++ b/src/Symfony/Component/Validator/Constraints/Choice.php @@ -53,16 +53,16 @@ public function getDefaultOption() public function __construct( $options = [], - array $choices = null, + ?array $choices = null, $callback = null, - bool $multiple = null, - bool $strict = null, - int $min = null, - int $max = null, - string $message = null, - string $multipleMessage = null, - string $minMessage = null, - string $maxMessage = null, + ?bool $multiple = null, + ?bool $strict = null, + ?int $min = null, + ?int $max = null, + ?string $message = null, + ?string $multipleMessage = null, + ?string $minMessage = null, + ?string $maxMessage = null, $groups = null, $payload = null ) { diff --git a/src/Symfony/Component/Validator/Constraints/Cidr.php b/src/Symfony/Component/Validator/Constraints/Cidr.php index 387c5996a053d..a65a83359c88b 100644 --- a/src/Symfony/Component/Validator/Constraints/Cidr.php +++ b/src/Symfony/Component/Validator/Constraints/Cidr.php @@ -51,12 +51,12 @@ class Cidr extends Constraint public $netmaskMax; public function __construct( - array $options = null, - string $version = null, - int $netmaskMin = null, - int $netmaskMax = null, - string $message = null, - array $groups = null, + ?array $options = null, + ?string $version = null, + ?int $netmaskMin = null, + ?int $netmaskMax = null, + ?string $message = null, + ?array $groups = null, $payload = null ) { $this->version = $version ?? $options['version'] ?? $this->version; diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php index b151f0cd4df67..316033508a62e 100644 --- a/src/Symfony/Component/Validator/Constraints/Collection.php +++ b/src/Symfony/Component/Validator/Constraints/Collection.php @@ -40,12 +40,9 @@ class Collection extends Composite /** * {@inheritdoc} */ - public function __construct($fields = null, array $groups = null, $payload = null, bool $allowExtraFields = null, bool $allowMissingFields = null, string $extraFieldsMessage = null, string $missingFieldsMessage = null) + public function __construct($fields = null, ?array $groups = null, $payload = null, ?bool $allowExtraFields = null, ?bool $allowMissingFields = null, ?string $extraFieldsMessage = null, ?string $missingFieldsMessage = null) { - if (\is_array($fields) - && (($firstField = reset($fields)) instanceof Constraint - || ($firstField[0] ?? null) instanceof Constraint - )) { + if (\is_array($fields) && ([] === $fields || ($firstField = reset($fields)) instanceof Constraint || ($firstField[0] ?? null) instanceof Constraint)) { $fields = ['fields' => $fields]; } diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php index 2f6eadffdd5a9..55f25e1985d17 100644 --- a/src/Symfony/Component/Validator/Constraints/Composite.php +++ b/src/Symfony/Component/Validator/Constraints/Composite.php @@ -51,7 +51,7 @@ abstract class Composite extends Constraint * cached. When constraints are loaded from the cache, no more group * checks need to be done. */ - public function __construct($options = null, array $groups = null, $payload = null) + public function __construct($options = null, ?array $groups = null, $payload = null) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Count.php b/src/Symfony/Component/Validator/Constraints/Count.php index 0d75903107999..06f6d6c67faaf 100644 --- a/src/Symfony/Component/Validator/Constraints/Count.php +++ b/src/Symfony/Component/Validator/Constraints/Count.php @@ -50,14 +50,14 @@ class Count extends Constraint */ public function __construct( $exactly = null, - int $min = null, - int $max = null, - int $divisibleBy = null, - string $exactMessage = null, - string $minMessage = null, - string $maxMessage = null, - string $divisibleByMessage = null, - array $groups = null, + ?int $min = null, + ?int $max = null, + ?int $divisibleBy = null, + ?string $exactMessage = null, + ?string $minMessage = null, + ?string $maxMessage = null, + ?string $divisibleByMessage = null, + ?array $groups = null, $payload = null, array $options = [] ) { diff --git a/src/Symfony/Component/Validator/Constraints/Country.php b/src/Symfony/Component/Validator/Constraints/Country.php index ccd815cfe5711..8c0eb099b6f7e 100644 --- a/src/Symfony/Component/Validator/Constraints/Country.php +++ b/src/Symfony/Component/Validator/Constraints/Country.php @@ -34,10 +34,10 @@ class Country extends Constraint public $alpha3 = false; public function __construct( - array $options = null, - string $message = null, - bool $alpha3 = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?bool $alpha3 = null, + ?array $groups = null, $payload = null ) { if (!class_exists(Countries::class)) { diff --git a/src/Symfony/Component/Validator/Constraints/CssColor.php b/src/Symfony/Component/Validator/Constraints/CssColor.php index e1510dafe38f2..f5a9ac897b7ea 100644 --- a/src/Symfony/Component/Validator/Constraints/CssColor.php +++ b/src/Symfony/Component/Validator/Constraints/CssColor.php @@ -65,7 +65,7 @@ class CssColor extends Constraint /** * @param array|string $formats The types of CSS colors allowed (e.g. hexadecimal only, RGB and HSL only, etc.). */ - public function __construct($formats = [], string $message = null, array $groups = null, $payload = null, array $options = null) + public function __construct($formats = [], ?string $message = null, ?array $groups = null, $payload = null, ?array $options = null) { $validationModesAsString = implode(', ', self::$validationModes); diff --git a/src/Symfony/Component/Validator/Constraints/Currency.php b/src/Symfony/Component/Validator/Constraints/Currency.php index cac2dfffc8818..7dea613e2e675 100644 --- a/src/Symfony/Component/Validator/Constraints/Currency.php +++ b/src/Symfony/Component/Validator/Constraints/Currency.php @@ -33,7 +33,7 @@ class Currency extends Constraint public $message = 'This value is not a valid currency.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { if (!class_exists(Currencies::class)) { throw new LogicException('The Intl component is required to use the Currency constraint. Try running "composer require symfony/intl".'); diff --git a/src/Symfony/Component/Validator/Constraints/Date.php b/src/Symfony/Component/Validator/Constraints/Date.php index 7c9666f7caa9e..025cb22d3f218 100644 --- a/src/Symfony/Component/Validator/Constraints/Date.php +++ b/src/Symfony/Component/Validator/Constraints/Date.php @@ -32,7 +32,7 @@ class Date extends Constraint public $message = 'This value is not a valid date.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/DateTime.php b/src/Symfony/Component/Validator/Constraints/DateTime.php index 94c3dd6adcf4d..b1c43b76e19d7 100644 --- a/src/Symfony/Component/Validator/Constraints/DateTime.php +++ b/src/Symfony/Component/Validator/Constraints/DateTime.php @@ -40,7 +40,7 @@ class DateTime extends Constraint * * @param string|array|null $format */ - public function __construct($format = null, string $message = null, array $groups = null, $payload = null, array $options = []) + public function __construct($format = null, ?string $message = null, ?array $groups = null, $payload = null, array $options = []) { if (\is_array($format)) { $options = array_merge($format, $options); diff --git a/src/Symfony/Component/Validator/Constraints/DisableAutoMapping.php b/src/Symfony/Component/Validator/Constraints/DisableAutoMapping.php index 9a91f009c8be6..8fc95ba728500 100644 --- a/src/Symfony/Component/Validator/Constraints/DisableAutoMapping.php +++ b/src/Symfony/Component/Validator/Constraints/DisableAutoMapping.php @@ -27,7 +27,7 @@ #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::TARGET_CLASS)] class DisableAutoMapping extends Constraint { - public function __construct(array $options = null) + public function __construct(?array $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__)); diff --git a/src/Symfony/Component/Validator/Constraints/Email.php b/src/Symfony/Component/Validator/Constraints/Email.php index b37c6054437b9..912878de763c9 100644 --- a/src/Symfony/Component/Validator/Constraints/Email.php +++ b/src/Symfony/Component/Validator/Constraints/Email.php @@ -51,11 +51,11 @@ class Email extends Constraint public $normalizer; public function __construct( - array $options = null, - string $message = null, - string $mode = null, - callable $normalizer = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?string $mode = null, + ?callable $normalizer = null, + ?array $groups = null, $payload = null ) { if (\is_array($options) && \array_key_exists('mode', $options) && !\in_array($options['mode'], self::$validationModes, true)) { diff --git a/src/Symfony/Component/Validator/Constraints/EnableAutoMapping.php b/src/Symfony/Component/Validator/Constraints/EnableAutoMapping.php index 3136fd3ed7a06..0667a46c7d784 100644 --- a/src/Symfony/Component/Validator/Constraints/EnableAutoMapping.php +++ b/src/Symfony/Component/Validator/Constraints/EnableAutoMapping.php @@ -27,7 +27,7 @@ #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::TARGET_CLASS)] class EnableAutoMapping extends Constraint { - public function __construct(array $options = null) + public function __construct(?array $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__)); diff --git a/src/Symfony/Component/Validator/Constraints/Expression.php b/src/Symfony/Component/Validator/Constraints/Expression.php index 01cf429b287d7..65b0ba3f21456 100644 --- a/src/Symfony/Component/Validator/Constraints/Expression.php +++ b/src/Symfony/Component/Validator/Constraints/Expression.php @@ -43,9 +43,9 @@ class Expression extends Constraint */ public function __construct( $expression, - string $message = null, - array $values = null, - array $groups = null, + ?string $message = null, + ?array $values = null, + ?array $groups = null, $payload = null, array $options = [] ) { diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntax.php b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntax.php index d5c1f6f9fc24d..bace6af5f3338 100644 --- a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntax.php +++ b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntax.php @@ -32,7 +32,7 @@ class ExpressionLanguageSyntax extends Constraint public $service; public $allowedVariables; - public function __construct(array $options = null, string $message = null, string $service = null, array $allowedVariables = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?string $service = null, ?array $allowedVariables = null, ?array $groups = null, $payload = null) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php index 4b67da2c2be9c..b5d4654c8a396 100644 --- a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php @@ -25,7 +25,7 @@ class ExpressionLanguageSyntaxValidator extends ConstraintValidator { private $expressionLanguage; - public function __construct(ExpressionLanguage $expressionLanguage = null) + public function __construct(?ExpressionLanguage $expressionLanguage = null) { $this->expressionLanguage = $expressionLanguage; } diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php index 3ae47f48023d1..59d24d06dc910 100644 --- a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php @@ -24,7 +24,7 @@ class ExpressionValidator extends ConstraintValidator { private $expressionLanguage; - public function __construct(ExpressionLanguage $expressionLanguage = null) + public function __construct(?ExpressionLanguage $expressionLanguage = null) { $this->expressionLanguage = $expressionLanguage; } diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php index b5a446ea2d2a0..f8bf0f4492a1a 100644 --- a/src/Symfony/Component/Validator/Constraints/File.php +++ b/src/Symfony/Component/Validator/Constraints/File.php @@ -67,25 +67,25 @@ class File extends Constraint * @param string[]|string|null $mimeTypes */ public function __construct( - array $options = null, + ?array $options = null, $maxSize = null, - bool $binaryFormat = null, + ?bool $binaryFormat = null, $mimeTypes = null, - string $notFoundMessage = null, - string $notReadableMessage = null, - string $maxSizeMessage = null, - string $mimeTypesMessage = null, - string $disallowEmptyMessage = null, - - string $uploadIniSizeErrorMessage = null, - string $uploadFormSizeErrorMessage = null, - string $uploadPartialErrorMessage = null, - string $uploadNoFileErrorMessage = null, - string $uploadNoTmpDirErrorMessage = null, - string $uploadCantWriteErrorMessage = null, - string $uploadExtensionErrorMessage = null, - string $uploadErrorMessage = null, - array $groups = null, + ?string $notFoundMessage = null, + ?string $notReadableMessage = null, + ?string $maxSizeMessage = null, + ?string $mimeTypesMessage = null, + ?string $disallowEmptyMessage = null, + + ?string $uploadIniSizeErrorMessage = null, + ?string $uploadFormSizeErrorMessage = null, + ?string $uploadPartialErrorMessage = null, + ?string $uploadNoFileErrorMessage = null, + ?string $uploadNoTmpDirErrorMessage = null, + ?string $uploadCantWriteErrorMessage = null, + ?string $uploadExtensionErrorMessage = null, + ?string $uploadErrorMessage = null, + ?array $groups = null, $payload = null ) { if (null !== $maxSize && !\is_int($maxSize) && !\is_string($maxSize)) { diff --git a/src/Symfony/Component/Validator/Constraints/Hostname.php b/src/Symfony/Component/Validator/Constraints/Hostname.php index d0d02d1f56515..3e5edf8b6bea3 100644 --- a/src/Symfony/Component/Validator/Constraints/Hostname.php +++ b/src/Symfony/Component/Validator/Constraints/Hostname.php @@ -32,10 +32,10 @@ class Hostname extends Constraint public $requireTld = true; public function __construct( - array $options = null, - string $message = null, - bool $requireTld = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?bool $requireTld = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Iban.php b/src/Symfony/Component/Validator/Constraints/Iban.php index 2f7a61e982f71..14937ab2fc77e 100644 --- a/src/Symfony/Component/Validator/Constraints/Iban.php +++ b/src/Symfony/Component/Validator/Constraints/Iban.php @@ -40,7 +40,7 @@ class Iban extends Constraint public $message = 'This is not a valid International Bank Account Number (IBAN).'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Image.php b/src/Symfony/Component/Validator/Constraints/Image.php index 83fc9f9dd2448..262b7d5354f94 100644 --- a/src/Symfony/Component/Validator/Constraints/Image.php +++ b/src/Symfony/Component/Validator/Constraints/Image.php @@ -97,49 +97,49 @@ class Image extends File * @param int|float $maxPixels */ public function __construct( - array $options = null, + ?array $options = null, $maxSize = null, - bool $binaryFormat = null, - array $mimeTypes = null, - int $minWidth = null, - int $maxWidth = null, - int $maxHeight = null, - int $minHeight = null, + ?bool $binaryFormat = null, + ?array $mimeTypes = null, + ?int $minWidth = null, + ?int $maxWidth = null, + ?int $maxHeight = null, + ?int $minHeight = null, $maxRatio = null, $minRatio = null, $minPixels = null, $maxPixels = null, - bool $allowSquare = null, - bool $allowLandscape = null, - bool $allowPortrait = null, - bool $detectCorrupted = null, - string $notFoundMessage = null, - string $notReadableMessage = null, - string $maxSizeMessage = null, - string $mimeTypesMessage = null, - string $disallowEmptyMessage = null, - string $uploadIniSizeErrorMessage = null, - string $uploadFormSizeErrorMessage = null, - string $uploadPartialErrorMessage = null, - string $uploadNoFileErrorMessage = null, - string $uploadNoTmpDirErrorMessage = null, - string $uploadCantWriteErrorMessage = null, - string $uploadExtensionErrorMessage = null, - string $uploadErrorMessage = null, - string $sizeNotDetectedMessage = null, - string $maxWidthMessage = null, - string $minWidthMessage = null, - string $maxHeightMessage = null, - string $minHeightMessage = null, - string $minPixelsMessage = null, - string $maxPixelsMessage = null, - string $maxRatioMessage = null, - string $minRatioMessage = null, - string $allowSquareMessage = null, - string $allowLandscapeMessage = null, - string $allowPortraitMessage = null, - string $corruptedMessage = null, - array $groups = null, + ?bool $allowSquare = null, + ?bool $allowLandscape = null, + ?bool $allowPortrait = null, + ?bool $detectCorrupted = null, + ?string $notFoundMessage = null, + ?string $notReadableMessage = null, + ?string $maxSizeMessage = null, + ?string $mimeTypesMessage = null, + ?string $disallowEmptyMessage = null, + ?string $uploadIniSizeErrorMessage = null, + ?string $uploadFormSizeErrorMessage = null, + ?string $uploadPartialErrorMessage = null, + ?string $uploadNoFileErrorMessage = null, + ?string $uploadNoTmpDirErrorMessage = null, + ?string $uploadCantWriteErrorMessage = null, + ?string $uploadExtensionErrorMessage = null, + ?string $uploadErrorMessage = null, + ?string $sizeNotDetectedMessage = null, + ?string $maxWidthMessage = null, + ?string $minWidthMessage = null, + ?string $maxHeightMessage = null, + ?string $minHeightMessage = null, + ?string $minPixelsMessage = null, + ?string $maxPixelsMessage = null, + ?string $maxRatioMessage = null, + ?string $minRatioMessage = null, + ?string $allowSquareMessage = null, + ?string $allowLandscapeMessage = null, + ?string $allowPortraitMessage = null, + ?string $corruptedMessage = null, + ?array $groups = null, $payload = null ) { parent::__construct( diff --git a/src/Symfony/Component/Validator/Constraints/Ip.php b/src/Symfony/Component/Validator/Constraints/Ip.php index 0e4124074fd1d..353c3f84c2600 100644 --- a/src/Symfony/Component/Validator/Constraints/Ip.php +++ b/src/Symfony/Component/Validator/Constraints/Ip.php @@ -80,11 +80,11 @@ class Ip extends Constraint * {@inheritdoc} */ public function __construct( - array $options = null, - string $version = null, - string $message = null, - callable $normalizer = null, - array $groups = null, + ?array $options = null, + ?string $version = null, + ?string $message = null, + ?callable $normalizer = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/IsFalse.php b/src/Symfony/Component/Validator/Constraints/IsFalse.php index 460aafc6d9721..4d232dd6c5c9b 100644 --- a/src/Symfony/Component/Validator/Constraints/IsFalse.php +++ b/src/Symfony/Component/Validator/Constraints/IsFalse.php @@ -30,7 +30,7 @@ class IsFalse extends Constraint public $message = 'This value should be false.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/IsNull.php b/src/Symfony/Component/Validator/Constraints/IsNull.php index 2a8439f429b19..c7ce18a40d346 100644 --- a/src/Symfony/Component/Validator/Constraints/IsNull.php +++ b/src/Symfony/Component/Validator/Constraints/IsNull.php @@ -30,7 +30,7 @@ class IsNull extends Constraint public $message = 'This value should be null.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/IsTrue.php b/src/Symfony/Component/Validator/Constraints/IsTrue.php index 7b95475e3814d..1185b59796a48 100644 --- a/src/Symfony/Component/Validator/Constraints/IsTrue.php +++ b/src/Symfony/Component/Validator/Constraints/IsTrue.php @@ -30,7 +30,7 @@ class IsTrue extends Constraint public $message = 'This value should be true.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Isbn.php b/src/Symfony/Component/Validator/Constraints/Isbn.php index b95dfebca9986..c51afa49c9f0a 100644 --- a/src/Symfony/Component/Validator/Constraints/Isbn.php +++ b/src/Symfony/Component/Validator/Constraints/Isbn.php @@ -54,11 +54,11 @@ class Isbn extends Constraint */ public function __construct( $type = null, - string $message = null, - string $isbn10Message = null, - string $isbn13Message = null, - string $bothIsbnMessage = null, - array $groups = null, + ?string $message = null, + ?string $isbn10Message = null, + ?string $isbn13Message = null, + ?string $bothIsbnMessage = null, + ?array $groups = null, $payload = null, array $options = [] ) { diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php index 37aa8730646eb..3aa88e2e32cf4 100644 --- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php +++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php @@ -169,7 +169,7 @@ protected function validateIsbn13(string $isbn) return 0 === $checkSum % 10 ? true : Isbn::CHECKSUM_FAILED_ERROR; } - protected function getMessage(Isbn $constraint, string $type = null) + protected function getMessage(Isbn $constraint, ?string $type = null) { if (null !== $constraint->message) { return $constraint->message; diff --git a/src/Symfony/Component/Validator/Constraints/Isin.php b/src/Symfony/Component/Validator/Constraints/Isin.php index 08fa60d41b907..9c285123a2011 100644 --- a/src/Symfony/Component/Validator/Constraints/Isin.php +++ b/src/Symfony/Component/Validator/Constraints/Isin.php @@ -37,7 +37,7 @@ class Isin extends Constraint public $message = 'This value is not a valid International Securities Identification Number (ISIN).'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Issn.php b/src/Symfony/Component/Validator/Constraints/Issn.php index b3b7b21f6c9e9..25553500ae908 100644 --- a/src/Symfony/Component/Validator/Constraints/Issn.php +++ b/src/Symfony/Component/Validator/Constraints/Issn.php @@ -44,11 +44,11 @@ class Issn extends Constraint public $requireHyphen = false; public function __construct( - array $options = null, - string $message = null, - bool $caseSensitive = null, - bool $requireHyphen = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?bool $caseSensitive = null, + ?bool $requireHyphen = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Json.php b/src/Symfony/Component/Validator/Constraints/Json.php index 4388858540b46..d1887138befb7 100644 --- a/src/Symfony/Component/Validator/Constraints/Json.php +++ b/src/Symfony/Component/Validator/Constraints/Json.php @@ -30,7 +30,7 @@ class Json extends Constraint public $message = 'This value should be valid JSON.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/JsonValidator.php b/src/Symfony/Component/Validator/Constraints/JsonValidator.php index 176331f6f0314..a2a26d574d909 100644 --- a/src/Symfony/Component/Validator/Constraints/JsonValidator.php +++ b/src/Symfony/Component/Validator/Constraints/JsonValidator.php @@ -14,6 +14,7 @@ use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Exception\UnexpectedTypeException; +use Symfony\Component\Validator\Exception\UnexpectedValueException; /** * @author Imad ZAIRIG @@ -34,7 +35,7 @@ public function validate($value, Constraint $constraint) } if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) { - throw new UnexpectedTypeException($value, 'string'); + throw new UnexpectedValueException($value, 'string'); } $value = (string) $value; diff --git a/src/Symfony/Component/Validator/Constraints/Language.php b/src/Symfony/Component/Validator/Constraints/Language.php index a8204da718af4..b8d7e4fa5c4b3 100644 --- a/src/Symfony/Component/Validator/Constraints/Language.php +++ b/src/Symfony/Component/Validator/Constraints/Language.php @@ -34,10 +34,10 @@ class Language extends Constraint public $alpha3 = false; public function __construct( - array $options = null, - string $message = null, - bool $alpha3 = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?bool $alpha3 = null, + ?array $groups = null, $payload = null ) { if (!class_exists(Languages::class)) { diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php index 29a89a3f3d3ab..1e47c6defccde 100644 --- a/src/Symfony/Component/Validator/Constraints/Length.php +++ b/src/Symfony/Component/Validator/Constraints/Length.php @@ -53,15 +53,15 @@ class Length extends Constraint */ public function __construct( $exactly = null, - int $min = null, - int $max = null, - string $charset = null, - callable $normalizer = null, - string $exactMessage = null, - string $minMessage = null, - string $maxMessage = null, - string $charsetMessage = null, - array $groups = null, + ?int $min = null, + ?int $max = null, + ?string $charset = null, + ?callable $normalizer = null, + ?string $exactMessage = null, + ?string $minMessage = null, + ?string $maxMessage = null, + ?string $charsetMessage = null, + ?array $groups = null, $payload = null, array $options = [] ) { diff --git a/src/Symfony/Component/Validator/Constraints/Locale.php b/src/Symfony/Component/Validator/Constraints/Locale.php index 43c46cc7b17a3..ba5cfc1511448 100644 --- a/src/Symfony/Component/Validator/Constraints/Locale.php +++ b/src/Symfony/Component/Validator/Constraints/Locale.php @@ -34,10 +34,10 @@ class Locale extends Constraint public $canonicalize = true; public function __construct( - array $options = null, - string $message = null, - bool $canonicalize = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?bool $canonicalize = null, + ?array $groups = null, $payload = null ) { if (!class_exists(Locales::class)) { diff --git a/src/Symfony/Component/Validator/Constraints/Luhn.php b/src/Symfony/Component/Validator/Constraints/Luhn.php index b2d2c297948dd..d1f03a3fea866 100644 --- a/src/Symfony/Component/Validator/Constraints/Luhn.php +++ b/src/Symfony/Component/Validator/Constraints/Luhn.php @@ -37,9 +37,9 @@ class Luhn extends Constraint public $message = 'Invalid card number.'; public function __construct( - array $options = null, - string $message = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/NotBlank.php b/src/Symfony/Component/Validator/Constraints/NotBlank.php index 6f98d5a617972..33d28b303d10a 100644 --- a/src/Symfony/Component/Validator/Constraints/NotBlank.php +++ b/src/Symfony/Component/Validator/Constraints/NotBlank.php @@ -34,7 +34,7 @@ class NotBlank extends Constraint public $allowNull = false; public $normalizer; - public function __construct(array $options = null, string $message = null, bool $allowNull = null, callable $normalizer = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?bool $allowNull = null, ?callable $normalizer = null, ?array $groups = null, $payload = null) { parent::__construct($options ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/NotCompromisedPassword.php b/src/Symfony/Component/Validator/Constraints/NotCompromisedPassword.php index 213bde2f8d4d2..1d2308ba1f409 100644 --- a/src/Symfony/Component/Validator/Constraints/NotCompromisedPassword.php +++ b/src/Symfony/Component/Validator/Constraints/NotCompromisedPassword.php @@ -33,11 +33,11 @@ class NotCompromisedPassword extends Constraint public $skipOnError = false; public function __construct( - array $options = null, - string $message = null, - int $threshold = null, - bool $skipOnError = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?int $threshold = null, + ?bool $skipOnError = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php index 148253dd81f5e..3d3bc9a2c2434 100644 --- a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php +++ b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php @@ -36,7 +36,7 @@ class NotCompromisedPasswordValidator extends ConstraintValidator private $enabled; private $endpoint; - public function __construct(HttpClientInterface $httpClient = null, string $charset = 'UTF-8', bool $enabled = true, string $endpoint = null) + public function __construct(?HttpClientInterface $httpClient = null, string $charset = 'UTF-8', bool $enabled = true, ?string $endpoint = null) { if (null === $httpClient && !class_exists(HttpClient::class)) { throw new \LogicException(sprintf('The "%s" class requires the "HttpClient" component. Try running "composer require symfony/http-client".', self::class)); diff --git a/src/Symfony/Component/Validator/Constraints/NotNull.php b/src/Symfony/Component/Validator/Constraints/NotNull.php index 85783c708162b..f455a64cbc0b3 100644 --- a/src/Symfony/Component/Validator/Constraints/NotNull.php +++ b/src/Symfony/Component/Validator/Constraints/NotNull.php @@ -30,7 +30,7 @@ class NotNull extends Constraint public $message = 'This value should not be null.'; - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { parent::__construct($options ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Range.php b/src/Symfony/Component/Validator/Constraints/Range.php index 906057ebaae80..6dbd61e0096eb 100644 --- a/src/Symfony/Component/Validator/Constraints/Range.php +++ b/src/Symfony/Component/Validator/Constraints/Range.php @@ -66,17 +66,17 @@ class Range extends Constraint * @param string|PropertyPathInterface|null $maxPropertyPath */ public function __construct( - array $options = null, - string $notInRangeMessage = null, - string $minMessage = null, - string $maxMessage = null, - string $invalidMessage = null, - string $invalidDateTimeMessage = null, + ?array $options = null, + ?string $notInRangeMessage = null, + ?string $minMessage = null, + ?string $maxMessage = null, + ?string $invalidMessage = null, + ?string $invalidDateTimeMessage = null, $min = null, $minPropertyPath = null, $max = null, $maxPropertyPath = null, - array $groups = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/RangeValidator.php b/src/Symfony/Component/Validator/Constraints/RangeValidator.php index e24cd8746e623..3268e0da21f30 100644 --- a/src/Symfony/Component/Validator/Constraints/RangeValidator.php +++ b/src/Symfony/Component/Validator/Constraints/RangeValidator.php @@ -26,7 +26,7 @@ class RangeValidator extends ConstraintValidator { private $propertyAccessor; - public function __construct(PropertyAccessorInterface $propertyAccessor = null) + public function __construct(?PropertyAccessorInterface $propertyAccessor = null) { $this->propertyAccessor = $propertyAccessor; } diff --git a/src/Symfony/Component/Validator/Constraints/Regex.php b/src/Symfony/Component/Validator/Constraints/Regex.php index 63bbd8d4c1fbb..dd55a65a0a8ea 100644 --- a/src/Symfony/Component/Validator/Constraints/Regex.php +++ b/src/Symfony/Component/Validator/Constraints/Regex.php @@ -42,11 +42,11 @@ class Regex extends Constraint */ public function __construct( $pattern, - string $message = null, - string $htmlPattern = null, - bool $match = null, - callable $normalizer = null, - array $groups = null, + ?string $message = null, + ?string $htmlPattern = null, + ?bool $match = null, + ?callable $normalizer = null, + ?array $groups = null, $payload = null, array $options = [] ) { diff --git a/src/Symfony/Component/Validator/Constraints/Sequentially.php b/src/Symfony/Component/Validator/Constraints/Sequentially.php index 36a801a4e28c0..2e26109fc56c1 100644 --- a/src/Symfony/Component/Validator/Constraints/Sequentially.php +++ b/src/Symfony/Component/Validator/Constraints/Sequentially.php @@ -25,7 +25,7 @@ class Sequentially extends Composite { public $constraints = []; - public function __construct($constraints = null, array $groups = null, $payload = null) + public function __construct($constraints = null, ?array $groups = null, $payload = null) { parent::__construct($constraints ?? [], $groups, $payload); } diff --git a/src/Symfony/Component/Validator/Constraints/Time.php b/src/Symfony/Component/Validator/Constraints/Time.php index 366d623766603..453d43dbe1a40 100644 --- a/src/Symfony/Component/Validator/Constraints/Time.php +++ b/src/Symfony/Component/Validator/Constraints/Time.php @@ -33,9 +33,9 @@ class Time extends Constraint public $message = 'This value is not a valid time.'; public function __construct( - array $options = null, - string $message = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Timezone.php b/src/Symfony/Component/Validator/Constraints/Timezone.php index 409fbc1d12b9f..7f6d7b907fb46 100644 --- a/src/Symfony/Component/Validator/Constraints/Timezone.php +++ b/src/Symfony/Component/Validator/Constraints/Timezone.php @@ -48,10 +48,10 @@ class Timezone extends Constraint */ public function __construct( $zone = null, - string $message = null, - string $countryCode = null, - bool $intlCompatible = null, - array $groups = null, + ?string $message = null, + ?string $countryCode = null, + ?bool $intlCompatible = null, + ?array $groups = null, $payload = null, array $options = [] ) { diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php index a83d78c2b72ed..68fe8946473dd 100644 --- a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php +++ b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php @@ -75,7 +75,7 @@ public function validate($value, Constraint $constraint) ->addViolation(); } - private static function getPhpTimezones(int $zone, string $countryCode = null): array + private static function getPhpTimezones(int $zone, ?string $countryCode = null): array { if (null !== $countryCode) { try { @@ -88,7 +88,7 @@ private static function getPhpTimezones(int $zone, string $countryCode = null): return \DateTimeZone::listIdentifiers($zone); } - private static function getIntlTimezones(int $zone, string $countryCode = null): array + private static function getIntlTimezones(int $zone, ?string $countryCode = null): array { if (!class_exists(Timezones::class)) { return []; diff --git a/src/Symfony/Component/Validator/Constraints/Type.php b/src/Symfony/Component/Validator/Constraints/Type.php index 220c2191a3c09..278dbb8210618 100644 --- a/src/Symfony/Component/Validator/Constraints/Type.php +++ b/src/Symfony/Component/Validator/Constraints/Type.php @@ -36,7 +36,7 @@ class Type extends Constraint * * @param string|array $type One ore multiple types to validate against or a set of options */ - public function __construct($type, string $message = null, array $groups = null, $payload = null, array $options = []) + public function __construct($type, ?string $message = null, ?array $groups = null, $payload = null, array $options = []) { if (\is_array($type) && \is_string(key($type))) { $options = array_merge($type, $options); diff --git a/src/Symfony/Component/Validator/Constraints/Ulid.php b/src/Symfony/Component/Validator/Constraints/Ulid.php index d1644b8b34bec..42d382d0c0487 100644 --- a/src/Symfony/Component/Validator/Constraints/Ulid.php +++ b/src/Symfony/Component/Validator/Constraints/Ulid.php @@ -36,9 +36,9 @@ class Ulid extends Constraint public $message = 'This is not a valid ULID.'; public function __construct( - array $options = null, - string $message = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Unique.php b/src/Symfony/Component/Validator/Constraints/Unique.php index 6280e9771fd6a..d50c1fe3e1db0 100644 --- a/src/Symfony/Component/Validator/Constraints/Unique.php +++ b/src/Symfony/Component/Validator/Constraints/Unique.php @@ -33,10 +33,10 @@ class Unique extends Constraint public $normalizer; public function __construct( - array $options = null, - string $message = null, - callable $normalizer = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?callable $normalizer = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Url.php b/src/Symfony/Component/Validator/Constraints/Url.php index 23cd77cad6082..1e252bda6d4e7 100644 --- a/src/Symfony/Component/Validator/Constraints/Url.php +++ b/src/Symfony/Component/Validator/Constraints/Url.php @@ -35,12 +35,12 @@ class Url extends Constraint public $normalizer; public function __construct( - array $options = null, - string $message = null, - array $protocols = null, - bool $relativeProtocol = null, - callable $normalizer = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?array $protocols = null, + ?bool $relativeProtocol = null, + ?callable $normalizer = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Uuid.php b/src/Symfony/Component/Validator/Constraints/Uuid.php index 84f83f896fc3c..98069b001d2b0 100644 --- a/src/Symfony/Component/Validator/Constraints/Uuid.php +++ b/src/Symfony/Component/Validator/Constraints/Uuid.php @@ -89,12 +89,12 @@ class Uuid extends Constraint * @param int[]|null $versions */ public function __construct( - array $options = null, - string $message = null, - array $versions = null, - bool $strict = null, - callable $normalizer = null, - array $groups = null, + ?array $options = null, + ?string $message = null, + ?array $versions = null, + ?bool $strict = null, + ?callable $normalizer = null, + ?array $groups = null, $payload = null ) { parent::__construct($options, $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/Valid.php b/src/Symfony/Component/Validator/Constraints/Valid.php index e0000632012eb..00674fa549a67 100644 --- a/src/Symfony/Component/Validator/Constraints/Valid.php +++ b/src/Symfony/Component/Validator/Constraints/Valid.php @@ -24,7 +24,7 @@ class Valid extends Constraint { public $traverse = true; - public function __construct(array $options = null, array $groups = null, $payload = null, bool $traverse = null) + public function __construct(?array $options = null, ?array $groups = null, $payload = null, ?bool $traverse = null) { parent::__construct($options ?? [], $groups, $payload); diff --git a/src/Symfony/Component/Validator/Constraints/ZeroComparisonConstraintTrait.php b/src/Symfony/Component/Validator/Constraints/ZeroComparisonConstraintTrait.php index b65fcf206a6ab..196c62e2b2901 100644 --- a/src/Symfony/Component/Validator/Constraints/ZeroComparisonConstraintTrait.php +++ b/src/Symfony/Component/Validator/Constraints/ZeroComparisonConstraintTrait.php @@ -21,7 +21,7 @@ */ trait ZeroComparisonConstraintTrait { - public function __construct(array $options = null, string $message = null, array $groups = null, $payload = null) + public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null) { if (null === $options) { $options = []; diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php index c640da36320a7..12973b17ae55a 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContext.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContext.php @@ -139,7 +139,7 @@ class ExecutionContext implements ExecutionContextInterface * * @internal Called by {@link ExecutionContextFactory}. Should not be used in user code. */ - public function __construct(ValidatorInterface $validator, $root, TranslatorInterface $translator, string $translationDomain = null) + public function __construct(ValidatorInterface $validator, $root, TranslatorInterface $translator, ?string $translationDomain = null) { $this->validator = $validator; $this->root = $root; @@ -152,7 +152,7 @@ public function __construct(ValidatorInterface $validator, $root, TranslatorInte /** * {@inheritdoc} */ - public function setNode($value, ?object $object, MetadataInterface $metadata = null, string $propertyPath) + public function setNode($value, ?object $object, ?MetadataInterface $metadata, string $propertyPath) { $this->value = $value; $this->object = $object; diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php index 623bd16eedfd3..442d59a144716 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php @@ -26,7 +26,7 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface private $translator; private $translationDomain; - public function __construct(TranslatorInterface $translator, string $translationDomain = null) + public function __construct(TranslatorInterface $translator, ?string $translationDomain = null) { $this->translator = $translator; $this->translationDomain = $translationDomain; diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php index 039ef74117fc0..e084500a9bc32 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php @@ -129,7 +129,7 @@ public function getObject(); * @param object|null $object The currently validated object * @param string $propertyPath The property path to the current value */ - public function setNode($value, ?object $object, MetadataInterface $metadata = null, string $propertyPath); + public function setNode($value, ?object $object, ?MetadataInterface $metadata, string $propertyPath); /** * Warning: Should not be called by user code, to be used by the validator engine only. diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php index 2b36267fbec4e..eb846cb5a9caf 100644 --- a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php +++ b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php @@ -40,7 +40,7 @@ public function __construct(TraceableValidator $validator) /** * {@inheritdoc} */ - public function collect(Request $request, Response $response, \Throwable $exception = null) + public function collect(Request $request, Response $response, ?\Throwable $exception = null) { // Everything is collected once, on kernel terminate. } diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php index 42ed0508d8047..a12e6b0973160 100644 --- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php +++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php @@ -48,7 +48,7 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface */ protected $loadedClasses = []; - public function __construct(LoaderInterface $loader = null, CacheItemPoolInterface $cache = null) + public function __construct(?LoaderInterface $loader = null, ?CacheItemPoolInterface $cache = null) { $this->loader = $loader; $this->cache = $cache; diff --git a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php index 0be3329342b2b..d9fa46e9540d2 100644 --- a/src/Symfony/Component/Validator/Mapping/GetterMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/GetterMetadata.php @@ -39,7 +39,7 @@ class GetterMetadata extends MemberMetadata * * @throws ValidatorException */ - public function __construct(string $class, string $property, string $method = null) + public function __construct(string $class, string $property, ?string $method = null) { if (null === $method) { $getMethod = 'get'.ucfirst($property); diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php index dfe0f8319c0af..2e4e8cb299b1f 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php @@ -29,7 +29,7 @@ class AnnotationLoader implements LoaderInterface { protected $reader; - public function __construct(Reader $reader = null) + public function __construct(?Reader $reader = null) { $this->reader = $reader; } diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AutoMappingTrait.php b/src/Symfony/Component/Validator/Mapping/Loader/AutoMappingTrait.php index f76442f06c05e..4661ce657cd7c 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/AutoMappingTrait.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/AutoMappingTrait.php @@ -21,7 +21,7 @@ */ trait AutoMappingTrait { - private function isAutoMappingEnabledForClass(ClassMetadata $metadata, string $classValidatorRegexp = null): bool + private function isAutoMappingEnabledForClass(ClassMetadata $metadata, ?string $classValidatorRegexp = null): bool { // Check if AutoMapping constraint is set first if (AutoMappingStrategy::NONE !== $strategy = $metadata->getAutoMappingStrategy()) { diff --git a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php index 118c159445282..3895eb11378c4 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php @@ -36,7 +36,7 @@ final class PropertyInfoLoader implements LoaderInterface private $accessExtractor; private $classValidatorRegexp; - public function __construct(PropertyListExtractorInterface $listExtractor, PropertyTypeExtractorInterface $typeExtractor, PropertyAccessExtractorInterface $accessExtractor, string $classValidatorRegexp = null) + public function __construct(PropertyListExtractorInterface $listExtractor, PropertyTypeExtractorInterface $typeExtractor, PropertyAccessExtractorInterface $accessExtractor, ?string $classValidatorRegexp = null) { $this->listExtractor = $listExtractor; $this->typeExtractor = $typeExtractor; diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.af.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.af.xlf index d1dcf3ec8fa50..387fb9a649711 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.af.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.af.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Hierdie lêer is nie 'n geldige beeld nie. - - This is not a valid IP address. - Hierdie is nie 'n geldige IP-adres nie. + + This value is not a valid IP address. + Hierdie waarde is nie 'n geldige IP-adres nie. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Geen lêer is opgelaai nie. - - No temporary folder was configured in php.ini. - Geen tydelike lêer is ingestel in php.ini nie. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Geen tydelike gids is in php.ini opgestel nie, of die opgestelde gids bestaan nie. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nie-ondersteunde tipe kaart of ongeldige kredietkaart nommer. - - This is not a valid International Bank Account Number (IBAN). - Hierdie is nie 'n geldige Internationale Bank Rekening Nommer (IBAN) nie. + + This value is not a valid International Bank Account Number (IBAN). + Hierdie waarde is nie 'n geldige Internasionale Bankrekeningnommer (IBAN) nie. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Die waarde stem nie ooreen met die verwagte {{ charset }} karakterstel nie. - - This is not a valid Business Identifier Code (BIC). - Hierdie is nie 'n geldige Besigheids Identifikasie Kode (BIC) nie. + + This value is not a valid Business Identifier Code (BIC). + Hierdie waarde is nie 'n geldige Besigheid Identifiseerder Kode (BIC) nie. Error Fout - - This is not a valid UUID. - Hierdie is nie 'n geldige UUID nie. + + This value is not a valid UUID. + Hierdie waarde is nie 'n geldige UUID nie. This value should be a multiple of {{ compared_value }}. @@ -358,6 +358,10 @@ This value is not a valid timezone. Hierdie waarde is nie 'n geldige tydsone nie. + + This password has been leaked in a data breach, it must not be used. Please use another password. + Hierdie wagwoord is in 'n data-oortreding uitgelek, dit mag nie gebruik word nie. Gebruik asseblief 'n ander wagwoord. + This value should be between {{ min }} and {{ max }}. Hierdie waarde moet tussen {{ min }} en {{ max }} wees. @@ -398,6 +402,42 @@ The value of the netmask should be between {{ min }} and {{ max }}. Die waarde van die netmasker moet tussen {{ min }} en {{ max }} wees. + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Die lêernaam is te lank. Dit moet {{ filename_max_length }} karakter of minder hê.|Die lêernaam is te lank. Dit moet {{ filename_max_length }} karakters of minder hê. + + + The password strength is too low. Please use a stronger password. + Die wagwoordsterkte is te laag. Gebruik asseblief 'n sterker wagwoord. + + + This value contains characters that are not allowed by the current restriction-level. + Hierdie waarde bevat karakters wat nie toegelaat word deur die huidige beperkingsvlak nie. + + + Using invisible characters is not allowed. + Die gebruik van onsigbare karakters word nie toegelaat nie. + + + Mixing numbers from different scripts is not allowed. + Die meng van nommers van verskillende skrifte word nie toegelaat nie. + + + Using hidden overlay characters is not allowed. + Die gebruik van verborge oorvleuelende karakters word nie toegelaat nie. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Die uitbreiding van die lêer is ongeldig ({{ extension }}). Toegelate uitbreidings is {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Die opgespoorde karakterkodering is ongeldig ({{ detected }}). Toegelate koderings is {{ encodings }}. + + + This value is not a valid MAC address. + Hierdie waarde is nie 'n geldige MAC-adres nie. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf index 0487d4225cc3b..6ac303a778fa9 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. هذا الملف ليس صورة صحيحة. - - This is not a valid IP address. - هذه القيمة ليست عنوان رقمى صحيح. + + This value is not a valid IP address. + هذه القيمة ليست عنوان IP صالحًا. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. لم يتم ارسال اى ملف. - - No temporary folder was configured in php.ini. - لم يتم تهيئة حافظة مؤقتة فى ملف php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + لم يتم تكوين مجلد مؤقت في ملف php.ini، أو المجلد المعد لا يوجد. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. نوع البطاقه غير مدعوم او الرقم غير صحيح. - - This is not a valid International Bank Account Number (IBAN). - الرقم IBAN (رقم الحساب المصرفي الدولي) الذي تم إدخاله غير صالح. + + This value is not a valid International Bank Account Number (IBAN). + هذه القيمة ليست رقم حساب بنكي دولي (IBAN) صالحًا. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. هذه القيمة غير متطابقة مع صيغة التحويل {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - هذه القيمة ليست رمز معرّف نشاط تجاري صالح (BIC). + + This value is not a valid Business Identifier Code (BIC). + هذه القيمة ليست رمز معرف الأعمال (BIC) صالحًا. Error خطأ - - This is not a valid UUID. - هذا ليس UUID صالح. + + This value is not a valid UUID. + هذه القيمة ليست UUID صالحًا. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. امتداد الملف غير صحيح ({{ extension }}). الامتدادات المسموح بها هي {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + تم اكتشاف ترميز الأحرف غير صالح ({{ detected }}). الترميزات المسموح بها هي {{ encodings }}. + + + This value is not a valid MAC address. + هذه القيمة ليست عنوان MAC صالحًا. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.az.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.az.xlf index 756ca28847f40..b6152e99dabc0 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.az.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.az.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Bu fayl düzgün bir şəkil deyil. - - This is not a valid IP address. - Bu düzgün bir IP adresi deyil. + + This value is not a valid IP address. + Bu dəyər etibarlı bir IP ünvanı deyil. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Fayl yüklənmədi. - - No temporary folder was configured in php.ini. - php.ini'də müvəqqəti qovluq quraşdırılmayıb. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini-də müvəqqəti qovluq quraşdırılmayıb, və ya quraşdırılmış qovluq mövcud deyil. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Dəstəklənməyən kart tipi və ya yanlış kart nömrəsi. - - This is not a valid International Bank Account Number (IBAN). - Bu dəyər doğru bir Beynəlxalq Bank Hesap Nömrəsi (IBAN) deyil. + + This value is not a valid International Bank Account Number (IBAN). + Bu dəyər etibarlı bir Beynəlxalq Bank Hesab Nömrəsi (IBAN) deyil. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Bu dəyər gözlənilən {{ charset }} simvol cədvəli ilə uyğun gəlmir. - - This is not a valid Business Identifier Code (BIC). - Bu dəyər doğru bir Biznes Təyinedici Kodu (BIC) deyil. + + This value is not a valid Business Identifier Code (BIC). + Bu dəyər etibarlı bir Biznes Təyinat Kodu (BIC) deyil. Error Xəta - - This is not a valid UUID. - Bu dəyər doğru bir UUID deyil. + + This value is not a valid UUID. + Bu dəyər etibarlı bir UUID deyil. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Faylın uzantısı yanlışdır ({{ extension }}). İcazə verilən uzantılar {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Təsbit edilən simvol şifrləməsi yanlışdır. ({{ detected }}). İcazə verilən şifrləmələr bunlardır: {{ encodings }}. + + + This value is not a valid MAC address. + Bu dəyər etibarlı bir MAC ünvanı deyil. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf index d9fcd93b808f9..ea7001957572b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Гэты файл не з'яўляецца сапраўднай выявай. - - This is not a valid IP address. - Значэнне не з'яўляецца сапраўдным IP-адрасам. + + This value is not a valid IP address. + Гэта значэнне не з'яўляецца сапраўдным IP-адрасам. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Файл не быў запампаваны. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. У php.ini не была налажана часовая папка, або часовая папка не існуе. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Тып карты не падтрымліваецца або несапраўдны нумар карты. - - This is not a valid International Bank Account Number (IBAN). - Несапраўдны міжнародны нумар банкаўскага рахунку (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Гэта значэнне не з'яўляецца сапраўдным міжнародным нумарам банкаўскага рахунку (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Гэта значэнне не супадае з чаканай {{ charset }} кадыроўкай. - - This is not a valid Business Identifier Code (BIC). - Несапраўдны банкаўскі ідэнтыфікацыйны код (BIC). + + This value is not a valid Business Identifier Code (BIC). + Гэта значэнне не з'яўляецца сапраўдным кодам ідэнтыфікацыі бізнесу (BIC). Error Памылка - - This is not a valid UUID. - Гэта несапраўдны UUID. + + This value is not a valid UUID. + Гэта значэнне не з'яўляецца сапраўдным UUID. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. Выкарыстанне схаваных накладзеных сімвалаў не дазваляецца. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Пашырэнне файла няслушнае ({{ extension }}). Дазволеныя пашырэнні: {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Выяўленая кадыроўка знакаў няслушная ({{ detected }}). Дазволеныя кадыроўкі: {{ encodings }}. + + + This value is not a valid MAC address. + Гэта значэнне не з'яўляецца сапраўдным MAC-адрасам. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf index d9efdf5751fe1..5705364f80f84 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Файлът не е валидно изображение. - - This is not a valid IP address. - Това не е валиден IP адрес. + + This value is not a valid IP address. + Тази стойност не е валиден IP адрес. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Файлът не беше качен. - - No temporary folder was configured in php.ini. - Не е посочена директория за временни файлове в php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + В php.ini не е конфигурирана временна директория, или конфигурираната директория не съществува. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Неподдържан тип карта или невалиден номер на карта. - - This is not a valid International Bank Account Number (IBAN). - Това не е валиден Международен номер на банкова сметка (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Тази стойност не е валиден международен банков сметка номер (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Стойността не съвпада с очакваната {{ charset }} кодировка. - - This is not a valid Business Identifier Code (BIC). - Това не е валиден Бизнес идентификационен код (BIC). + + This value is not a valid Business Identifier Code (BIC). + Тази стойност не е валиден код за идентификация на бизнеса (BIC). Error Грешка - - This is not a valid UUID. - Това не е валиден UUID. + + This value is not a valid UUID. + Тази стойност не е валиден UUID. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. Използването на скрити насложени символи не е позволено. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Разширението на файла е невалидно ({{ extension }}). Разрешените разширения са {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Откритото кодиране на знаците е невалидно ({{ detected }}). Разрешените кодирания са {{ encodings }}. + + + This value is not a valid MAC address. + Тази стойност не е валиден MAC адрес. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf index 423ca01a52f3b..bff1c8b441e2c 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ova datoteka nije validna slika. - - This is not a valid IP address. - Ovo nije ispravna IP adresa. + + This value is not a valid IP address. + Ova vrijednost nije valjana IP adresa. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nijedna datoteka nije prenijeta (uploaded). - - No temporary folder was configured in php.ini. - Privremeni direktorijum nije konfigurisan u datoteci php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Privremeni direktorij nije konfiguriran u php.ini, ili konfigurirani direktorij ne postoji. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tip kartice nije podržan ili je broj kartice neispravan. - - This is not a valid International Bank Account Number (IBAN). - Ova vrijednost nije ispravan međunarodni broj bankovnog računa (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ova vrijednost nije valjan Međunarodni broj bankovnog računa (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Ova vrijednost ne odgovara očekivanom {{ charset }} setu karaktera (charset). - - This is not a valid Business Identifier Code (BIC). - Ovo nije validan poslovni identifikacioni kod (BIC). + + This value is not a valid Business Identifier Code (BIC). + Ova vrijednost nije valjan Poslovni identifikacijski kod (BIC). Error Greška - - This is not a valid UUID. - Ovo nije validan UUID. + + This value is not a valid UUID. + Ova vrijednost nije valjan UUID. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. Upotreba skrivenih preklapajućih znakova nije dozvoljena. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Ekstenzija datoteke je nevažeća ({{ extension }}). Dozvoljene ekstenzije su {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Otkriveno kodiranje karaktera je nevažeće ({{ detected }}). Dozvoljena kodiranja su {{ encodings }}. + + + This value is not a valid MAC address. + Ova vrijednost nije valjana MAC adresa. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf index d6d925ecc5814..2f301e784ac03 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. L'arxiu no és una imatge vàlida. - - This is not a valid IP address. - Això no és una adreça IP vàlida. + + This value is not a valid IP address. + Aquest valor no és una adreça IP vàlida. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Cap arxiu va ser pujat. - - No temporary folder was configured in php.ini. - Cap carpeta temporal va ser configurada en php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + No s'ha configurat cap carpeta temporal en php.ini, o la carpeta configurada no existeix. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tipus de targeta no suportada o número de targeta invàlid. - - This is not a valid International Bank Account Number (IBAN). - Això no és un nombre de compte bancari internacional (IBAN) vàlid. + + This value is not a valid International Bank Account Number (IBAN). + Aquest valor no és un Número de Compte Bancari Internacional (IBAN) vàlid. This value is not a valid ISBN-10. @@ -302,7 +302,7 @@ An empty file is not allowed. No està permès un fixter buit. - + The host could not be resolved. No s'ha pogut resoldre l'amfitrió. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Aquest valor no coincideix amb l'esperat {{ charset }} joc de caràcters. - - This is not a valid Business Identifier Code (BIC). - Aquest no és un codi d'identificació bancari (BIC) vàlid. + + This value is not a valid Business Identifier Code (BIC). + Aquest valor no és un Codi d'Identificador de Negocis (BIC) vàlid. Error Error - - This is not a valid UUID. - Aquest valor no és un UUID vàlid. + + This value is not a valid UUID. + Aquest valor no és un UUID vàlid. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. No es permet l'ús de caràcters superposats ocults. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + L'extensió del fitxer no és vàlida ({{ extension }}). Les extensions permeses són {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + S'ha detectat que la codificació de caràcters no és vàlida ({{ detected }}). Les codificacions permeses són {{ encodings }}. + + + This value is not a valid MAC address. + Aquest valor no és una adreça MAC vàlida. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf index d53747e2aef70..fcae07cec0e79 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Tento soubor není obrázek. - - This is not a valid IP address. - Toto není platná IP adresa. + + This value is not a valid IP address. + Tato hodnota není platnou IP adresou. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Žádný soubor nebyl nahrán. - - No temporary folder was configured in php.ini. - V php.ini není nastavena cesta k adresáři pro dočasné soubory. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + V php.ini nebyla nastavena cesta k dočasnému adresáři, nebo nastavený adresář neexistuje. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nepodporovaný typ karty nebo neplatné číslo karty. - - This is not a valid International Bank Account Number (IBAN). - Toto je neplatný IBAN. + + This value is not a valid International Bank Account Number (IBAN). + Tato hodnota není platným Mezinárodním bankovním číslem účtu (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Tato hodnota neodpovídá očekávané znakové sadě {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Tato hodnota není platný identifikační kód podniku (BIC). + + This value is not a valid Business Identifier Code (BIC). + Tato hodnota není platným Kódem obchodního identifikátoru (BIC). Error Chyba - - This is not a valid UUID. - Tato hodnota není platné UUID. + + This value is not a valid UUID. + Tato hodnota není platným UUID. This value should be a multiple of {{ compared_value }}. @@ -414,18 +414,30 @@ This value contains characters that are not allowed by the current restriction-level. Tato hodnota obsahuje znaky, které nejsou povoleny aktuální úrovní omezení. - - Using invisible characters is not allowed. - Používání neviditelných znaků není povoleno. - - - Mixing numbers from different scripts is not allowed. - Kombinování čísel z různých písem není povoleno. - - - Using hidden overlay characters is not allowed. - Použití skrytých překrývajících znaků není povoleno. - + + Using invisible characters is not allowed. + Používání neviditelných znaků není povoleno. + + + Mixing numbers from different scripts is not allowed. + Kombinování čísel z různých písem není povoleno. + + + Using hidden overlay characters is not allowed. + Použití skrytých překrývajících znaků není povoleno. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Přípona souboru je neplatná ({{ extension }}). Povolené přípony jsou {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Zjištěné kódování znaků je neplatné ({{ detected }}). Povolená kódování jsou {{ encodings }}. + + + This value is not a valid MAC address. + Tato hodnota není platnou MAC adresou. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf index 752b6c2ae5143..fd984989e3597 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Nid yw'r ffeil hon yn ddelwedd dilys. - - This is not a valid IP address. - Nid yw hwn yn gyfeiriad IP dilys. + + This value is not a valid IP address. + Nid yw'r gwerth hwn yn gyfeiriad IP dilys. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Ni uwchlwythwyd unrhyw ffeil. - - No temporary folder was configured in php.ini. - Nid oes ffolder dros-dro wedi'i gosod yn php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Nid oedd ffolder dros dro wedi'i ffurfweddu yn php.ini, neu nid yw'r ffolder a ffurfweddiwyd yn bodoli. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Unai ni dderbynir y math yna o gerdyn, neu nid yw rhif y cerdyn yn ddilys. - - This is not a valid International Bank Account Number (IBAN). - Nid yw hwn yn Rhif Cyfrif Banc Rhyngwladol (IBAN) dilys. + + This value is not a valid International Bank Account Number (IBAN). + Nid yw'r gwerth hwn yn Rhif Cyfrif Banc Rhyngwladol (IBAN) dilys. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Nid yw'r gwerth hwn yn cyfateb â'r {{ charset }} set nodau ddisgwyliedig. - - This is not a valid Business Identifier Code (BIC). - Nid yw hwn yn God Adnabod Busnes (BIC) dilys. + + This value is not a valid Business Identifier Code (BIC). + Nid yw'r gwerth hwn yn God Adnabod Busnes (BIC) dilys. Error Gwall - - This is not a valid UUID. - Nid yw hyn yn UUID dilys. + + This value is not a valid UUID. + Nid yw'r gwerth hwn yn UUID dilys. This value should be a multiple of {{ compared_value }}. @@ -330,6 +330,114 @@ This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}. Nid yw'r Cod Adnabod Busnes (BIC) hwn yn gysylltiedig ag IBAN {{ iban }}. + + This value should be valid JSON. + Dylai'r gwerth hwn fod yn JSON dilys. + + + This collection should contain only unique elements. + Dylai'r casgliad hwn gynnwys elfennau unigryw yn unig. + + + This value should be positive. + Dylai'r gwerth hwn fod yn gadarnhaol. + + + This value should be either positive or zero. + Dylai'r gwerth hwn fod yn gadarnhaol neu sero. + + + This value should be negative. + Dylai'r gwerth hwn fod yn negyddol. + + + This value should be either negative or zero. + Dylai'r gwerth hwn fod yn negyddol neu sero. + + + This value is not a valid timezone. + Nid yw'r gwerth hwn yn gyfnod parth amser dilys. + + + This password has been leaked in a data breach, it must not be used. Please use another password. + Mae'r cyfrinair hwn wedi'i ddatgelu mewn toriad data, ni ddylid ei ddefnyddio. Defnyddiwch gyfrinair arall. + + + This value should be between {{ min }} and {{ max }}. + Dylai'r gwerth hwn fod rhwng {{ min }} a {{ max }}. + + + This value is not a valid hostname. + Nid yw'r gwerth hwn yn enw gwesteiwr dilys. + + + The number of elements in this collection should be a multiple of {{ compared_value }}. + Dylai nifer yr elfennau yn y casgliad hwn fod yn luosrif o {{ compared_value }}. + + + This value should satisfy at least one of the following constraints: + Dylai'r gwerth hwn fodloni o leiaf un o'r cyfyngiadau canlynol: + + + Each element of this collection should satisfy its own set of constraints. + Dylai pob elfen o'r casgliad hwn fodloni ei gyfres ei hun o gyfyngiadau. + + + This value is not a valid International Securities Identification Number (ISIN). + Nid yw'r gwerth hwn yn Rhif Adnabod Diogelwch Rhyngwladol (ISIN) dilys. + + + This value should be a valid expression. + Dylai'r gwerth hwn fod yn fynegiant dilys. + + + This value is not a valid CSS color. + Nid yw'r gwerth hwn yn lliw CSS dilys. + + + This value is not a valid CIDR notation. + Nid yw'r gwerth hwn yn nodiant CIDR dilys. + + + The value of the netmask should be between {{ min }} and {{ max }}. + Dylai gwerth y mwgwd rhwydwaith fod rhwng {{ min }} a {{ max }}. + + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Mae'r enw ffeil yn rhy hir. Dylai fod â {{ filename_max_length }} cymeriad neu lai.|Mae'r enw ffeil yn rhy hir. Dylai fod â {{ filename_max_length }} nodau neu lai. + + + The password strength is too low. Please use a stronger password. + Mae cryfder y cyfrinair yn rhy isel. Defnyddiwch gyfrinair cryfach os gwelwch yn dda. + + + This value contains characters that are not allowed by the current restriction-level. + Mae'r gwerth hwn yn cynnwys cymeriadau nad ydynt yn cael eu caniatáu gan y lefel cyfyngu presennol. + + + Using invisible characters is not allowed. + Ni chaniateir defnyddio cymeriadau anweledig. + + + Mixing numbers from different scripts is not allowed. + Ni chaniateir cymysgu rhifau o sgriptiau gwahanol. + + + Using hidden overlay characters is not allowed. + Ni chaniateir defnyddio cymeriadau goruwchlwytho cudd. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Mae estyniad y ffeil yn annilys ({{ extension }}). Mae'r estyniadau a ganiateir yn {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Mae'r codio cymeriadau a ganfuwyd yn annilys ({{ detected }}). Mae'r codiadau a ganiateir yn {{ encodings }}. + + + This value is not a valid MAC address. + Nid yw'r gwerth hwn yn gyfeiriad MAC dilys. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf index 21893c6ede456..826ef10c955db 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Filen er ikke gyldigt billede. - - This is not a valid IP address. - Dette er ikke en gyldig IP-adresse. + + This value is not a valid IP address. + Denne værdi er ikke en gyldig IP-adresse. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Ingen fil blev uploadet. - - No temporary folder was configured in php.ini. - Ingen midlertidig mappe er konfigureret i php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Der blev ikke konfigureret en midlertidig mappe i php.ini, eller den konfigurerede mappe eksisterer ikke. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Ikke-understøttet korttype eller ugyldigt kortnummer. - - This is not a valid International Bank Account Number (IBAN). - Det er ikke et gyldigt International Bank Account Number (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Denne værdi er ikke et gyldigt internationalt bankkontonummer (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Denne værdi stemmer ikke overens med den forventede {{ charset }} charset. - - This is not a valid Business Identifier Code (BIC). - Dette er ikke en gyldig Business Identifier Code (BIC).a + + This value is not a valid Business Identifier Code (BIC). + Denne værdi er ikke en gyldig forretningsidentifikationskode (BIC). Error Fejl - - This is not a valid UUID. - Dette er ikke en gyldig UUID. + + This value is not a valid UUID. + Denne værdi er ikke en gyldig UUID. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. At bruge skjulte overlejringstegn er ikke tilladt. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Udvidelsen til filen er ugyldig ({{ extension }}). De tilladte udvidelser er {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Det registrerede tegnsæt er ugyldigt ({{ detected }}). De tilladte tegnsæt er {{ encodings }}. + + + This value is not a valid MAC address. + Denne værdi er ikke en gyldig MAC-adresse. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf index bc1c3e4d51011..9f145fdeed911 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Diese Datei ist kein gültiges Bild. - - This is not a valid IP address. - Dies ist keine gültige IP-Adresse. + + This value is not a valid IP address. + Dieser Wert ist keine gültige IP-Adresse. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Es wurde keine Datei hochgeladen. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. Es wurde kein temporärer Ordner in der php.ini konfiguriert oder der temporäre Ordner existiert nicht. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nicht unterstützter Kartentyp oder ungültige Kartennummer. - - This is not a valid International Bank Account Number (IBAN). - Dieser Wert ist keine gültige internationale Bankkontonummer (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Dieser Wert ist keine gültige Internationale Bankkontonummer (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Dieser Wert entspricht nicht dem erwarteten Zeichensatz {{ charset }}. - - This is not a valid Business Identifier Code (BIC). + + This value is not a valid Business Identifier Code (BIC). Dieser Wert ist keine gültige internationale Bankleitzahl (BIC). Error Fehler - - This is not a valid UUID. - Dies ist keine gültige UUID. + + This value is not a valid UUID. + Dieser Wert ist keine gültige UUID. This value should be a multiple of {{ compared_value }}. @@ -434,6 +434,10 @@ The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. Der erkannte Zeichensatz ist nicht gültig ({{ detected }}). Gültige Zeichensätze sind {{ encodings }}. + + This value is not a valid MAC address. + Dieser Wert ist keine gültige MAC-Adresse. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf index 9c624df363853..f7677fabfb89a 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Το αρχείο δεν αποτελεί έγκυρη εικόνα. - - This is not a valid IP address. - Αυτό δεν είναι μια έγκυρη διεύθυνση IP. + + This value is not a valid IP address. + Αυτή η τιμή δεν είναι έγκυρη διεύθυνση IP. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Δεν ανέβηκε κανένα αρχείο. - - No temporary folder was configured in php.ini. - Κανένας προσωρινός φάκελος δεν έχει ρυθμιστεί στο php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Δεν ρυθμίστηκε προσωρινός φάκελος στο php.ini, ή ο ρυθμισμένος φάκελος δεν υπάρχει. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Μη υποστηριζόμενος τύπος κάρτας ή μη έγκυρος αριθμός κάρτας. - - This is not a valid International Bank Account Number (IBAN). - Αυτό δεν αντιστοιχεί σε έγκυρο διεθνή αριθμό τραπεζικού λογαριασμού (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Αυτή η τιμή δεν είναι έγκυρος Διεθνής Αριθμός Τραπεζικού Λογαριασμού (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Αυτή η τιμή δεν ταιριάζει στο αναμενόμενο {{ charset }} σύνολο χαρακτήρων. - - This is not a valid Business Identifier Code (BIC). - Αυτός δεν είναι ένας έγκυρος κωδικός BIC. + + This value is not a valid Business Identifier Code (BIC). + Αυτή η τιμή δεν είναι έγκυρος Κωδικός Ταυτοποίησης Επιχείρησης (BIC). Error Σφάλμα - - This is not a valid UUID. - Αυτό δεν είναι ένα έγκυρο UUID. + + This value is not a valid UUID. + Αυτή η τιμή δεν είναι έγκυρη UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Η επέκταση του αρχείου δεν είναι έγκυρη ({{ extension }}). Οι επιτρεπτόμενες επεκτάσεις είναι {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Η κωδικοποίηση χαρακτήρων που ανιχνεύτηκε δεν είναι έγκυρη ({{ detected }}). Οι επιτρεπόμενες κωδικοποιήσεις είναι {{ encodings }}. + + + This value is not a valid MAC address. + Αυτή η τιμή δεν είναι έγκυρη διεύθυνση MAC. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf index 6a49fb39f627d..35196e572e0f0 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -136,7 +136,7 @@ This is not a valid IP address. - This is not a valid IP address. + This value is not a valid IP address. This value is not a valid language. @@ -224,7 +224,7 @@ This is not a valid International Bank Account Number (IBAN). - This is not a valid International Bank Account Number (IBAN). + This value is not a valid International Bank Account Number (IBAN). This value is not a valid ISBN-10. @@ -312,7 +312,7 @@ This is not a valid Business Identifier Code (BIC). - This is not a valid Business Identifier Code (BIC). + This value is not a valid Business Identifier Code (BIC). Error @@ -320,7 +320,7 @@ This is not a valid UUID. - This is not a valid UUID. + This value is not a valid UUID. This value should be a multiple of {{ compared_value }}. @@ -434,6 +434,10 @@ The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + + This value is not a valid MAC address. + This value is not a valid MAC address. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf index e0003901f8641..4c1fa82e2f471 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. El archivo no es una imagen válida. - - This is not a valid IP address. - Esto no es una dirección IP válida. + + This value is not a valid IP address. + Este valor no es una dirección IP válida. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. No se subió ningún archivo. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. Ninguna carpeta temporal fue configurada en php.ini o la carpeta configurada no existe. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tipo de tarjeta no soportado o número de tarjeta inválido. - - This is not a valid International Bank Account Number (IBAN). - Esto no es un International Bank Account Number (IBAN) válido. + + This value is not a valid International Bank Account Number (IBAN). + Este valor no es un Número de Cuenta Bancaria Internacional (IBAN) válido. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. La codificación de caracteres para este valor debería ser {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - No es un Código de Identificación Bancaria (BIC) válido. + + This value is not a valid Business Identifier Code (BIC). + Este valor no es un Código de Identificación de Negocios (BIC) válido. Error Error - - This is not a valid UUID. - Este valor no es un UUID válido. + + This value is not a valid UUID. + Este valor no es un UUID válido. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. La extensión del archivo no es válida ({{ extension }}). Las extensiones permitidas son {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + La codificación de los caracteres detectada es inválida ({{ detected }}). Las codificaciones permitidas son {{ encodings }}. + + + This value is not a valid MAC address. + Este valor no es una dirección MAC válida. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.et.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.et.xlf index 080492b107500..853d7a09954ef 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.et.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.et.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Fail ei ole korrektne pilt. - - This is not a valid IP address. - IP aadress pole korrektne. + + This value is not a valid IP address. + See väärtus ei ole kehtiv IP-aadress. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Ühtegi faili ei laetud üles. - - No temporary folder was configured in php.ini. - Ühtegi ajutist kausta polnud php.ini-s seadistatud. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini-s ei olnud seadistatud ajutist kausta, või seadistatud kaust ei eksisteeri. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Kaardi tüüpi ei toetata või kaardi number on vigane. - - This is not a valid International Bank Account Number (IBAN). - Väärtus pole korrektne IBAN-number. + + This value is not a valid International Bank Account Number (IBAN). + See väärtus ei ole kehtiv Rahvusvaheline Pangakonto Number (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. See väärtus ei ühti eeldatava tähemärgiga {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - See ei ole kehtiv ettevõtte identifitseerimiskood (BIC). + + This value is not a valid Business Identifier Code (BIC). + See väärtus ei ole kehtiv Äriühingu Tuvastuskood (BIC). Error Viga - - This is not a valid UUID. - See pole kehtiv UUID. + + This value is not a valid UUID. + See väärtus ei ole kehtiv UUID. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. Peidetud tähemärkide kasutamine pole lubatud. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Faili laiend on vigane ({{ extension }}). Lubatud laiendid on {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Tuvastatud teksti kodeering on vigane ({{ detected }}). Lubatud kodeeringud on {{ encodings }}. + + + This value is not a valid MAC address. + See väärtus ei ole kehtiv MAC-aadress. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf index 2af7c04954861..6094d1cbca575 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -105,7 +105,7 @@ This value is not a valid time. Balio hau ez da ordu egoki bat. - + This value is not a valid URL. Balio hau ez da baliabideen kokatzaile uniforme (URL) egoki bat. @@ -134,9 +134,9 @@ This file is not a valid image. Fitxategi hau ez da irudi egoki bat. - - This is not a valid IP address. - Honako hau ez da IP helbide egoki bat. + + This value is not a valid IP address. + Balio hau ez da IP helbide baliozko bat. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Ez da fitxategirik igo. - - No temporary folder was configured in php.ini. - Ez da aldi baterako karpetarik konfiguratu php.ini fitxategian. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Ez da aldi baterako karpetarik konfiguratu php.ini-n, edo konfiguratutako karpeta ez da existitzen. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Txartel mota onartezina edo txartel zenbaki baliogabea. - - This is not a valid International Bank Account Number (IBAN). - Hau ez da baliozko banku internazionaleko kontu zenbaki (IBAN) bat. + + This value is not a valid International Bank Account Number (IBAN). + Balio hau ez da Nazioarteko Banku Kontu Zenbaki (IBAN) baliozko bat. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Balio honen karaktere kodea ez da esperotakoa {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Ez da balizko Banku Identifikazioko Kodea (BIC). + + This value is not a valid Business Identifier Code (BIC). + Balio hau ez da Negozioaren Identifikazio Kode (BIC) baliozko bat. Error Errore - - This is not a valid UUID. - Balio hau ez da onartutako UUID bat. + + This value is not a valid UUID. + Balio hau ez da UUID baliozko bat. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. Ez da onartzen karaktere gainjarri ezkutuen erabilera. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Fitxategiaren luzapena ez da zuzena ({{ extension }}). Baimendutako luzapenak hauek dira: {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Detektatutako karaktere-kodetzea ez da zuzena ({{ detected }}). Baimendutako kodetzeak hauek dira: {{ encodings }}. + + + This value is not a valid MAC address. + Balio hau ez da MAC helbide baliozko bat. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf index 50bb61aac420f..1db553c9ffb18 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -35,12 +35,12 @@ یک یا چند مقدار داده شده نامعتبر است. - The fields {{ fields }} were not expected. - فیلدهای {{ fields }} مورد انتظار نبود. + This field was not expected. + این فیلد انتظار نمی‌رفت. - The fields {{ fields }} are missing. - فیلدهای {{ fields }} مفقود شده اند. + This field is missing. + این فیلد گمشده است. This value is not a valid date. @@ -134,9 +134,9 @@ This file is not a valid image. این فایل یک تصویر معتبر نمی‌باشد. - - This is not a valid IP address. - این آدرس IP معتبر نیست. + + This value is not a valid IP address. + این مقدار آدرس IP معتبری نیست. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. هیچ فایلی بارگذاری نشد. - - No temporary folder was configured in php.ini. - پوشه موقتی در php.ini پیکربندی نگردیده است. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + هیچ پوشه موقتی در php.ini پیکربندی نشده است، یا پوشه پیکربندی شده وجود ندارد. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. نوع کارت پشتیبانی نمی‌شود و یا شماره کارت نامعتبر می‌باشد. - - This is not a valid International Bank Account Number (IBAN). - این یک شماره حساب بانک بین المللی معتبر نمی‌باشد(IBAN). + + This value is not a valid International Bank Account Number (IBAN). + این مقدار یک شماره حساب بانکی بین‌المللی (IBAN) معتبر نیست. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. این مقدار مطابق charset مورد انتظار {{ charset }} نمی باشد. - - This is not a valid Business Identifier Code (BIC). - این مقدار یک کد شناسایی کسب‌و‌کار معتبر (BIC) نیست. + + This value is not a valid Business Identifier Code (BIC). + این مقدار یک کد شناسه کسب‌وکار (BIC) معتبر نیست. Error خطا - - This is not a valid UUID. - این مقدار یک UUID معتبر نمی‌باشد. + + This value is not a valid UUID. + این مقدار یک UUID معتبر نیست. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. استفاده از کاراکترهای همپوشانی پنهان (hidden overlay characters) مجاز نیست. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + پسوند فایل نامعتبر است ({{ extension }}). پسوندهای مجاز {{ extensions }} هستند. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + رمزگذاری کاراکتر تشخیص داده شده نامعتبر است ({{ detected }}). رمزگذاری‌های مجاز {{ encodings }} هستند. + + + This value is not a valid MAC address. + این مقدار یک آدرس MAC معتبر نیست. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.fi.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.fi.xlf index 565ca29fb258f..324df2c276b79 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.fi.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.fi.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Tiedosto ei ole kelvollinen kuva. - - This is not a valid IP address. - Tämä ei ole kelvollinen IP-osoite. + + This value is not a valid IP address. + Tämä arvo ei ole kelvollinen IP-osoite. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Tiedostoa ei ladattu. - - No temporary folder was configured in php.ini. - Väliaikaishakemistoa ei ole asetettu php.ini-tiedostossa. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Väliaikaista kansiota ei ole määritetty php.ini:ssä, tai määritetty kansio ei ole olemassa. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tätä korttityyppiä ei tueta tai korttinumero on virheellinen. - - This is not a valid International Bank Account Number (IBAN). - Arvo ei ole kelvollinen kansainvälinen pankkitilinumero (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Tämä arvo ei ole kelvollinen kansainvälinen pankkitilinumero (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Arvo ei vastaa odotettua merkistöä {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Arvo ei ole kelvollinen yritystunnus (BIC). + + This value is not a valid Business Identifier Code (BIC). + Tämä arvo ei ole kelvollinen liiketoiminnan tunnistekoodi (BIC). Error Virhe - - This is not a valid UUID. - Arvo ei ole kelvollinen UUID. + + This value is not a valid UUID. + Tämä arvo ei ole kelvollinen UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Tiedostopääte ({{ extension }}) on virheellinen. Sallitut tiedostopäätteet ovat: {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Havaittu merkistö on virheellinen ({{ detected }}). Sallitut merkistöt ovat {{ encodings }}. + + + This value is not a valid MAC address. + Tämä arvo ei ole kelvollinen MAC-osoite. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf index bc4513bc46951..e2d747a49bffe 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ce fichier n'est pas une image valide. - - This is not a valid IP address. - Cette adresse IP n'est pas valide. + + This value is not a valid IP address. + Cette valeur n'est pas une adresse IP valide. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Aucun fichier n'a été transféré. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. Aucun répertoire temporaire n'a été configuré dans le php.ini, ou le répertoire configuré n'existe pas. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Type de carte non supporté ou numéro invalide. - - This is not a valid International Bank Account Number (IBAN). - Le numéro IBAN (International Bank Account Number) saisi n'est pas valide. + + This value is not a valid International Bank Account Number (IBAN). + Cette valeur n'est pas un Numéro de Compte Bancaire International (IBAN) valide. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Cette valeur ne correspond pas au jeu de caractères {{ charset }} attendu. - - This is not a valid Business Identifier Code (BIC). - Ce n'est pas un code universel d'identification des banques (BIC) valide. + + This value is not a valid Business Identifier Code (BIC). + Cette valeur n'est pas un Code Identifiant de Business (BIC) valide. Error Erreur - - This is not a valid UUID. - Ceci n'est pas un UUID valide. + + This value is not a valid UUID. + Cette valeur n'est pas un UUID valide. This value should be a multiple of {{ compared_value }}. @@ -434,6 +434,10 @@ The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. L'encodage de caractères détecté est invalide ({{ detected }}). Les encodages autorisés sont {{ encodings }}. + + This value is not a valid MAC address. + Cette valeur n'est pas une adresse MAC valide. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.gl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.gl.xlf index f8c5c0493f731..2723983c5a99d 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.gl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.gl.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. O arquivo non é unha imaxe válida. - - This is not a valid IP address. - Isto non é unha dirección IP válida. + + This value is not a valid IP address. + Este valor non é un enderezo IP válido. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Non se subiu ningún arquivo. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. Ningunha carpeta temporal foi configurada en php.ini, ou a carpeta non existe. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tipo de tarxeta non soportado ou número de tarxeta non válido. - - This is not a valid International Bank Account Number (IBAN). - Este valor non é un International Bank Account Number (IBAN) válido. + + This value is not a valid International Bank Account Number (IBAN). + Este valor non é un Número de Conta Bancaria Internacional (IBAN) válido. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. A codificación de caracteres para este valor debería ser {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Non é un Código de Identificación Bancaria (BIC) válido. + + This value is not a valid Business Identifier Code (BIC). + Este valor non é un Código de Identificación de Negocios (BIC) válido. Error Erro - - This is not a valid UUID. - Isto non é un UUID válido. + + This value is not a valid UUID. + Este valor non é un UUID válido. This value should be a multiple of {{ compared_value }}. @@ -402,6 +402,42 @@ The value of the netmask should be between {{ min }} and {{ max }}. O valor da máscara de rede debería estar entre {{ min }} e {{ max }}. + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + O nome do ficheiro é demasiado longo. Debe ter {{ filename_max_length }} caracteres ou menos. + + + The password strength is too low. Please use a stronger password. + A forza do contrasinal é demasiado baixa. Utilice un contrasinal máis forte. + + + This value contains characters that are not allowed by the current restriction-level. + Este valor contén caracteres que non están permitidos polo nivel de restrición actual. + + + Using invisible characters is not allowed. + Non se permite usar caracteres invisibles. + + + Mixing numbers from different scripts is not allowed. + Non se permite mesturar números de diferentes scripts. + + + Using hidden overlay characters is not allowed. + Non se permite usar caracteres de superposición ocultos. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + A extensión do ficheiro non é válida ({{ extension }}). As extensións permitidas son {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + A codificación de caracteres detectada non é válida ({{ detected }}). As codificacións permitidas son {{ encodings }}. + + + This value is not a valid MAC address. + Este valor non é un enderezo MAC válido. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf index af82426f733a3..b1bb894a7fe4b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. הקובץ הזה אינו תמונה תקינה. - - This is not a valid IP address. - זו אינה כתובת IP חוקית. + + This value is not a valid IP address. + ערך זה אינו כתובת IP תקפה. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. הקובץ לא הועלה. - - No temporary folder was configured in php.ini. - לא הוגדרה תיקייה זמנית ב php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + לא הוגדרה תיקייה זמנית ב-php.ini, או שהתיקייה המוגדרת אינה קיימת. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. סוג הכרטיס אינו נתמך או לא חוקי. - - This is not a valid International Bank Account Number (IBAN). - מספר חשבון בנק בינלאומי אינו חוקי (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + ערך זה אינו מספר חשבון בנק בינלאומי (IBAN) תקף. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. הערך אינו תואם למערך התווים {{ charset }} הצפוי. - - This is not a valid Business Identifier Code (BIC). - קוד זיהוי עסקי אינו חוקי (BIC). + + This value is not a valid Business Identifier Code (BIC). + ערך זה אינו קוד מזהה עסקי (BIC) תקף. Error שגיאה - - This is not a valid UUID. - הערך אינו ערך UUID חוקי. + + This value is not a valid UUID. + ערך זה אינו UUID תקף. This value should be a multiple of {{ compared_value }}. @@ -386,7 +386,7 @@ This value is not a valid International Securities Identification Number (ISIN). ערך זה אינו מספר זיהוי ניירות ערך בינלאומי תקף (ISIN). - + This value should be a valid expression. ערך זה חייב להיות ביטוי חוקי. @@ -402,6 +402,42 @@ The value of the netmask should be between {{ min }} and {{ max }}. הערך של מסכת הרשת חייב להיות בין {{ min }} ו {{ max }}. + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + שם הקובץ ארוך מדי. עליו להכיל {{ filename_max_length }} תווים או פחות. + + + The password strength is too low. Please use a stronger password. + חוזק הסיסמה נמוך מדי. אנא השתמש בסיסמה חזקה יותר. + + + This value contains characters that are not allowed by the current restriction-level. + הערך כולל תווים שאינם מותרים על פי רמת ההגבלה הנוכחית. + + + Using invisible characters is not allowed. + אסור להשתמש בתווים בלתי נראים. + + + Mixing numbers from different scripts is not allowed. + אסור לערבב מספרים מתסריטים שונים. + + + Using hidden overlay characters is not allowed. + אסור להשתמש בתווים מוסתרים של חפיפה. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + סיומת הקובץ אינה תקינה ({{ extension }}). הסיומות המותרות הן {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + קידוד התווים שזוהה אינו חוקי ({{ detected }}). הקידודים המותרים הם {{ encodings }}. + + + This value is not a valid MAC address. + ערך זה אינו כתובת MAC תקפה. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf index 327b8d50f7738..9186d8b3bae84 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ova datoteka nije ispravna slika. - - This is not a valid IP address. - Ovo nije ispravna IP adresa. + + This value is not a valid IP address. + Ova vrijednost nije valjana IP adresa. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Niti jedna datoteka nije prenesena. - - No temporary folder was configured in php.ini. - U php.ini datoteci nije konfiguriran privremeni direktorij. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Privremena mapa nije konfigurirana u php.ini, ili konfigurirana mapa ne postoji. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tip kartice nije podržan ili je broj kartice neispravan. - - This is not a valid International Bank Account Number (IBAN). - Ova vrijednost nije ispravan međunarodni broj bankovnog računa (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ova vrijednost nije valjani međunarodni bankovni broj računa (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Ova vrijednost ne odgovara očekivanom {{ charset }} znakovnom skupu. - - This is not a valid Business Identifier Code (BIC). - Ovo nije validan poslovni identifikacijski broj (BIC). + + This value is not a valid Business Identifier Code (BIC). + Ova vrijednost nije valjani poslovni identifikacijski kod (BIC). Error Greška - - This is not a valid UUID. - Ovo nije validan UUID. + + This value is not a valid UUID. + Ova vrijednost nije valjani UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Ekstenzija datoteke nije valjana ({{ extension }}). Dozvoljene ekstenzije su {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Otkriveno kodiranje znakova je nevažeće ({{ detected }}). Dopuštena kodiranja su {{ encodings }}. + + + This value is not a valid MAC address. + Ova vrijednost nije valjana MAC adresa. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf index 7c117f13138c8..56591ac0fa729 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ez a fájl nem egy érvényes kép. - - This is not a valid IP address. - Ez az érték nem egy érvényes IP cím. + + This value is not a valid IP address. + Ez az érték nem érvényes IP-cím. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nem lett fájl feltöltve. - - No temporary folder was configured in php.ini. - Nincs ideiglenes könyvtár beállítva a php.ini-ben. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Nem lett ideiglenes mappa beállítva a php.ini-ben, vagy a beállított mappa nem létezik. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nem támogatott kártyatípus vagy érvénytelen kártyaszám. - - This is not a valid International Bank Account Number (IBAN). - Érvénytelen nemzetközi bankszámlaszám (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ez az érték nem érvényes Nemzetközi Bankszámlaszám (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Ez az érték nem az elvárt {{ charset }} karakterkódolást használja. - - This is not a valid Business Identifier Code (BIC). - Érvénytelen nemzetközi bankazonosító kód (BIC/SWIFT). + + This value is not a valid Business Identifier Code (BIC). + Ez az érték nem érvényes Üzleti Azonosító Kód (BIC). Error Hiba - - This is not a valid UUID. - Érvénytelen egyedi azonosító (UUID). + + This value is not a valid UUID. + Ez az érték nem érvényes UUID. This value should be a multiple of {{ compared_value }}. @@ -335,25 +335,25 @@ Ez az érték érvényes JSON kell, hogy legyen. + This collection should contain only unique elements. + Ez a gyűjtemény csak egyedi elemeket tartalmazhat. + + This value should be positive. Ennek az értéknek pozitívnak kell lennie. - + This value should be either positive or zero. Ennek az értéknek pozitívnak vagy nullának kell lennie. - + This value should be negative. Ennek az értéknek negatívnak kell lennie. - + This value should be either negative or zero. Ennek az értéknek negatívnak vagy nullának kell lennie. - - This collection should contain only unique elements. - Ez a gyűjtemény csak egyedi elemeket tartalmazhat. - This value is not a valid timezone. Ez az érték nem egy érvényes időzóna. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. A fájl kiterjesztése érvénytelen ({{ extension }}). Engedélyezett kiterjesztések: {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Az érzékelt karakterkódolás érvénytelen ({{ detected }}). Engedélyezett karakterkódolások: {{ encodings }}. + + + This value is not a valid MAC address. + Ez az érték nem érvényes MAC-cím. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf index f53df123423d7..707301d18c037 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Նիշքը նկարի վավեր ֆորմատ չէ։ - - This is not a valid IP address. - Արժեքը վավեր IP հասցե չէ։ + + This value is not a valid IP address. + Այս արժեքը վավեր IP հասցե չէ։ This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Նիշքը չի բեռնվել։ - - No temporary folder was configured in php.ini. - php.ini նիշքում ժամանակավոր պանակ նշված չէ։ + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini-ում չի կարգավորվել ժամանակավոր թղթապանակ, կամ կարգավորված թղթապանակը չկա։ Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Չսպասարկվող կամ սխալ քարտի համար: - - This is not a valid International Bank Account Number (IBAN). - Արժեքը վավեր միջազային բանկային հաշվի համար չէ (IBAN)։ + + This value is not a valid International Bank Account Number (IBAN). + Այս արժեքը վավեր միջազգային բանկային հաշվի համար (IBAN) չէ։ This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Արժեքը չի համընկնում {{ charset }} կոդավորման հետ։ - - This is not a valid Business Identifier Code (BIC). - Սա վավեր Business Identifier Code (BIC) չէ։ + + This value is not a valid Business Identifier Code (BIC). + Այս արժեքը վավեր բիզնեսի նորմատիվ կոդ (BIC) չէ։ Error Սխալ - - This is not a valid UUID. - Սա վավեր UUID չէ։ + + This value is not a valid UUID. + Այս արժեքը վավեր UUID չէ։ This value should be a multiple of {{ compared_value }}. @@ -371,7 +371,7 @@ Այս հոստի անունը վավեր չէ։ - 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 }}. Այս համախմբի տարրերի քանակը պետք է հավասար լինի {{ compared_value }}-ի բազմապատիկներին։ @@ -390,6 +390,54 @@ This value should be a valid expression. Այս արժեքը պետք է լինի վավեր արտահայտություն: + + This value is not a valid CSS color. + Այս արժեքը վավեր CSS գույն չէ։ + + + This value is not a valid CIDR notation. + Այս արժեքը վավեր CIDR նշում չէ։ + + + The value of the netmask should be between {{ min }} and {{ max }}. + Ցանցային դիմակի արժեքը պետք է լինի {{ min }}-ի և {{ max }}-ի միջև։ + + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Ֆայլի անունը շատ երկար է։ Այն պետք է ունենա {{ filename_max_length }} նիշ կամ պակաս։ + + + The password strength is too low. Please use a stronger password. + Գաղտնաբառի անվտանգությունը շատ ցածր է։ Խնդրում ենք գործածել ավելի ամրագույն գաղտնաբառ։ + + + This value contains characters that are not allowed by the current restriction-level. + Այս արժեքը պարունակում է այն նիշերը, որոնք չեն թույլատրվում ըստ ընթացիկ սահմանումների։ + + + Using invisible characters is not allowed. + Անտեսանելի նիշերի օգտագործումը չի թույլատրվում։ + + + Mixing numbers from different scripts is not allowed. + Թվերի խառնուրդը տարբեր սցենարներից չի թույլատրվում։ + + + Using hidden overlay characters is not allowed. + Թաքնված ծածկանիշերի օգտագործումը չի թույլատրվում։ + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Ֆայլի ընդլայնումը անվավեր է ({{ extension }})։ Թույլատրվող ընդլայնումներն են՝ {{ extensions }}։ + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Հայտնաբերված նիշագրության կոդը անվավեր է ({{ detected }})։ Թույլատրվող կոդերն են՝ {{ encodings }}։ + + + This value is not a valid MAC address. + Այս արժեքը վավեր MAC հասցե չէ։ + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf index 5ddda209428bc..1cc60c4d8f9a2 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Berkas ini tidak termasuk citra. - - This is not a valid IP address. - Ini bukan alamat IP yang sah. + + This value is not a valid IP address. + Nilai ini bukan alamat IP yang valid. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Tidak ada berkas terunggah. - - No temporary folder was configured in php.ini. - Direktori sementara tidak dikonfiguasi pada php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Tidak ada folder sementara yang dikonfigurasi di php.ini, atau folder yang dikonfigurasi tidak ada. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Jenis kartu tidak didukung atau nomor kartu tidak sah. - - This is not a valid International Bank Account Number (IBAN). - Ini bukan Nomor Rekening Bank Internasional (IBAN) yang sah. + + This value is not a valid International Bank Account Number (IBAN). + Nilai ini bukan Nomor Rekening Bank Internasional (IBAN) yang valid. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Nilai ini tidak memenuhi set karakter {{ charset }} yang diharapkan. - - This is not a valid Business Identifier Code (BIC). - Ini bukan Business Identifier Code (BIC) yang sah. + + This value is not a valid Business Identifier Code (BIC). + Nilai ini bukan Kode Identifikasi Bisnis (BIC) yang valid. Error Galat - - This is not a valid UUID. - Ini bukan UUID yang sah. + + This value is not a valid UUID. + Nilai ini bukan UUID yang valid. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Ekstensi file tidak valid ({{ extension }}). Ekstensi yang diperbolehkan adalah {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Pengkodean karakter yang terdeteksi tidak valid ({{ detected }}). Pengkodean yang diperbolehkan adalah {{ encodings }}. + + + This value is not a valid MAC address. + Nilai ini bukan alamat MAC yang valid. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf index 4781b986d3681..8fe556696d7cc 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Questo file non è una immagine valida. - - This is not a valid IP address. - Questo valore non è un indirizzo IP valido. + + This value is not a valid IP address. + Questo valore non è un indirizzo IP valido. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nessun file è stato caricato. - - No temporary folder was configured in php.ini. - Nessuna cartella temporanea è stata configurata nel php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Nessuna cartella temporanea è stata configurata in php.ini, o la cartella configurata non esiste. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tipo di carta non supportato o numero non valido. - - This is not a valid International Bank Account Number (IBAN). - Questo valore non è un IBAN (International Bank Account Number) valido. + + This value is not a valid International Bank Account Number (IBAN). + Questo valore non è un Numero di Conto Bancario Internazionale (IBAN) valido. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Questo valore non corrisponde al charset {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Questo valore non è un codice BIC valido. + + This value is not a valid Business Identifier Code (BIC). + Questo valore non è un Codice Identificativo di Business (BIC) valido. Error Errore - - This is not a valid UUID. - Questo non è un UUID valido. + + This value is not a valid UUID. + Questo valore non è un UUID valido. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. L'estensione del file non è valida ({{ extension }}). Le estensioni consentite sono {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + La codifica dei caratteri rilevata non è valida ({{ detected }}). Le codifiche ammesse sono {{ encodings }}. + + + This value is not a valid MAC address. + Questo valore non è un indirizzo MAC valido. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf index 9bbf0df3ec191..0524cd0511e15 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. ファイルが画像ではありません。 - - This is not a valid IP address. - 有効なIPアドレスではありません。 + + This value is not a valid IP address. + この値は有効なIPアドレスではありません。 This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. ファイルがアップロードされていません。 - - No temporary folder was configured in php.ini. - php.iniで一時フォルダが設定されていません。 + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.iniに一時フォルダが設定されていないか、設定されたフォルダが存在しません。 Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. 未対応のカード種類又は無効なカード番号です。 - - This is not a valid International Bank Account Number (IBAN). - 有効なIBANコードではありません。 + + This value is not a valid International Bank Account Number (IBAN). + この値は有効な国際銀行口座番号（IBAN）ではありません。 This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. この値は予期される文字コード（{{ charset }}）と異なります。 - - This is not a valid Business Identifier Code (BIC). - 有効なSWIFTコードではありません。 + + This value is not a valid Business Identifier Code (BIC). + この値は有効なビジネス識別コード（BIC）ではありません。 Error エラー - - This is not a valid UUID. - 有効なUUIDではありません。 + + This value is not a valid UUID. + この値は有効なUUIDではありません。 This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. ファイルの拡張子が無効です({{ extension }})。有効な拡張子は{{ extensions }}です。 + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + 検出された文字コードは無効です({{ detected }})。有効な文字コードは{{ encodings }}です。 + + + This value is not a valid MAC address. + この値は有効なMACアドレスではありません。 + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf index c681ce2ba9be6..548d82da41683 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Dëse Fichier ass kee gëltegt Bild. - - This is not a valid IP address. - Dëst ass keng gëlteg IP-Adress. + + This value is not a valid IP address. + Dëse Wäert ass keng gülteg IP-Adress. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Et gouf kee Fichier eropgelueden. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. Et gouf keen temporären Dossier an der php.ini konfiguréiert oder den temporären Dossier existéiert net. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Net ënnerstëtzte Kaartentyp oder ongëlteg Kaartennummer. - - This is not a valid International Bank Account Number (IBAN). - Dëst ass keng gëlteg IBAN-Kontonummer. + + This value is not a valid International Bank Account Number (IBAN). + Dëse Wäert ass keng gülteg International Bankkontonummer (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Dëse Wäert entsprécht net dem erwaarten Zeechesaz {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Dëst ass kee gëltege "Business Identifier Code" (BIC). + + This value is not a valid Business Identifier Code (BIC). + Dëse Wäert ass kee gültege Business Identifier Code (BIC). Error Feeler - - This is not a valid UUID. - Dëst ass keng gëlteg UUID. + + This value is not a valid UUID. + Dëse Wäert ass keng gülteg UUID. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. D'Benotzen vu verstoppten Iwwerlagungszeechen ass net erlaabt. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + D'Extensioun vum Fichier ass net valabel ({{ extension }}). Valabel Extensioune sinn {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Den Encodage vun de Schrëftzeechen ass net valabel ({{ detected }}). Valabel Encodage sinn {{ encodings }}. + + + This value is not a valid MAC address. + Dëse Wäert ass keng gülteg MAC-Adress. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf index c480904a20119..b3ee199fe4c73 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Byla nėra paveikslėlis. - - This is not a valid IP address. - Ši reikšmė nėra tinkamas IP adresas. + + This value is not a valid IP address. + Ši vertė nėra galiojantis IP adresas. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nebuvo įkelta jokių failų. - - No temporary folder was configured in php.ini. - Nėra sukonfiguruoto jokio laikino katalogo php.ini faile. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini nesukonfigūruotas laikinas aplankas, arba sukonfigūruotas aplankas neegzistuoja. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Kortelės tipas nepalaikomas arba klaidingas kortelės numeris. - - This is not a valid International Bank Account Number (IBAN). - Ši reišmė neatitinka tarptautinio banko sąskaitos numerio formato (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ši vertė nėra galiojantis Tarptautinis Banko Sąskaitos Numeris (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Ši reikšmė neatitinka {{ charset }} koduotės. - - This is not a valid Business Identifier Code (BIC). - Bendrovės Identifikavimo Kodas (BIC) nėra tinkamas. + + This value is not a valid Business Identifier Code (BIC). + Ši vertė nėra galiojantis Verslo Identifikavimo Kodas (BIC). Error Klaida - - This is not a valid UUID. - Ši reikšmė nėra tinkamas UUID. + + This value is not a valid UUID. + Ši vertė nėra galiojantis UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Failo plėtinys netinkamas ({{ extension }}). Leidžiami plėtiniai yra {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Nustatyta simbolių koduotė yra netinkama ({{ detected }}). Leidžiamos koduotės yra {{ encodings }}. + + + This value is not a valid MAC address. + Ši vertė nėra galiojantis MAC adresas. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf index fa2380040d9de..d1222f02b72a5 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -20,7 +20,7 @@ The value you selected is not a valid choice. - Vērtība, kuru jūs izvēlējāties nav derīga izvēle. + Vērtība, kuru jūs izvēlējāties, nav derīga izvēle. You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices. @@ -76,7 +76,7 @@ This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less. - Šīs vērtības garums ir 0 rakstzīmju.|Šī vērtība ir pārāk gara. Tai būtu jābūt ne vairāk kā {{ limit }} rakstzīmei.|Šī vērtība ir pārāk gara. Tai būtu jābūt ne vairāk kā {{ limit }} rakstzīmēm. + Šīs vērtības garums ir 0 rakstzīmes.|Šī vērtība ir pārāk gara. Tai būtu jābūt ne vairāk kā {{ limit }} rakstzīmi garai.|Šī vērtība ir pārāk gara. Tai būtu jābūt ne vairāk kā {{ limit }} rakstzīmes garai. This value should be {{ limit }} or more. @@ -84,7 +84,7 @@ This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more. - Šīs vērtības garums ir 0 rakstzīmju.|Šī vērtība ir pārāk īsa. Tai būtu jābūt ne mazāk kā {{ limit }} rakstzīmei.|Šī vērtība ir pārāk īsa. Tai būtu jābūt ne mazāk kā {{ limit }} rakstzīmēm. + Šīs vērtības garums ir 0 rakstzīmes.|Šī vērtība ir pārāk īsa. Tai būtu jābūt ne mazāk kā {{ limit }} rakstzīmi garai.|Šī vērtība ir pārāk īsa. Tai būtu jābūt ne mazāk kā {{ limit }} rakstzīmes garai. This value should not be blank. @@ -112,7 +112,7 @@ The two values should be equal. - Abām vērtībām jābūt vienādam. + Abām vērtībām jābūt vienādām. The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}. @@ -134,9 +134,9 @@ This file is not a valid image. Šis fails nav derīgs attēls. - - This is not a valid IP address. - Šī nav derīga IP adrese. + + This value is not a valid IP address. + Šī vērtība nav derīga IP adrese. This value is not a valid language. @@ -180,7 +180,7 @@ This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters. - Šīs vērtības garums ir 0 rakstzīmju.|Šai vērtībai ir jābūt tieši {{ limit }} rakstzīmei.|Šai vērtībai ir jābūt tieši {{ limit }} rakstzīmēm. + Šīs vērtības garums ir 0 rakstzīmes.|Šai vērtībai ir jābūt tieši {{ limit }} rakstzīmi garai.|Šai vērtībai ir jābūt tieši {{ limit }} rakstzīmes garai. The file was only partially uploaded. @@ -190,13 +190,13 @@ No file was uploaded. Fails netika augšupielādēts. - - No temporary folder was configured in php.ini. - Pagaidu mape php.ini failā nav nokonfigurēta. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini nav konfigurēta pagaidu mape vai arī konfigurētā mape neeksistē. Cannot write temporary file to disk. - Nevar ierakstīt pagaidu failu uz diska. + Nevar ierakstīt pagaidu failu diskā. A PHP extension caused the upload to fail. @@ -204,15 +204,15 @@ This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more. - Šis krājums satur 0 elementu.|Šim krājumam jāsatur vismaz {{ limit }} elementu.|Šim krājumam jāsatur vismaz {{ limit }} elementus. + Šis krājums satur 0 elementu.|Šim krājumam jāsatur vismaz {{ limit }} elements.|Šim krājumam jāsatur vismaz {{ limit }} elementi. This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less. - Šis krājums satur 0 elementu.|Šim krājumam jāsatur ne vairāk kā {{ limit }} elementu.|Šim krājumam jāsatur ne vairāk kā {{ limit }} elementus. + Šis krājums satur 0 elementu.|Šim krājumam jāsatur ne vairāk kā {{ limit }} elements.|Šim krājumam jāsatur ne vairāk kā {{ limit }} elementi. This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements. - Šis krājums satur 0 elementu.|Šim krājumam jāsatur tieši {{ limit }} elementu.|Šim krājumam jāsatur tieši {{ limit }} elementus. + Šis krājums satur 0 elementu.|Šim krājumam jāsatur tieši {{ limit }} elements.|Šim krājumam jāsatur tieši {{ limit }} elementi. Invalid card number. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Neatbalstīts kartes tips vai nederīgs kartes numurs. - - This is not a valid International Bank Account Number (IBAN). - Šis nav derīgs starptautisks banku konta numurs (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Šī vērtība nav derīgs Starptautiskais Bankas Konta Numurs (IBAN). This value is not a valid ISBN-10. @@ -232,7 +232,7 @@ This value is not a valid ISBN-13. - Šī vērtība nav derīgs ISBN-13 numurs + Šī vērtība nav derīgs ISBN-13 numurs. This value is neither a valid ISBN-10 nor a valid ISBN-13. @@ -240,11 +240,11 @@ This value is not a valid ISSN. - Šī vērtība nav derīgs ISSN numurs + Šī vērtība nav derīgs ISSN numurs. This value is not a valid currency. - Šī vērtība nav derīga valūta + Šī vērtība nav derīga valūta. This value should be equal to {{ compared_value }}. @@ -292,11 +292,11 @@ The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed. - Attēls ir orientēts kā ainava ({{ width }}x{{ height }}px). Attēli, kas ir orientēti kā ainavas nav atļauti. + Attēls ir orientēts kā ainava ({{ width }}x{{ height }}px). Attēli, kas ir orientēti kā ainavas, nav atļauti. The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed. - Attēls ir orientēts kā portrets ({{ width }}x{{ height }}px). Attēli, kas ir orientēti kā portreti nav atļauti. + Attēls ir orientēts kā portrets ({{ width }}x{{ height }}px). Attēli, kas ir orientēti kā portreti, nav atļauti. An empty file is not allowed. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Šī vērtība neatbilst sagaidāmajai rakstzīmju kopai {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Šī vērtība nav derīgs Biznesa Identifikācijas Kods (BIC). + + This value is not a valid Business Identifier Code (BIC). + Šī vērtība nav derīgs Uzņēmuma Identifikācijas Kods (BIC). Error Kļūda - - This is not a valid UUID. - Šis nav derīgs UUID. + + This value is not a valid UUID. + Šī vērtība nav derīgs UUID. This value should be a multiple of {{ compared_value }}. @@ -360,7 +360,7 @@ This password has been leaked in a data breach, it must not be used. Please use another password. - Šī parole tika publicēta datu noplūdē, viņu nedrīkst izmantot. Lūdzu, izvēlieties citu paroli. + Šī parole tika publicēta datu noplūdē, to nedrīkst izmantot. Lūdzu, izvēlieties citu paroli. This value should be between {{ min }} and {{ max }}. @@ -404,7 +404,7 @@ The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. - Faila nosaukums ir pārāk garš. Tas var būt {{ filename_max_length }} rakstzīme vai īsāks.|Faila nosaukums ir pārāk garš. Tas var būt {{ filename_max_length }} rakstzīmes vai īsāks. + Faila nosaukums ir pārāk garš. Tas var būt {{ filename_max_length }} rakstzīmi garš vai īsāks.|Faila nosaukums ir pārāk garš. Tas var būt {{ filename_max_length }} rakstzīmes garš vai īsāks. The password strength is too low. Please use a stronger password. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Faila paplašinājums nav derīgs ({{ extension }}). Atļautie paplašinājumi ir {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Noteiktais rakstzīmju kodējums nav derīgs ({{ detected }}). Atļautie kodējumi ir {{ encodings }}. + + + This value is not a valid MAC address. + Šī vērtība nav derīga MAC adrese. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.mk.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.mk.xlf index 12ff9b96633ab..9d6dec6288b8a 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.mk.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.mk.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Оваа датотека не е валидна слика. - - This is not a valid IP address. - Ова не е валидна IP адреса. + + This value is not a valid IP address. + Оваа вредност не е валидна IP адреса. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Датотеката не е подигната. - - No temporary folder was configured in php.ini. - Ниту една привремена папка не е конфигурирана во php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Не е конфигурирана привремена папка во php.ini, или конфигурираната папка не постои. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Неподдржан тип на картичка или бројот на картичката не е валиден. - - This is not a valid International Bank Account Number (IBAN). - Ова не е валиден број на меѓународна банкарска сметка (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Оваа вредност не е валиден Меѓународен Банкарски Сметка Број (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Оваа вредност не се совпаѓа со очекуваниот {{ charset }} сет на карактери (charset). - - This is not a valid Business Identifier Code (BIC). - Ова не е валиден бизнис идентификациски код (BIC). + + This value is not a valid Business Identifier Code (BIC). + Оваа вредност не е валиден Бизнис Идентификациски Код (BIC). Error Грешка - - This is not a valid UUID. - Ова не е валиден универзален уникатен идентификатор (UUID). + + This value is not a valid UUID. + Оваа вредност не е валиден UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Зголемувања на датотеката е неважечка ({{ extension }}). Дозволени зголемувања се ({{ extensions }}). + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Откриеното кодирање на знаци е неважечко ({{ detected }}). Дозволените шифрирања се {{ encodings }}. + + + This value is not a valid MAC address. + Оваа вредност не е валидна MAC адреса. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.mn.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.mn.xlf index b767dc87c8452..4984bb127cab1 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.mn.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.mn.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Файл зураг биш байна. - - This is not a valid IP address. - IP хаяг зөв биш байна. + + This value is not a valid IP address. + Энэ утга хүчинтэй IP хаяг биш юм. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Ямар ч файл upload хийгдсэнгүй. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. php.ini дээр түр зуурын хавтсыг тохируулаагүй байна, эсвэл тохируулсан хавтас байхгүй байна. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Дэмжигдээгүй картын төрөл эсвэл картын дугаар буруу байна. - - This is not a valid International Bank Account Number (IBAN). - Энэ утга үнэн зөв Олон Улсын Банкны Дансны Дугаар (IBAN) биш байна. + + This value is not a valid International Bank Account Number (IBAN). + Энэ утга хүчинтэй Олон улсын Банкны Дансны Дугаар (IBAN) биш юм. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Энэ утга тооцоолсон {{ charset }} тэмдэгттэй таарахгүй байна. - - This is not a valid Business Identifier Code (BIC). - Энэ утга үнэн зөв Business Identifier Code (BIC) биш байна. + + This value is not a valid Business Identifier Code (BIC). + Энэ утга хүчинтэй Бизнес Таних Код (BIC) биш юм. Error Алдаа - - This is not a valid UUID. - Энэ утга үнэн зөв UUID биш байна. + + This value is not a valid UUID. + Энэ утга хүчинтэй UUID биш юм. This value should be a multiple of {{ compared_value }}. @@ -386,6 +386,58 @@ This value is not a valid International Securities Identification Number (ISIN). Энэ утга зөв International Securities Identification Number (ISIN) биш байна. + + This value should be a valid expression. + Энэ утга нь зөв илэрхийлэл байх ёстой. + + + This value is not a valid CSS color. + Энэ утга нь хүчинтэй CSS өнгө биш байна. + + + This value is not a valid CIDR notation. + Энэ утга нь хүчинтэй CIDR тэмдэглэгээ биш байна. + + + The value of the netmask should be between {{ min }} and {{ max }}. + Сүлжээний маскны утга нь {{ min }} ба {{ max }}-ийн хооронд байх ёстой. + + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Файлын нэр хэт урт байна. Энэ нь {{ filename_max_length }} тэмдэгт эсвэл түүнээс бага байх ёстой.|Файлын нэр хэт урт байна. Энэ нь {{ filename_max_length }} тэмдэгт эсвэл түүнээс бага байх ёстой. + + + The password strength is too low. Please use a stronger password. + Нууц үгийн хүч нь хэт бага байна. Хүчтэй нууц үгийг ашиглана уу. + + + This value contains characters that are not allowed by the current restriction-level. + Энэ утга нь одоогийн хязгаарлалтын түвшинд зөвшөөрөгдөөгүй тэмдэгтүүд агуулж байна. + + + Using invisible characters is not allowed. + Харагдахгүй тэмдэгтүүдийг ашиглахыг зөвшөөрөхгүй. + + + Mixing numbers from different scripts is not allowed. + Янз бүрийн скриптүүдээс тоог хольж хэрэглэхийг зөвшөөрөхгүй. + + + Using hidden overlay characters is not allowed. + Нууцлагдсан давхаргын тэмдэгтүүдийг ашиглахыг зөвшөөрөхгүй. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Файлын өргөтгөл буруу байна ({{ extension }}). Зөвшөөрөгдсөн өргөтгөлүүд нь {{ extensions }} юм. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Илрүүлсэн тэмдэгтийн кодчилол буруу байна ({{ detected }}). Зөвшөөрөгдсөн кодчилолууд нь {{ encodings }} юм. + + + This value is not a valid MAC address. + Энэ утга хүчинтэй MAC хаяг биш юм. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.my.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.my.xlf index 7f45aaed64f36..e4858336c1c7d 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.my.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.my.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. ဤဖိုင်သည်မှန်ကန်သော ဓါတ်ပုံမဟုတ်ပါ။ - - This is not a valid IP address. - ၎င်းသည်တရားဝင် IP လိပ်စာမဟုတ်ပါ။ + + This value is not a valid IP address. + ဤတန်ဖိုးသည် မှန်ကန်သော IP လိပ်စာ မဟုတ်ပါ။ This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. မည်သည့် ဖိုင်မျှ upload မလုပ်ခဲ့ပါ။ - - No temporary folder was configured in php.ini. - php.ini တွင်ယာယီဖိုင်တွဲကိုပြင်ဆင်ထားခြင်းမရှိပါ၊ + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini တွင်ယာယီဖိုင်တွဲကိုပြင်ဆင်ထားခြင်းမရှိပါ၊ သို့မဟုတ် ပြင်ဆင်ထားသောဖိုင်တွဲမရှိပါ။ Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. ကဒ်အမျိုးအစားမမှန်ပါ (သို့မဟုတ်) ကဒ်နံပါတ်မမှန်ပါ။ - - This is not a valid International Bank Account Number (IBAN). - ဤတန်ဖိုးသည် တရား၀င်နိုင်ငံတကာဘဏ်အကောင့်နံပါတ် (International Bank Account Number, IBAN) မဟုတ်ပါ။ + + This value is not a valid International Bank Account Number (IBAN). + ဤတန်ဖိုးသည် မှန်ကန်သော နိုင်ငံတကာ ဘဏ်စာရင်းနံပါတ် (IBAN) မဟုတ်ပါ။ This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. ဤတန်ဖိုးသည် မျှော်မှန်းထားသော {{ charset }} စားလုံးနှင့် ကိုက်ညီမှုမရှိပါ။ - - This is not a valid Business Identifier Code (BIC). - ၎င်းသည်မှန်ကန်သော Business Identifier Code (BIC) မဟုတ်ပါ။ + + This value is not a valid Business Identifier Code (BIC). + ဤတန်ဖိုးသည် မှန်ကန်သော စီးပွားရေး မှတ်ပုံတင်ကုဒ် (BIC) မဟုတ်ပါ။ Error အမှား - - This is not a valid UUID. - ဤတန်ဖိုးသည် သင့်လျှော်သော် UUID မဟုတ်ပါ။ + + This value is not a valid UUID. + ဤတန်ဖိုးသည် မှန်ကန်သော UUID မဟုတ်ပါ။ This value should be a multiple of {{ compared_value }}. @@ -390,6 +390,54 @@ This value should be a valid expression. ဤတန်ဖိုးသည်မှန်ကန်သောစကားရပ်ဖြစ်သင့်သည်။ + + This value is not a valid CSS color. + ဤတန်ဖိုးသည် CSS အရောင်မှန်ကန်မှုမရှိပါ။ + + + This value is not a valid CIDR notation. + ဤတန်ဖိုးသည် CIDR မှတ်စုံမှန်ကန်မှုမရှိပါ။ + + + The value of the netmask should be between {{ min }} and {{ max }}. + ကွန်ယက်မျက်နှာဖုံး၏ တန်ဖိုးသည် {{ min }} နှင့် {{ max }} ကြားရှိရမည်။ + + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + ဖိုင်နာမည်သည် အရှည်လွန်းသည်။ သင်္ကေတ {{ filename_max_length }} သို့မဟုတ် နည်းသည့်အရေအတွက်ရှိရမည်။|ဖိုင်နာမည်သည် အရှည်လွန်းသည်။ သင်္ကေတ {{ filename_max_length }} သို့မဟုတ် နည်းသည့်အရေအတွက်ရှိရမည်။ + + + The password strength is too low. Please use a stronger password. + စကားဝှက်ခိုင်မာမှုနည်းပါးသည်။ ပိုခိုင်မာသော စကားဝှက်ကို သုံးပါ။ + + + This value contains characters that are not allowed by the current restriction-level. + ဤတန်ဖိုးတွင် လက်ရှိကန့်သတ်မှုအဆင့်မှ ခွင့်မပြုထားသော ဇာတ်ကောင်များပါဝင်သည်။ + + + Using invisible characters is not allowed. + မမြင်ရသော ဇာတ်ကောင်များကို သုံးခြင်းကို ခွင့်မပြုပါ။ + + + Mixing numbers from different scripts is not allowed. + မတူညီသော ဇာတ်ကောင်များမှ နံပါတ်များကို ရောနှောစပ်ခြင်းကို ခွင့်မပြုပါ။ + + + Using hidden overlay characters is not allowed. + ပုန်းထားသော အထပ်ကောင်းဇာတ်ကောင်များကို သုံးခြင်းကို ခွင့်မပြုပါ။ + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + ဖိုင်တွင်းတိုးခြင်းသည် မမှန်ကန်ပါ ({{ extension }})။ ခွင့်ပြုထားသော တိုးခြင်းများမှာ {{ extensions }} ဖြစ်သည်။ + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + တွေ့ရှိထားသော စာလုံးကုဒ်စံနစ်သည် မမှန်ကန်ပါ ({{ detected }})။ ခွင့်ပြုထားသော ကုဒ်စံနစ်များမှာ {{ encodings }} ဖြစ်သည်။ + + + This value is not a valid MAC address. + ဤတန်ဖိုးသည် မှန်ကန်သော MAC လိပ်စာ မဟုတ်ပါ။ + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.nb.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.nb.xlf index 5e1ebc189c350..8b317449ef4e8 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.nb.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.nb.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Denne filen er ikke et gyldig bilde. - - This is not a valid IP address. - Dette er ikke en gyldig IP adresse. + + This value is not a valid IP address. + Denne verdien er ikke en gyldig IP-adresse. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Ingen fil var lastet opp. - - No temporary folder was configured in php.ini. - Den midlertidige mappen (tmp) er ikke konfigurert i php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Ingen midlertidig mappe ble konfigurert i php.ini, eller den konfigurerte mappen eksisterer ikke. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Korttypen er ikke støttet eller kortnummeret er ugyldig. - - This is not a valid International Bank Account Number (IBAN). - Dette er ikke et gyldig IBAN-nummer. + + This value is not a valid International Bank Account Number (IBAN). + Denne verdien er ikke et gyldig internasjonalt bankkontonummer (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Verdien samsvarer ikke med forventet tegnsett {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Dette er ikke en gyldig BIC. + + This value is not a valid Business Identifier Code (BIC). + Denne verdien er ikke en gyldig forretningsidentifikasjonskode (BIC). Error Feil - - This is not a valid UUID. - Dette er ikke en gyldig UUID. + + This value is not a valid UUID. + Denne verdien er ikke en gyldig UUID. This value should be a multiple of {{ compared_value }}. @@ -402,6 +402,42 @@ The value of the netmask should be between {{ min }} and {{ max }}. Verdien på nettmasken skal være mellom {{ min }} og {{ max }}. + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Filnavnet er for langt. Det bør ha {{ filename_max_length }} tegn eller mindre.|Filnavnet er for langt. Det bør ha {{ filename_max_length }} tegn eller mindre. + + + The password strength is too low. Please use a stronger password. + Passordstyrken er for lav. Vennligst bruk et sterkere passord. + + + This value contains characters that are not allowed by the current restriction-level. + Denne verdien inneholder tegn som ikke er tillatt av gjeldende restriksjonsnivå. + + + Using invisible characters is not allowed. + Det er ikke tillatt å bruke usynlige tegn. + + + Mixing numbers from different scripts is not allowed. + Det er ikke tillatt å blande tall fra forskjellige skript. + + + Using hidden overlay characters is not allowed. + Det er ikke tillatt å bruke skjulte overleggskarakterer. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Filutvidelsen er ugyldig ({{ extension }}). Tillatte utvidelser er {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Den oppdagede tegnkodingen er ugyldig ({{ detected }}). Tillatte kodinger er {{ encodings }}. + + + This value is not a valid MAC address. + Denne verdien er ikke en gyldig MAC-adresse. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf index 92d7651216bca..b8c00c26cc61f 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Dit bestand is geen geldige afbeelding. - - This is not a valid IP address. - Dit is geen geldig IP-adres. + + This value is not a valid IP address. + Deze waarde is geen geldig IP-adres. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Er is geen bestand geüpload. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. Er is geen tijdelijke map geconfigureerd in php.ini, of de gespecificeerde map bestaat niet. @@ -222,11 +222,11 @@ Unsupported card type or invalid card number. Niet-ondersteund type creditcard of ongeldig nummer. - - This is not a valid International Bank Account Number (IBAN). - Dit is geen geldig internationaal bankrekeningnummer (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Deze waarde is geen geldig internationaal bankrekeningnummer (IBAN). - + This value is not a valid ISBN-10. Deze waarde is geen geldige ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Deze waarde is niet in de verwachte tekencodering {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Dit is geen geldige bedrijfsidentificatiecode (BIC/SWIFT). + + This value is not a valid Business Identifier Code (BIC). + Deze waarde is geen geldige zakelijke identificatiecode (BIC). Error Fout - - This is not a valid UUID. - Dit is geen geldige UUID. + + This value is not a valid UUID. + Deze waarde is geen geldige UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. De extensie van het bestand is ongeldig ({{ extension }}). Toegestane extensies zijn {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + De gedetecteerde karaktercodering is ongeldig ({{ detected }}). Toegestane coderingen zijn {{ encodings }}. + + + This value is not a valid MAC address. + Deze waarde is geen geldig MAC-adres. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.nn.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.nn.xlf index fa472b5c194c2..4e1a41dab84d7 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.nn.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.nn.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Fila er ikkje eit gyldig bilete. - - This is not a valid IP address. - Dette er ikkje ei gyldig IP-adresse. + + This value is not a valid IP address. + Denne verdien er ikkje ein gyldig IP-adresse. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Inga fil vart lasta opp. - - No temporary folder was configured in php.ini. - Førebels mappe (tmp) er ikkje konfigurert i php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Ingen midlertidig mappe var konfigurert i php.ini, eller den konfigurerte mappa eksisterer ikkje. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Korttypen er ikkje støtta, eller kortnummeret er ugyldig. - - This is not a valid International Bank Account Number (IBAN). - Dette er ikkje eit gyldig internasjonalt bankkontonummer (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Denne verdien er ikkje eit gyldig internasjonalt bankkontonummer (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Verdien stemmer ikkje med forventa {{ charset }} charset. - - This is not a valid Business Identifier Code (BIC). - Dette er ikkje ein gyldig Business Identifier Code (BIC). + + This value is not a valid Business Identifier Code (BIC). + Denne verdien er ikkje ein gyldig forretningsidentifikasjonskode (BIC). Error Feil - - This is not a valid UUID. - Dette er ikkje ein gyldig UUID. + + This value is not a valid UUID. + Denne verdien er ikkje ein gyldig UUID. This value should be a multiple of {{ compared_value }}. @@ -386,7 +386,7 @@ This value is not a valid International Securities Identification Number (ISIN). Verdien er ikkje eit gyldig International Securities Identification Number (ISIN). - + This value should be a valid expression. Denne verdien skal være et gyldig uttrykk. @@ -402,6 +402,42 @@ The value of the netmask should be between {{ min }} and {{ max }}. Verdien av nettmasken skal være mellom {{ min }} og {{ max }}. + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Filnamnet er for langt. Det bør ha {{ filename_max_length }} teikn eller færre.|Filnamnet er for langt. Det bør ha {{ filename_max_length }} teikn eller færre. + + + The password strength is too low. Please use a stronger password. + Passordstyrken er for låg. Vennligst bruk eit sterkare passord. + + + This value contains characters that are not allowed by the current restriction-level. + Denne verdien inneheld teikn som ikkje er tillatne av det gjeldande restriksjonsnivået. + + + Using invisible characters is not allowed. + Det er ikkje tillate å bruke usynlege teikn. + + + Mixing numbers from different scripts is not allowed. + Det er ikkje tillate å blande tal frå forskjellige skript. + + + Using hidden overlay characters is not allowed. + Det er ikkje tillate å bruke skjulte overleggsteikn. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Filutvidinga er ugyldig ({{ extension }}). Tillatne utvidingar er {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Den oppdaga teiknkodinga er ugyldig ({{ detected }}). Tillatne kodingar er {{ encodings }}. + + + This value is not a valid MAC address. + Denne verdien er ikkje ein gyldig MAC-adresse. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf index 5e1ebc189c350..8b317449ef4e8 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Denne filen er ikke et gyldig bilde. - - This is not a valid IP address. - Dette er ikke en gyldig IP adresse. + + This value is not a valid IP address. + Denne verdien er ikke en gyldig IP-adresse. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Ingen fil var lastet opp. - - No temporary folder was configured in php.ini. - Den midlertidige mappen (tmp) er ikke konfigurert i php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Ingen midlertidig mappe ble konfigurert i php.ini, eller den konfigurerte mappen eksisterer ikke. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Korttypen er ikke støttet eller kortnummeret er ugyldig. - - This is not a valid International Bank Account Number (IBAN). - Dette er ikke et gyldig IBAN-nummer. + + This value is not a valid International Bank Account Number (IBAN). + Denne verdien er ikke et gyldig internasjonalt bankkontonummer (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Verdien samsvarer ikke med forventet tegnsett {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Dette er ikke en gyldig BIC. + + This value is not a valid Business Identifier Code (BIC). + Denne verdien er ikke en gyldig forretningsidentifikasjonskode (BIC). Error Feil - - This is not a valid UUID. - Dette er ikke en gyldig UUID. + + This value is not a valid UUID. + Denne verdien er ikke en gyldig UUID. This value should be a multiple of {{ compared_value }}. @@ -402,6 +402,42 @@ The value of the netmask should be between {{ min }} and {{ max }}. Verdien på nettmasken skal være mellom {{ min }} og {{ max }}. + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Filnavnet er for langt. Det bør ha {{ filename_max_length }} tegn eller mindre.|Filnavnet er for langt. Det bør ha {{ filename_max_length }} tegn eller mindre. + + + The password strength is too low. Please use a stronger password. + Passordstyrken er for lav. Vennligst bruk et sterkere passord. + + + This value contains characters that are not allowed by the current restriction-level. + Denne verdien inneholder tegn som ikke er tillatt av gjeldende restriksjonsnivå. + + + Using invisible characters is not allowed. + Det er ikke tillatt å bruke usynlige tegn. + + + Mixing numbers from different scripts is not allowed. + Det er ikke tillatt å blande tall fra forskjellige skript. + + + Using hidden overlay characters is not allowed. + Det er ikke tillatt å bruke skjulte overleggskarakterer. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Filutvidelsen er ugyldig ({{ extension }}). Tillatte utvidelser er {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Den oppdagede tegnkodingen er ugyldig ({{ detected }}). Tillatte kodinger er {{ encodings }}. + + + This value is not a valid MAC address. + Denne verdien er ikke en gyldig MAC-adresse. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf index 449e05b698103..29180984e6dfb 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ten plik nie jest obrazem. - - This is not a valid IP address. - To nie jest prawidłowy adres IP. + + This value is not a valid IP address. + Ta wartość nie jest prawidłowym adresem IP. This value is not a valid language. @@ -190,8 +190,8 @@ No file was uploaded. Żaden plik nie został wgrany. - - No temporary folder was configured in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. Nie skonfigurowano folderu tymczasowego w php.ini lub skonfigurowany folder nie istnieje. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nieobsługiwany rodzaj karty lub nieprawidłowy numer karty. - - This is not a valid International Bank Account Number (IBAN). - Nieprawidłowy międzynarodowy numer rachunku bankowego (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ta wartość nie jest prawidłowym Międzynarodowym Numerem Rachunku Bankowego (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Ta wartość nie pasuje do oczekiwanego zestawu znaków {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Ta wartość nie jest poprawnym kodem BIC (Business Identifier Code). + + This value is not a valid Business Identifier Code (BIC). + Ta wartość nie jest prawidłowym Kodem Identyfikującym Bank (BIC). Error Błąd - - This is not a valid UUID. - To nie jest poprawne UUID. + + This value is not a valid UUID. + Ta wartość nie jest prawidłowym UUID. This value should be a multiple of {{ compared_value }}. @@ -434,6 +434,10 @@ The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. Wykryte kodowanie znaków ({{ detected }}) jest nieprawidłowe. Dozwolone kodowania to {{ encodings }}. + + This value is not a valid MAC address. + Ta wartość nie jest prawidłowym adresem MAC. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pt.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pt.xlf index 4b15617702c42..b380f686eeaa0 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.pt.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.pt.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Este ficheiro não é uma imagem. - - This is not a valid IP address. - Este endereço de IP não é válido. + + This value is not a valid IP address. + Este valor não é um endereço IP válido. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nenhum arquivo foi enviado. - - No temporary folder was configured in php.ini. - Não existe uma pasta temporária configurada no arquivo php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Nenhuma pasta temporária foi configurada no php.ini, ou a pasta configurada não existe. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tipo de cartão não suportado ou número de cartão inválido. - - This is not a valid International Bank Account Number (IBAN). - Este não é um Número Internacional de Conta Bancária (IBAN) válido. + + This value is not a valid International Bank Account Number (IBAN). + Este valor não é um Número de Conta Bancária Internacional (IBAN) válido. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. O valor não corresponde ao conjunto de caracteres {{ charset }} esperado. - - This is not a valid Business Identifier Code (BIC). - O Código de Identificação de Empresa (BIC) não é válido. + + This value is not a valid Business Identifier Code (BIC). + Este valor não é um Código de Identificação de Negócio (BIC) válido. Error Erro - - This is not a valid UUID. - Este valor não é um UUID válido. + + This value is not a valid UUID. + Este valor não é um UUID válido. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. A extensão do ficheiro é inválida ({{ extension }}). As extensões permitidas são {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + A codificação de carateres detetada é inválida ({{ detected }}). As codificações permitidas são {{ encodings }}. + + + This value is not a valid MAC address. + Este valor não é um endereço MAC válido. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf index 2430ad6b58285..4372885085282 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Este arquivo não é uma imagem válida. - - This is not a valid IP address. - Este não é um endereço de IP válido. + + This value is not a valid IP address. + Este valor não é um endereço IP válido. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nenhum arquivo foi enviado. - - No temporary folder was configured in php.ini. - Nenhum diretório temporário foi configurado no php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Nenhum diretório temporário foi configurado no php.ini, ou o diretório configurado não existe. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tipo de cartão não suportado ou número de cartão inválido. - - This is not a valid International Bank Account Number (IBAN). - Este não é um Número Internacional de Conta Bancária (IBAN) válido. + + This value is not a valid International Bank Account Number (IBAN). + Este valor não é um Número de Conta Bancária Internacional (IBAN) válido. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Este valor não corresponde ao charset {{ charset }} esperado. - - This is not a valid Business Identifier Code (BIC). - Este não é um Código Identificador Bancário (BIC) válido. + + This value is not a valid Business Identifier Code (BIC). + Este valor não é um Código de Identificação de Negócios (BIC) válido. Error Erro - - This is not a valid UUID. - Este não é um UUID válido. + + This value is not a valid UUID. + Este valor não é um UUID válido. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. O uso de caracteres de sobreposição ocultos não é permitido. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + A extensão do arquivo é inválida ({{ extension }}). As extensões permitidas são {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + A codificação de caracteres detectada é inválida ({{ detected }}). As codificações permitidas são {{ encodings }}. + + + This value is not a valid MAC address. + Este valor não é um endereço MAC válido. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf index f10fe4df78a21..5c4a4cd308cfb 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Acest fișier nu este o imagine validă. - - This is not a valid IP address. - Această valoare nu este o adresă IP validă. + + This value is not a valid IP address. + Această valoare nu este o adresă IP validă. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nu a fost încărcat nici un fișier. - - No temporary folder was configured in php.ini. - Nu este configurat nici un director temporar in php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Nu a fost configurat niciun folder temporar în php.ini, sau folderul configurat nu există. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Tipul sau numărul cardului nu sunt valide. - - This is not a valid International Bank Account Number (IBAN). - Acesta nu este un cod IBAN (International Bank Account Number) valid. + + This value is not a valid International Bank Account Number (IBAN). + Această valoare nu este un Număr de Cont Bancar Internațional (IBAN) valid. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Această valoare nu corespunde setului de caractere {{ charset }} așteptat. - - This is not a valid Business Identifier Code (BIC). - Codul BIC (Business Identifier Code) nu este valid. + + This value is not a valid Business Identifier Code (BIC). + Această valoare nu este un Cod de Identificare a Afacerilor (BIC) valid. Error Eroare - - This is not a valid UUID. - Identificatorul universal unic (UUID) nu este valid. + + This value is not a valid UUID. + Această valoare nu este un UUID valid. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Extensia fișierului este invalidă ({{ extension }}). Extensiile permise sunt {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Codificarea caracterelor detectate nu este valabilă ({{ detected }}). Codificările permise sunt {{ encodings }}. + + + This value is not a valid MAC address. + Această valoare nu este o adresă MAC validă. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf index a457d18f1891e..2e96883727892 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Файл не является допустимым форматом изображения. - - This is not a valid IP address. - Значение не является допустимым IP адресом. + + This value is not a valid IP address. + Это значение не является действительным IP-адресом. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Файл не был загружен. - - No temporary folder was configured in php.ini. - Не настроена временная директория в php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + В php.ini не была настроена временная папка, или настроенная папка не существует. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Неподдерживаемый тип или неверный номер карты. - - This is not a valid International Bank Account Number (IBAN). - Значение не является допустимым международным номером банковского счета (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Это значение не является действительным Международным банковским счетом (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Значение не совпадает с ожидаемой {{ charset }} кодировкой. - - This is not a valid Business Identifier Code (BIC). - Значение не соответствует формату BIC. + + This value is not a valid Business Identifier Code (BIC). + Это значение не является действительным Бизнес-идентификатором (BIC). Error Ошибка - - This is not a valid UUID. - Значение не соответствует формату UUID. + + This value is not a valid UUID. + Это значение не является действительным UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Недопустимое расширение файла ({{ extension }}). Разрешенные расширения: {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Обнаруженная кодировка символов недопустима ({{ detected }}). Разрешенные кодировки: {{ encodings }}. + + + This value is not a valid MAC address. + Это значение не является действительным MAC-адресом. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.sk.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.sk.xlf index 55d5b9713ac8b..9b06bdfb8c12e 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.sk.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.sk.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Tento súbor nie je obrázok. - - This is not a valid IP address. - Toto nie je platná IP adresa. + + This value is not a valid IP address. + Táto hodnota nie je platná IP adresa. This value is not a valid language. @@ -168,7 +168,7 @@ The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px. - >Obrázok je príliš vysoký ({{ height }}px). Maximálna povolená výška obrázku je {{ max_height }}px. + Obrázok je príliš vysoký ({{ height }}px). Maximálna povolená výška obrázku je {{ max_height }}px.]]> The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px. @@ -190,9 +190,9 @@ No file was uploaded. Žiadny súbor nebol nahraný. - - No temporary folder was configured in php.ini. - V php.ini nie je nastavená cesta k addressáru pre dočasné súbory. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + V php.ini nie je nastavený žiadny dočasný adresár, alebo nastavený adresár neexistuje. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nepodporovaný typ karty alebo neplatné číslo karty. - - This is not a valid International Bank Account Number (IBAN). - Toto je neplatný IBAN. + + This value is not a valid International Bank Account Number (IBAN). + Táto hodnota nie je platným Medzinárodným bankovým číslom účtu (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Táto hodnota nezodpovedá očakávanej znakovej sade {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Táto hodnota nie je platný identifikačný kód podniku (BIC). + + This value is not a valid Business Identifier Code (BIC). + Táto hodnota nie je platným Obchodným identifikačným kódom (BIC). Error Chyba - - This is not a valid UUID. - Táto hodnota nie je platný UUID. + + This value is not a valid UUID. + Táto hodnota nie je platným UUID. This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. Používanie skrytých prekryvných znakov nie je povolené. + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Prípona súboru je neplatná ({{ extension }}). Povolené prípony sú {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Zistené kódovanie znakov je neplatné ({{ detected }}). Povolené kódovania sú {{ encodings }}. + + + This value is not a valid MAC address. + Táto hodnota nie je platnou MAC adresou. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf index ff7c06a7cb0f3..252a51969a78d 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ta datoteka ni veljavna slika. - - This is not a valid IP address. - To ni veljaven IP naslov. + + This value is not a valid IP address. + Ta vrednost ni veljaven IP naslov. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nobena datoteka ni bila naložena. - - No temporary folder was configured in php.ini. - Začasna mapa ni nastavljena v php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + V php.ini ni bila nastavljena začasna mapa, ali nastavljena mapa ne obstaja. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nepodprti tip kartice ali neveljavna številka kartice. - - This is not a valid International Bank Account Number (IBAN). - To ni veljavna mednarodna številka bančnega računa (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ta vrednost ni veljavna Mednarodna številka bančnega računa (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Ta vrednost se ne ujema s pričakovanim naborom znakov {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - To ni veljavna identifikacijska koda podjetja (BIC). + + This value is not a valid Business Identifier Code (BIC). + Ta vrednost ni veljavna Poslovna identifikacijska koda (BIC). Error Napaka - - This is not a valid UUID. - To ni veljaven UUID. + + This value is not a valid UUID. + Ta vrednost ni veljaven UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Končnica datoteke ni veljavna ({{ extension }}). Dovoljene so naslednje končnice: {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Zaznano kodiranje znakov ni veljavno ({{ detected }}). Dovoljene so naslednje vrste kodiranja {{ encodings }}. + + + This value is not a valid MAC address. + Ta vrednost ni veljaven MAC naslov. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.sq.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.sq.xlf index ae49abb468592..d04b4af8561d8 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.sq.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.sq.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ky file nuk është imazh i vlefshëm. - - This is not a valid IP address. - Kjo adresë IP nuk është e vlefshme. + + This value is not a valid IP address. + Kjo vlerë nuk është një adresë IP e vlefshme. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Nuk është ngarkuar ndonjë file. - - No temporary folder was configured in php.ini. - Asnjë folder i përkohshëm nuk është konfiguruar në php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Asnjë dosje e përkohshme nuk është konfiguruar në php.ini, ose dosja e konfiguruar nuk ekziston. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Lloj karte i papranuar ose numër karte i pavlefshëm. - - This is not a valid International Bank Account Number (IBAN). - Ky nuk është një numër i vlefshëm ndërkombëtar i llogarisë bankare (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Kjo vlerë nuk është një Numër i Llogarisë Bankare Ndërkombëtare (IBAN) i vlefshëm. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Kjo vlerë nuk përputhet me kodifikimin e karaktereve {{ charset }} që pritej. - - This is not a valid Business Identifier Code (BIC). - Ky nuk është një Kod Identifikues i Biznesit (BIC) i vleflshem. + + This value is not a valid Business Identifier Code (BIC). + Kjo vlerë nuk është një Kod Identifikues i Biznesit (BIC) i vlefshëm. Error Gabim - - This is not a valid UUID. - Ky nuk është një UUID i vlefshëm. + + This value is not a valid UUID. + Kjo vlerë nuk është një UUID i vlefshëm. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Shtesa e skedarit është e pavlefshme ({{ extension }}). Shtesat e lejuara janë {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Kodimi i karakterit të identifikuar është i pavlefshëm ({{ detected }}). Kodimet e lejuara janë {{ encodings }}. + + + This value is not a valid MAC address. + Kjo nuk është një adresë e vlefshme e Kontrollit të Qasjes në Media (MAC). + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf index 9dd577fa650ee..b73cde9bac4a9 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ова датотека није валидна слика. - - This is not a valid IP address. - Ово није валидна ИП адреса. + + This value is not a valid IP address. + Ова вредност није валидна IP адреса. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Датотека није отпремљена. - - No temporary folder was configured in php.ini. - Привремени директоријум није конфигурисан у php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Привремени директоријум није конфигурисан у php.ini, или конфигурисани директоријум не постоји. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Невалидан број картице или тип картице није подржан. - - This is not a valid International Bank Account Number (IBAN). - Ово није валидан међународни број банковног рачуна (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ова вредност није валидан Међународни број банкарског рачуна (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Вредност се не поклапа са очекиваним {{ charset }} сетом карактера. - - This is not a valid Business Identifier Code (BIC). - Ово није валидан међународни идентификацијски код банке (BIC). + + This value is not a valid Business Identifier Code (BIC). + Ова вредност није валидан Код за идентификацију бизниса (BIC). Error Грешка - - This is not a valid UUID. - Ово није валидан универзални уникатни идентификатор (UUID). + + This value is not a valid UUID. + Ова вредност није валидан UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Екстензија фајла није валидна ({{ extension }}). Дозвољене екстензије су {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Откривено кодирање знакова је неважеће ({{ detected }}). Дозвољена кодирања су {{ encodings }}. + + + This value is not a valid MAC address. + Ова вредност није валидна MAC адреса. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf index e7162fa84bd25..cd4ccfb3f3c03 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ovaj fajl nije validan kao slika. - - This is not a valid IP address. - Ovo nije validna IP adresa. + + This value is not a valid IP address. + Ova vrednost nije validna IP adresa. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Fajl nije otpremljen. - - No temporary folder was configured in php.ini. - Privremeni direktorijum nije konfigurisan u php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Privremeni direktorijum nije konfigurisan u php.ini, ili konfigurisani direktorijum ne postoji. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Nevalidan broj kartice ili nepodržan tip kartice. - - This is not a valid International Bank Account Number (IBAN). - Nevalidan međunarodni broj bankovnog računa (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ova vrednost nije validan Međunarodni broj bankovnog računa (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Vrednost se ne poklapa sa očekivanim {{ charset }} setom karaktera. - - This is not a valid Business Identifier Code (BIC). - Ovo nije validan BIC. + + This value is not a valid Business Identifier Code (BIC). + Ova vrednost nije validan Kod za identifikaciju biznisa (BIC). Error Greška - - This is not a valid UUID. - Ovo nije validan univerzalni unikatni identifikator (UUID). + + This value is not a valid UUID. + Ova vrednost nije validan UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Ekstenzija fajla je nevalidna ({{ extension }}). Dozvoljene ekstenzije su {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Detektovani enkoding karaktera nije validan ({{ detected }}). Dozvoljne vrednosti za enkoding su: {{ encodings }}. + + + This value is not a valid MAC address. + Ova vrednost nije validna MAC adresa. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf index aee80ac4d629a..2ec539cc5b5ee 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Filen är ingen giltig bild. - - This is not a valid IP address. - Det här är inte en giltig IP-adress. + + This value is not a valid IP address. + Detta värde är inte en giltig IP-adress. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Ingen fil laddades upp. - - No temporary folder was configured in php.ini. - Det finns ingen temporär mapp konfigurerad i php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Ingen tillfällig mapp konfigurerades i php.ini, eller den konfigurerade mappen finns inte. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Okänd korttyp eller ogiltigt kortnummer. - - This is not a valid International Bank Account Number (IBAN). - Det här är inte en giltig International Bank Account Number (IBANK). + + This value is not a valid International Bank Account Number (IBAN). + Detta värde är inte ett giltigt Internationellt Bankkontonummer (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Detta värde har inte den förväntade teckenkodningen {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Detta är inte en giltig BIC-kod. + + This value is not a valid Business Identifier Code (BIC). + Detta värde är inte en giltig Företagsidentifieringskod (BIC). Error Fel - - This is not a valid UUID. - Detta är inte ett giltigt UUID. + + This value is not a valid UUID. + Detta värde är inte en giltig UUID. This value should be a multiple of {{ compared_value }}. @@ -390,7 +390,7 @@ This value should be a valid expression. Det här värdet bör vara ett giltigt uttryck. - + This value is not a valid CSS color. Det här värdet är inte en giltig CSS-färg. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Filtillägget är ogiltigt ({{ extension }}). Tillåtna filtillägg är {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Den upptäckta teckenkodningen är ogiltig ({{ detected }}). Tillåtna kodningar är {{ encodings }}. + + + This value is not a valid MAC address. + Detta värde är inte en giltig MAC-adress. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf index ad50e7411c92b..f109024bfeaf3 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. ไฟล์นี้ไม่ใช่ไฟล์รูปภาพ - - This is not a valid IP address. - ค่าของ IP ไม่ถูกต้อง + + This value is not a valid IP address. + ค่านี้ไม่ใช่ที่อยู่ IP ที่ถูกต้อง This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. ไม่มีไฟล์ใดถูกอัปโหลด - - No temporary folder was configured in php.ini. - ไม่พบการตั้งค่าโฟลเดอร์ชั่วคราว (temporary folder) ใน php.ini + + No temporary folder was configured in php.ini, or the configured folder does not exist. + ไม่มีการกำหนดโฟลเดอร์ชั่วคราวใน php.ini หรือโฟลเดอร์ที่กำหนดไม่มีอยู่จริง Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. ไม่รู้จักประเภทของบัตร หรือหมายเลขบัตรไม่ถูกต้อง - - This is not a valid International Bank Account Number (IBAN). - ค่านี้ไม่ใช่ International Bank Account Number (IBAN) ที่ถูกต้อง + + This value is not a valid International Bank Account Number (IBAN). + ค่านี้ไม่ใช่หมายเลขบัญชีธนาคารระหว่างประเทศ (IBAN) ที่ถูกต้อง This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. ค่านี้ไม่ตรงกับการเข้ารหัส {{ charset }} - - This is not a valid Business Identifier Code (BIC). - นี่ไม่ถูกต้องตามรหัสสำหรับระบุธุรกิจนี้ (BIC) + + This value is not a valid Business Identifier Code (BIC). + ค่านี้ไม่ใช่รหัสประจำตัวธุรกิจ (BIC) ที่ถูกต้อง Error เกิดข้อผิดพลาด - - This is not a valid UUID. - นี่ไม่ใช่ UUID ที่ถูกต้อง + + This value is not a valid UUID. + ค่านี้ไม่ใช่ UUID ที่ถูกต้อง This value should be a multiple of {{ compared_value }}. @@ -390,7 +390,7 @@ This value should be a valid expression. ค่านี้ควรเป็นนิพจน์ที่ถูกต้อง - + This value is not a valid CSS color. ค่านี้ไม่ใช่สี CSS ที่ถูกต้อง @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. ไม่อนุญาตให้ใช้ตัวอักษรซ้อนทับที่ซ่อนอยู่ + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + นามสกุลไฟล์ไม่ถูกต้อง ({{ extension }}). นามสกุลที่อนุญาตคือ {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + การเข้ารหัสอักขระที่ตรวจพบไม่ถูกต้อง ({{ detected }}). การเข้ารหัสที่อนุญาตคือ {{ encodings }}. + + + This value is not a valid MAC address. + ค่านี้ไม่ใช่ที่อยู่ MAC ที่ถูกต้อง + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.tl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.tl.xlf index 74d5ed5cfca15..632efbc3f3f95 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.tl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.tl.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Ang file na ito ay hindi wastong imahe. - - This is not a valid IP address. - Ito ay hindi wastong IP address. + + This value is not a valid IP address. + Ang halagang ito ay hindi isang wastong IP address. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Walang na upload na file. - - No temporary folder was configured in php.ini. - Walang temporaryong folder ang naayos sa php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Walang pansamantalang folder na na-configure sa php.ini, o ang naka-configure na folder ay hindi umiiral. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Hindi supportadong uri ng kard o hindi wastong numero ng kard. - - This is not a valid International Bank Account Number (IBAN). - Ito ay hindi isang balidong International Bank Account Number (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Ang halagang ito ay hindi isang wastong International Bank Account Number (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Ang halaga ay hindi kapareha sa inaasahang {{ charset }} set ng karater. - - This is not a valid Business Identifier Code (BIC). - Ito ay hindi isang balidong Business Identifier Code (BIC). + + This value is not a valid Business Identifier Code (BIC). + Ang halagang ito ay hindi isang wastong Business Identifier Code (BIC). Error Error - - This is not a valid UUID. - Ito ay hindi wastong UUID. + + This value is not a valid UUID. + Ang halagang ito ay hindi isang wastong UUID. This value should be a multiple of {{ compared_value }}. @@ -394,6 +394,50 @@ This value is not a valid CSS color. Ang halagang ito ay hindi wastong kulay ng CSS. + + This value is not a valid CIDR notation. + Ang halagang ito ay hindi wastong notasyong CIDR. + + + The value of the netmask should be between {{ min }} and {{ max }}. + Ang halaga ng netmask ay dapat nasa pagitan ng {{ min }} at {{ max }}. + + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + Ang pangalan ng file ay masyadong mahaba. Dapat itong magkaroon ng {{ filename_max_length }} karakter o mas kaunti.|Ang pangalan ng file ay masyadong mahaba. Dapat itong magkaroon ng {{ filename_max_length }} mga karakter o mas kaunti. + + + The password strength is too low. Please use a stronger password. + Ang lakas ng password ay masyadong mababa. Mangyaring gumamit ng mas malakas na password. + + + This value contains characters that are not allowed by the current restriction-level. + Ang halagang ito ay naglalaman ng mga karakter na hindi pinapayagan ng kasalukuyang antas ng paghihigpit. + + + Using invisible characters is not allowed. + Hindi pinapayagan ang paggamit ng mga hindi nakikitang karakter. + + + Mixing numbers from different scripts is not allowed. + Hindi pinapayagan ang paghahalo ng mga numero mula sa iba't ibang script. + + + Using hidden overlay characters is not allowed. + Hindi pinapayagan ang paggamit ng mga nakatagong overlay na karakter. + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + Ang extension ng file ay hindi wasto ({{ extension }}). Ang mga pinapayagang extension ay {{ extensions }}. + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Ang nakitang encoding ng karakter ay hindi wasto ({{ detected }}). Ang mga pinapayagang encoding ay {{ encodings }}. + + + This value is not a valid MAC address. + Ang halagang ito ay hindi isang wastong MAC address. + - + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf index b0bb1565d073a..4d66ce8bcbc58 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Bu dosya geçerli bir resim değildir. - - This is not a valid IP address. - Bu geçerli bir IP adresi değildir. + + This value is not a valid IP address. + Bu değer geçerli bir IP adresi değil. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Hiçbir dosya yüklenmedi. - - No temporary folder was configured in php.ini. - php.ini içerisinde geçici dizin tanımlanmadı. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini'de geçici bir klasör yapılandırılmadı, veya yapılandırılan klasör mevcut değil. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Desteklenmeyen kart tipi veya geçersiz kart numarası. - - This is not a valid International Bank Account Number (IBAN). - Bu geçerli bir Uluslararası Banka Hesap Numarası (IBAN) değildir. + + This value is not a valid International Bank Account Number (IBAN). + Bu değer geçerli bir Uluslararası Banka Hesap Numarası (IBAN) değil. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Bu değer beklenen {{ charset }} karakter kümesiyle eşleşmiyor. - - This is not a valid Business Identifier Code (BIC). - Bu geçerli bir İşletme Tanımlayıcı Kodu (BIC) değildir. + + This value is not a valid Business Identifier Code (BIC). + Bu değer geçerli bir İşletme Tanımlama Kodu (BIC) değil. Error Hata - - This is not a valid UUID. - Bu geçerli bir UUID değildir. + + This value is not a valid UUID. + Bu değer geçerli bir UUID değil. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Dosya uzantısı geçersiz ({{ extension }}). İzin verilen uzantılar {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Tespit edilen karakter kodlaması geçersiz ({{ detected }}). İzin verilen kodlamalar: {{ encodings }}. + + + This value is not a valid MAC address. + Bu değer geçerli bir MAC adresi değil. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf index 160352a0f573a..fcf63e0f675f3 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Цей файл не є допустимим форматом зображення. - - This is not a valid IP address. - Це некоректна IP адреса. + + This value is not a valid IP address. + Це значення не є дійсною IP-адресою. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Файл не був завантажений. - - No temporary folder was configured in php.ini. - Не налаштована тимчасова директорія в php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + У php.ini не було налаштовано тимчасової теки, або налаштована тека не існує. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Непідтримуваний тип карти або невірний номер карти. - - This is not a valid International Bank Account Number (IBAN). - Це не дійсний міжнародний номер банківського рахунку (IBAN). + + This value is not a valid International Bank Account Number (IBAN). + Це значення не є дійсним Міжнародним банківським рахунком (IBAN). This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Значення не збігається з очікуваним {{ charset }} кодуванням. - - This is not a valid Business Identifier Code (BIC). - Це не дійсний банківський код (BIC). + + This value is not a valid Business Identifier Code (BIC). + Це значення не є дійсним Кодом ідентифікації бізнесу (BIC). Error Помилка - - This is not a valid UUID. - Це не валідне значення UUID. + + This value is not a valid UUID. + Це значення не є дійсним UUID. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Розширення файлу недопустиме ({{ extension }}). Дозволені розширення {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Недопустиме кодування символів ({{ detected }}). Допустимі кодування: {{ encodings }}. + + + This value is not a valid MAC address. + Це значення не є дійсною MAC-адресою. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ur.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ur.xlf index c2b114942972f..65719c64ebc4a 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ur.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ur.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. یہ فائل درست تصویر نہیں ہے - - This is not a valid IP address. - ایڈریس نہیں ہے IP یہ ایک درست + + This value is not a valid IP address. + یہ قیمت کوئی درست IP پتہ نہیں ہے۔ This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. کوئی فائل اپ لوڈ نہیں کی گئی - - No temporary folder was configured in php.ini. - میں کوئی عارضی فولڈر کنفیگر نہیں کیا گیا، یا کنفیگرڈ فولڈر موجود نہیں ہے php.ini + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini میں کوئی عارضی فولڈر ترتیب نہیں دیا گیا تھا، یا ترتیب دیا گیا فولڈر موجود نہیں ہے۔ Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. غیر تعاون یافتہ کارڈ کی قسم یا غلط کارڈ نمبر - - This is not a valid International Bank Account Number (IBAN). - (IBAN)یہ ایک درست بین الاقوامی بینک اکاؤنٹ نمبر نہیں ہے + + This value is not a valid International Bank Account Number (IBAN). + یہ قیمت کوئی درست بین الاقوامی بینک اکاؤنٹ نمبر (IBAN) نہیں ہے۔ This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. کے جيسي نہیں ہے charset {{ charset }} یہ ويليو متوقع - - This is not a valid Business Identifier Code (BIC). - (BIC)یہ ایک درست کاروباری شناخت کنندہ کوڈ نہیں ہے + + This value is not a valid Business Identifier Code (BIC). + یہ قیمت کوئی درست بزنس شناختی کوڈ (BIC) نہیں ہے۔ Error خرابی - - This is not a valid UUID. - نہیں ہے UUID یہ درست + + This value is not a valid UUID. + یہ قیمت کوئی درست UUID نہیں ہے۔ This value should be a multiple of {{ compared_value }}. @@ -402,6 +402,42 @@ The value of the netmask should be between {{ min }} and {{ max }}. کے درمیان ہونی چاہیے {{ max }} اور {{ min }} نیٹ ماسک کی ويليو + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + فائل کا نام بہت لمبا ہے۔ اس میں {{ filename_max_length }} حرف یا اس سے کم ہونے چاہئیں۔|فائل کا نام بہت لمبا ہے۔ اس میں {{ filename_max_length }} حروف یا اس سے کم ہونے چاہئیں۔ + + + The password strength is too low. Please use a stronger password. + پاس ورڈ کی طاقت بہت کم ہے۔ براہ کرم مضبوط پاس ورڈ استعمال کریں۔ + + + This value contains characters that are not allowed by the current restriction-level. + اس قدر میں ایسے حروف موجود ہیں جو موجودہ پابندی کی سطح کی طرف سے اجازت نہیں ہیں۔ + + + Using invisible characters is not allowed. + نادیدہ حروف استعمال کرنے کی اجازت نہیں ہے۔ + + + Mixing numbers from different scripts is not allowed. + مختلف اسکرپٹس سے نمبروں کو ملا کر استعمال کرنے کی اجازت نہیں ہے۔ + + + Using hidden overlay characters is not allowed. + چھپے ہوئے اوورلے کریکٹرز کا استعمال کرنے کی اجازت نہیں ہے۔ + + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + فائل کی توسیع نامناسب ہے ({{ extension }})۔ اجازت شدہ توسیعات {{ extensions }} ہیں۔ + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + پتہ چلنے والی کریکٹر انکوڈنگ نامناسب ہے ({{ detected }})۔ اجازت شدہ انکوڈنگز {{ encodings }} ہیں۔ + + + This value is not a valid MAC address. + یہ قیمت کوئی درست MAC پتہ نہیں ہے۔ + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.uz.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.uz.xlf index 3e58e24c58bbf..bf5a2d5f4d9de 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.uz.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.uz.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Fayl yaroqli rasm formati emas. - - This is not a valid IP address. - Ip manzil noto'g'ri. + + This value is not a valid IP address. + Bu qiymat haqiqiy IP manzil emas. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Fayl yuklanmagan. - - No temporary folder was configured in php.ini. - php.ini da vaqtinchalik katalog sozlanmagan. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini da vaqtinchalik katalog sozlanmagan, yoki sozlangan katalog mavjud emas. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Qo'llab-quvvatlanmaydigan karta turi yoki yaroqsiz karta raqami. - - This is not a valid International Bank Account Number (IBAN). - Qiymat haqiqiy xalqaro hisob raqamining raqami (IBAN) emas. + + This value is not a valid International Bank Account Number (IBAN). + Bu qiymat haqiqiy Xalqaro Bank Hisob Raqami (IBAN) emas. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Qiymat kutilgan {{ charset }} kodlashiga mos kelmaydi. - - This is not a valid Business Identifier Code (BIC). - Qiymat BIC formatida emas. + + This value is not a valid Business Identifier Code (BIC). + Bu qiymat haqiqiy Biznes Identifikatsiya Kodi (BIC) emas. Error Xatolik - - This is not a valid UUID. - Qiymat UUID formatida emas. + + This value is not a valid UUID. + Bu qiymat haqiqiy UUID emas. This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Fayl kengaytmasi yaroqsiz ({{ extension }}). Ruxsat berilgan kengaytmalar {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Aniqlangan belgi kodlamasi yaroqsiz ({{ detected }}). Ruxsat etilgan kodlamalar {{ encodings }}. + + + This value is not a valid MAC address. + Bu qiymat haqiqiy MAC manzil emas. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf index b3c60a0a4e38f..eadf61467c8bc 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. Tập tin không phải là hình ảnh hợp lệ. - - This is not a valid IP address. - Địa chỉ IP không hợp lệ. + + This value is not a valid IP address. + Giá trị này không phải là địa chỉ IP hợp lệ. This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. Tập tin không được tải lên. - - No temporary folder was configured in php.ini. - Thư mục tạm không được định nghĩa trong php.ini. + + No temporary folder was configured in php.ini, or the configured folder does not exist. + Không có thư mục tạm được cấu hình trong php.ini, hoặc thư mục đã cấu hình không tồn tại. Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. Thẻ không được hỗ trợ hoặc số thẻ không hợp lệ. - - This is not a valid International Bank Account Number (IBAN). - Giá trị không phải là International Bank Account Number (IBAN) hợp lệ. + + This value is not a valid International Bank Account Number (IBAN). + Giá trị này không phải là Số Tài Khoản Ngân Hàng Quốc Tế (IBAN) hợp lệ. This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. Giá trị này không đúng định dạng bộ ký tự mong muốn {{ charset }}. - - This is not a valid Business Identifier Code (BIC). - Giá trị này không đúng định dạng mã định danh doanh nghiệp (BIC). + + This value is not a valid Business Identifier Code (BIC). + Giá trị này không phải là Mã Định Danh Doanh Nghiệp (BIC) hợp lệ. Error Lỗi - - This is not a valid UUID. - Giá trị này không đúng định dạng UUID. + + This value is not a valid UUID. + Giá trị này không phải là UUID hợp lệ. This value should be a multiple of {{ compared_value }}. @@ -361,19 +361,19 @@ This password has been leaked in a data breach, it must not be used. Please use another password. Mật khẩu này đã bị rò rỉ dữ liệu, không được sử dụng nữa. Xin vui lòng sử dụng mật khẩu khác. - - - This value should be between {{ min }} and {{ max }}. - Giá trị này nên thuộc giữa {{ min }} và {{ max }}. - - - This value is not a valid hostname. - Giá trị này không phải là tên máy chủ hợp lệ. - - - 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 }}. - + + + This value should be between {{ min }} and {{ max }}. + Giá trị này nên thuộc giữa {{ min }} và {{ max }}. + + + This value is not a valid hostname. + Giá trị này không phải là tên máy chủ hợp lệ. + + + 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 }}. + This value should satisfy at least one of the following constraints: Giá trị này nên thỏa mãn ít nhất một trong những ràng buộc sau: @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. Phần mở rộng của tệp không hợp lệ ({{ extension }}). Phần mở rộng cho phép là {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + Mã hóa ký tự được phát hiện là không hợp lệ ({{ detected }}). Các mã hóa được phép là {{ encodings }}. + + + This value is not a valid MAC address. + Giá trị này không phải là địa chỉ MAC hợp lệ. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf index 4579b2e5c5b03..155871cd38df4 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,14 +134,14 @@ This file is not a valid image. 该文件不是有效的图片。 - - This is not a valid IP address. - 该值不是有效的IP地址。 - - - This value is not a valid language. - 该值不是有效的语言名。 - + + This value is not a valid IP address. + 该值不是有效的IP地址。 + + + This value is not a valid language. + 该值不是有效的语言名。 + This value is not a valid locale. 该值不是有效的区域值（locale）。 @@ -190,9 +190,9 @@ No file was uploaded. 没有上传任何文件。 - - No temporary folder was configured in php.ini. - php.ini 里没有配置临时文件目录。 + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini 中没有配置临时文件夹，或配置的文件夹不存在。 Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. 不支持的信用卡类型或无效的信用卡号。 - - This is not a valid International Bank Account Number (IBAN). - 该值不是有效的国际银行帐号（IBAN）。 + + This value is not a valid International Bank Account Number (IBAN). + 该值不是有效的国际银行账号（IBAN）。 This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. 该值不符合 {{ charset }} 编码。 - - This is not a valid Business Identifier Code (BIC). - 这不是有效的业务标识符代码（BIC)。 + + This value is not a valid Business Identifier Code (BIC). + 该值不是有效的业务标识符代码（BIC）。 Error 错误 - - This is not a valid UUID. - 这不是有效的UUID。 + + This value is not a valid UUID. + 该值不是有效的UUID。 This value should be a multiple of {{ compared_value }}. @@ -426,6 +426,18 @@ Using hidden overlay characters is not allowed. 不允许使用隐藏的覆盖字符。 + + The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. + 文件的扩展名无效 ({{ extension }})。允许的扩展名为 {{ extensions }}。 + + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + 检测到的字符编码无效 ({{ detected }})。允许的编码为 {{ encodings }}。 + + + This value is not a valid MAC address. + 该值不是有效的MAC地址。 + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf index d74c2e9ba77f0..1a90678627e97 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf @@ -1,6 +1,6 @@ - - - + + + This value should be false. @@ -134,9 +134,9 @@ This file is not a valid image. 該檔案不是有效的圖片。 - - This is not a valid IP address. - 該值不是有效的IP地址。 + + This value is not a valid IP address. + 此值不是有效的IP地址。 This value is not a valid language. @@ -190,9 +190,9 @@ No file was uploaded. 沒有上傳任何檔案。 - - No temporary folder was configured in php.ini. - php.ini 裡沒有配置臨時目錄。 + + No temporary folder was configured in php.ini, or the configured folder does not exist. + php.ini 中沒有配置臨時文件夾，或配置的文件夾不存在。 Cannot write temporary file to disk. @@ -222,9 +222,9 @@ Unsupported card type or invalid card number. 不支援的信用卡類型或無效的信用卡號。 - - This is not a valid International Bank Account Number (IBAN). - 該值不是有效的國際銀行帳號（IBAN）。 + + This value is not a valid International Bank Account Number (IBAN). + 此值不是有效的國際銀行帳戶號碼（IBAN）。 This value is not a valid ISBN-10. @@ -310,17 +310,17 @@ This value does not match the expected {{ charset }} charset. 該數值不符合預期 {{ charset }} 符號編碼。 - - This is not a valid Business Identifier Code (BIC). - 無效企業識別碼 (BIC)。 + + This value is not a valid Business Identifier Code (BIC). + 此值不是有效的業務識別碼（BIC）。 - Error. + Error 錯誤。 - - This is not a valid UUID. - 無效的通用唯壹標識符 (UUID)。 + + This value is not a valid UUID. + 此值不是有效的UUID。 This value should be a multiple of {{ compared_value }}. @@ -430,6 +430,14 @@ The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}. 無效的副檔名 ({{ extension }}). 允許的副檔名有 {{ extensions }}. + + The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}. + 偵測到的字元編碼無效 ({{ detected }})。允許的編碼為 {{ encodings }}。 + + + This value is not a valid MAC address. + 這不是一個有效的MAC地址。 + diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php index 9cc6f0ab868c2..89f8d0008e75a 100644 --- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php +++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php @@ -324,7 +324,7 @@ final class ConstraintViolationAssertion /** * @internal */ - public function __construct(ExecutionContextInterface $context, string $message, Constraint $constraint = null, array $assertions = []) + public function __construct(ExecutionContextInterface $context, string $message, ?Constraint $constraint = null, array $assertions = []) { $this->context = $context; $this->message = $message; @@ -575,7 +575,7 @@ public function expectNoValidate() $this->expectNoValidate = true; } - public function expectValidation(string $call, ?string $propertyPath, $value, $group, callable $constraints, ConstraintViolationInterface $violation = null) + public function expectValidation(string $call, ?string $propertyPath, $value, $group, callable $constraints, ?ConstraintViolationInterface $violation = null) { if (null !== $propertyPath) { $this->expectedAtPath[$call] = $propertyPath; diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php index 0df1bae15e02b..9d3c99c983473 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php @@ -295,7 +295,7 @@ abstract public static function provideComparisonsToNullValueAtPropertyPath(); /** * @param array|null $options Options for the constraint */ - abstract protected static function createConstraint(array $options = null): Constraint; + abstract protected static function createConstraint(?array $options = null): Constraint; protected function getErrorCode(): ?string { diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AtLeastOneOfValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AtLeastOneOfValidatorTest.php index 961607b4b7a45..457894b58b418 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/AtLeastOneOfValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/AtLeastOneOfValidatorTest.php @@ -268,7 +268,7 @@ public function testTranslatorIsCalledOnConstraintBaseMessageAndViolations() $translator = new class() implements TranslatorInterface, LocaleAwareInterface { use TranslatorTrait; - public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string + public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string { if ('This value should satisfy at least one of the following constraints:' === $id) { return 'Dummy translation:'; diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CidrValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CidrValidatorTest.php index 7c5745ee6942a..d2a617d720ae2 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/CidrValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/CidrValidatorTest.php @@ -105,7 +105,7 @@ public function testInvalidIpAddressAndNetmask(string $cidr) /** * @dataProvider getOutOfRangeNetmask */ - public function testOutOfRangeNetmask(string $cidr, string $version = null, int $min = null, int $max = null) + public function testOutOfRangeNetmask(string $cidr, ?string $version = null, ?int $min = null, ?int $max = null) { $cidrConstraint = new Cidr([ 'version' => $version, diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php index e5685a4acc7ed..2b9acb8d43fa4 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php @@ -153,4 +153,24 @@ public function testAllKeysAreKnowOptions() $this->assertTrue($constraint->allowExtraFields); $this->assertSame('foo bar baz', $constraint->extraFieldsMessage); } + + public function testEmptyFields() + { + $constraint = new Collection([], [], null, true, null, 'foo bar baz'); + + $this->assertTrue($constraint->allowExtraFields); + $this->assertSame('foo bar baz', $constraint->extraFieldsMessage); + } + + public function testEmptyFieldsInOptions() + { + $constraint = new Collection([ + 'fields' => [], + 'allowExtraFields' => true, + 'extraFieldsMessage' => 'foo bar baz', + ]); + + $this->assertTrue($constraint->allowExtraFields); + $this->assertSame('foo bar baz', $constraint->extraFieldsMessage); + } } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php index ebcf9b8493af1..474020ea2624c 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php @@ -26,7 +26,7 @@ protected function createValidator() return new DivisibleByValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new DivisibleBy($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php index c55757902a750..9bb195e3dec7c 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new EqualToValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new EqualTo($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php index 367c670f0fe5a..b460f2a9a3da5 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new GreaterThanOrEqualValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new GreaterThanOrEqual($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest.php b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest.php index d6c6682fabf92..e019c99e31751 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest.php @@ -21,7 +21,7 @@ */ class GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest extends GreaterThanOrEqualValidatorTest { - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new PositiveOrZero(); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php index 1816788b84e5c..0eb5ebe53c835 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new GreaterThanValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new GreaterThan($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorWithPositiveConstraintTest.php b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorWithPositiveConstraintTest.php index 3b31ff4d0be35..967d87c5a21a6 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorWithPositiveConstraintTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorWithPositiveConstraintTest.php @@ -21,7 +21,7 @@ */ class GreaterThanValidatorWithPositiveConstraintTest extends GreaterThanValidatorTest { - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new Positive(); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php index 165e31823f530..13231a657113f 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new IdenticalToValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new IdenticalTo($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php index 2526987ec3daa..2344634ab09da 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new LessThanOrEqualValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new LessThanOrEqual($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorWithNegativeOrZeroConstraintTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorWithNegativeOrZeroConstraintTest.php index c5874ed5b5368..05d36a8186620 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorWithNegativeOrZeroConstraintTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorWithNegativeOrZeroConstraintTest.php @@ -21,7 +21,7 @@ */ class LessThanOrEqualValidatorWithNegativeOrZeroConstraintTest extends LessThanOrEqualValidatorTest { - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new NegativeOrZero(); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php index e8106b6cb01ef..95c59b3efb361 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new LessThanValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new LessThan($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorWithNegativeConstraintTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorWithNegativeConstraintTest.php index 5e7173c304f40..f56b48adcf72e 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorWithNegativeConstraintTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorWithNegativeConstraintTest.php @@ -21,7 +21,7 @@ */ class LessThanValidatorWithNegativeConstraintTest extends LessThanValidatorTest { - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new Negative(); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php index 65d4329efedd1..0f5fa1aa13fad 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new NotEqualToValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new NotEqualTo($options); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php index a67aa8cb98cfb..f25445ad84400 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php @@ -28,7 +28,7 @@ protected function createValidator() return new NotIdenticalToValidator(); } - protected static function createConstraint(array $options = null): Constraint + protected static function createConstraint(?array $options = null): Constraint { return new NotIdenticalTo($options); } diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php index f41d4c55443a9..ee0f5fb97e60b 100644 --- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php +++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php @@ -187,7 +187,7 @@ public function testLoadClassMetadata() /** * @dataProvider regexpProvider */ - public function testClassValidator(bool $expected, string $classValidatorRegexp = null) + public function testClassValidator(bool $expected, ?string $classValidatorRegexp = null) { $propertyInfoStub = $this->createMock(PropertyInfoExtractorInterface::class); $propertyInfoStub diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 3e860daa30e30..5cc9b399f1fb5 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -40,7 +40,7 @@ "symfony/mime": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.0|^6.0", "symfony/property-info": "^5.3|^6.0", - "symfony/translation": "^4.4|^5.0|^6.0", + "symfony/translation": "^5.4.35|~6.3.12|^6.4.3", "doctrine/annotations": "^1.13|^2", "doctrine/cache": "^1.11|^2.0", "egulias/email-validator": "^2.1.10|^3|^4" @@ -54,7 +54,7 @@ "symfony/http-kernel": "<4.4", "symfony/intl": "<4.4", "symfony/property-info": "<5.3", - "symfony/translation": "<4.4", + "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3", "symfony/yaml": "<4.4" }, "suggest": { diff --git a/src/Symfony/Component/VarDumper/Caster/Caster.php b/src/Symfony/Component/VarDumper/Caster/Caster.php index 81bfd54e5aa38..09238093ded36 100644 --- a/src/Symfony/Component/VarDumper/Caster/Caster.php +++ b/src/Symfony/Component/VarDumper/Caster/Caster.php @@ -42,7 +42,7 @@ class Caster * * @param bool $hasDebugInfo Whether the __debugInfo method exists on $obj or not */ - public static function castObject(object $obj, string $class, bool $hasDebugInfo = false, string $debugClass = null): array + public static function castObject(object $obj, string $class, bool $hasDebugInfo = false, ?string $debugClass = null): array { if ($hasDebugInfo) { try { diff --git a/src/Symfony/Component/VarDumper/Caster/LinkStub.php b/src/Symfony/Component/VarDumper/Caster/LinkStub.php index 7e0780339a9f0..bd4c796a51acc 100644 --- a/src/Symfony/Component/VarDumper/Caster/LinkStub.php +++ b/src/Symfony/Component/VarDumper/Caster/LinkStub.php @@ -23,7 +23,7 @@ class LinkStub extends ConstStub private static $vendorRoots; private static $composerRoots; - public function __construct(string $label, int $line = 0, string $href = null) + public function __construct(string $label, int $line = 0, ?string $href = null) { $this->value = $label; diff --git a/src/Symfony/Component/VarDumper/Caster/TraceStub.php b/src/Symfony/Component/VarDumper/Caster/TraceStub.php index 5eea1c876680f..d215d8db0014c 100644 --- a/src/Symfony/Component/VarDumper/Caster/TraceStub.php +++ b/src/Symfony/Component/VarDumper/Caster/TraceStub.php @@ -25,7 +25,7 @@ class TraceStub extends Stub public $sliceLength; public $numberingOffset; - public function __construct(array $trace, bool $keepArgs = true, int $sliceOffset = 0, int $sliceLength = null, int $numberingOffset = 0) + public function __construct(array $trace, bool $keepArgs = true, int $sliceOffset = 0, ?int $sliceLength = null, int $numberingOffset = 0) { $this->value = $trace; $this->keepArgs = $keepArgs; diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php index f74a61d7a6564..e811fbf720e37 100644 --- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php @@ -216,7 +216,7 @@ abstract class AbstractCloner implements ClonerInterface * * @see addCasters */ - public function __construct(array $casters = null) + public function __construct(?array $casters = null) { if (null === $casters) { $casters = static::$defaultCasters; diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php index ae19faf613a26..66da669de9aaf 100644 --- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php @@ -42,7 +42,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface * @param string|null $charset The default character encoding to use for non-UTF8 strings * @param int $flags A bit field of static::DUMP_* constants to fine tune dumps representation */ - public function __construct($output = null, string $charset = null, int $flags = 0) + public function __construct($output = null, ?string $charset = null, int $flags = 0) { $this->flags = $flags; $this->setCharset($charset ?: \ini_get('php.output_encoding') ?: \ini_get('default_charset') ?: 'UTF-8'); diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php index 690f6d016791b..abb29a952cb8a 100644 --- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php @@ -64,7 +64,7 @@ class CliDumper extends AbstractDumper /** * {@inheritdoc} */ - public function __construct($output = null, string $charset = null, int $flags = 0) + public function __construct($output = null, ?string $charset = null, int $flags = 0) { parent::__construct($output, $charset, $flags); @@ -564,6 +564,10 @@ protected function supportsColors() */ protected function dumpLine(int $depth, bool $endOfValue = false) { + if (null === $this->colors) { + $this->colors = $this->supportsColors(); + } + if ($this->colors) { $this->line = sprintf("\033[%sm%s\033[m", $this->styles['default'], $this->line); } diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php index 520f9c46d1643..dee887ec1f166 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php +++ b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php @@ -30,7 +30,7 @@ final class SourceContextProvider implements ContextProviderInterface private $projectDir; private $fileLinkFormatter; - public function __construct(string $charset = null, string $projectDir = null, FileLinkFormatter $fileLinkFormatter = null, int $limit = 9) + public function __construct(?string $charset = null, ?string $projectDir = null, ?FileLinkFormatter $fileLinkFormatter = null, int $limit = 9) { $this->charset = $charset; $this->projectDir = $projectDir; diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php index 75cbe2fcbf6e6..55030cfd02ba5 100644 --- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php @@ -77,7 +77,7 @@ class HtmlDumper extends CliDumper /** * {@inheritdoc} */ - public function __construct($output = null, string $charset = null, int $flags = 0) + public function __construct($output = null, ?string $charset = null, int $flags = 0) { AbstractDumper::__construct($output, $charset, $flags); $this->dumpId = 'sf-dump-'.mt_rand(); diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php index 94795bf6d69dd..b8871b00ba923 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php @@ -30,7 +30,7 @@ class ServerDumper implements DataDumperInterface * @param DataDumperInterface|null $wrappedDumper A wrapped instance used whenever we failed contacting the server * @param ContextProviderInterface[] $contextProviders Context providers indexed by context name */ - public function __construct(string $host, DataDumperInterface $wrappedDumper = null, array $contextProviders = []) + public function __construct(string $host, ?DataDumperInterface $wrappedDumper = null, array $contextProviders = []) { $this->connection = new Connection($host, $contextProviders); $this->wrappedDumper = $wrappedDumper; diff --git a/src/Symfony/Component/VarDumper/Server/DumpServer.php b/src/Symfony/Component/VarDumper/Server/DumpServer.php index f9735db785caa..b006ea1203a76 100644 --- a/src/Symfony/Component/VarDumper/Server/DumpServer.php +++ b/src/Symfony/Component/VarDumper/Server/DumpServer.php @@ -32,7 +32,7 @@ class DumpServer */ private $socket; - public function __construct(string $host, LoggerInterface $logger = null) + public function __construct(string $host, ?LoggerInterface $logger = null) { if (!str_contains($host, '://')) { $host = 'tcp://'.$host; diff --git a/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php b/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php index 33d60c020196b..5959195c356f7 100644 --- a/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php +++ b/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php @@ -27,7 +27,7 @@ trait VarDumperTestTrait 'flags' => null, ]; - protected function setUpVarDumper(array $casters, int $flags = null): void + protected function setUpVarDumper(array $casters, ?int $flags = null): void { $this->varDumperConfig['casters'] = $casters; $this->varDumperConfig['flags'] = $flags; diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php index 564c8a0166679..c6a96ec37069b 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php @@ -43,7 +43,28 @@ public function testCastPdo() $this->assertSame('NATURAL', $attr['CASE']->class); $this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class); - $xDump = <<<'EODUMP' + if (\PHP_VERSION_ID >= 80215 && \PHP_VERSION_ID < 80300 || \PHP_VERSION_ID >= 80302) { + $xDump = <<<'EODUMP' +array:2 [ + "\x00~\x00inTransaction" => false + "\x00~\x00attributes" => array:10 [ + "CASE" => NATURAL + "ERRMODE" => EXCEPTION + "PERSISTENT" => false + "DRIVER_NAME" => "sqlite" + "ORACLE_NULLS" => NATURAL + "CLIENT_VERSION" => "%s" + "SERVER_VERSION" => "%s" + "STATEMENT_CLASS" => array:%d [ + 0 => "PDOStatement"%A + ] + "STRINGIFY_FETCHES" => false + "DEFAULT_FETCH_MODE" => BOTH + ] +] +EODUMP; + } else { + $xDump = <<<'EODUMP' array:2 [ "\x00~\x00inTransaction" => false "\x00~\x00attributes" => array:9 [ @@ -61,6 +82,7 @@ public function testCastPdo() ] ] EODUMP; + } $this->assertDumpMatchesFormat($xDump, $cast); } diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php index c0aca218be1ab..07226b0ed37a9 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php @@ -727,6 +727,6 @@ public static function stub(): void } } -function reflectionParameterFixture(NotLoadableClass $arg1 = null, $arg2) +function reflectionParameterFixture(?NotLoadableClass $arg1, $arg2) { } diff --git a/src/Symfony/Component/VarDumper/VarDumper.php b/src/Symfony/Component/VarDumper/VarDumper.php index 20429ac788c14..9db5811ea00f9 100644 --- a/src/Symfony/Component/VarDumper/VarDumper.php +++ b/src/Symfony/Component/VarDumper/VarDumper.php @@ -49,7 +49,7 @@ public static function dump($var) /** * @return callable|null */ - public static function setHandler(callable $callable = null) + public static function setHandler(?callable $callable = null) { $prevHandler = self::$handler; diff --git a/src/Symfony/Component/VarExporter/Exception/ClassNotFoundException.php b/src/Symfony/Component/VarExporter/Exception/ClassNotFoundException.php index 4cebe44b0fe49..379a76517226b 100644 --- a/src/Symfony/Component/VarExporter/Exception/ClassNotFoundException.php +++ b/src/Symfony/Component/VarExporter/Exception/ClassNotFoundException.php @@ -13,7 +13,7 @@ class ClassNotFoundException extends \Exception implements ExceptionInterface { - public function __construct(string $class, \Throwable $previous = null) + public function __construct(string $class, ?\Throwable $previous = null) { parent::__construct(sprintf('Class "%s" not found.', $class), 0, $previous); } diff --git a/src/Symfony/Component/VarExporter/Exception/NotInstantiableTypeException.php b/src/Symfony/Component/VarExporter/Exception/NotInstantiableTypeException.php index 771ee612dbc37..b9ba225d8469d 100644 --- a/src/Symfony/Component/VarExporter/Exception/NotInstantiableTypeException.php +++ b/src/Symfony/Component/VarExporter/Exception/NotInstantiableTypeException.php @@ -13,7 +13,7 @@ class NotInstantiableTypeException extends \Exception implements ExceptionInterface { - public function __construct(string $type, \Throwable $previous = null) + public function __construct(string $type, ?\Throwable $previous = null) { parent::__construct(sprintf('Type "%s" is not instantiable.', $type), 0, $previous); } diff --git a/src/Symfony/Component/VarExporter/VarExporter.php b/src/Symfony/Component/VarExporter/VarExporter.php index 59d5e8631da1a..d4c0809150336 100644 --- a/src/Symfony/Component/VarExporter/VarExporter.php +++ b/src/Symfony/Component/VarExporter/VarExporter.php @@ -38,7 +38,7 @@ final class VarExporter * * @throws ExceptionInterface When the provided value cannot be serialized */ - public static function export($value, bool &$isStaticValue = null, array &$foundClasses = []): string + public static function export($value, ?bool &$isStaticValue = null, array &$foundClasses = []): string { $isStaticValue = true; diff --git a/src/Symfony/Component/WebLink/Link.php b/src/Symfony/Component/WebLink/Link.php index a9727cec7a208..7c58754f1e520 100644 --- a/src/Symfony/Component/WebLink/Link.php +++ b/src/Symfony/Component/WebLink/Link.php @@ -50,7 +50,7 @@ class Link implements EvolvableLinkInterface */ private $attributes = []; - public function __construct(string $rel = null, string $href = '') + public function __construct(?string $rel = null, string $href = '') { if (null !== $rel) { $this->rel[$rel] = $rel; diff --git a/src/Symfony/Component/Workflow/Definition.php b/src/Symfony/Component/Workflow/Definition.php index 1233538616013..5be31f98c0401 100644 --- a/src/Symfony/Component/Workflow/Definition.php +++ b/src/Symfony/Component/Workflow/Definition.php @@ -32,7 +32,7 @@ final class Definition * @param Transition[] $transitions * @param string|string[]|null $initialPlaces */ - public function __construct(array $places, array $transitions, $initialPlaces = null, MetadataStoreInterface $metadataStore = null) + public function __construct(array $places, array $transitions, $initialPlaces = null, ?MetadataStoreInterface $metadataStore = null) { foreach ($places as $place) { $this->addPlace($place); diff --git a/src/Symfony/Component/Workflow/Dumper/DumperInterface.php b/src/Symfony/Component/Workflow/Dumper/DumperInterface.php index 19f04b0554927..9186aa7cc88bc 100644 --- a/src/Symfony/Component/Workflow/Dumper/DumperInterface.php +++ b/src/Symfony/Component/Workflow/Dumper/DumperInterface.php @@ -27,5 +27,5 @@ interface DumperInterface * * @return string */ - public function dump(Definition $definition, Marking $marking = null, array $options = []); + public function dump(Definition $definition, ?Marking $marking = null, array $options = []); } diff --git a/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php b/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php index 56623b55909d1..9c79f823808b6 100644 --- a/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php +++ b/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php @@ -44,7 +44,7 @@ class GraphvizDumper implements DumperInterface * * node: The default options for nodes (places + transitions) * * edge: The default options for edges */ - public function dump(Definition $definition, Marking $marking = null, array $options = []) + public function dump(Definition $definition, ?Marking $marking = null, array $options = []) { $places = $this->findPlaces($definition, $marking); $transitions = $this->findTransitions($definition); @@ -62,7 +62,7 @@ public function dump(Definition $definition, Marking $marking = null, array $opt /** * @internal */ - protected function findPlaces(Definition $definition, Marking $marking = null): array + protected function findPlaces(Definition $definition, ?Marking $marking = null): array { $workflowMetadata = $definition->getMetadataStore(); diff --git a/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php b/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php index 9f6a5b5f95a9c..11c89d3f34bc0 100644 --- a/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php +++ b/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php @@ -66,7 +66,7 @@ public function __construct(string $transitionType, string $direction = self::DI $this->transitionType = $transitionType; } - public function dump(Definition $definition, Marking $marking = null, array $options = []): string + public function dump(Definition $definition, ?Marking $marking = null, array $options = []): string { $this->linkCount = 0; $placeNameMap = []; diff --git a/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php b/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php index d8548469a54e4..72911a3d19bda 100644 --- a/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php +++ b/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php @@ -53,7 +53,7 @@ class PlantUmlDumper implements DumperInterface private $transitionType = self::STATEMACHINE_TRANSITION; - public function __construct(string $transitionType = null) + public function __construct(?string $transitionType = null) { if (!\in_array($transitionType, self::TRANSITION_TYPES, true)) { throw new \InvalidArgumentException("Transition type '$transitionType' does not exist."); @@ -61,7 +61,7 @@ public function __construct(string $transitionType = null) $this->transitionType = $transitionType; } - public function dump(Definition $definition, Marking $marking = null, array $options = []): string + public function dump(Definition $definition, ?Marking $marking = null, array $options = []): string { $options = array_replace_recursive(self::DEFAULT_OPTIONS, $options); @@ -191,7 +191,7 @@ private function escape(string $string): string return '"'.str_replace('"', '', $string).'"'; } - private function getState(string $place, Definition $definition, Marking $marking = null): string + private function getState(string $place, Definition $definition, ?Marking $marking = null): string { $workflowMetadata = $definition->getMetadataStore(); diff --git a/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php b/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php index 4bd818d5363fc..3ea6d763977e9 100644 --- a/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php +++ b/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php @@ -27,7 +27,7 @@ class StateMachineGraphvizDumper extends GraphvizDumper * * node: The default options for nodes (places) * * edge: The default options for edges */ - public function dump(Definition $definition, Marking $marking = null, array $options = []) + public function dump(Definition $definition, ?Marking $marking = null, array $options = []) { $places = $this->findPlaces($definition, $marking); $edges = $this->findEdges($definition); diff --git a/src/Symfony/Component/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php index e1f448a8b5168..cd59d03882f4c 100644 --- a/src/Symfony/Component/Workflow/Event/Event.php +++ b/src/Symfony/Component/Workflow/Event/Event.php @@ -29,7 +29,7 @@ class Event extends BaseEvent private $transition; private $workflow; - public function __construct(object $subject, Marking $marking, Transition $transition = null, WorkflowInterface $workflow = null, array $context = []) + public function __construct(object $subject, Marking $marking, ?Transition $transition = null, ?WorkflowInterface $workflow = null, array $context = []) { $this->subject = $subject; $this->marking = $marking; diff --git a/src/Symfony/Component/Workflow/Event/GuardEvent.php b/src/Symfony/Component/Workflow/Event/GuardEvent.php index 039d1614c3ada..11df6cc2df5d8 100644 --- a/src/Symfony/Component/Workflow/Event/GuardEvent.php +++ b/src/Symfony/Component/Workflow/Event/GuardEvent.php @@ -28,7 +28,7 @@ final class GuardEvent extends Event /** * {@inheritdoc} */ - public function __construct(object $subject, Marking $marking, Transition $transition, WorkflowInterface $workflow = null) + public function __construct(object $subject, Marking $marking, Transition $transition, ?WorkflowInterface $workflow = null) { parent::__construct($subject, $marking, $transition, $workflow); @@ -45,7 +45,7 @@ public function isBlocked(): bool return !$this->transitionBlockerList->isEmpty(); } - public function setBlocked(bool $blocked, string $message = null): void + public function setBlocked(bool $blocked, ?string $message = null): void { if (!$blocked) { $this->transitionBlockerList->clear(); diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php index 8b63f9380b95d..016299632334f 100644 --- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php +++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php @@ -32,7 +32,7 @@ class GuardListener private $roleHierarchy; private $validator; - public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null) + public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, ?RoleHierarchyInterface $roleHierarchy = null, ?ValidatorInterface $validator = null) { $this->configuration = $configuration; $this->expressionLanguage = $expressionLanguage; diff --git a/src/Symfony/Component/Workflow/Metadata/InMemoryMetadataStore.php b/src/Symfony/Component/Workflow/Metadata/InMemoryMetadataStore.php index 8fdc9e7729321..e072ac3397475 100644 --- a/src/Symfony/Component/Workflow/Metadata/InMemoryMetadataStore.php +++ b/src/Symfony/Component/Workflow/Metadata/InMemoryMetadataStore.php @@ -27,7 +27,7 @@ final class InMemoryMetadataStore implements MetadataStoreInterface /** * @param \SplObjectStorage|null $transitionsMetadata */ - public function __construct(array $workflowMetadata = [], array $placesMetadata = [], \SplObjectStorage $transitionsMetadata = null) + public function __construct(array $workflowMetadata = [], array $placesMetadata = [], ?\SplObjectStorage $transitionsMetadata = null) { $this->workflowMetadata = $workflowMetadata; $this->placesMetadata = $placesMetadata; diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php index 3474e953fa637..85aa36f7926a4 100644 --- a/src/Symfony/Component/Workflow/Registry.php +++ b/src/Symfony/Component/Workflow/Registry.php @@ -27,7 +27,7 @@ public function addWorkflow(WorkflowInterface $workflow, WorkflowSupportStrategy $this->workflows[] = [$workflow, $supportStrategy]; } - public function has(object $subject, string $workflowName = null): bool + public function has(object $subject, ?string $workflowName = null): bool { foreach ($this->workflows as [$workflow, $supportStrategy]) { if ($this->supports($workflow, $supportStrategy, $subject, $workflowName)) { @@ -41,7 +41,7 @@ public function has(object $subject, string $workflowName = null): bool /** * @return Workflow */ - public function get(object $subject, string $workflowName = null) + public function get(object $subject, ?string $workflowName = null) { $matched = []; diff --git a/src/Symfony/Component/Workflow/StateMachine.php b/src/Symfony/Component/Workflow/StateMachine.php index 8fb4d3b8ff57e..0946307af3308 100644 --- a/src/Symfony/Component/Workflow/StateMachine.php +++ b/src/Symfony/Component/Workflow/StateMachine.php @@ -20,7 +20,7 @@ */ class StateMachine extends Workflow { - public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', array $eventsToDispatch = null) + public function __construct(Definition $definition, ?MarkingStoreInterface $markingStore = null, ?EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', ?array $eventsToDispatch = null) { parent::__construct($definition, $markingStore ?? new MethodMarkingStore(true), $dispatcher, $name, $eventsToDispatch); } diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php index 9636402a1db86..8eb0a771714ab 100644 --- a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php +++ b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php @@ -148,7 +148,7 @@ public function testGuardExpressionBlocks() $this->assertTrue($event->isBlocked()); } - private function createEvent(Transition $transition = null) + private function createEvent(?Transition $transition = null) { $subject = new Subject(); $transition = $transition ?? new Transition('name', 'from', 'to'); diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php index 6d84b1937d94d..a109655cd22c2 100644 --- a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php +++ b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php @@ -791,7 +791,7 @@ class EventDispatcherMock implements \Symfony\Contracts\EventDispatcher\EventDis { public $dispatchedEvents = []; - public function dispatch($event, string $eventName = null): object + public function dispatch($event, ?string $eventName = null): object { $this->dispatchedEvents[] = $eventName; diff --git a/src/Symfony/Component/Workflow/TransitionBlocker.php b/src/Symfony/Component/Workflow/TransitionBlocker.php index 9e52cc92a02aa..233cf4d4a4568 100644 --- a/src/Symfony/Component/Workflow/TransitionBlocker.php +++ b/src/Symfony/Component/Workflow/TransitionBlocker.php @@ -67,7 +67,7 @@ public static function createBlockedByExpressionGuardListener(string $expression * Creates a blocker that says the transition cannot be made because of an * unknown reason. */ - public static function createUnknown(string $message = null, int $backtraceFrame = 2): self + public static function createUnknown(?string $message = null, int $backtraceFrame = 2): self { if (null !== $message) { return new static($message, self::UNKNOWN); diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php index 12a0bab57a040..965face7fa499 100644 --- a/src/Symfony/Component/Workflow/Workflow.php +++ b/src/Symfony/Component/Workflow/Workflow.php @@ -67,7 +67,7 @@ class Workflow implements WorkflowInterface */ private $eventsToDispatch = null; - public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', array $eventsToDispatch = null) + public function __construct(Definition $definition, ?MarkingStoreInterface $markingStore = null, ?EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', ?array $eventsToDispatch = null) { $this->definition = $definition; $this->markingStore = $markingStore ?? new MethodMarkingStore(); diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php index 3ebd570e760e7..6eac39983ba0e 100644 --- a/src/Symfony/Component/Yaml/Command/LintCommand.php +++ b/src/Symfony/Component/Yaml/Command/LintCommand.php @@ -43,7 +43,7 @@ class LintCommand extends Command private $directoryIteratorProvider; private $isReadableProvider; - public function __construct(string $name = null, callable $directoryIteratorProvider = null, callable $isReadableProvider = null) + public function __construct(?string $name = null, ?callable $directoryIteratorProvider = null, ?callable $isReadableProvider = null) { parent::__construct($name); @@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output) return $this->display($io, $filesInfo); } - private function validate(string $content, int $flags, string $file = null) + private function validate(string $content, int $flags, ?string $file = null) { $prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) { if (\E_USER_DEPRECATED === $level) { diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php index 8748d2b228a6f..9b59ea30eacf3 100644 --- a/src/Symfony/Component/Yaml/Exception/ParseException.php +++ b/src/Symfony/Component/Yaml/Exception/ParseException.php @@ -29,7 +29,7 @@ class ParseException extends RuntimeException * @param string|null $snippet The snippet of code near the problem * @param string|null $parsedFile The file name where the error occurred */ - public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Throwable $previous = null) + public function __construct(string $message, int $parsedLine = -1, ?string $snippet = null, ?string $parsedFile = null, ?\Throwable $previous = null) { $this->parsedFile = $parsedFile; $this->parsedLine = $parsedLine; diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 712add900a5d0..36cc404a9c445 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -34,7 +34,7 @@ class Inline private static $objectForMap = false; private static $constantSupport = false; - public static function initialize(int $flags, int $parsedLineNumber = null, string $parsedFilename = null) + public static function initialize(int $flags, ?int $parsedLineNumber = null, ?string $parsedFilename = null) { self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags); self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags); @@ -58,7 +58,7 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri * * @throws ParseException */ - public static function parse(string $value = null, int $flags = 0, array &$references = []) + public static function parse(?string $value = null, int $flags = 0, array &$references = []) { if (null === $value) { return ''; @@ -269,7 +269,7 @@ private static function dumpNull(int $flags): string * * @throws ParseException When malformed inline YAML string is parsed */ - public static function parseScalar(string $scalar, int $flags = 0, array $delimiters = null, int &$i = 0, bool $evaluate = true, array &$references = [], bool &$isQuoted = null) + public static function parseScalar(string $scalar, int $flags = 0, ?array $delimiters = null, int &$i = 0, bool $evaluate = true, array &$references = [], ?bool &$isQuoted = null) { if (\in_array($scalar[$i], ['"', "'"], true)) { // quoted scalar @@ -562,7 +562,7 @@ private static function parseMapping(string $mapping, int $flags, int &$i = 0, a * * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved */ - private static function evaluateScalar(string $scalar, int $flags, array &$references = [], bool &$isQuotedString = null) + private static function evaluateScalar(string $scalar, int $flags, array &$references = [], ?bool &$isQuotedString = null) { $isQuotedString = false; $scalar = trim($scalar); diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php index e4bacd7856c7e..1b193ee6e917f 100644 --- a/src/Symfony/Component/Yaml/Parser.php +++ b/src/Symfony/Component/Yaml/Parser.php @@ -576,7 +576,7 @@ private function getCurrentLineIndentation(): int * * @throws ParseException When indentation problem are detected */ - private function getNextEmbedBlock(int $indentation = null, bool $inSequence = false): string + private function getNextEmbedBlock(?int $indentation = null, bool $inSequence = false): string { $oldLineIndentation = $this->getCurrentLineIndentation(); @@ -1082,7 +1082,7 @@ private function isStringUnIndentedCollectionItem(): bool * * @internal */ - public static function preg_match(string $pattern, string $subject, array &$matches = null, int $flags = 0, int $offset = 0): int + public static function preg_match(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): int { if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) { switch (preg_last_error()) { diff --git a/src/Symfony/Contracts/Cache/CacheInterface.php b/src/Symfony/Contracts/Cache/CacheInterface.php index 5244a2d0de5e9..70cb0d5446949 100644 --- a/src/Symfony/Contracts/Cache/CacheInterface.php +++ b/src/Symfony/Contracts/Cache/CacheInterface.php @@ -42,7 +42,7 @@ interface CacheInterface * * @throws InvalidArgumentException When $key is not valid or when $beta is negative */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null); + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null); /** * Removes an item from the pool. diff --git a/src/Symfony/Contracts/Cache/CacheTrait.php b/src/Symfony/Contracts/Cache/CacheTrait.php index d340e069623f9..b9feafbc6ac62 100644 --- a/src/Symfony/Contracts/Cache/CacheTrait.php +++ b/src/Symfony/Contracts/Cache/CacheTrait.php @@ -30,7 +30,7 @@ trait CacheTrait * * @return mixed */ - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null) + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null) { return $this->doGet($this, $key, $callback, $beta, $metadata); } @@ -43,7 +43,7 @@ public function delete(string $key): bool return $this->deleteItem($key); } - private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null, LoggerInterface $logger = null) + private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, ?array &$metadata = null, ?LoggerInterface $logger = null) { if (0 > $beta = $beta ?? 1.0) { throw new class(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta)) extends \InvalidArgumentException implements InvalidArgumentException { }; diff --git a/src/Symfony/Contracts/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Contracts/EventDispatcher/EventDispatcherInterface.php index 351dc51312cc6..81f4e89fd03c5 100644 --- a/src/Symfony/Contracts/EventDispatcher/EventDispatcherInterface.php +++ b/src/Symfony/Contracts/EventDispatcher/EventDispatcherInterface.php @@ -27,5 +27,5 @@ interface EventDispatcherInterface extends PsrEventDispatcherInterface * * @return object The passed $event MUST be returned */ - public function dispatch(object $event, string $eventName = null): object; + public function dispatch(object $event, ?string $eventName = null): object; } diff --git a/src/Symfony/Contracts/HttpClient/HttpClientInterface.php b/src/Symfony/Contracts/HttpClient/HttpClientInterface.php index 9c96629b9ac02..73a7cb517edcd 100644 --- a/src/Symfony/Contracts/HttpClient/HttpClientInterface.php +++ b/src/Symfony/Contracts/HttpClient/HttpClientInterface.php @@ -91,5 +91,5 @@ public function request(string $method, string $url, array $options = []): Respo * @param ResponseInterface|iterable $responses One or more responses created by the current HTTP client * @param float|null $timeout The idle timeout before yielding timeout chunks */ - public function stream($responses, float $timeout = null): ResponseStreamInterface; + public function stream($responses, ?float $timeout = null): ResponseStreamInterface; } diff --git a/src/Symfony/Contracts/HttpClient/ResponseInterface.php b/src/Symfony/Contracts/HttpClient/ResponseInterface.php index df7148816e3e2..7c84a98ab267f 100644 --- a/src/Symfony/Contracts/HttpClient/ResponseInterface.php +++ b/src/Symfony/Contracts/HttpClient/ResponseInterface.php @@ -105,5 +105,5 @@ public function cancel(): void; * @return mixed An array of all available info, or one of them when $type is * provided, or null when an unsupported type is requested */ - public function getInfo(string $type = null); + public function getInfo(?string $type = null); } diff --git a/src/Symfony/Contracts/Translation/TranslatableInterface.php b/src/Symfony/Contracts/Translation/TranslatableInterface.php index 47fd6fa029f04..8554697ec018d 100644 --- a/src/Symfony/Contracts/Translation/TranslatableInterface.php +++ b/src/Symfony/Contracts/Translation/TranslatableInterface.php @@ -16,5 +16,5 @@ */ interface TranslatableInterface { - public function trans(TranslatorInterface $translator, string $locale = null): string; + public function trans(TranslatorInterface $translator, ?string $locale = null): string; } diff --git a/src/Symfony/Contracts/Translation/TranslatorInterface.php b/src/Symfony/Contracts/Translation/TranslatorInterface.php index 77b7a9c586079..85ca166bf70bb 100644 --- a/src/Symfony/Contracts/Translation/TranslatorInterface.php +++ b/src/Symfony/Contracts/Translation/TranslatorInterface.php @@ -63,5 +63,5 @@ interface TranslatorInterface * * @throws \InvalidArgumentException If the locale contains invalid characters */ - public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null); + public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null); } diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php index 405ce8d70d3e1..ac01d730a33eb 100644 --- a/src/Symfony/Contracts/Translation/TranslatorTrait.php +++ b/src/Symfony/Contracts/Translation/TranslatorTrait.php @@ -43,7 +43,7 @@ public function getLocale() /** * {@inheritdoc} */ - public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string + public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string { if (null === $id || '' === $id) { return '';