8000 Merge branch '2.8' into 3.4 · symfony/symfony@68ff3d3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 68ff3d3

Browse files
Merge branch '2.8' into 3.4
* 2.8: [Routing] remove useless failing mocks
2 parents 0b86145 + 64e538e commit 68ff3d3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Symfony/Component/Routing/Tests/RouterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function testMatcherIsCreatedIfCacheIsNotConfigured($option)
102102

103103
$this->loader->expects($this->once())
104104
->method('load')->with('routing.yml', null)
105-
->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
105+
->will($this->returnValue(new RouteCollection()));
106106

107107
$this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher());
108108
}
@@ -124,7 +124,7 @@ public function testGeneratorIsCreatedIfCacheIsNotConfigured($option)
124124

125125
$this->loader->expects($this->once())
126126
->method('load')->with('routing.yml', null)
127-
->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
127+
->will($this->returnValue(new RouteCollection()));
128128

129129
$this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator());
130130
}

0 commit comments

Comments
 (0)
0