Skip to content

Commit c49360d

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Use fourth argument of RoutingConfigurator instead of non-existent method
2 parents f7948d8 + 5622342 commit c49360d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

routing.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,9 +1370,14 @@ when importing the routes.
13701370
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
13711371
13721372
return function (RoutingConfigurator $routes) {
1373-
// use the optional fourth argument of import() to exclude some files
1374-
// or subdirectories when loading annotations
1375-
$routes->import('../../src/Controller/', 'annotation')
1373+
$routes->import(
1374+
'../../src/Controller/',
1375+
'annotation',
1376+
false,
1377+
// the optional fourth argument is used to exclude some files
1378+
// or subdirectories when loading annotations
1379+
'../../src/Controller/{DebugEmailController}.php'
1380+
)
13761381
// this is added to the beginning of all imported route URLs
13771382
->prefix('/blog')
13781383
@@ -1385,9 +1390,6 @@ when importing the routes.
13851390
13861391
// these requirements are added to all imported routes
13871392
->requirements(['_locale' => 'en|es|fr'])
1388-
1389-
// you can optionally exclude some files/subdirectories when loading annotations
1390-
->exclude('../../src/Controller/{DebugEmailController}.php')
13911393
;
13921394
};
13931395

0 commit comments

Comments
 (0)