Merge branch '6.0' into 6.1

* 6.0:
  Fix URL to get composer.phar
  Fix appveyor
  [TwigBridge] Fix the build

Author: nicolas-grekas

.appveyor.yml

@@ -3,10 +3,6 @@ clone_depth: 2
 clone_folder: c:\projects\symfony
 image: Visual Studio 2019
 
-cache:
-    - composer.phar
-    - .phpunit -> phpunit
-
 init:
     - SET PATH=c:\php;%PATH%
     - SET COMPOSER_NO_INTERACTION=1
@@ -49,9 +45,8 @@ install:
     - echo extension=php_sodium.dll >> php.ini-max
     - copy /Y php.ini-max php.ini
     - cd c:\projects\symfony
-    - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.2.10/composer.phar)
-    - php composer.phar self-update --2
-    - copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
+    - appveyor DownloadFile https://getcomposer.org/download/latest-stable/composer.phar
+    - mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
     - 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)

src/Symfony/Bridge/Doctrine/composer.json

@@ -33,7 +33,6 @@
         "symfony/http-kernel": "^5.4|^6.0",
         "symfony/messenger": "^5.4|^6.0",
         "symfony/doctrine-messenger": "^5.4|^6.0",
-        "symfony/phpunit-bridge": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/property-info": "^5.4|^6.0",
         "symfony/proxy-manager-bridge": "^5.4|^6.0",

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

@@ -101,8 +101,8 @@
             {%- endif -%}
         {%- endif -%}
         <label{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
-            {{- widget|raw }}
-            {%- if label is not same as(false) -%}
+            {#- if statement must be kept on the same line, to force the space between widget and label -#}
+            {{- widget|raw }} {% if label is not same as(false) -%}
                 {%- if translation_domain is same as(false) -%}
                     {%- if label_html is same as(false) -%}
                         {{ label -}}

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -65,8 +65,7 @@
         "symfony/uid": "^5.4|^6.0",
         "symfony/web-link": "^5.4|^6.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "twig/twig": "^2.10|^3.0",
-        "symfony/phpunit-bridge": "^5.4|^6.0"
+        "twig/twig": "^2.10|^3.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13.1",