From ad0bb6ac534f90bc8e5fa6be07818ca48f784832 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 1 Mar 2017 07:03:05 -0800 Subject: [PATCH] fixed CS --- .../Fixtures/CustomPathBundle/src/CustomPathBundle.php | 4 +++- .../DependencyInjection/Fixtures/TestBundle/TestBundle.php | 4 +++- .../Component/Form/Extension/Validator/Util/ServerParams.php | 4 +++- src/Symfony/Component/Form/Tests/AbstractLayoutTest.php | 3 ++- .../Component/Form/Tests/CompoundFormPerformanceTest.php | 4 +++- .../Form/Tests/Extension/Core/Type/BaseTypeTest.php | 4 +++- .../Form/Tests/Extension/Core/Type/CheckboxTypeTest.php | 3 ++- .../Form/Tests/Extension/Core/Type/CollectionTypeTest.php | 3 ++- .../Form/Tests/Extension/Core/Type/FileTypeTest.php | 4 +++- .../Form/Tests/Extension/Core/Type/PasswordTypeTest.php | 4 +++- .../Form/Tests/Extension/Core/Type/RepeatedTypeTest.php | 4 +++- .../Form/Tests/Extension/Core/Type/TimezoneTypeTest.php | 3 ++- .../Security/Acl/Tests/Domain/ObjectIdentityTest.php | 5 +++-- .../Component/Security/Core/Tests/Util/ClassUtilsTest.php | 5 +++-- 14 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php index 31cec239d8..166b606a45 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php +++ b/src/Symfony/Bundle/FrameworkBundle/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/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php index b0c4548fa0..2f090b2de8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php +++ b/src/Symfony/Bundle/FrameworkBundle/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 { } diff --git a/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php b/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php index c058d60cae..54437f76a3 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php +++ b/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php @@ -11,9 +11,11 @@ namespace Symfony\Component\Form\Extension\Validator\Util; +use Symfony\Component\Form\Util\ServerParams as BaseServerParams; + /** * @author Bernhard Schussek */ -class ServerParams extends \Symfony\Component\Form\Util\ServerParams +class ServerParams extends BaseServerParams { } diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index 1678a4bb2b..3873fb4cd4 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -14,8 +14,9 @@ namespace Symfony\Component\Form\Tests; use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormView; use Symfony\Component\Form\Extension\Csrf\CsrfExtension; +use Symfony\Component\Form\Test\FormIntegrationTestCase; -abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormIntegrationTestCase +abstract class AbstractLayoutTest extends FormIntegrationTestCase { protected $csrfTokenManager; protected $testableFeatures = array(); diff --git a/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php b/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php index 77873a71f9..663387090e 100644 --- a/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php +++ b/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php @@ -11,10 +11,12 @@ namespace Symfony\Component\Form\Tests; +use Symfony\Component\Form\Test\FormPerformanceTestCase; + /** * @author Bernhard Schussek */ -class CompoundFormPerformanceTest extends \Symfony\Component\Form\Test\FormPerformanceTestCase +class CompoundFormPerformanceTest extends FormPerformanceTestCase { /** * Create a compound form multiple times, as happens in a collection form. diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php index 0048cf41c5..b802325850 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php @@ -11,10 +11,12 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Component\Form\Test\TypeTestCase; + /** * @author Bernhard Schussek */ -abstract class BaseTypeTest extends \Symfony\Component\Form\Test\TypeTestCase +abstract class BaseTypeTest extends TypeTestCase { public function testPassDisabledAsOption() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php index 9437bd7eea..af3c5244ee 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php @@ -12,8 +12,9 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\CallbackTransformer; +use Symfony\Component\Form\Test\TypeTestCase; -class CheckboxTypeTest extends \Symfony\Component\Form\Test\TypeTestCase +class CheckboxTypeTest extends TypeTestCase { public function testDataIsFalseByDefault() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php index 27237f3e66..1a29b4e825 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php @@ -11,10 +11,11 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Component\Form\Test\TypeTestCase; use Symfony\Component\Form\Tests\Fixtures\Author; use Symfony\Component\Form\Tests\Fixtures\AuthorType; -class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase +class CollectionTypeTest extends TypeTestCase { public function testContainsNoChildByDefault() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php index c6a61af8b7..6315e97a4f 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php @@ -11,7 +11,9 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; -class FileTypeTest extends \Symfony\Component\Form\Test\TypeTestCase +use Symfony\Component\Form\Test\TypeTestCase; + +class FileTypeTest extends TypeTestCase { // https://github.com/symfony/symfony/pull/5028 public function testSetData() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php index bccb6f7b77..c809e2fd8f 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php @@ -11,7 +11,9 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; -class PasswordTypeTest extends \Symfony\Component\Form\Test\TypeTestCase +use Symfony\Component\Form\Test\TypeTestCase; + +class PasswordTypeTest extends TypeTestCase { public function testEmptyIfNotSubmitted() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php index 8e56b8feb9..4d77ee388b 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php @@ -11,7 +11,9 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; -class RepeatedTypeTest extends \Symfony\Component\Form\Test\TypeTestCase +use Symfony\Component\Form\Test\TypeTestCase; + +class RepeatedTypeTest extends TypeTestCase { protected $form; diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php index 05e2346984..b36f0b328a 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php @@ -12,8 +12,9 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\ChoiceList\View\ChoiceView; +use Symfony\Component\Form\Test\TypeTestCase; -class TimezoneTypeTest extends \Symfony\Component\Form\Test\TypeTestCase +class TimezoneTypeTest extends TypeTestCase { public function testTimezonesAreSelectable() { diff --git a/src/Symfony/Component/Security/Acl/Tests/Domain/ObjectIdentityTest.php b/src/Symfony/Component/Security/Acl/Tests/Domain/ObjectIdentityTest.php index 89782640c3..f497bcda79 100644 --- a/src/Symfony/Component/Security/Acl/Tests/Domain/ObjectIdentityTest.php +++ b/src/Symfony/Component/Security/Acl/Tests/Domain/ObjectIdentityTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Security\Acl\Tests\Domain { - use PHPUnit\Framework\TestCase; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; use Symfony\Component\Security\Acl\Model\DomainObjectInterface; @@ -131,7 +130,9 @@ namespace Symfony\Component\Security\Acl\Tests\Domain namespace Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Acl\Tests\Domain { - class TestDomainObject extends \Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject + use Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject as BaseTestDomainObject; + + class TestDomainObject extends BaseTestDomainObject { } } diff --git a/src/Symfony/Component/Security/Core/Tests/Util/ClassUtilsTest.php b/src/Symfony/Component/Security/Core/Tests/Util/ClassUtilsTest.php index bd499b50e4..f921841ab0 100644 --- a/src/Symfony/Component/Security/Core/Tests/Util/ClassUtilsTest.php +++ b/src/Symfony/Component/Security/Core/Tests/Util/ClassUtilsTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Security\Core\Tests\Util { - use PHPUnit\Framework\TestCase; use Symfony\Component\Security\Core\Util\ClassUtils; @@ -46,7 +45,9 @@ namespace Symfony\Component\Security\Core\Tests\Util 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 { } }