Merge remote-tracking branch 'upstream/6.1' into 6.1

* upstream/6.1:
  Minor tweak
  [Kernel] Mention extra interfaces in `MicroKernel` section
  Mailer: remove port 99 for requestbin.com
  [Testing] Add a section to mock service dependencies

Author: OskarStark

configuration/micro_kernel_trait.rst

@@ -99,6 +99,44 @@ that define your bundles, your services and your routes:
     ``RoutingConfigurator`` has methods that make adding routes in PHP more
     fun. You can also load external routing files (shown below).
 
+Adding Interfaces to "Micro" Kernel
+-----------------------------------
+
+When using the ``MicroKernelTrait``, you can also implement the
+``CompilerPassInterface`` to automatically register the kernel itself as a
+compiler pass as explained in the dedicated
+:ref:`compiler pass section <kernel-as-compiler-pass>`.
+
+It is also possible to implement the ``EventSubscriberInterface`` to handle
+events directly from the kernel, again it will be registered automatically::
+
+    // ...
+    use App\Exception\Danger;
+    use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+    use Symfony\Component\HttpKernel\Event\ExceptionEvent;
+    use Symfony\Component\HttpKernel\KernelEvents;
+
+    class Kernel extends BaseKernel implements EventSubscriberInterface
+    {
+        use MicroKernelTrait;
+
+        // ...
+
+        public function onKernelException(ExceptionEvent $event): void
+        {
+            if ($event->getException() instanceof Danger) {
+                $event->setResponse(new Response('It\'s dangerous to go alone. Take this ⚔'));
+            }
+        }
+
+        public static function getSubscribedEvents(): array
+        {
+            return [
+                KernelEvents::EXCEPTION => 'onKernelException',
+            ];
+        }
+    }
+
 Advanced Example: Twig, Annotations and the Web Debug Toolbar
 -------------------------------------------------------------
 

mailer.rst

@@ -191,7 +191,6 @@ OhMySMTP             ohmysmtp+smtp://API_TOKEN@default                    n/a
 
         # .env
         MAILER_DSN=mailgun+https://KEY:DOMAIN@requestbin.com
-        MAILER_DSN=mailgun+https://KEY:DOMAIN@requestbin.com:99
 
     Note that the protocol is *always* HTTPs and cannot be changed.
 

service_container/compiler_passes.rst

@@ -32,6 +32,8 @@ Compiler passes are registered in the ``build()`` method of the application kern
         }
     }
 
+.. _kernel-as-compiler-pass:
+
 One of the most common use-cases of compiler passes is to work with :doc:`tagged
 services </service_container/tags>`. In those cases, instead of creating a
 compiler pass, you can make the kernel implement

testing.rst

@@ -281,6 +281,91 @@ It gives you access to both the public services and the non-removed
     are not used by any other services), you need to declare those private
     services as public in the ``config/services_test.yaml`` file.
 
+Mocking Dependencies
+--------------------
+
+Sometimes it can be useful to mock a dependency of a tested service.
+From the example in the previous section, let's assume the
+``NewsletterGenerator`` has a dependency to a private alias
+``NewsRepositoryInterface`` pointing to a private ``NewsRepository`` service
+and you'd like to use a mocked ``NewsRepositoryInterface`` instead of the
+concrete one::
+
+    // ...
+    use App\Contracts\Repository\NewsRepositoryInterface;
+
+    class NewsletterGeneratorTest extends KernelTestCase
+    {
+        public function testSomething()
+        {
+            // ... same bootstrap as the section above
+
+            $newsRepository = $this->createMock(NewsRepositoryInterface::class);
+            $newsRepository->expects(self::once())
+                ->method('findNewsFromLastMonth')
+                ->willReturn([
+                    new News('some news'),
+                    new News('some other news'),
+                ])
+            ;
+
+            // the following line won't work unless the alias is made public
+            $container->set(NewsRepositoryInterface::class, $newsRepository);
+
+            // will be injected the mocked repository
+            $newsletterGenerator = $container->get(NewsletterGenerator::class);
+
+            // ...
+        }
+    }
+
+In order to make the alias public, you will need to update configuration for
+the ``test`` environment as follows:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/services_test.yaml
+        services:
+            # redefine the alias as it should be while making it public
+            App\Contracts\Repository\NewsRepositoryInterface:
+                alias: App\Repository\NewsRepository
+                public: true
+
+    .. code-block:: xml
+
+        <!-- config/services_test.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+        ">
+            <services>
+                <!-- redefine the alias as it should be while making it public -->
+                <service id="App\Contracts\Repository\NewsRepositoryInterface"
+                    alias="App\Repository\NewsRepository"
+                />
+            </services>
+        </container>
+
+    .. code-block:: php
+
+        // config/services_test.php
+        namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+        use App\Contracts\Repository\NewsRepositoryInterface;
+        use App\Repository\NewsRepository;
+
+        return static function (ContainerConfigurator $container) {
+            $container->services()
+                // redefine the alias as it should be while making it public
+                ->alias(NewsRepositoryInterface::class, NewsRepository::class)
+                    ->public()
+            ;
+        };
+
 .. _testing-databases:
 
 Configuring a Database for Tests