Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit f9fac11c894e · 2017-06-02T16:36:56.000+02:00
* 2.7:
  CS: adjust chaining indentation
diff --git a/Tests/Command/RouterDebugCommandTest.php b/Tests/Command/RouterDebugCommandTest.php
@@ -72,8 +72,8 @@ private function getContainer()
         ;
 
         $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
-             ->disableOriginalConstructor()
-             ->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container
diff --git a/Tests/Command/RouterMatchCommandTest.php b/Tests/Command/RouterMatchCommandTest.php
@@ -76,8 +76,8 @@ private function getContainer()
         ;
 
         $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
-             ->disableOriginalConstructor()
-             ->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ private function getContainer()`
`72`	`72`	`;`
`73`	`73`
`74`	`74`	`$loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')`
`75`		`- ->disableOriginalConstructor()`
`76`		`- ->getMock();`
	`75`	`+ ->disableOriginalConstructor()`
	`76`	`+ ->getMock();`
`77`	`77`
`78`	`78`	`$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();`
`79`	`79`	`$container`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ private function getContainer()`
`76`	`76`	`;`
`77`	`77`
`78`	`78`	`$loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')`
`79`		`- ->disableOriginalConstructor()`
`80`		`- ->getMock();`
	`79`	`+ ->disableOriginalConstructor()`
	`80`	`+ ->getMock();`
`81`	`81`
`82`	`82`	`$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();`
`83`	`83`	`$container`