Merge branch '2.7' into 2.8

fabpot · fabpot · commit 865ff951f142 · 2017-03-02T13:33:27.000-08:00
* 2.7:
  fixed CS
diff --git a/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php b/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests;
 
-class CustomPathBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class CustomPathBundle extends Bundle
 {
     public function getPath()
     {
diff --git a/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php b/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests;
 
-class TestBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class TestBundle extends Bundle
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests;`
`13`	`13`
`14`		`-class CustomPathBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle`
	`14`	`+use Symfony\Component\HttpKernel\Bundle\Bundle;`
	`15`	`+`
	`16`	`+class CustomPathBundle extends Bundle`
`15`	`17`	`{`
`16`	`18`	`public function getPath()`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests;`
`13`	`13`
`14`		`-class TestBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle`
	`14`	`+use Symfony\Component\HttpKernel\Bundle\Bundle;`
	`15`	`+`
	`16`	`+class TestBundle extends Bundle`
`15`	`17`	`{`
`16`	`18`	`}`