Merge branch '2.7' into 2.8

fabpot · fabpot · commit 14d1643e8ad0 · 2017-03-02T13:33:27.000-08:00
* 2.7:
  fixed CS
diff --git a/Tests/Util/ClassUtilsTest.php b/Tests/Util/ClassUtilsTest.php
@@ -48,7 +48,9 @@ class TestObject
 
 namespace Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Core\Tests\Util
 {
-    class TestObject extends \Symfony\Component\Security\Core\Tests\Util\TestObject
+    use Symfony\Component\Security\Core\Tests\Util\TestObject as BaseTestObject;
+
+    class TestObject extends BaseTestObject
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ class TestObject`
`48`	`48`
`49`	`49`	`namespace Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Core\Tests\Util`
`50`	`50`	`{`
`51`		`- class TestObject extends \Symfony\Component\Security\Core\Tests\Util\TestObject`
	`51`	`+ use Symfony\Component\Security\Core\Tests\Util\TestObject as BaseTestObject;`
	`52`	`+`
	`53`	`+ class TestObject extends BaseTestObject`
`52`	`54`	`{`
`53`	`55`	`}`
`54`	`56`	`}`