From 4eb10eaa2ce831880ed5f433ac418cadf64f5128 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 28 Oct 2020 06:49:13 +0100
Subject: [PATCH 1/9] Bump Symfony version to 3.4.47

---
 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 95eb438d49cee..815359e13201b 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -67,12 +67,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private $requestStackSize = 0;
     private $resetServices = false;
 
-    const VERSION = '3.4.46';
-    const VERSION_ID = 30446;
+    const VERSION = '3.4.47-DEV';
+    const VERSION_ID = 30447;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 4;
-    const RELEASE_VERSION = 46;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 47;
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '11/2020';
     const END_OF_LIFE = '11/2021';

From 427e31421221ee77d663cd9e0f32dd69ed6589d1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 2 Nov 2020 15:30:42 +0100
Subject: [PATCH 2/9] Fix CI

---
 .appveyor.yml | 2 +-
 .travis.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f0865f311d664..a43914c8b3eef 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -57,7 +57,7 @@ install:
     - 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 branch-version composer.json | grep -o '[0-9.]*'"`) DO (SET SYMFONY_VERSION=%%F)
+    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.x]*'"`) 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
diff --git a/.travis.yml b/.travis.yml
index 8a02ce10d5e13..b830033cdb24b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -213,7 +213,7 @@ install:
       git config --global user.email ""
       git config --global user.name "Symfony"
 
-      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*')
+      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*')
 
       if [[ ! $deps ]]; then
           php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit

From 4c361456644d7d7f7fadc79c8633572c33a94d72 Mon Sep 17 00:00:00 2001
From: Juan Miguel Besada <juanmiguelbesada@gmail.com>
Date: Mon, 19 Oct 2020 12:26:04 +0200
Subject: [PATCH 3/9] [DoctrineBridge]  indexBy could reference to association
 columns

---
 .../PropertyInfo/DoctrineExtractor.php         | 18 ++++++++++++++++--
 .../PropertyInfo/DoctrineExtractorTest.php     | 18 ++++++++++++++++++
 .../PropertyInfo/Fixtures/DoctrineDummy.php    | 10 ++++++++++
 .../PropertyInfo/Fixtures/DoctrineRelation.php |  5 +++++
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
index 0cfdc8768c9fe..651ff3e96c79d 100644
--- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -110,10 +110,24 @@ public function getTypes($class, $property, array $context = [])
                 $associationMapping = $metadata->getAssociationMapping($property);
 
                 if (isset($associationMapping['indexBy'])) {
-                    $indexColumn = $associationMapping['indexBy'];
                     /** @var ClassMetadataInfo $subMetadata */
                     $subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
-                    $typeOfField = $subMetadata->getTypeOfField($subMetadata->getFieldForColumn($indexColumn));
+
+                    // Check if indexBy value is a property
+                    $fieldName = $associationMapping['indexBy'];
+                    if (null === ($typeOfField = $subMetadata->getTypeOfField($fieldName))) {
+                        $fieldName = $subMetadata->getFieldForColumn($associationMapping['indexBy']);
+                        //Not a property, maybe a column name?
+                        if (null === ($typeOfField = $subMetadata->getTypeOfField($fieldName))) {
+                            //Maybe the column name is the association join column?
+                            $associationMapping = $subMetadata->getAssociationMapping($fieldName);
+
+                            /** @var ClassMetadataInfo $subMetadata */
+                            $indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($fieldName);
+                            $subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
+                            $typeOfField = $subMetadata->getTypeOfField($indexProperty);
+                        }
+                    }
 
                     if (!$collectionKeyType = $this->getPhpType($typeOfField)) {
                         return null;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
index b9abd03347e83..845a0612b81af 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -72,8 +72,10 @@ public function testGetProperties()
         $expected = array_merge($expected, [
             'foo',
             'bar',
+            'indexedRguid',
             'indexedBar',
             'indexedFoo',
+            'indexedBaz',
             'indexedByDt',
             'indexedByCustomType',
         ]);
@@ -151,6 +153,14 @@ public function typesProvider()
                 new Type(Type::BUILTIN_TYPE_INT),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
             )]],
+            ['indexedRguid', [new Type(
+                Type::BUILTIN_TYPE_OBJECT,
+                false,
+                'Doctrine\Common\Collections\Collection',
+                true,
+                new Type(Type::BUILTIN_TYPE_STRING),
+                new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
+            )]],
             ['indexedBar', [new Type(
                 Type::BUILTIN_TYPE_OBJECT,
                 false,
@@ -167,6 +177,14 @@ public function typesProvider()
                 new Type(Type::BUILTIN_TYPE_STRING),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
             )]],
+            ['indexedBaz', [new Type(
+                Type::BUILTIN_TYPE_OBJECT,
+                false,
+                Collection::class,
+                true,
+                new Type(Type::BUILTIN_TYPE_INT),
+                new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
+            )]],
             ['simpleArray', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
             ['customFoo', null],
             ['notMapped', null],
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
index 568efce33d382..46e5b2341476d 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
@@ -41,6 +41,11 @@ class DoctrineDummy
      */
     public $bar;
 
+    /**
+     * @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid")
+     */
+    protected $indexedRguid;
+
     /**
      * @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid_column")
      */
@@ -51,6 +56,11 @@ class DoctrineDummy
      */
     protected $indexedFoo;
 
+    /**
+     * @OneToMany(targetEntity="DoctrineRelation", mappedBy="baz", indexBy="baz_id")
+     */
+    protected $indexedBaz;
+
     /**
      * @Column(type="guid")
      */
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
index e480ca9d777ba..b40c0883e1213 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
@@ -40,6 +40,11 @@ class DoctrineRelation
      */
     protected $foo;
 
+    /**
+     * @ManyToOne(targetEntity="DoctrineDummy")
+     */
+    protected $baz;
+
     /**
      * @Column(type="datetime")
      */

From f9a0e000e93773f6c44342d5376c0c03ce3c091a Mon Sep 17 00:00:00 2001
From: Bart Wach <bwach.it@gmail.com>
Date: Thu, 29 Oct 2020 21:30:43 +0100
Subject: [PATCH 4/9] failing test for issue 38861

---
 .../Tests/PropertyInfo/DoctrineExtractorTest.php         | 9 +++++++++
 .../Tests/PropertyInfo/Fixtures/DoctrineDummy.php        | 5 +++++
 .../Tests/PropertyInfo/Fixtures/DoctrineRelation.php     | 6 ++++++
 3 files changed, 20 insertions(+)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
index 845a0612b81af..98d64cefd77e9 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -78,6 +78,7 @@ public function testGetProperties()
             'indexedBaz',
             'indexedByDt',
             'indexedByCustomType',
+            'indexedBuz',
         ]);
 
         $this->assertEquals(
@@ -197,6 +198,14 @@ public function typesProvider()
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
             )]],
             ['indexedByCustomType', null],
+            ['indexedBuz', [new Type(
+                Type::BUILTIN_TYPE_OBJECT,
+                false,
+                Collection::class,
+                true,
+                new Type(Type::BUILTIN_TYPE_STRING),
+                new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
+            )]],
         ];
 
         if (class_exists(Types::class)) {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
index 46e5b2341476d..a065dc49cd2d4 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
@@ -132,4 +132,9 @@ class DoctrineDummy
      * @OneToMany(targetEntity="DoctrineRelation", mappedBy="customType", indexBy="customType")
      */
     private $indexedByCustomType;
+
+    /**
+     * @OneToMany(targetEntity="DoctrineRelation", mappedBy="buzField", indexBy="buzField")
+     */
+    protected $indexedBuz;
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
index b40c0883e1213..d6d9af6d70c38 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php
@@ -54,4 +54,10 @@ class DoctrineRelation
      * @Column(type="foo")
      */
     private $customType;
+
+    /**
+     * @Column(type="guid", name="different_than_field")
+     * @ManyToOne(targetEntity="DoctrineDummy", inversedBy="indexedBuz")
+     */
+    protected $buzField;
 }

From c5a107e4cce55057fbe335909ba95c4d46e47feb Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 13 Nov 2020 17:28:59 +0100
Subject: [PATCH 5/9] [PhpUnitBridge] Fix test fixture file name

---
 .../coverage/tests/{SutNotFindTest.php => SutNotFoundTest.php}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/{SutNotFindTest.php => SutNotFoundTest.php} (100%)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFoundTest.php
similarity index 100%
rename from src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php
rename to src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFoundTest.php

From 160cc6144cef25110330e7bce007dd348264d74e Mon Sep 17 00:00:00 2001
From: Bruno Baguette <1922257+Levure@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:02:08 +0100
Subject: [PATCH 6/9] Minor : Removed typo (extra "the" term)

---
 src/Symfony/Component/Finder/Finder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 3e8a9483ea0fe..186cb32298507 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -616,7 +616,7 @@ public function append($iterator)
     }
 
     /**
-     * Check if the any results were found.
+     * Check if any results were found.
      *
      * @return bool
      */

From 0153c44975f89859a6f764384089eb0eb1685aa4 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 27 Nov 2020 09:41:25 +0100
Subject: [PATCH 7/9] Update CHANGELOG for 3.4.47

---
 CHANGELOG-3.4.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index 95a2107528b52..23e1671360b2c 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -7,6 +7,10 @@ in 3.4 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.4.0...v3.4.1
 
+* 3.4.47 (2020-11-27)
+
+ * bug #38628 [DoctrineBridge]  indexBy could reference to association columns (juanmiguelbesada)
+
 * 3.4.46 (2020-10-28)
 
  * bug #38669 [Serializer] fix decoding float XML attributes starting with 0 (Marcin Kruk)

From f93df0ef1d6b9206c9ffe2f64ded2bfab982ee65 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 27 Nov 2020 09:41:54 +0100
Subject: [PATCH 8/9] Update CONTRIBUTORS for 3.4.47

---
 CONTRIBUTORS.md | 84 +++++++++++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 30 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 5d3ae522834d7..3bed011d06243 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -12,9 +12,10 @@ Symfony is the result of the work of many people who made the code better
  - Robin Chalas (chalas_r)
  - Christophe Coevoet (stof)
  - Kévin Dunglas (dunglas)
- - Jordi Boggiano (seldaek)
  - Maxime Steinhausser (ogizanagi)
+ - Jordi Boggiano (seldaek)
  - Victor Berchet (victor)
+ - Alexander M. Turek (derrabus)
  - Grégoire Pineau (lyrixx)
  - Ryan Weaver (weaverryan)
  - Javier Eguiluz (javier.eguiluz)
@@ -22,33 +23,32 @@ Symfony is the result of the work of many people who made the code better
  - Jakub Zalas (jakubzalas)
  - Johannes S (johannes)
  - Kris Wallsmith (kriswallsmith)
- - Alexander M. Turek (derrabus)
  - Wouter de Jong (wouterj)
  - Yonel Ceruto (yonelceruto)
  - Thomas Calvet (fancyweb)
  - Hugo Hamon (hhamon)
+ - Jérémy DERUSSÉ (jderusse)
  - Abdellatif Ait boudad (aitboudad)
  - Samuel ROZE (sroze)
  - Romain Neutron (romain)
  - Pascal Borreli (pborreli)
- - Jérémy DERUSSÉ (jderusse)
  - Joseph Bielawski (stloyd)
  - Karma Dordrak (drak)
  - Jules Pietri (heah)
  - Lukas Kahwe Smith (lsmith)
  - Martin Hasoň (hason)
  - Hamza Amrouche (simperfit)
+ - Tobias Nyholm (tobias)
  - Jeremy Mikola (jmikola)
  - Jean-François Simon (jfsimon)
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
- - Tobias Nyholm (tobias)
  - Eriksen Costa (eriksencosta)
  - Guilhem Niot (energetick)
  - Sarah Khalil (saro0h)
  - Jonathan Wage (jwage)
- - Lynn van der Berg (kjarli)
  - Jan Schädlich (jschaedl)
+ - Lynn van der Berg (kjarli)
  - Matthias Pigulla (mpdude)
  - Diego Saint Esteben (dosten)
  - Pierre du Plessis (pierredup)
@@ -56,13 +56,13 @@ Symfony is the result of the work of many people who made the code better
  - William Durand (couac)
  - Valentin Udaltsov (vudaltsov)
  - ornicar
+ - Grégoire Paris (greg0ire)
  - Dany Maillard (maidmaid)
  - Francis Besset (francisbesset)
  - stealth35 ‏ (stealth35)
  - Alexander Mols (asm89)
  - Kevin Bond (kbond)
  - Konstantin Myakshin (koc)
- - Grégoire Paris (greg0ire)
  - Bulat Shakirzyanov (avalanche123)
  - Saša Stamenković (umpirsky)
  - Peter Rehm (rpet)
@@ -116,17 +116,17 @@ Symfony is the result of the work of many people who made the code better
  - Tim Nagel (merk)
  - Chris Wilkinson (thewilkybarkid)
  - Brice BERNARD (brikou)
+ - Alexander Schranz (alexander-schranz)
  - marc.weistroff
  - Tomáš Votruba (tomas_votruba)
  - Peter Kokot (maastermedia)
  - Lars Strojny (lstrojny)
  - lenar
  - Alexander Schwenn (xelaris)
+ - Massimiliano Arione (garak)
  - Włodzimierz Gajda (gajdaw)
- - Alexander Schranz (alexander-schranz)
  - Oskar Stark (oskarstark)
  - Adrien Brault (adrienbrault)
- - Massimiliano Arione (garak)
  - Jacob Dreesen (jdreesen)
  - Florian Voutzinos (florianv)
  - Teoh Han Hui (teohhanhui)
@@ -139,11 +139,11 @@ Symfony is the result of the work of many people who made the code better
  - excelwebzone
  - Gordon Franke (gimler)
  - Joel Wurtz (brouznouf)
+ - Antoine Makdessi (amakdessi)
  - Fabien Pennequin (fabienpennequin)
  - Julien Falque (julienfalque)
  - Théo FIDRY (theofidry)
  - Eric GELOEN (gelo)
- - Antoine Makdessi (amakdessi)
  - Jannik Zschiesche (apfelbox)
  - jeremyFreeAgent (jeremyfreeagent)
  - Robert Schönthal (digitalkaoz)
@@ -166,6 +166,7 @@ Symfony is the result of the work of many people who made the code better
  - Guilherme Blanco (guilhermeblanco)
  - SpacePossum
  - Pablo Godel (pgodel)
+ - Andreas Braun
  - Matthieu Napoli (mnapoli)
  - Richard van Laak (rvanlaak)
  - Jérémie Augustin (jaugustin)
@@ -175,7 +176,6 @@ Symfony is the result of the work of many people who made the code better
  - Rafael Dohms (rdohms)
  - jwdeitch
  - Ahmed TAILOULOUTE (ahmedtai)
- - Andreas Braun
  - Mikael Pajunen
  - Arman Hosseini (arman)
  - Niels Keurentjes (curry684)
@@ -295,7 +295,9 @@ Symfony is the result of the work of many people who made the code better
  - Lorenz Schori
  - Sébastien Lavoie (lavoiesl)
  - Dariusz
+ - Farhad Safarov (safarov)
  - Michael Babker (mbabker)
+ - Thomas Lallement (raziel057)
  - Francois Zaninotto
  - Colin O&#039;Dell (colinodell)
  - Alexander Kotynia (olden)
@@ -307,21 +309,25 @@ Symfony is the result of the work of many people who made the code better
  - Danny Berger (dpb587)
  - zairig imad (zairigimad)
  - Antonio J. García Lagar (ajgarlag)
+ - Alessandro Lai (jean85)
  - Adam Prager (padam87)
  - Benoît Burnichon (bburnichon)
  - Maciej Malarz (malarzm)
  - Roman Marintšenko (inori)
  - Xavier Montaña Carreras (xmontana)
+ - Timothée Barray (tyx)
  - Mickaël Andrieu (mickaelandrieu)
  - Xavier Perez
  - Arjen Brouwer (arjenjb)
  - Katsuhiro OGAWA
  - Patrick McDougle (patrick-mcdougle)
+ - Rokas Mikalkėnas (rokasm)
  - Marc Weistroff (futurecat)
  - Alif Rachmawadi
  - Anton Chernikov (anton_ch1989)
  - Kristen Gilden (kgilden)
  - Pierre-Yves LEBECQ (pylebecq)
+ - Benjamin Leveque (benji07)
  - Jordan Samouh (jordansamouh)
  - Jakub Kucharovic (jkucharovic)
  - Loick Piera (pyrech)
@@ -337,6 +343,7 @@ Symfony is the result of the work of many people who made the code better
  - Ray
  - Chekote
  - Thomas Adam
+ - Chi-teck
  - Jhonny Lidfors (jhonne)
  - Diego Agulló (aeoris)
  - jdhoek
@@ -348,7 +355,6 @@ Symfony is the result of the work of many people who made the code better
  - Wodor Wodorski
  - Timo Bakx (timobakx)
  - Joe Bennett (kralos)
- - Thomas Lallement (raziel057)
  - soyuka
  - Giorgio Premi
  - renanbr
@@ -362,7 +368,6 @@ Symfony is the result of the work of many people who made the code better
  - Alexander Menshchikov (zmey_kk)
  - Emanuele Panzeri (thepanz)
  - Kim Hemsø Rasmussen (kimhemsoe)
- - Alessandro Lai (jean85)
  - Langlet Vincent (deviling)
  - Pascal Luna (skalpa)
  - Wouter Van Hecke
@@ -375,6 +380,7 @@ Symfony is the result of the work of many people who made the code better
  - Christian Schmidt
  - Patrick Landolt (scube)
  - MatTheCat
+ - Denis Brumann (dbrumann)
  - Bohan Yang (brentybh)
  - Vilius Grigaliūnas
  - David Badura (davidbadura)
@@ -383,8 +389,6 @@ Symfony is the result of the work of many people who made the code better
  - Chris Smith (cs278)
  - Thomas Bisignani (toma)
  - Florian Klein (docteurklein)
- - Timothée Barray (tyx)
- - Benjamin Leveque (benji07)
  - Manuel Kiessling (manuelkiessling)
  - Alexey Kopytko (sanmai)
  - Atsuhiro KUBO (iteman)
@@ -404,7 +408,6 @@ Symfony is the result of the work of many people who made the code better
  - Emmanuel BORGES (eborges78)
  - Aurelijus Valeiša (aurelijus)
  - Jan Decavele (jandc)
- - Chi-teck
  - Gustavo Piltcher
  - Jesse Rushlow (geeshoe)
  - Stepan Tanasiychuk (stfalcon)
@@ -459,19 +462,22 @@ Symfony is the result of the work of many people who made the code better
  - Thomas Perez (scullwm)
  - Felix Labrecque
  - Yaroslav Kiliba
+ - Ben Hakim
  - Terje Bråten
  - Gonzalo Vilaseca (gonzalovilaseca)
+ - Marco Petersen (ocrampete16)
  - Markus Fasselt (digilist)
  - Daniel STANCU
  - Robbert Klarenbeek (robbertkl)
  - Eric Masoero (eric-masoero)
  - Ion Bazan (ionbazan)
- - Denis Brumann (dbrumann)
+ - Vitalii Ekert (comrade42)
  - JhonnyL
  - Clara van Miert
  - Haralan Dobrev (hkdobrev)
  - hossein zolfi (ocean)
  - Clément Gautier (clementgautier)
+ - Jeroen Noten (jeroennoten)
  - Bastien Jaillot (bastnic)
  - Dāvis Zālītis (k0d3r1s)
  - Sanpi
@@ -485,7 +491,6 @@ Symfony is the result of the work of many people who made the code better
  - Dimitri Gritsajuk (ottaviano)
  - Kirill chEbba Chebunin (chebba)
  - 
- - Rokas Mikalkėnas (rokasm)
  - Greg Thornton (xdissent)
  - Alex Bowers
  - Philipp Cordes
@@ -551,7 +556,6 @@ Symfony is the result of the work of many people who made the code better
  - Nate Wiebe (natewiebe13)
  - Marcin Szepczynski (czepol)
  - Mohammad Emran Hasan (phpfour)
- - Farhad Safarov
  - Dmitriy Mamontov (mamontovdmitriy)
  - Jan Schumann
  - Niklas Fiekas
@@ -600,18 +604,20 @@ Symfony is the result of the work of many people who made the code better
  - Arkadius Stefanski (arkadius)
  - Tim Goudriaan (codedmonkey)
  - Jonas Flodén (flojon)
+ - AnneKir
  - Soner Sayakci
  - Tobias Weichart
+ - Miro Michalicka
  - Tarmo Leppänen (tarlepp)
  - Marcin Sikoń (marphi)
  - M. Vondano
  - Dominik Zogg (dominik.zogg)
  - Marek Pietrzak
+ - Tavo Nieves J
  - Luc Vieillescazes (iamluc)
  - Lukáš Holeczy (holicz)
  - franek (franek)
  - Raulnet
- - Marco Petersen (ocrampete16)
  - Christian Wahler
  - Giso Stallenberg (gisostallenberg)
  - Gintautas Miselis
@@ -660,6 +666,7 @@ Symfony is the result of the work of many people who made the code better
  - Roy Van Ginneken (rvanginneken)
  - ondrowan
  - Barry vd. Heuvel (barryvdh)
+ - Michael Voříšek
  - Evan S Kaufman (evanskaufman)
  - mcben
  - Jérôme Vieilledent (lolautruche)
@@ -758,6 +765,7 @@ Symfony is the result of the work of many people who made the code better
  - Fred Cox
  - vitaliytv
  - Philippe Segatori
+ - fd6130 (fdtvui)
  - Dalibor Karlović (dkarlovi)
  - Andrey Sevastianov
  - Sebastian Blum
@@ -803,8 +811,10 @@ Symfony is the result of the work of many people who made the code better
  - Jérôme Tamarelle (jtamarelle-prismamedia)
  - Geoffrey Brier (geoffrey-brier)
  - Alexandre Parent
+ - Roger Guasch (rogerguasch)
  - Vladimir Tsykun
  - Dustin Dobervich (dustin10)
+ - Luis Tacón (lutacon)
  - dantleech
  - Philipp Kolesnikov
  - Anne-Sophie Bachelard (annesophie)
@@ -828,6 +838,7 @@ Symfony is the result of the work of many people who made the code better
  - Stefan Warman
  - Tristan Maindron (tmaindron)
  - Behnoush Norouzali (behnoush)
+ - Marko H. Tamminen (gzumba)
  - Wesley Lancel
  - Xavier Briand (xavierbriand)
  - Ke WANG (yktd26)
@@ -853,8 +864,10 @@ Symfony is the result of the work of many people who made the code better
  - Michael Devery (mickadoo)
  - Antoine Corcy
  - Ahmed Ashraf (ahmedash95)
+ - Luca Saba (lucasaba)
  - Sascha Grossenbacher
  - Szijarto Tamas
+ - Thomas P
  - Robin Lehrmann (robinlehrmann)
  - Catalin Dan
  - Jaroslav Kuba
@@ -918,6 +931,7 @@ Symfony is the result of the work of many people who made the code better
  - Peter Ward
  - Davide Borsatto (davide.borsatto)
  - Julien DIDIER (juliendidier)
+ - Randy Geraads
  - Dominik Ritter (dritter)
  - Andreas Leathley (iquito)
  - Sebastian Grodzicki (sgrodzicki)
@@ -927,7 +941,6 @@ Symfony is the result of the work of many people who made the code better
  - Baldur Rensch (brensch)
  - Pierre Rineau
  - Fritz Michael Gschwantner
- - Jeroen Noten (jeroennoten)
  - Vladyslav Petrovych
  - Alex Xandra Albert Sim
  - Carson Full
@@ -1045,12 +1058,10 @@ Symfony is the result of the work of many people who made the code better
  - Daniel Gorgan
  - Tony Malzhacker
  - Mathieu MARCHOIS
- - Tavo Nieves J
  - Cyril Quintin (cyqui)
  - Gerard van Helden (drm)
  - flack (flack)
  - Johnny Peck (johnnypeck)
- - Michael Voříšek
  - Stefan Kruppa
  - Ivan Menshykov
  - David Romaní
@@ -1058,6 +1069,7 @@ Symfony is the result of the work of many people who made the code better
  - Gustavo Falco (gfalco)
  - Matt Robinson (inanimatt)
  - Kristof Van Cauwenbergh (kristofvc)
+ - Marco Lipparini (liarco)
  - Peter Bowyer (pbowyer)
  - Aleksey Podskrebyshev
  - Calin Mihai Pristavu
@@ -1095,6 +1107,7 @@ Symfony is the result of the work of many people who made the code better
  - Don Pinkster
  - Maksim Muruev
  - Emil Einarsson
+ - Anderson Müller
  - 243083df
  - Thibault Duplessis
  - Rimas Kudelis
@@ -1195,7 +1208,9 @@ Symfony is the result of the work of many people who made the code better
  - Pieter
  - Michael Tibben
  - Hallison Boaventura (hallisonboaventura)
+ - Mas Iting
  - Billie Thompson
+ - Albion Bame (abame)
  - Ganesh Chandrasekaran
  - Sander Marechal
  - Franz Wilding (killerpoke)
@@ -1216,11 +1231,15 @@ Symfony is the result of the work of many people who made the code better
  - Nicolas Martin (cocorambo)
  - Tom Panier (neemzy)
  - Fred Cox
+ - luffy1727
  - Luciano Mammino (loige)
  - fabios
  - Sander Coolen (scoolen)
+ - Amirreza Shafaat (amirrezashafaat)
  - Laurent Clouet
+ - Adoni Pavlakis (adoni)
  - Nicolas Le Goff (nlegoff)
+ - Ahmed EBEN HASSINE (famas23)
  - Ben Oman
  - Chris de Kok
  - Eduard Bulava (nonanerz)
@@ -1229,6 +1248,7 @@ Symfony is the result of the work of many people who made the code better
  - Guillaume (guill)
  - Igor Timoshenko (igor.timoshenko)
  - Manuele Menozzi
+ - “teerasak”
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
  - Benoit Mallo
@@ -1238,6 +1258,7 @@ Symfony is the result of the work of many people who made the code better
  - pizzaminded
  - Arnaud PETITPAS (apetitpa)
  - Ken Stanley
+ - ivan
  - Zachary Tong (polyfractal)
  - linh
  - Guilherme Augusto Henschel
@@ -1279,8 +1300,10 @@ Symfony is the result of the work of many people who made the code better
  - Danijel Obradović
  - Pablo Borowicz
  - Arjan Keeman
+ - Bruno Rodrigues de Araujo (brunosinister)
  - Máximo Cuadros (mcuadros)
  - Lukas Mencl
+ - Jacek Wilczyński (jacekwilczynski)
  - tamirvs
  - gauss
  - julien.galenski
@@ -1342,7 +1365,6 @@ Symfony is the result of the work of many people who made the code better
  - Martijn Evers
  - Philipp Fritsche
  - tarlepp
- - Luca Saba (lucasaba)
  - Benjamin Paap (benjaminpaap)
  - Claus Due (namelesscoder)
  - Christian
@@ -1449,6 +1471,7 @@ Symfony is the result of the work of many people who made the code better
  - Makdessi Alex
  - James Gilliland
  - fduch (fduch)
+ - Juan Miguel Besada Vidal (soutlink)
  - Stuart Fyfe
  - David de Boer (ddeboer)
  - Eno Mullaraj (emullaraj)
@@ -1677,7 +1700,6 @@ Symfony is the result of the work of many people who made the code better
  - WedgeSama
  - Hugo Sales
  - Felds Liscia
- - Randy Geraads
  - Chihiro Adachi (chihiro-adachi)
  - Raphaëll Roussel
  - Tadcka
@@ -1693,7 +1715,6 @@ Symfony is the result of the work of many people who made the code better
  - Emmanuel Vella (emmanuel.vella)
  - Guillaume BRETOU (guiguiboy)
  - Carsten Nielsen (phreaknerd)
- - Roger Guasch (rogerguasch)
  - Jay Severson
  - Benny Born
  - Emirald Mateli
@@ -1727,6 +1748,7 @@ Symfony is the result of the work of many people who made the code better
  - Michael Dowling (mtdowling)
  - Karlos Presumido (oneko)
  - Tony Vermeiren (tony)
+ - Bart Wach
  - Jos Elstgeest
  - Thomas Counsell
  - BilgeXA
@@ -1772,7 +1794,6 @@ Symfony is the result of the work of many people who made the code better
  - Pablo Ogando Ferreira
  - Thomas Ploch
  - Simon Neidhold
- - Ben Hakim
  - Valentin VALCIU
  - Jeremiah VALERIE
  - Julien Menth
@@ -1826,8 +1847,8 @@ Symfony is the result of the work of many people who made the code better
  - Antonio Peric-Mazar (antonioperic)
  - César Suárez (csuarez)
  - Bjorn Twachtmann (dotbjorn)
+ - Marek Víger (freezy)
  - Tobias Genberg (lorceroth)
- - Luis Tacón (lutacon)
  - Nicolas Badey (nico-b)
  - Shane Preece (shane)
  - Johannes Goslar
@@ -1996,6 +2017,7 @@ Symfony is the result of the work of many people who made the code better
  - Felix Marezki
  - Normunds
  - Luiz “Felds” Liscia
+ - Johan
  - Thomas Rothe
  - Adrien Wilmet
  - Martin
@@ -2095,6 +2117,8 @@ Symfony is the result of the work of many people who made the code better
  - Ali Tavafi
  - Trevor Suarez
  - gedrox
+ - hugovms
+ - Viet Pham
  - Alan Bondarchuk
  - Pchol
  - dropfen
@@ -2200,7 +2224,6 @@ Symfony is the result of the work of many people who made the code better
  - Marin Nicolae
  - Alessandro Loffredo
  - Ian Phillips
- - Marco Lipparini
  - Haritz
  - Matthieu Prat
  - Grummfy
@@ -2246,7 +2269,6 @@ Symfony is the result of the work of many people who made the code better
  - Gyula Szucs
  - Tomas Liubinas
  - Alex
- - Thomas P
  - Jan Hort
  - Klaas Naaijkens
  - Daniel González Cerviño
@@ -2410,8 +2432,10 @@ Symfony is the result of the work of many people who made the code better
  - Daniel Bannert
  - Karim Miladi
  - Michael Genereux
+ - Wojciech Kania
  - patrick-mcdougle
  - Dariusz Czech
+ - Bruno Baguette
  - Jack Wright
  - MrNicodemuz
  - Anonymous User
@@ -2430,7 +2454,6 @@ Symfony is the result of the work of many people who made the code better
  - n-aleha
  - Talha Zekeriya Durmuş
  - Anatol Belski
- - Anderson Müller
  - Şəhriyar İmanov
  - Alexis BOYER
  - Kaipi Yann
@@ -2485,6 +2508,7 @@ Symfony is the result of the work of many people who made the code better
  - Alex Nostadt
  - Michael Squires
  - Egor Gorbachev
+ - Fabien Villepinte
  - Derek Stephen McLean
  - Norman Soetbeer
  - zorn

From 67f1f1e159e7f83f6b3497847462aae263c6b100 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 27 Nov 2020 09:42:42 +0100
Subject: [PATCH 9/9] Update VERSION for 3.4.47

---
 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 815359e13201b..280401e919033 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -67,12 +67,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private $requestStackSize = 0;
     private $resetServices = false;
 
-    const VERSION = '3.4.47-DEV';
+    const VERSION = '3.4.47';
     const VERSION_ID = 30447;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 4;
     const RELEASE_VERSION = 47;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '11/2020';
     const END_OF_LIFE = '11/2021';