diff --git a/.appveyor.yml b/.appveyor.yml
index 09fa4fbc5954b..e536bf33d2201 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,7 @@ init:
- SET SYMFONY_DEPRECATIONS_HELPER=strict
- SET ANSICON=121x90 (121x90)
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
- - SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
+ - SET SYMFONY_DEPRECATIONS_HELPER=max[direct]=1
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
install:
@@ -49,12 +49,10 @@ install:
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
- php composer.phar self-update --2
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
- - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
- git config --global user.email ""
- git config --global user.name "Symfony"
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F)
- php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
- - SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
- php composer.phar update --no-progress --ansi
- php phpunit install
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 91fcd5ea0f79e..b6a13a19f76d1 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -157,6 +157,7 @@ jobs:
- name: Run tests
run: ./phpunit --group integration -v
env:
+ SYMFONY_DEPRECATIONS_HELPER: max[direct]=1 # to be removed once DbalLogger is compatible with dbal 3.2+
REDIS_HOST: localhost
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
REDIS_SENTINEL_HOSTS: 'localhost:26379'
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 09e0b1f25d6b0..42bc28c6622b7 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -62,6 +62,7 @@ jobs:
echo COLUMNS=120 >> $GITHUB_ENV
echo PHPUNIT="$(readlink -f ./phpunit) --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
+ echo SYMFONY_DEPRECATIONS_HELPER=max[direct]=1 >> $GITHUB_ENV # to be removed once DbalLogger is compatible with dbal 3.2+
SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
SYMFONY_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+')
diff --git a/CHANGELOG-6.0.md b/CHANGELOG-6.0.md
index 0023f5b2f2c73..969f4134161ff 100644
--- a/CHANGELOG-6.0.md
+++ b/CHANGELOG-6.0.md
@@ -7,6 +7,27 @@ in 6.0 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/v6.0.0...v6.0.1
+* 6.0.0-RC1 (2021-11-24)
+
+ * security #cve-2021-41268 [SecurityBundle] Default signature_properties to the previous behavior (wouterj)
+ * security #cve-2021-41267 [HttpKernel] Fix missing extra trusted header in sub-request (jderusse)
+ * security #cve-2021-41270 [Serializer] Use single quote to escape formulas (jderusse)
+ * bug #44230 [Console] Add Suggestion class for more advanced completion suggestion (wouterj)
+ * bug #44232 [Cache] fix connecting to local Redis sockets (nicolas-grekas)
+ * bug #44204 [HttpClient] fix closing curl multi handle when destructing client (nicolas-grekas)
+ * bug #44208 [Process] exclude argv/argc from possible default env vars (nicolas-grekas)
+ * bug #44188 [VarExporter] fix exporting declared but unset properties when __sleep() is implemented (nicolas-grekas)
+ * bug #44176 [Console] Default ansi option to null (jderusse)
+ * bug #44179 [WebProfilerBundle] Fix JS error when toolbar is reloaded (jderusse)
+ * bug #44177 [SecurityBundle] Remove Guard (derrabus)
+ * bug #44172 [Security] Guard is incompatible with Symfony 6 (derrabus)
+ * bug #44119 [HttpClient][Mime] Add correct IDN flags for IDNA2008 compliance (j-bernard)
+ * bug #44139 [WebProfilerBundle] Prevent installation of incompatible mailer component versions (Anne-Julia Seitz)
+ * bug #43917 Allow autodetecting mapping type for any object (franmomu)
+ * bug #44130 [SecurityBundle] Remove outdated conditions based on authenticatorManagerEnabled (chalasr)
+ * bug #44131 [Yaml] properly parse quoted strings tagged with !!str (xabbuh)
+ * bug #42323 [TwigBridge] do not merge label classes into expanded choice labels (xabbuh)
+
* 6.0.0-BETA3 (2021-11-18)
* feature #44125 Add a setter on DateTimeNormalizer to change the default context at runtime (Seldaek)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 1ac10f641e698..92b9b528b9c50 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -20,9 +20,9 @@ The Symfony Connect username in parenthesis allows to get more information
- Jordi Boggiano (seldaek)
- Victor Berchet (victor)
- Javier Eguiluz (javier.eguiluz)
+ - Thomas Calvet (fancyweb)
- Ryan Weaver (weaverryan)
- Roland Franssen (ro0)
- - Thomas Calvet (fancyweb)
- Jakub Zalas (jakubzalas)
- Johannes S (johannes)
- Kris Wallsmith (kriswallsmith)
@@ -46,20 +46,21 @@ The Symfony Connect username in parenthesis allows to get more information
- Jan Schädlich (jschaedl)
- Igor Wiedler (igorw)
- Eriksen Costa (eriksencosta)
+ - Kevin Bond (kbond)
- Ener-Getick (energetick)
- Sarah Khalil (saro0h)
- - Kevin Bond (kbond)
- Pierre du Plessis (pierredup)
+ - Vasilij Duško (staff)
- Valentin Udaltsov (vudaltsov)
- Iltar van der Berg (kjarli)
- Jonathan Wage (jwage)
- - Vasilij Duško (staff)
- Matthias Pigulla (mpdude)
- Diego Saint Esteben (dosten)
- Grégoire Paris (greg0ire)
- Alexandre Salomé (alexandresalome)
- William Durand (couac)
- ornicar
+ - Jérôme Tamarelle (gromnan)
- Konstantin Myakshin (koc)
- Dany Maillard (maidmaid)
- Francis Besset (francisbesset)
@@ -68,13 +69,12 @@ The Symfony Connect username in parenthesis allows to get more information
- Titouan Galopin (tgalopin)
- Laurent VOULLEMIER (lvo)
- Vasilij Dusko | CREATION
- - Jérôme Tamarelle (gromnan)
- Bulat Shakirzyanov (avalanche123)
- David Maicher (dmaicher)
+ - Gábor Egyed (1ed)
- gadelat (gadelat)
- Saša Stamenković (umpirsky)
- Peter Rehm (rpet)
- - Gábor Egyed (1ed)
- Henrik Bjørnskov (henrikbjorn)
- Miha Vrhovnik
- Diego Saint Esteben (dii3g0)
@@ -82,10 +82,10 @@ The Symfony Connect username in parenthesis allows to get more information
- Konstantin Kudryashov (everzet)
- Vladimir Reznichenko (kalessil)
- Bilal Amarni (bamarni)
+ - Antoine M (amakdessi)
- Florin Patan (florinpatan)
- Jáchym Toušek (enumag)
- Alex Pott
- - Antoine M (amakdessi)
- Michel Weimerskirch (mweimerskirch)
- Andrej Hudec (pulzarraider)
- Christian Raue
@@ -112,24 +112,25 @@ The Symfony Connect username in parenthesis allows to get more information
- Toni Uebernickel (havvg)
- Bart van den Burg (burgov)
- Jordan Alliot (jalliot)
+ - Mathieu Santostefano (welcomattic)
- John Wards (johnwards)
- Tomas Norkūnas (norkunas)
- Baptiste Clavié (talus)
- Antoine Hérault (herzult)
- Paráda József (paradajozsef)
+ - Alexandre Daubois (alexandre-daubois)
- Vincent Langlet (deviling)
+ - HypeMC (hypemc)
- Massimiliano Arione (garak)
- Arnaud Le Blanc (arnaud-lb)
- Przemysław Bogusz (przemyslaw-bogusz)
+ - Julien Falque (julienfalque)
- Maxime STEINHAUSSER
- Michal Piotrowski (eventhorizon)
- Tomáš Votruba (tomas_votruba)
- Mathias Arlaud (mtarld)
- Tim Nagel (merk)
- - Alexandre Daubois (alexandre-daubois)
- - HypeMC (hypemc)
- Chris Wilkinson (thewilkybarkid)
- - Julien Falque (julienfalque)
- Peter Kokot (maastermedia)
- Lars Strojny (lstrojny)
- Brice BERNARD (brikou)
@@ -144,7 +145,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Adrien Brault (adrienbrault)
- Yanick Witschi (toflar)
- Jacob Dreesen (jdreesen)
- - Mathieu Santostefano (welcomattic)
- Malte Schlüter (maltemaltesich)
- Joel Wurtz (brouznouf)
- Théo FIDRY (theofidry)
@@ -168,6 +168,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Gary PEGEOT (gary-p)
- Matthieu Napoli (mnapoli)
- Ruud Kamphuis (ruudk)
+ - Ion Bazan (ionbazan)
- Jannik Zschiesche (apfelbox)
- Robert Schönthal (digitalkaoz)
- Florian Lonqueu-Brochard (florianlb)
@@ -186,7 +187,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Hidenori Goto (hidenorigoto)
- Jan Rosier (rosier)
- Alessandro Chitolina (alekitto)
- - Ion Bazan (ionbazan)
- Albert Casademont (acasademont)
- Arnaud Kleinpeter (nanocom)
- Guilherme Blanco (guilhermeblanco)
@@ -202,6 +202,8 @@ The Symfony Connect username in parenthesis allows to get more information
- George Mponos (gmponos)
- jwdeitch
- Jeroen Spee (jeroens)
+ - Jérôme Parmentier (lctrs)
+ - Marco Pivetta (ocramius)
- Fabien Bourigault (fbourigault)
- Joe Bennett (kralos)
- Mikael Pajunen
@@ -216,16 +218,16 @@ The Symfony Connect username in parenthesis allows to get more information
- Thomas Rabaix (rande)
- Chi-teck
- Timo Bakx (timobakx)
- - Marco Pivetta (ocramius)
- Vincent Touzet (vincenttouzet)
- Nate Wiebe (natewiebe13)
- Rouven Weßling (realityking)
- - Jérôme Parmentier (lctrs)
+ - Michael Babker (mbabker)
- Ben Davies (bendavies)
- Clemens Tolboom
- Helmer Aaviksoo
- Christopher Hertel (chertel)
- Remon van de Kamp (rpkamp)
+ - Rokas Mikalkėnas (rokasm)
- Filippo Tessarotto (slamdunk)
- Hiromi Hishida (77web)
- Michael Käfer (michael_kaefer)
@@ -233,6 +235,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Michał Pipa (michal.pipa)
- Dawid Nowak
- Andreas Möller (localheinz)
+ - Roman Martinuk (a2a4)
- Amal Raghav (kertz)
- Jonathan Ingram (jonathaningram)
- Artur Kotyrba
@@ -241,8 +244,9 @@ The Symfony Connect username in parenthesis allows to get more information
- Samuel NELA (snela)
- David Prévot
- Hugo Monteiro (monteiro)
+ - Baptiste Leduc (korbeil)
- Dmitrii Poddubnyi (karser)
- - Michael Babker (mbabker)
+ - zairig imad (zairigimad)
- Tien Vo (tienvx)
- Timothée Barray (tyx)
- James Halsall (jaitsu)
@@ -270,11 +274,9 @@ The Symfony Connect username in parenthesis allows to get more information
- Philippe Segatori
- Thibaut Cheymol (tcheymol)
- Sebastien Morel (plopix)
- - Baptiste Leduc (korbeil)
- mcfedr (mcfedr)
- Ruben Gonzalez (rubenrua)
- Benjamin Dulau (dbenjamin)
- - zairig imad (zairigimad)
- Baptiste Lafontaine (magnetik)
- Mathieu Lemoine (lemoinem)
- Denis Brumann (dbrumann)
@@ -287,13 +289,11 @@ The Symfony Connect username in parenthesis allows to get more information
- Stadly
- Stepan Anchugov (kix)
- François Pluchino (francoispluchino)
- - Rokas Mikalkėnas (rokasm)
- bronze1man
- sun (sun)
- Larry Garfield (crell)
- Edi Modrić (emodric)
- Gocha Ossinkine (ossinkine)
- - Roman Martinuk (a2a4)
- Leo Feyer (leofeyer)
- Nikolay Labinskiy (e-moe)
- Martin Schuhfuß (usefulthink)
@@ -317,6 +317,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Dustin Whittle (dustinwhittle)
- jeff
- John Kary (johnkary)
+ - fd6130 (fdtvui)
- Justin Hileman (bobthecow)
- Blanchon Vincent (blanchonvincent)
- Maciej Malarz (malarzm)
@@ -330,6 +331,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Bastien Jaillot (bastnic)
- Rui Marinho (ruimarinho)
- Patrick Landolt (scube)
+ - Michał (bambucha15)
- Eugene Wissner
- Bohan Yang (brentybh)
- Pascal Montoya
@@ -362,7 +364,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Marcos Sánchez
- Elnur Abdurrakhimov (elnur)
- Manuel Reinhard (sprain)
- - fd6130 (fdtvui)
- Harm van Tilborg (hvt)
- Danny Berger (dpb587)
- Antonio J. García Lagar (ajgarlag)
@@ -375,9 +376,9 @@ The Symfony Connect username in parenthesis allows to get more information
- Xavier Perez
- Arjen Brouwer (arjenjb)
- Katsuhiro OGAWA
+ - Sylvain Fabre (sylfabre)
- Patrick McDougle (patrick-mcdougle)
- Marc Weistroff (futurecat)
- - Michał (bambucha15)
- Alif Rachmawadi
- Anton Chernikov (anton_ch1989)
- Kristen Gilden (kgilden)
@@ -387,6 +388,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Sullivan SENECHAL (soullivaneuh)
- Thomas Bisignani (toma)
- Uwe Jäger (uwej711)
+ - Dāvis Zālītis (k0d3r1s)
- Eugene Leonovich (rybakit)
- Joseph Rouff (rouffj)
- Félix Labrecque (woodspire)
@@ -395,11 +397,13 @@ The Symfony Connect username in parenthesis allows to get more information
- Jan Sorgalla (jsor)
- Ray
- Chekote
+ - Aleksandar Jakovljevic (ajakov)
- Thomas Adam
- Jhonny Lidfors (jhonne)
- Diego Agulló (aeoris)
- jdhoek
- Thomas Landauer (thomas-landauer)
+ - Jurica Vlahoviček (vjurica)
- Bob den Otter (bopp)
- Thomas Schulz (king2500)
- Frank de Jonge (frenkynet)
@@ -412,6 +416,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Dmitriy Mamontov (mamontovdmitriy)
- Ben Ramsey (ramsey)
- Laurent Masforné (heisenberg)
+ - Sergey (upyx)
- Giorgio Premi
- Guillaume (guill)
- renanbr
@@ -434,7 +439,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Soner Sayakci
- Peter Kruithof (pkruithof)
- Michael Holm (hollo)
- - Sylvain Fabre (sylfabre)
- Arjen van der Meijden
- Markus Fasselt (digilist)
- Damien Alexandre (damienalexandre)
@@ -452,7 +456,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Chris Smith (cs278)
- Florian Klein (docteurklein)
- W0rma
- - Dāvis Zālītis (k0d3r1s)
- Manuel Kiessling (manuelkiessling)
- Dimitri Gritsajuk (ottaviano)
- Alexey Kopytko (sanmai)
@@ -497,6 +500,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Berny Cantos (xphere81)
- Andrii Bodnar
- Thierry Thuon (lepiaf)
+ - Antonio Jose Cerezo (ajcerezo)
- Ricard Clau (ricardclau)
- Mark Challoner (markchalloner)
- Loïc Frémont (loic425)
@@ -507,9 +511,9 @@ The Symfony Connect username in parenthesis allows to get more information
- Tri Pham (phamuyentri)
- Urinbayev Shakhobiddin (shokhaa)
- Gennady Telegin (gtelegin)
- - Sergey (upyx)
- Krystian Marcisz (simivar)
- Toni Rudolf (toooni)
+ - Dalibor Karlović (dkarlovi)
- Erin Millard
- Artur Melo (restless)
- Matthew Lewinski (lewinski)
@@ -526,10 +530,12 @@ The Symfony Connect username in parenthesis allows to get more information
- Tobias Sjösten (tobiassjosten)
- Gyula Sallai (salla)
- Benjamin Cremer (bcremer)
+ - Hendrik Luup (hluup)
- Inal DJAFAR (inalgnu)
- Christian Gärtner (dagardner)
- Dmytro Borysovskyi (dmytr0)
- Tomasz Kowalczyk (thunderer)
+ - Artem Lopata
- Artur Eshenbrener
- Thomas Perez (scullwm)
- Yoann RENARD (yrenard)
@@ -585,7 +591,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Daniel Beyer
- Manuel Alejandro Paz Cetina
- Shein Alexey
- - Aleksandar Jakovljevic (ajakov)
- Jacek Jędrzejewski (jacek.jedrzejewski)
- Romain Gautier (mykiwi)
- Stefan Kruppa
@@ -611,7 +616,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Marc Morales Valldepérez (kuert)
- Jean-Baptiste GOMOND (mjbgo)
- Vadim Kharitonov (virtuozzz)
- - Jurica Vlahoviček (vjurica)
- Oscar Cubo Medina (ocubom)
- Karel Souffriau
- Christophe L. (christophelau)
@@ -630,7 +634,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Alexandru Furculita (afurculita)
- Valentin Jonovs (valentins-jonovs)
- Bastien DURAND (deamon)
- - Antonio Jose Cerezo (ajcerezo)
- Jeanmonod David (jeanmonod)
- Christin Gruber (christingruber)
- Andrey Sevastianov
@@ -640,11 +643,11 @@ The Symfony Connect username in parenthesis allows to get more information
- Noémi Salaün (noemi-salaun)
- Niklas Fiekas
- Philippe Segatori
- - Dalibor Karlović (dkarlovi)
- Markus Bachmann (baachi)
- Kévin THERAGE (kevin_therage)
- Michel Hunziker
- Gunnstein Lye (glye)
+ - scyzoryck
- Matthias Krauser (mkrauser)
- Erkhembayar Gantulga (erheme318)
- Lorenzo Millucci (lmillucci)
@@ -665,14 +668,12 @@ The Symfony Connect username in parenthesis allows to get more information
- Stefan Gehrig (sgehrig)
- vagrant
- Aurimas Niekis (gcds)
- - Hendrik Luup (hluup)
- EdgarPE
- Florian Pfitzer (marmelatze)
- Asier Illarramendi (doup)
- Martijn Cuppens
- Vlad Gregurco (vgregurco)
- Boris Vujicic (boris.vujicic)
- - Artem Lopata
- Chris Sedlmayr (catchamonkey)
- Indra Gunawan (indragunawan)
- Mathias STRASSER (roukmoute)
@@ -703,6 +704,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Lukáš Holeczy (holicz)
- Erik Saunier (snickers)
- franek (franek)
+ - Jerzy (jlekowski)
- Raulnet
- Christian Wahler
- Dries Vints
@@ -770,6 +772,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Alex Bacart
- mcben
- Jérôme Vieilledent (lolautruche)
+ - Roman Anasal
- Maks Slesarenko
- Filip Procházka (fprochazka)
- mmoreram
@@ -808,6 +811,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Tom Klingenberg
- Gábor Fási
- DUPUCH (bdupuch)
+ - Dadang NH (dadangnh)
- Nate (frickenate)
- Joachim Løvgaard (loevgaard)
- Stefan Kruppa
@@ -832,8 +836,10 @@ The Symfony Connect username in parenthesis allows to get more information
- Samuele Lilli (doncallisto)
- Gawain Lynch (gawain)
- Peter Bowyer (pbowyer)
+ - Wojciech Kania
- mmokhi
- NothingWeAre
+ - Andrii Dembitskyi
- Ryan
- Lctrs
- Alexander Deruwe (aderuwe)
@@ -857,6 +863,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Johnny Robeson (johnny)
- Disquedur
- Michiel Boeckaert (milio)
+ - Benjamin Morel
- Dmitriy Derepko
- Geoffrey Tran (geoff)
- Pablo Lozano (arkadis)
@@ -992,7 +999,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Timothée BARRAY
- Nilmar Sanchez Muguercia
- Ivo Bathke (ivoba)
- - scyzoryck
- Ippei SUmida (ippey_s)
- David Molineus
- Strate
@@ -1010,6 +1016,7 @@ The Symfony Connect username in parenthesis allows to get more information
- rtek
- Benjamin Dos Santos
- Jérémy Jarrié (gagnar)
+ - Adrien Jourdier
- Tomas Javaisis
- Ivan Grigoriev
- Johann Saunier (prophet777)
@@ -1019,6 +1026,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Michael Devery (mickadoo)
- Antoine Corcy
- Ahmed Ashraf (ahmedash95)
+ - Gert Wijnalda (cinamo)
- Luca Saba (lucasaba)
- maxime.perrimond
- Sascha Grossenbacher
@@ -1090,7 +1098,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Junaid Farooq (junaidfarooq)
- Massimiliano Braglia (massimilianobraglia)
- Frankie Wittevrongel
- - Jerzy (jlekowski)
- Richard Quadling
- Raphaëll Roussel
- Anton Kroshilin
@@ -1240,6 +1247,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Jake (jakesoft)
- Flinsch
- Quentin Dreyer
+ - Bahman Mehrdad (bahman)
- Jordan de Laune (jdelaune)
- Christopher Hall (mythmakr)
- none (nelexa)
@@ -1251,6 +1259,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Martin Parsiegla (spea)
- Bernhard Rusch
- bhavin (bhavin4u)
+ - Mario Ramundo (rammar)
- Ivan
- Quentin Schuler
- Nico Haase
@@ -1259,6 +1268,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Sofiane HADDAG (sofhad)
- frost-nzcr4
- Taylor Otwell
+ - Shahriar56
- Sami Mussbach
- Dhananjay Goratela
- Kien Nguyen
@@ -1268,17 +1278,18 @@ The Symfony Connect username in parenthesis allows to get more information
- Achilles Kaloeridis (achilles)
- Adrien Wilmet (adrienfr)
- Laurent Bassin (lbassin)
+ - Mouad ZIANI (mouadziani)
- Tomasz Ignatiuk
- andrey1s
- Abhoryo
- Fabian Vogler (fabian)
+ - Shakhobiddin
- Korvin Szanto
- Stéphan Kochen
- Steven Dubois
- Arjan Keeman
- siganushka
- Alaattin Kahramanlar (alaattin)
- - Dadang NH (dadangnh)
- Sergey Zolotov (enleur)
- Maksim Kotlyar (makasim)
- Neil Ferreira
@@ -1287,6 +1298,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Paul LE CORRE
- Loïc Beurlet
- Sébastien COURJEAN
+ - Ana Raro
- Daniel Gorgan
- Ana Raro
- Tony Malzhacker
@@ -1295,9 +1307,9 @@ The Symfony Connect username in parenthesis allows to get more information
- Cyril Quintin (cyqui)
- Cyrille Bourgois (cyrilleb)
- Gerard van Helden (drm)
+ - Ivan Sarastov (isarastov)
- Johnny Peck (johnnypeck)
- Jordi Sala Morales (jsala)
- - Roman Anasal
- Ivan Menshykov
- David Romaní
- Patrick Allaert
@@ -1305,7 +1317,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Matt Robinson (inanimatt)
- Aleksey Podskrebyshev
- Calin Mihai Pristavu
- - Andrii Dembitskyi
- David Marín Carreño (davefx)
- Fabien LUCAS (flucas2)
- Ondrej Machulda (ondram)
@@ -1328,6 +1339,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Derek ROTH
- Ben Johnson
- mweimerskirch
+ - Andrew Codispoti
- Benjamin Franzke
- baron (bastien)
- Dmytro Boiko (eagle)
@@ -1379,7 +1391,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Matthew Davis (mdavis1982)
- Paulo Ribeiro (paulo)
- Markus S. (staabm)
- - Benjamin Morel
- Maks
- Knallcharge
- Antoine LA
@@ -1467,6 +1478,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Mahmoud Mostafa (mahmoud)
- Fractal Zombie
- Ahmed Abdou
+ - Khoo Yong Jun
- shreyadenny
- Daniel Iwaniec
- Pieter
@@ -1500,6 +1512,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Amirreza Shafaat (amirrezashafaat)
- Adoni Pavlakis (adoni)
- Nicolas Le Goff (nlegoff)
+ - Alex Hofbauer (alexhofbauer)
- Maarten Nusteling (nusje2000)
- Ahmed EBEN HASSINE (famas23)
- Ben Oman
@@ -1777,6 +1790,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Jorge Vahldick (jvahldick)
- Frederic Godfrin
- Paul Matthews
+ - aim8604
- Jakub Kisielewski
- Vacheslav Silyutin
- Aleksandr Dankovtsev
@@ -1831,6 +1845,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Rubén Calvo (rubencm)
- Abdul.Mohsen B. A. A
- Swen van Zanten
+ - Agustin Gomes
- Benoît Burnichon
- pthompson
- Malaney J. Hill
@@ -1845,6 +1860,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Sebastian Göttschkes (sgoettschkes)
- Tatsuya Tsuruoka
- Ross Tuck
+ - Oleksiy (alexndlm)
- Kévin Gomez (kevin)
- Mihai Nica (redecs)
- Andrei Igna
@@ -1935,7 +1951,9 @@ The Symfony Connect username in parenthesis allows to get more information
- Lance McNearney
- Volodymyr Kupriienko (greeflas)
- Serhiy Lunak (slunak)
+ - Wojciech Błoszyk (wbloszyk)
- Giorgio Premi
+ - abunch
- Sergey Belyshkin
- tamcy
- Mikko Pesari
@@ -1958,6 +1976,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Foxprodev
- Max Summe
- WedgeSama
+ - Dale.Nash
- Felds Liscia
- Chihiro Adachi (chihiro-adachi)
- Raphaëll Roussel
@@ -2030,6 +2049,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Alexander Janssen (tnajanssen)
- Thomas Chmielowiec (chmielot)
- Jānis Lukss
+ - Julien BERNARD
- Michael Zangerle
- rkerner
- Alex Silcock
@@ -2177,6 +2197,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Matt Farmer
- catch
- aetxebeste
+ - Juga Paazmaya
- Alexandre Segura
- afaricamp
- Josef Cech
@@ -2186,11 +2207,12 @@ The Symfony Connect username in parenthesis allows to get more information
- Andrii Boiko
- Harold Iedema
- WaiSkats
+ - Morimoto Ryosuke
- Ikhsan Agustian
- Arnau González (arnaugm)
- - Bahman Mehrdad (bahman)
- Simon Bouland (bouland)
- Jibé Barth (jibbarth)
+ - Jm Aribau (jmaribau)
- Matthew Foster (mfoster)
- Reyo Stallenberg (reyostallenberg)
- Paul Seiffert (seiffert)
@@ -2226,6 +2248,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Eric Schildkamp
- Andreas
- Markus
+ - agaktr
- kernig
- Thomas Chmielowiec
- shdev
@@ -2239,6 +2262,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Joe Springe
- Mickael GOETZ
- Maciej Schmidt
+ - botbotbot
- Dennis Væversted
- Timon van der Vorm
- nuncanada
@@ -2255,7 +2279,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Mathieu Dewet (mdewet)
- Nicolas Tallefourtané (nicolab)
- Botond Dani (picur)
- - Mario Ramundo (rammar)
- Rémi Faivre (rfv)
- Thierry Marianne (thierrymarianne)
- Nick Stemerdink
@@ -2263,6 +2286,7 @@ The Symfony Connect username in parenthesis allows to get more information
- jjanvier
- Julius Beckmann
- Ruben Jansen
+ - Marc Biorklund
- shreypuranik
- loru88
- Thibaut Salanon
@@ -2291,6 +2315,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Yuri Karaban
- Johan
- Thomas Rothe
+ - Edwin
- Martin
- nietonfir
- Andriy
@@ -2300,21 +2325,26 @@ The Symfony Connect username in parenthesis allows to get more information
- Pavel.Batanov
- avi123
- Pavel Prischepa
+ - qzylalala
- alsar
- downace
- Aarón Nieves Fernández
- Mike Meier
+ - Mikolaj Czajkowski
- Kirill Saksin
- Shiro
- Reda DAOUDI
- Koalabaerchen
- michalmarcinkowski
- Warwick
+ - Jesper Skytte
- Chris
- Farid Jalilov
- Christiaan Wiesenekker
- Florent Olivaud
+ - Sergey Panteleev
- JakeFr
+ - Dmitry Hordinky
- Oliver Klee
- Simon Sargeant
- efeen
@@ -2329,20 +2359,22 @@ The Symfony Connect username in parenthesis allows to get more information
- kshida
- Michał Dąbrowski (defrag)
- Aryel Tupinamba (dfkimera)
+ - Florian Wolfsjaeger (flowolf)
- Hans Höchtl (hhoechtl)
- Simone Fumagalli (hpatoio)
- Brian Graham (incognito)
- Kevin Vergauwen (innocenzo)
- Alessio Baglio (ioalessio)
+ - Jawira Portugal (jawira)
- Johannes Müller (johmue)
- Jordi Llonch (jordillonch)
- - Mouad ZIANI (mouadziani)
- Nicholas Ruunu (nicholasruunu)
- Jeroen van den Nieuwenhuisen (nieuwenhuisen)
- Cyril Pascal (paxal)
- Cédric Dugat (ph3nol)
- Philip Dahlstrøm (phidah)
- Milos Colakovic (project2481)
+ - Raphael de Almeida (raphaeldealmeida)
- Rénald Casagraude (rcasagraude)
- Robin Duval (robin-duval)
- Grinbergs Reinis (shima5)
@@ -2446,6 +2478,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Darryl Hein (xmmedia)
- Sadicov Vladimir (xtech)
- Kevin EMO (zarcox)
+ - Marcel Berteler
- sdkawata
- Andrzej
- Alexander Zogheb
@@ -2473,7 +2506,6 @@ The Symfony Connect username in parenthesis allows to get more information
- adenkejawen
- Florent SEVESTRE (aniki-taicho)
- Ari Pringle (apringle)
- - Gert Wijnalda (cinamo)
- Dan Ordille (dordille)
- Jan Eichhorn (exeu)
- Grégory Pelletier (ip512)
@@ -2493,16 +2525,13 @@ The Symfony Connect username in parenthesis allows to get more information
- grifx
- Robert Campbell
- Matt Lehner
- - Shakhobiddin
- Helmut Januschka
- Hein Zaw Htet™
- Ruben Kruiswijk
- Cosmin-Romeo TANASE
- - Ana Raro
- Michael J
- youssef saoubou
- Joseph Maarek
- - Ivan Sarastov
- Alexander Menk
- Alex Pods
- hadriengem
@@ -2517,6 +2546,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Matthieu Prat
- Grummfy
- zors1
+ - Peter Simoncic
- Paul Le Corre
- Noel Light-Hilary
- Filipe Guerra
@@ -2693,6 +2723,7 @@ The Symfony Connect username in parenthesis allows to get more information
- temperatur
- misterx
- Cas
+ - arend
- Vincent Godé
- Dusan Kasan
- Michael Steininger
@@ -2739,7 +2770,6 @@ The Symfony Connect username in parenthesis allows to get more information
- Daniel Bannert
- Karim Miladi
- Michael Genereux
- - Wojciech Kania
- patrick-mcdougle
- Dariusz Czech
- Bruno Baguette
@@ -2811,6 +2841,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Adam Klvač
- Bruno Nogueira Nascimento Wowk
- Tomanhez
+ - satalaondrej
- jonmldr
- Yevgen Kovalienia
- Lebnik
@@ -2871,6 +2902,7 @@ The Symfony Connect username in parenthesis allows to get more information
- Nicolas
- Sergio Santoro
- tirnanog06
+ - Andrejs Leonovs
- phc
- Дмитрий Пацура
- Signor Pedro
@@ -3037,6 +3069,7 @@ The Symfony Connect username in parenthesis allows to get more information
- ddegentesh
- DSeemiller
- Jan Emrich
+ - Anne-Julia Seitz
- Mark Topper
- Xavier REN
- Zander Baldwin
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index 6d03fdbae3561..367eb12e29162 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -286,13 +286,15 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
$glob = new GlobResource($directory, '*', true);
$container->addResource($glob);
+ $quotedMappingObjectName = preg_quote($this->getMappingObjectDefaultName(), '/');
+
foreach ($glob as $file) {
$content = file_get_contents($file);
- if (preg_match('/^#\[.*Entity\b/m', $content)) {
+ if (preg_match('/^#\[.*'.$quotedMappingObjectName.'\b/m', $content)) {
break;
}
- if (preg_match('/^ \* @.*Entity\b/m', $content)) {
+ if (preg_match('/^ \* @.*'.$quotedMappingObjectName.'\b/m', $content)) {
$type = 'annotation';
break;
}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
index e4f578bc207e7..774f1f0babf3c 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -49,6 +49,10 @@ protected function setUp(): void
->willReturnCallback(function ($name) {
return 'doctrine.orm.'.$name;
});
+
+ $this->extension
+ ->method('getMappingObjectDefaultName')
+ ->willReturn('Entity');
}
public function testFixManagersAutoMappingsWithTwoAutomappings()
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 86e7daa4e89ea..494e8835bb371 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -19,10 +19,10 @@
"php": ">=8.0.2",
"doctrine/event-manager": "~1.0",
"doctrine/persistence": "^2",
- "symfony/deprecation-contracts": "^2.1|^3.0",
+ "symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0",
- "symfony/service-contracts": "^1.1|^2.0|^3.0"
+ "symfony/service-contracts": "^1.1|^2|^3"
},
"require-dev": {
"composer/package-versions-deprecated": "^1.8",
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
index e73f8ca757d9d..1fd9424f683a9 100644
--- a/src/Symfony/Bridge/Monolog/composer.json
+++ b/src/Symfony/Bridge/Monolog/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": ">=8.0.2",
"monolog/monolog": "^1.25.1|^2",
- "symfony/service-contracts": "^1.1|^2.0|^3.0",
+ "symfony/service-contracts": "^1.1|^2|^3",
"symfony/http-kernel": "^5.4|^6.0"
},
"require-dev": {
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
index 7316abf0ddd12..34cbc76074acd 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -90,9 +90,6 @@
{%- if required -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
{%- endif -%}
- {%- if parent_label_class is defined -%}
- {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|trim}) -%}
- {%- endif -%}
{%- if label is not same as(false) and label is empty -%}
{%- if label_format is not empty -%}
{%- set label = label_format|replace({
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index fb440282861d8..0e80840541fa1 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -283,9 +283,6 @@
{%- if required -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
{%- endif -%}
- {%- if parent_label_class is defined -%}
- {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|replace({'checkbox-inline': '', 'radio-inline': '', 'checkbox-custom': '', 'radio-custom': ''})|trim}) -%}
- {%- endif -%}
{%- if label is not same as(false) and label is empty -%}
{%- if label_format is not empty -%}
{%- set label = label_format|replace({
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
index b02b94210d9be..f8c51b83dd8ed 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
@@ -253,9 +253,6 @@
{% if errors|length > 0 -%}
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' error')|trim}) %}
{% endif %}
- {% if parent_label_class is defined %}
- {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ parent_label_class)|trim}) %}
- {% endif %}
{% if label is empty %}
{%- if label_format is not empty -%}
{% set label = label_format|replace({
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 0b474b61be2ae..0765818346b6d 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.0.2",
- "symfony/translation-contracts": "^1.1|^2.0|^3.0",
+ "symfony/translation-contracts": "^1.1|^2|^3",
"twig/twig": "^2.13|^3.0.4"
},
"require-dev": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 866efbd4f7e89..18115870fa87e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -328,7 +328,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
$workflows = [];
}
- if (1 === \count($workflows) && isset($workflows['workflows']) && array_keys($workflows['workflows']) !== range(0, \count($workflows) - 1) && !empty(array_diff(array_keys($workflows['workflows']), ['audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_marking', 'places', 'transitions']))) {
+ if (1 === \count($workflows) && isset($workflows['workflows']) && !array_is_list($workflows['workflows']) && !empty(array_diff(array_keys($workflows['workflows']), ['audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_marking', 'places', 'transitions']))) {
$workflows = $workflows['workflows'];
}
@@ -1251,7 +1251,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
->ifString()->then(function ($v) { return ['default' => $v]; })
->end()
->beforeNormalization()
- ->ifTrue(function ($v) { return \is_array($v) && array_keys($v) === range(0, \count($v) - 1); })
+ ->ifTrue(function ($v) { return \is_array($v) && array_is_list($v); })
->then(function ($v) {
$resources = [];
foreach ($v as $resource) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 96ae42c0ac18c..6b91858fde767 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -81,11 +81,9 @@
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Lock\Lock;
use Symfony\Component\Lock\LockFactory;
use Symfony\Component\Lock\PersistingStoreInterface;
use Symfony\Component\Lock\Store\StoreFactory;
-use Symfony\Component\Lock\StoreInterface;
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
@@ -1439,10 +1437,6 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
$definition->replaceArgument(0, $config['email_validation_mode']);
if (\array_key_exists('enable_annotations', $config) && $config['enable_annotations']) {
- if (!$this->annotationsConfigEnabled) {
- throw new \LogicException('"enable_annotations" on the validator cannot be set as the PHP version is lower than 8 and Doctrine Annotations support is disabled. Consider upgrading PHP.');
- }
-
$validatorBuilder->addMethodCall('enableAnnotationMapping', [true]);
if ($this->annotationsConfigEnabled) {
$validatorBuilder->addMethodCall('setDoctrineAnnotationReader', [new Reference('annotation_reader')]);
@@ -1815,7 +1809,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
$storeDefinitions = [];
foreach ($resourceStores as $storeDsn) {
$storeDsn = $container->resolveEnvPlaceholders($storeDsn, null, $usedEnvs);
- $storeDefinition = new Definition(interface_exists(StoreInterface::class) ? StoreInterface::class : PersistingStoreInterface::class);
+ $storeDefinition = new Definition(PersistingStoreInterface::class);
$storeDefinition->setFactory([StoreFactory::class, 'createStore']);
$storeDefinition->setArguments([$storeDsn]);
@@ -1838,12 +1832,6 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
$factoryDefinition->replaceArgument(0, new Reference($storeDefinitionId));
$container->setDefinition('lock.'.$resourceName.'.factory', $factoryDefinition);
- // Generate services for lock instances
- $lockDefinition = new Definition(Lock::class);
- $lockDefinition->setPublic(false);
- $lockDefinition->setFactory([new Reference('lock.'.$resourceName.'.factory'), 'createLock']);
- $lockDefinition->setArguments([$resourceName]);
-
// provide alias for default resource
if ('default' === $resourceName) {
$container->setAlias('lock.factory', new Alias('lock.'.$resourceName.'.factory', false));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/BaseBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/BaseBundle.php
deleted file mode 100644
index 494a18dff0a14..0000000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/BaseBundle.php
+++ /dev/null
@@ -1,18 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BaseBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class BaseBundle extends Bundle
-{
-}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/Resources/views/base.format.engine b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/Resources/views/base.format.engine
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/Resources/views/controller/base.format.engine b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/Resources/views/controller/base.format.engine
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/Resources/views/this.is.a.template.format.engine b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BaseBundle/Resources/views/this.is.a.template.format.engine
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 54cf9cc13307b..1d73dd97e57c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -27,6 +27,7 @@
"symfony/http-foundation": "^5.4|^6.0",
"symfony/http-kernel": "^5.4|^6.0",
"symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php81": "^1.22",
"symfony/filesystem": "^5.4|^6.0",
"symfony/finder": "^5.4|^6.0",
"symfony/routing": "^5.4|^6.0"
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
index b33136891809f..b2cd3fed196ba 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -154,6 +154,7 @@ public function addConfiguration(NodeDefinition $node)
->requiresAtLeastOneElement()
->info('An array of properties on your User that are used to sign the remember-me cookie. If any of these change, all existing cookies will become invalid.')
->example(['email', 'password'])
+ ->defaultValue(['password'])
->end()
->arrayNode('token_provider')
->beforeNormalization()
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
index 33285fc8f565d..ba479f2fbe832 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
@@ -4,8 +4,6 @@
{% block toolbar %}
{% if collector.firewall %}
- {% set color_code = collector.enabled and not collector.authenticatorManagerEnabled ? 'yellow' %}
-
{% set icon %}
{{ include('@Security/Collector/icon.svg') }}
{{ collector.user|default('n/a') }}
@@ -85,7 +83,7 @@
{% endset %}
- {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: color_code }) }}
+ {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
{% endif %}
{% endblock %}
@@ -176,12 +174,6 @@
{{ include('@WebProfiler/Icon/' ~ (collector.firewall.stateless ? 'yes' : 'no') ~ '.svg') }}Stateless
- {% if collector.authenticatorManagerEnabled == false %}
-