Merge branch '7.0' into 7.1

* 7.0:
  Extend AbstractBundle instead of Bundle

Author: javiereguiluz

bundles/best_practices.rst

@@ -78,16 +78,22 @@ The following is the recommended directory structure of an AcmeBlogBundle:
     ├── LICENSE
     └── README.md
 
-This directory structure requires to configure the bundle path to its root
-directory as follows::
+.. note::
+
+    This directory structure is used by default when your bundle class extends
+    the recommended :class:`Symfony\\Component\\HttpKernel\\Bundle\\AbstractBundle`.
+    If your bundle extends the :class:`Symfony\\Component\\HttpKernel\\Bundle\\Bundle`
+    class, you have to override the ``getPath()`` method as follows::
 
-    class AcmeBlogBundle extends Bundle
-    {
-        public function getPath(): string
+        use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+        class AcmeBlogBundle extends Bundle
         {
-            return \dirname(__DIR__);
+            public function getPath(): string
+            {
+                return \dirname(__DIR__);
+            }
         }
-    }
 
 **The following files are mandatory**, because they ensure a structure convention
 that automated tools can rely on:

service_container/compiler_passes.rst

@@ -75,9 +75,9 @@ method in the extension)::
 
     use App\DependencyInjection\Compiler\CustomPass;
     use Symfony\Component\DependencyInjection\ContainerBuilder;
-    use Symfony\Component\HttpKernel\Bundle\Bundle;
+    use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
 
-    class MyBundle extends Bundle
+    class MyBundle extends AbstractBundle
     {
         public function build(ContainerBuilder $container): void
         {