Skip to content

Commit 9d7b6fb

Browse files
bug #25989 [DI][Routing] Fix tracking of globbed resources (nicolas-grekas, sroze)
This PR was merged into the 3.4 branch. Discussion ---------- [DI][Routing] Fix tracking of globbed resources | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25904 | License | MIT | Doc PR | - The current `GlobFileLoader` in `Config` misses resource tracking, so we can't use it and have to use a per-component one instead. (deps=high failures will be fixed after merging up to master.) Commits ------- 945c753 Add tests for glob loaders ad98c1fa [DI][Routing] Fix tracking of globbed resources
2 parents 05f8e01 + d745b71 commit 9d7b6fb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Resources/config/routing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<argument type="service" id="file_locator" />
3939
</service>
4040

41-
<service id="routing.loader.glob" class="Symfony\Component\Config\Loader\GlobFileLoader">
41+
<service id="routing.loader.glob" class="Symfony\Component\Routing\Loader\GlobFileLoader">
4242
<tag name="routing.loader" />
4343
<argument type="service" id="file_locator" />
4444
</service>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"symfony/polyfill-mbstring": "~1.0",
2929
"symfony/filesystem": "~2.8|~3.0|~4.0",
3030
"symfony/finder": "~2.8|~3.0|~4.0",
31-
"symfony/routing": "~3.4|~4.0"
31+
"symfony/routing": "^3.4.5|^4.0.5"
3232
},
3333
"require-dev": {
3434
"doctrine/cache": "~1.0",

0 commit comments

Comments
 (0)