Merge branch '6.3' into 6.4

* 6.3: (27 commits)
  [Filesystem] Follow symlinks when dumping files
  [Security] Add clock dependency to OidcTokenHandler
  [DependencyInjection] Escape `%` from parameter-like default values
  [SecurityBundle] add missing xsd definition for OIDC
  [FrameworkBundle] remove support for preloading ESM modules using headers
  Fix tests
  [SecurityBundle] Fix configuring OIDC user info token handler client
  [Notifier] Fix ContactEveryoneOptions
  CS fix
  [FrameworkBundle][PhpUnitBridge] Configure doctrine/deprecations as expected
  [HttpKernel] Fix default value ignored with pinned resolvers
  Fix unable to use asset mapper with CSP
  Fix Typos
  Ignore definitions bearing the `container.excluded` tag
  Bump Symfony version to 6.3.0
  Update VERSION for 6.3.0-RC2
  Update CHANGELOG for 6.3.0-RC2
  Bump Symfony version to 6.2.12
  Update VERSION for 6.2.11
  Update CHANGELOG for 6.2.11
  ...

Author: nicolas-grekas

Console/Descriptor/JsonDescriptor.php

@@ -106,6 +106,9 @@ protected function describeContainerServices(ContainerBuilder $container, array
             if ($service instanceof Alias) {
                 $data['aliases'][$serviceId] = $this->getContainerAliasData($service);
             } elseif ($service instanceof Definition) {
+                if ($service->hasTag('container.excluded')) {
+                    continue;
+                }
                 $data['definitions'][$serviceId] = $this->getContainerDefinitionData($service, $omitTags, $showArguments, $container, $serviceId);
             } else {
                 $data['services'][$serviceId] = $service::class;

Console/Descriptor/MarkdownDescriptor.php

@@ -162,6 +162,9 @@ protected function describeContainerServices(ContainerBuilder $container, array
             if ($service instanceof Alias) {
                 $services['aliases'][$serviceId] = $service;
             } elseif ($service instanceof Definition) {
+                if ($service->hasTag('container.excluded')) {
+                    continue;
+                }
                 $services['definitions'][$serviceId] = $service;
             } else {
                 $services['services'][$serviceId] = $service;

Console/Descriptor/TextDescriptor.php

@@ -198,6 +198,10 @@ protected function describeContainerServices(ContainerBuilder $container, array
             }
 
             if ($definition instanceof Definition) {
+                if ($definition->hasTag('container.excluded')) {
+                    unset($serviceIds[$key]);
+                    continue;
+                }
                 if ($showTag) {
                     $tags = $definition->getTag($showTag);
                     foreach ($tags as $tag) {

Console/Descriptor/XmlDescriptor.php

@@ -293,6 +293,10 @@ private function getContainerServicesDocument(ContainerBuilder $container, strin
                 continue;
             }
 
+            if ($service instanceof Definition && $service->hasTag('container.excluded')) {
+                continue;
+            }
+
             $serviceXML = $this->getContainerServiceDocument($service, $serviceId, null, $showArguments);
             $containerXML->appendChild($containerXML->ownerDocument->importNode($serviceXML->childNodes->item(0), true));
         }

Controller/AbstractController.php

@@ -14,7 +14,6 @@
 use Psr\Container\ContainerInterface;
 use Psr\Link\EvolvableLinkInterface;
 use Psr\Link\LinkInterface;
-use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -97,7 +96,6 @@ public static function getSubscribedServices(): array
             'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class,
             'parameter_bag' => '?'.ContainerBagInterface::class,
             'web_link.http_header_serializer' => '?'.HttpHeaderSerializer::class,
-            'asset_mapper.importmap.manager' => '?'.ImportMapManager::class,
         ];
     }
 
@@ -412,7 +410,7 @@ protected function addLink(Request $request, LinkInterface $link): void
     /**
      * @param LinkInterface[] $links
      */
-    protected function sendEarlyHints(iterable $links = [], Response $response = null, bool $preloadJavaScriptModules = false): Response
+    protected function sendEarlyHints(iterable $links = [], Response $response = null): Response
     {
         if (!$this->container->has('web_link.http_header_serializer')) {
             throw new \LogicException('You cannot use the "sendEarlyHints" method if the WebLink component is not available. Try running "composer require symfony/web-link".');
@@ -421,17 +419,6 @@ protected function sendEarlyHints(iterable $links = [], Response $response = nul
         $response ??= new Response();
 
         $populatedLinks = [];
-
-        if ($preloadJavaScriptModules) {
-            if (!$this->container->has('asset_mapper.importmap.manager')) {
-                throw new \LogicException('You cannot use the JavaScript modules method if the AssetMapper component is not available. Try running "composer require symfony/asset-mapper".');
-            }
-
-            foreach ($this->container->get('asset_mapper.importmap.manager')->getModulesToPreload() as $url) {
-                $populatedLinks[] = new Link('modulepreload', $url);
-            }
-        }
-
         foreach ($links as $link) {
             if ($link instanceof EvolvableLinkInterface && !$link->getRels()) {
                 $link = $link->withRel('preload');

FrameworkBundle.php

@@ -95,6 +95,8 @@ class FrameworkBundle extends Bundle
      */
     public function boot()
     {
+        $_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';
+
         $handler = ErrorHandler::register(null, false);
         $this->container->get('debug.error_handler_configurator')->configure($handler);
 

Tests/Controller/AbstractControllerTest.php

@@ -74,7 +74,6 @@ public function testSubscribedServices()
             'security.token_storage' => '?Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface',
             'security.csrf.token_manager' => '?Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface',
             'web_link.http_header_serializer' => '?Symfony\\Component\\WebLink\\HttpHeaderSerializer',
-            'asset_mapper.importmap.manager' => '?Symfony\\Component\\AssetMapper\\ImportMap\\ImportMapManager',
         ];
 
         $this->assertEquals($expectedServices, $subscribed, 'Subscribed core services in AbstractController have changed');

Tests/Fixtures/ContainerExcluded.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+class ContainerExcluded
+{
+}

Tests/Functional/ContainerDebugCommandTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ContainerExcluded;
 use Symfony\Component\Console\Tester\ApplicationTester;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -99,6 +100,19 @@ public function testDeprecatedServiceAndAlias()
         $this->assertStringContainsString('[WARNING] The "deprecated_alias" alias is deprecated since foo/bar 1.9 and will be removed in 2.0', $tester->getDisplay());
     }
 
+    public function testExcludedService()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'debug:container']);
+        $this->assertStringNotContainsString(ContainerExcluded::class, $tester->getDisplay());
+    }
+
     /**
      * @dataProvider provideIgnoreBackslashWhenFindingService
      */

Tests/Functional/app/ContainerDebug/config.yml

@@ -33,3 +33,5 @@ services:
             - '%env(REAL)%'
             - '%env(int:key:2:json:JSON)%'
             - '%env(float:key:2:json:JSON)%'
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ContainerExcluded:
+        tags: ['container.excluded']