From 36dece58f7885bc83217f1a5e00f2fbaf6342889 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 30 Jun 2021 10:15:30 +0200 Subject: [PATCH 1/5] Update CHANGELOG for 4.4.26 --- CHANGELOG-4.4.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG-4.4.md b/CHANGELOG-4.4.md index 87e51995fc..d31628e66b 100644 --- a/CHANGELOG-4.4.md +++ b/CHANGELOG-4.4.md @@ -7,6 +7,34 @@ in 4.4 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.4.0...v4.4.1 +* 4.4.26 (2021-06-30) + + * bug #41893 [Filesystem] Workaround cannot dumpFile into "protected" folders on Windows (arnegroskurth) + * bug #41665 [HttpKernel] Keep max lifetime also when part of the responses don't set it (mpdude) + * bug #41760 [ErrorHandler] fix handling buffered SilencedErrorContext (nicolas-grekas) + * bug #41807 [HttpClient] fix Psr18Client when allow_url_fopen=0 (nicolas-grekas) + * bug #40857 [DependencyInjection] Add support of PHP enumerations (alexandre-daubois) + * bug #41767 [Config] fix tracking default values that reference the parent class (nicolas-grekas) + * bug #41768 [DependencyInjection] Fix binding "iterable $foo" when using the PHP-DSL (nicolas-grekas) + * bug #41793 [Cache] handle prefixed redis connections when clearing pools (nicolas-grekas) + * bug #41804 [Cache] fix eventual consistency when using RedisTagAwareAdapter with a cluster (nicolas-grekas) + * bug #41773 [Cache] Disable locking on Windows by default (nicolas-grekas) + * bug #41655 [Mailer] fix encoding of addresses using SmtpTransport (dmaicher) + * bug #41663 [HttpKernel] [HttpCache] Keep s-maxage=0 from ESI sub-responses (mpdude) + * bug #41701 [VarDumper] Fix tests for PHP 8.1 (alexandre-daubois) + * bug #41795 [FrameworkBundle] Replace var_export with VarExporter to use array short syntax in secrets list files (alexandre-daubois) + * bug #41779 [DependencyInjection] throw proper exception when decorating a synthetic service (nicolas-grekas) + * bug #41776 [ErrorHandler] [DebugClassLoader] Do not check Phake mocks classes (adoy) + * bug #41780 [PhpUnitBridge] fix handling the COMPOSER_BINARY env var when using simple-phpunit (Taluu) + * bug #41670 [HttpFoundation] allow savePath of NativeFileSessionHandler to be null (simon.chrzanowski) + * bug #41644 [Config] fix tracking attributes in ReflectionClassResource (nicolas-grekas) + * bug #41621 [Process] Fix incorrect parameter type (bch36) + * bug #41624 [HttpClient] Revert bindto workaround for unaffected PHP versions (derrabus) + * bug #41549 [Security] Fix opcache preload with alias classes (jderusse) + * bug #41491 [Serializer] Do not allow to denormalize string with spaces only to valid a DateTime object (sidz) + * bug #41386 [Console] Escape synopsis output (jschaedl) + * bug #41495 [HttpFoundation] Add ReturnTypeWillChange to SessionHandlers (nikic) + * 4.4.25 (2021-06-01) * bug #41000 [Form] Use !isset for checks cause this doesn't falsely include 0 (Kai Dederichs) From f5a5e5b108bda4c586b9d104ba4e0d9a253920b5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 30 Jun 2021 10:17:21 +0200 Subject: [PATCH 2/5] Update CONTRIBUTORS for 4.4.26 --- CONTRIBUTORS.md | 53 ++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3119570984..275042f9e0 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -13,8 +13,8 @@ The Symfony Connect username in parenthesis allows to get more information - Robin Chalas (chalas_r) - Christophe Coevoet (stof) - Maxime Steinhausser (ogizanagi) - - Kévin Dunglas (dunglas) - Jérémy DERUSSÉ (jderusse) + - Kévin Dunglas (dunglas) - Grégoire Pineau (lyrixx) - Wouter De Jong (wouterj) - Jordi Boggiano (seldaek) @@ -43,8 +43,8 @@ The Symfony Connect username in parenthesis allows to get more information - Jeremy Mikola (jmikola) - Jean-François Simon (jfsimon) - Benjamin Eberlei (beberlei) - - Igor Wiedler (igorw) - Jan Schädlich (jschaedl) + - Igor Wiedler (igorw) - Eriksen Costa (eriksencosta) - Ener-Getick (energetick) - Sarah Khalil (saro0h) @@ -112,10 +112,10 @@ The Symfony Connect username in parenthesis allows to get more information - Bart van den Burg (burgov) - Jordan Alliot (jalliot) - John Wards (johnwards) + - Baptiste Clavié (talus) - Antoine Hérault (herzult) - Paráda József (paradajozsef) - Alexander Schranz (alexander-schranz) - - Baptiste Clavié (talus) - Arnaud Le Blanc (arnaud-lb) - Przemysław Bogusz (przemyslaw-bogusz) - Maxime STEINHAUSSER @@ -138,6 +138,7 @@ The Symfony Connect username in parenthesis allows to get more information - Włodzimierz Gajda (gajdaw) - Christian Scheb - Adrien Brault (adrienbrault) + - Tomas Norkūnas (norkunas) - Julien Falque (julienfalque) - Jacob Dreesen (jdreesen) - Malte Schlüter (maltemaltesich) @@ -147,21 +148,20 @@ The Symfony Connect username in parenthesis allows to get more information - Colin Frei - Javier Spagnoletti (phansys) - Joshua Thijssen - - Tomas Norkūnas (norkunas) - Yanick Witschi (toflar) - Daniel Wehner (dawehner) - Tugdual Saunier (tucksaun) - excelwebzone - Gordon Franke (gimler) - Saif Eddin Gmati (azjezz) + - HypeMC (hypemc) - Jesse Rushlow (geeshoe) - Fabien Pennequin (fabienpennequin) - Théo FIDRY (theofidry) + - Olivier Dolbeau (odolbeau) - Eric GELOEN (gelo) - Matthieu Napoli (mnapoli) - - HypeMC (hypemc) - Jannik Zschiesche (apfelbox) - - Olivier Dolbeau (odolbeau) - Robert Schönthal (digitalkaoz) - Florian Lonqueu-Brochard (florianlb) - Tigran Azatyan (tigranazatyan) @@ -202,12 +202,14 @@ The Symfony Connect username in parenthesis allows to get more information - Andreas Schempp (aschempp) - Romaric Drigon (romaricdrigon) - Arman Hosseini (arman) + - Alexandre Daubois (alexandre-daubois) - Niels Keurentjes (curry684) - Vyacheslav Pavlov - Richard Shank (iampersistent) - Wouter J - Thomas Rabaix (rande) - Chi-teck + - Mathieu Santostefano (welcomattic) - Jeroen Spee (jeroens) - Timo Bakx (timobakx) - Marco Pivetta (ocramius) @@ -233,9 +235,9 @@ The Symfony Connect username in parenthesis allows to get more information - GDIBass - Samuel NELA (snela) - David Prévot - - Mathieu Santostefano - Dmitrii Poddubnyi (karser) - Joe Bennett (kralos) + - Michael Babker (mbabker) - Tien Vo (tienvx) - Timothée Barray (tyx) - James Halsall (jaitsu) @@ -244,6 +246,7 @@ The Symfony Connect username in parenthesis allows to get more information - Benjamin Leveque (benji07) - Dmitrii Chekaliuk (lazyhammer) - Clément JOBEILI (dator) + - Mathieu Lechat (mat_the_cat) - Marek Štípek (maryo) - Daniel Espendiller - Possum @@ -257,6 +260,7 @@ The Symfony Connect username in parenthesis allows to get more information - Christopher Hertel (chertel) - DQNEO - Hidde Wieringa (hiddewie) + - Hugo Monteiro (monteiro) - Antonio Pauletich (x-coder264) - Andre Rømcke (andrerom) - Nate Wiebe (natewiebe13) @@ -275,7 +279,6 @@ The Symfony Connect username in parenthesis allows to get more information - Tom Van Looy (tvlooy) - Guillaume Pédelagrabe - Noel Guilbert (noel) - - Mathieu Lechat (mat_the_cat) - Anthony GRASSIOT (antograssiot) - Stadly - Stepan Anchugov (kix) @@ -296,12 +299,10 @@ The Symfony Connect username in parenthesis allows to get more information - Pierre Minnieur (pminnieur) - fivestar - Dominique Bongiraud - - Hugo Monteiro (monteiro) - dFayet - Jeremy Livingston (jeremylivingston) - Michael Lee (zerustech) - Matthieu Auger (matthieuauger) - - Michael Babker (mbabker) - Leszek Prabucki (l3l0) - Nicolas Philippe (nikophil) - Colin O'Dell (colinodell) @@ -312,15 +313,17 @@ The Symfony Connect username in parenthesis allows to get more information - John Kary (johnkary) - Justin Hileman (bobthecow) - Blanchon Vincent (blanchonvincent) + - Denis Brumann (dbrumann) - Michele Orselli (orso) - Sven Paulus (subsven) - Daniel STANCU - Maxime Veber (nek-) + - Ion Bazan (ionbazan) - Loick Piera (pyrech) - Clara van Miert + - Valentine Boineau (valentineboineau) - Bastien Jaillot (bastnic) - Rui Marinho (ruimarinho) - - Alexandre Daubois (alexandre-daubois) - Eugene Wissner - Bohan Yang (brentybh) - Pascal Montoya @@ -363,7 +366,6 @@ The Symfony Connect username in parenthesis allows to get more information - Roman Marintšenko (inori) - Xavier Montaña Carreras (xmontana) - Mickaël Andrieu (mickaelandrieu) - - Ion Bazan (ionbazan) - Xavier Perez - Arjen Brouwer (arjenjb) - Katsuhiro OGAWA @@ -374,7 +376,6 @@ The Symfony Connect username in parenthesis allows to get more information - Anton Chernikov (anton_ch1989) - Kristen Gilden (kgilden) - Pierre-Yves LEBECQ (pylebecq) - - Denis Brumann (dbrumann) - Jordan Samouh (jordansamouh) - Jakub Kucharovic (jkucharovic) - Sullivan SENECHAL (soullivaneuh) @@ -489,6 +490,7 @@ The Symfony Connect username in parenthesis allows to get more information - Loïc Frémont (loic425) - Oleksandr Barabolia (oleksandrbarabolia) - ivan + - Artem Henvald (artemgenvald) - Greg Anderson - Tri Pham (phamuyentri) - BoShurik @@ -523,6 +525,7 @@ The Symfony Connect username in parenthesis allows to get more information - Terje Bråten - Renan Gonçalves (renan_saddam) - Marco Petersen (ocrampete16) + - Tarmo Leppänen (tarlepp) - Martin Auswöger - Robbert Klarenbeek (robbertkl) - Eric Masoero (eric-masoero) @@ -556,7 +559,6 @@ The Symfony Connect username in parenthesis allows to get more information - Tamas Szijarto - Michele Locati - Pavel Volokitin (pvolok) - - Valentine Boineau (valentineboineau) - Gijs van Lammeren - Arthur de Moulins (4rthem) - Matthias Althaus (althaus) @@ -616,7 +618,6 @@ The Symfony Connect username in parenthesis allows to get more information - Christopher Davis (chrisguitarguy) - Andrey Sevastianov - Webnet team (webnet) - - Artem Henvald (artemgenvald) - marie - Jan Schumann - Noémi Salaün (noemi-salaun) @@ -643,6 +644,7 @@ The Symfony Connect username in parenthesis allows to get more information - Xavier Briand (xavierbriand) - Asmir Mustafic (goetas) - DerManoMann + - Stefan Gehrig (sgehrig) - vagrant - Aurimas Niekis (gcds) - EdgarPE @@ -674,7 +676,6 @@ The Symfony Connect username in parenthesis allows to get more information - Soner Sayakci - Tobias Weichart - Miro Michalicka - - Tarmo Leppänen (tarlepp) - Marcin Sikoń (marphi) - M. Vondano - Dominik Zogg (dominik.zogg) @@ -786,6 +787,7 @@ The Symfony Connect username in parenthesis allows to get more information - Joachim Løvgaard (loevgaard) - jhonnyL - sasezaki + - Jonathan Scheiber (jmsche) - Kristof Van Cauwenbergh (kristofvc) - Dawid Pakuła (zulusx) - Marco Lipparini (liarco) @@ -832,6 +834,7 @@ The Symfony Connect username in parenthesis allows to get more information - Pablo Lozano (arkadis) - Thiago Cordeiro (thiagocordeiro) - Jan Behrens + - Dragos Protung (dragosprotung) - Mantas Var (mvar) - Terje Bråten - Yann LUCAS (drixs6o9) @@ -912,7 +915,6 @@ The Symfony Connect username in parenthesis allows to get more information - Julien Fredon - Jacek Wilczyński (jacekwilczynski) - Xavier Leune (xleune) - - Stefan Gehrig (sgehrig) - Hany el-Kerdany - Wang Jingyu - Åsmund Garfors @@ -1075,6 +1077,7 @@ The Symfony Connect username in parenthesis allows to get more information - Andrea Sprega (asprega) - Alexander Volochnev (exelenz) - Viktor Bajraktar (njutn95) + - SiD (plbsid) - Mbechezi Nawo - Michael Piecko - Toni Peric (tperic) @@ -1223,7 +1226,6 @@ The Symfony Connect username in parenthesis allows to get more information - Bernhard Rusch - Ivan - Quentin Schuler - - Jonathan Scheiber (jmsche) - Pierre Vanliefland (pvanliefland) - Roy Klutman (royklutman) - Sofiane HADDAG (sofhad) @@ -1231,6 +1233,7 @@ The Symfony Connect username in parenthesis allows to get more information - Taylor Otwell - Dries Vints - Sami Mussbach + - Kien Nguyen - Foxprodev - Eric Hertwig - Niels Robin-Aubertin @@ -1391,7 +1394,6 @@ The Symfony Connect username in parenthesis allows to get more information - Andre Johnson - Marco Pfeiffer - Rootie - - Dragos Protung (dragosprotung) - Gabriel Solomon (gabrielsolomon) - Daniel Alejandro Castro Arellano (lexcast) - Aleksandar Dimitrov (netbull) @@ -1454,6 +1456,7 @@ The Symfony Connect username in parenthesis allows to get more information - Amirreza Shafaat (amirrezashafaat) - Adoni Pavlakis (adoni) - Nicolas Le Goff (nlegoff) + - Maarten Nusteling (nusje2000) - Ahmed EBEN HASSINE (famas23) - Ben Oman - Chris de Kok @@ -1464,6 +1467,7 @@ The Symfony Connect username in parenthesis allows to get more information - Irmantas Šiupšinskas (irmantas) - Danilo Silva - Giuseppe Campanelli + - Matthieu Calie (matth--) - Arnaud PETITPAS (apetitpa) - Ken Stanley - ivan @@ -1651,6 +1655,7 @@ The Symfony Connect username in parenthesis allows to get more information - Loïc Ovigne (oviglo) - Artem Kolesnikov (tyomo4ka) - Markkus Millend + - Clément - Gustavo Adrian - Jorrit Schippers (jorrit) - Yannick @@ -1664,6 +1669,7 @@ The Symfony Connect username in parenthesis allows to get more information - Amine Yakoubi - Eduardo García Sanz (coma) - Sergio (deverad) + - simon chrzanowski (simonch) - Makdessi Alex - James Gilliland - fduch (fduch) @@ -1677,7 +1683,6 @@ The Symfony Connect username in parenthesis allows to get more information - arnaud (arnooo999) - Gilles Doge (gido) - Oscar Esteve (oesteve) - - SiD (plbsid) - abulford - Philipp Kretzschmar - antograssiot @@ -1901,6 +1906,7 @@ The Symfony Connect username in parenthesis allows to get more information - Daniel González Zaballos (dem3trio) - Emmanuel Vella (emmanuel.vella) - Guillaume BRETOU (guiguiboy) + - Nikita Popov (nikic) - Carsten Nielsen (phreaknerd) - Jay Severson - Benny Born @@ -1938,6 +1944,7 @@ The Symfony Connect username in parenthesis allows to get more information - r1pp3rj4ck - phydevs - mmokhi + - Serhii Smirnov - Robert Queck - Peter Bouwdewijn - mlively @@ -1961,6 +1968,7 @@ The Symfony Connect username in parenthesis allows to get more information - Matthew J Mucklo - AnrDaemon - Emre Akinci (emre) + - Chris Maiden (matason) - fdgdfg (psampaz) - Andrea Ruggiero (pupax) - Stéphane Seng @@ -1976,6 +1984,7 @@ The Symfony Connect username in parenthesis allows to get more information - Valentin VALCIU - Jeremiah VALERIE - Julien Menth + - George Yiannoulopoulos - Yannick Snobbert - Kevin Dew - James Cowgill @@ -2516,6 +2525,7 @@ The Symfony Connect username in parenthesis allows to get more information - Youpie - Jason Stephens - srsbiz + - Tinjo Schöni - Taylan Kasap - Michael Orlitzky - Nicolas A. Bérard-Nault @@ -2625,6 +2635,7 @@ The Symfony Connect username in parenthesis allows to get more information - Michal Forbak - Drew Butler - Alexey Berezuev + - Pierrick Charron - Steve Müller - Andras Ratz - andreabreu98 @@ -2636,10 +2647,12 @@ The Symfony Connect username in parenthesis allows to get more information - Anatol Belski - Şəhriyar İmanov - Alexis BOYER + - bch36 - Kaipi Yann - adam-mospan - Steve Hyde - Sam Williams + - Ettore Del Negro - Guillaume Aveline - Adrian Philipp - James Michael DuPont From 689e2967e5073d60e8b1017e70aa0fac7d533777 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 30 Jun 2021 10:18:06 +0200 Subject: [PATCH 3/5] Update VERSION for 4.4.26 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 819c60538f..1275f12e7a 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - public const VERSION = '4.4.26-DEV'; + public const VERSION = '4.4.26'; public const VERSION_ID = 40426; public const MAJOR_VERSION = 4; public const MINOR_VERSION = 4; public const RELEASE_VERSION = 26; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '11/2022'; public const END_OF_LIFE = '11/2023'; From ffb4795104ba4cfacbc84c47b8f76c5cd32ab07e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 30 Jun 2021 10:22:49 +0200 Subject: [PATCH 4/5] Bump Symfony version to 4.4.27 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 1275f12e7a..1c46d1cbb5 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - public const VERSION = '4.4.26'; - public const VERSION_ID = 40426; + public const VERSION = '4.4.27-DEV'; + public const VERSION_ID = 40427; public const MAJOR_VERSION = 4; public const MINOR_VERSION = 4; - public const RELEASE_VERSION = 26; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 27; + public const EXTRA_VERSION = 'DEV'; public const END_OF_MAINTENANCE = '11/2022'; public const END_OF_LIFE = '11/2023'; From 31e1a978f5d2b7899eb2edff8a6f9b2bc4863b0f Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 30 Jun 2021 15:02:00 +0200 Subject: [PATCH 5/5] CS fixes --- .php-cs-fixer.dist.php | 1 + src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php | 3 --- .../Tests/Functional/app/CachePools/bundles.php | 1 - .../Component/Cache/Tests/Adapter/ArrayAdapterTest.php | 2 +- .../Config/Tests/Definition/Builder/ExprBuilderTest.php | 2 +- .../Config/Tests/Resource/ReflectionClassResourceTest.php | 2 +- .../Storage/Handler/MemcachedSessionHandlerTest.php | 2 +- src/Symfony/Component/Mailer/Transport/Dsn.php | 2 +- src/Symfony/Component/Yaml/Exception/ParseException.php | 8 ++++---- 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 583be2ac59..fdb481fd19 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -11,6 +11,7 @@ return (new PhpCsFixer\Config()) '@Symfony' => true, '@Symfony:risky' => true, 'protected_to_private' => false, + 'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false], ]) ->setRiskyAllowed(true) ->setFinder( diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php index 5ddd60df8e..a004935a6a 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php @@ -19,9 +19,6 @@ class ManagerRegistryTest extends TestCase { public static function setUpBeforeClass(): void { - if (!class_exists(\PHPUnit_Framework_TestCase::class)) { - self::markTestSkipped('proxy-manager-bridge is not yet compatible with namespaced phpunit versions.'); - } $test = new PhpDumperTest(); $test->testDumpContainerWithProxyServiceWillShareProxies(); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php index 2e46e896bc..13ab9fddee 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php @@ -10,7 +10,6 @@ */ use Symfony\Bundle\FrameworkBundle\FrameworkBundle; -use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle; return [ new FrameworkBundle(), diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php index 9292b1c962..5ed33cee77 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php @@ -49,7 +49,7 @@ class ArrayAdapterTest extends AdapterTestCase // Fail (should be missing from $values) $item = $cache->getItem('buz'); - $cache->save($item->set(function() {})); + $cache->save($item->set(function () {})); $values = $cache->getValues(); diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php index 74ae972e54..bec4275404 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php @@ -225,7 +225,7 @@ class ExprBuilderTest extends TestCase * * @return array The finalized config values */ - 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/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php index 8ba3a8c2c9..e097205e8c 100644 --- a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php +++ b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php @@ -64,7 +64,7 @@ class ReflectionClassResourceTest extends TestCase /** * @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/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php index a7f7e8f817..200567a29d 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php @@ -40,7 +40,7 @@ class MemcachedSessionHandlerTest extends TestCase $r = new \ReflectionClass(\Memcached::class); $methodsToMock = array_map(function ($m) { return $m->name; }, $r->getMethods(\ReflectionMethod::IS_PUBLIC)); - $methodsToMock = array_diff($methodsToMock, ['getDelayed','getDelayedByKey']); + $methodsToMock = array_diff($methodsToMock, ['getDelayed', 'getDelayedByKey']); $this->memcached = $this->getMockBuilder(\Memcached::class) ->disableOriginalConstructor() diff --git a/src/Symfony/Component/Mailer/Transport/Dsn.php b/src/Symfony/Component/Mailer/Transport/Dsn.php index cc25f7a237..04d3540f7b 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; diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php index c75066da2d..82c05a714f 100644 --- a/src/Symfony/Component/Yaml/Exception/ParseException.php +++ b/src/Symfony/Component/Yaml/Exception/ParseException.php @@ -24,10 +24,10 @@ class ParseException extends RuntimeException private $rawMessage; /** - * @param string $message The error message - * @param int $parsedLine The line where the error occurred - * @param string|null $snippet The snippet of code near the problem - * @param string|null $parsedFile The file name where the error occurred + * @param string $message The error message + * @param int $parsedLine The line where the error occurred + * @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) {