Skip to content

Commit 5622342

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: Use fourth argument of RoutingConfigurator instead of non-existent method
2 parents 5947b3e + 83d0d4d commit 5622342

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
@@ -1711,9 +1711,14 @@ when importing the routes.
17111711
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
17121712
17131713
return function (RoutingConfigurator $routes) {
1714-
// use the optional fourth argument of import() to exclude some files
1715-
// or subdirectories when loading annotations
1716-
$routes->import('../../src/Controller/', 'annotation')
1714+
$routes->import(
1715+
'../../src/Controller/',
1716+
'annotation',
1717+
false,
1718+
// the optional fourth argument is used to exclude some files
1719+
// or subdirectories when loading annotations
1720+
'../../src/Controller/{DebugEmailController}.php'
1721+
)
17171722
// this is added to the beginning of all imported route URLs
17181723
->prefix('/blog')
17191724
@@ -1726,9 +1731,6 @@ when importing the routes.
17261731
17271732
// these requirements are added to all imported routes
17281733
->requirements(['_locale' => 'en|es|fr'])
1729-
1730-
// you can optionally exclude some files/subdirectories when loading annotations
1731-
->exclude('../../src/Controller/{DebugEmailController}.php')
17321734
;
17331735
};
17341736

0 commit comments

Comments
 (0)