Merge branch '7.4' into 8.0

* 7.4:
  Update DOCtor-RST and enable new rules

Author: OskarStark

.doctor-rst.yaml

@@ -21,6 +21,17 @@ rules:
     ensure_order_of_code_blocks_in_configuration_block: ~
     ensure_php_reference_syntax: ~
     extend_abstract_controller: ~
+    filepath_and_namespace_should_match:
+        namespace_mapping:
+            'src/': 'App\'
+            'tests/': 'App\Tests\'
+        ignored_namespaces:
+            - '/^Acme/'
+            - '/^Shared/'
+        ignored_paths:
+            - '/^config\//'
+            - '/^example\.com\//'
+            - '/^apps\/api\/tests\//'
     # extension_xlf_instead_of_xliff: ~
     forbidden_directives:
         directives:
@@ -43,12 +54,14 @@ rules:
     no_composer_req: ~
     no_directive_after_shorthand: ~
     no_duplicate_use_statements: ~
+    no_empty_directive: ~
     no_empty_literals: ~
     no_explicit_use_of_code_block_php: ~
     no_footnotes: ~
     no_inheritdoc: ~
     no_merge_conflict: ~
     no_namespace_after_use_statements: ~
+    no_non_breaking_space: ~
     no_php_open_tag_in_code_block_php_directive: ~
     no_space_before_self_xml_closing_tag: ~
     no_typographic_quotes: ~

.github/workflows/ci.yaml

@@ -72,7 +72,7 @@ jobs:
                     key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
 
             -   name: "Run DOCtor-RST"
-                uses: docker://oskarstark/doctor-rst:1.73.0
+                uses: docker://oskarstark/doctor-rst:1.76.0
                 with:
                     args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
 

bundles/prepend_extension.rst

@@ -20,7 +20,7 @@ on another bundle being loaded as well.
 To give an Extension the power to do this, it needs to implement
 :class:`Symfony\\Component\\DependencyInjection\\Extension\\PrependExtensionInterface`::
 
-    // src/Acme/HelloBundle/DependencyInjection/AcmeHelloExtension.php
+    // src/DependencyInjection/AcmeHelloExtension.php
     namespace Acme\HelloBundle\DependencyInjection;
 
     use Symfony\Component\DependencyInjection\ContainerBuilder;

components/phpunit_bridge.rst

@@ -138,12 +138,12 @@ a directory containing multiple test suites with their own ``phpunit.xml.dist``.
 .. code-block:: terminal
 
     ├── tests/
-    │   ├── Functional/
-    │   │   ├── ...
-    │   │   └── phpunit.xml.dist
-    │   ├── Unit/
-    │   │   ├── ...
-    │   │   └── phpunit.xml.dist
+    │   ├── Functional/
+    │   │   ├── ...
+    │   │   └── phpunit.xml.dist
+    │   ├── Unit/
+    │   │   ├── ...
+    │   │   └── phpunit.xml.dist
 
 .. code-block:: terminal
 

console/style.rst

@@ -483,7 +483,7 @@ your commands. Thanks to the ``StyleInterface`` you won't need to change the cod
 of your commands to change their appearance::
 
     // src/Command/MyCommand.php
-    namespace App\Console;
+    namespace App\Command;
 
     use App\Console\CustomStyle;
     use Symfony\Component\Console\Command\Command;

contributing/documentation/standards.rst

@@ -101,7 +101,7 @@ Example
 .. code-block:: php
 
     // src/Foo/Bar.php
-    namespace Foo;
+    namespace App\Foo;
 
     use Acme\Demo\Cat;
     // ...

mercure.rst

@@ -597,7 +597,7 @@ During unit testing it's usually not needed to send updates to Mercure.
 
 You can instead make use of the ``MockHub`` class::
 
-    // tests/FunctionalTest.php
+    // tests/Unit/Controller/FunctionalTest.php
     namespace App\Tests\Unit\Controller;
 
     use App\Controller\MessageController;

reference/constraints/Choice.rst

@@ -86,7 +86,7 @@ If your valid choice list is simple, you can pass them in directly via the
 
     .. code-block:: php
 
-        // src/EntityAuthor.php
+        // src/Entity/Author.php
         namespace App\Entity;
 
         use Symfony\Component\Validator\Constraints as Assert;
@@ -173,7 +173,7 @@ constraint.
 
     .. code-block:: php
 
-        // src/EntityAuthor.php
+        // src/Entity/Author.php
         namespace App\Entity;
 
         use Symfony\Component\Validator\Constraints as Assert;

reference/constraints/Compound.rst

@@ -53,7 +53,7 @@ You can now use it anywhere you need it:
     .. code-block:: php-attributes
 
         // src/Entity/User.php
-        namespace App\Entity\User;
+        namespace App\Entity;
 
         use App\Validator\Constraints as Assert;
 
@@ -89,7 +89,7 @@ You can now use it anywhere you need it:
     .. code-block:: php
 
         // src/Entity/User.php
-        namespace App\Entity\User;
+        namespace App\Entity;
 
         use App\Validator\Constraints as Assert;
         use Symfony\Component\Validator\Mapping\ClassMetadata;

security.rst

@@ -1571,7 +1571,7 @@ You can logout user programmatically using the ``logout()`` method of the
 :class:`Symfony\\Bundle\\SecurityBundle\\Security` helper::
 
     // src/Controller/SecurityController.php
-    namespace App\Controller\SecurityController;
+    namespace App\Controller;
 
     use Symfony\Bundle\SecurityBundle\Security;