Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit d56d0c3470cc · 2018-02-26T16:48:27.000+01:00
* 2.7:
  [Routing] remove useless failing mocks
diff --git a/Tests/RouterTest.php b/Tests/RouterTest.php
@@ -102,7 +102,7 @@ public function testMatcherIsCreatedIfCacheIsNotConfigured($option)
 
         $this->loader->expects($this->once())
             ->method('load')->with('routing.yml', null)
-            ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
+            ->will($this->returnValue(new RouteCollection()));
 
         $this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher());
     }
@@ -124,7 +124,7 @@ public function testGeneratorIsCreatedIfCacheIsNotConfigured($option)
 
         $this->loader->expects($this->once())
             ->method('load')->with('routing.yml', null)
-            ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
+            ->will($this->returnValue(new RouteCollection()));
 
         $this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator());
     }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function testMatcherIsCreatedIfCacheIsNotConfigured($option)`
`102`	`102`
`103`	`103`	`$this->loader->expects($this->once())`
`104`	`104`	`->method('load')->with('routing.yml', null)`
`105`		`- ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));`
	`105`	`+ ->will($this->returnValue(new RouteCollection()));`
`106`	`106`
`107`	`107`	`$this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher());`
`108`	`108`	`}`
`@@ -124,7 +124,7 @@ public function testGeneratorIsCreatedIfCacheIsNotConfigured($option)`
`124`	`124`
`125`	`125`	`$this->loader->expects($this->once())`
`126`	`126`	`->method('load')->with('routing.yml', null)`
`127`		`- ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));`
	`127`	`+ ->will($this->returnValue(new RouteCollection()));`
`128`	`128`
`129`	`129`	`$this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator());`
`130`	`130`	`}`