Merge branch '6.2' into 6.3

* 6.2:
  Fix Typos
  Ignore definitions bearing the `container.excluded` tag
  Bump Symfony version to 6.2.12
  Update VERSION for 6.2.11
  Update CHANGELOG for 6.2.11
  Bump Symfony version to 5.4.25
  Update CONTRIBUTORS for 5.4.24
  Update VERSION for 5.4.24
  Update CHANGELOG for 5.4.24

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,12 @@ private function getContainerServicesDocument(ContainerBuilder $container, strin
                 continue;
             }
 
+            if ($service instanceof Definition) {
+                if ($service->hasTag('container.excluded')) {
+                    continue;
+                }
+            }
+
             $serviceXML = $this->getContainerServiceDocument($service, $serviceId, null, $showArguments);
             $containerXML->appendChild($containerXML->ownerDocument->importNode($serviceXML->childNodes->item(0), true));
         }

Tests/Fixtures/ContainerExcluded.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+/**
+ * @author Maksim Vorozhtsov <[email protected]>
+ */
+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']