8000 minor #58854 [Routing] fix merge (xabbuh) · symfony/symfony@5cc07e7 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5cc07e7

Browse files
committed
minor #58854 [Routing] fix merge (xabbuh)
This PR was merged into the 6.4 branch. Discussion ---------- [Routing] fix merge | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- e4f2ae6 fix merge
2 parents 3538046 + e4f2ae6 commit 5cc07e7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
controllers:
22
resource: Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures\RouteWithPriorityController
3-
type: annotation
3+
type: attribute
44
host:
55
cs: www.domain.cs
66
en: www.domain.com

src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ public function testPriorityWithHost()
486486
{
487487
new LoaderResolver([
488488
$loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/locale_and_host')),
489-
new class(new AnnotationReader(), null) extends AnnotationClassLoader {
489+
new class() extends AttributeClassLoader {
490490
protected function configureRoute(
491491
Route $route,
492492
\ReflectionClass $class,

0 commit comments

Comments
 (0)
0