Skip to content

Commit 83ea019

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Enable argument_variable_must_match_type doctor-rst rule
2 parents 75f490e + 180886c commit 83ea019

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.doctor-rst.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
rules:
22
american_english: ~
3+
argument_variable_must_match_type:
4+
arguments:
5+
- { type: 'ContainerBuilder', name: 'containerBuilder' }
6+
- { type: 'ContainerConfigurator', name: 'containerConfigurator' }
37
avoid_repetetive_words: ~
48
blank_line_after_anchor: ~
59
blank_line_after_directive: ~
@@ -95,6 +99,5 @@ whitelist:
9599
- '.. versionadded:: 3.6' # MonologBundle
96100
- '// bin/console'
97101
- 'End to End Tests (E2E)'
98-
- '.. code-block:: php'
99102
- '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
100103
- '.. End to End Tests (E2E)'

components/uid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ configure the behavior of the factory using configuration files::
118118
119119
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
120120
121-
return static function (ContainerConfigurator $configurator): void {
121+
return static function (ContainerConfigurator $containerConfigurator): void {
122122
$services = $configurator->services()
123123
->defaults()
124124
->autowire()

security/entry_point.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ You can configure this using the ``entry_point`` setting:
6060
.. code-block:: php
6161
6262
// config/packages/security.php
63-
use Symfony\Config\SecurityConfig;
6463
use App\Security\SocialConnectAuthenticator;
64+
use Symfony\Config\SecurityConfig;
6565
6666
return static function (SecurityConfig $security) {
6767
$security->enableAuthenticatorManager(true);

serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ configuration:
144144
.. code-block:: php
145145
146146
// config/packages/framework.php
147-
use Symfony\Config\FrameworkConfig;
148147
use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
148+
use Symfony\Config\FrameworkConfig;
149149
150150
return static function (FrameworkConfig $framework) {
151151
$framework->serializer()

templating/global_variables.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ the ``@`` character, which is the usual syntax to
9999
.. code-block:: php
100100
101101
// config/packages/twig.php
102-
use Symfony\Config\TwigConfig;
103102
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
103+
use Symfony\Config\TwigConfig;
104104
105105
return static function (TwigConfig $twig) {
106106
// ...

0 commit comments

Comments
 (0)