Skip to content

Commit cf2694c

Browse files
committed
[Routing] fix merge
1 parent fd4eb8a commit cf2694c

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Loader/XmlFileLoader.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, $
221221
if (null !== $methods) {
222222
$subCollection->setMethods($methods);
223223
}
224+
$subCollection->addDefaults($defaults);
225+
$subCollection->addRequirements($requirements);
226+
$subCollection->addOptions($options);
224227

225228
if ($namePrefix = $node->getAttribute('name-prefix')) {
226229
$subCollection->addNamePrefix($namePrefix);

Loader/YamlFileLoader.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@ protected function parseImport(RouteCollection $collection, array $config, $path
216216
if (null !== $methods) {
217217
$subCollection->setMethods($methods);
218218
}
219+
$subCollection->addDefaults($defaults);
220+
$subCollection->addRequirements($requirements);
221+
$subCollection->addOptions($options);
219222

220223
if (isset($config['name_prefix'])) {
221224
$subCollection->addNamePrefix($config['name_prefix']);

0 commit comments

Comments
 (0)