Merge branch '6.1' into 6.2

* 6.1:
  Fix the code example leading to an error

Author: javiereguiluz

configuration/micro_kernel_trait.rst

@@ -274,7 +274,7 @@ add a service conditionally based on the ``foo`` value::
         public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             if ($config['foo']) {
-                $container->set('foo_service', new \stdClass());
+                $builder->register('foo_service', \stdClass::class);
             }
         }
     }