Skip to content

Commit 3065ce8

Browse files
OskarStarkOskarStark
committed
Use import instead of FQCN
1 parent 13271c6 commit 3065ce8

File tree

127 files changed

+697
-461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+697
-461
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\DataCollector;
1313

14+
use Doctrine\DBAL\Logging\DebugStack;
1415
use Doctrine\DBAL\Platforms\MySqlPlatform;
1516
use Doctrine\DBAL\Version;
1617
use Doctrine\Persistence\ManagerRegistry;
@@ -249,7 +250,7 @@ private function createCollector($queries)
249250
->method('getConnection')
250251
->willReturn($connection);
251252

252-
$logger = $this->createMock(\Doctrine\DBAL\Logging\DebugStack::class);
253+
$logger = $this->createMock(DebugStack::class);
253254
$logger->queries = $queries;
254255

255256
$collector = new DoctrineDataCollector($registry);

‎src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
1616
use Symfony\Bridge\Doctrine\Tests\Fixtures\ContainerAwareFixture;
17+
use Symfony\Component\DependencyInjection\ContainerInterface;
1718

1819
class ContainerAwareLoaderTest extends TestCase
1920
{
2021
public function testShouldSetContainerOnContainerAwareFixture()
2122
{
22-
$container = $this->createMock(\Symfony\Component\DependencyInjection\ContainerInterface::class);
23+
$container = $this->createMock(ContainerInterface::class);
2324
$loader = new ContainerAwareLoader($container);
2425
$fixture = new ContainerAwareFixture();
2526

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Definition;
1718
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -22,7 +23,7 @@
2223
class DoctrineExtensionTest extends TestCase
2324
{
2425
/**
25-
* @var \Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension
26+
* @var AbstractDoctrineExtension
2627
*/
2728
private $extension;
2829

@@ -31,7 +32,7 @@ protected function setUp(): void
3132
parent::setUp();
3233

3334
$this->extension = $this
34-
->getMockBuilder(\Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension::class)
35+
->getMockBuilder(AbstractDoctrineExtension::class)
3536
->setMethods([
3637
'getMappingResourceConfigDirectory',
3738
'getObjectManagerElementName',

‎src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Doctrine\Common\Collections\ArrayCollection;
1515
use PHPUnit\Framework\TestCase;
1616
use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
17+
use Symfony\Component\Form\Exception\TransformationFailedException;
1718

1819
/**
1920
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -64,7 +65,7 @@ public function testTransformNull()
6465

6566
public function testTransformExpectsArrayOrCollection()
6667
{
67-
$this->expectException(\Symfony\Component\Form\Exception\TransformationFailedException::class);
68+
$this->expectException(TransformationFailedException::class);
6869
$this->transformer->transform('Foo');
6970
}
7071

‎src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Component\Form\FormBuilder;
1919
use Symfony\Component\Form\FormEvent;
2020
use Symfony\Component\Form\FormEvents;
21+
use Symfony\Component\Form\FormFactoryInterface;
2122

2223
class MergeDoctrineCollectionListenerTest extends TestCase
2324
{
@@ -32,7 +33,7 @@ protected function setUp(): void
3233
{
3334
$this->collection = new ArrayCollection(['test']);
3435
$this->dispatcher = new EventDispatcher();
35-
$this->factory = $this->createMock(\Symfony\Component\Form\FormFactoryInterface::class);
36+
$this->factory = $this->createMock(FormFactoryInterface::class);
3637
$this->form = $this->getBuilder()
3738
->getForm();
3839
}

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,16 @@
2929
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
3030
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringCastableIdEntity;
3131
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity;
32+
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
3233
use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
3334
use Symfony\Component\Form\ChoiceList\View\ChoiceView;
35+
use Symfony\Component\Form\Exception\RuntimeException;
36+
use Symfony\Component\Form\Exception\UnexpectedTypeException;
3437
use Symfony\Component\Form\Forms;
3538
use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTest;
3639
use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
40+
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
41+
use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
3742

3843
class EntityTypeTest extends BaseTypeTest
3944
{
@@ -118,13 +123,13 @@ protected function persist(array $entities)
118123

119124
public function testClassOptionIsRequired()
120125
{
121-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\MissingOptionsException::class);
126+
$this->expectException(MissingOptionsException::class);
122127
$this->factory->createNamed('name', static::TESTED_TYPE);
123128
}
124129

125130
public function testInvalidClassOption()
126131
{
127-
$this->expectException(\Symfony\Component\Form\Exception\RuntimeException::class);
132+
$this->expectException(RuntimeException::class);
128133
$this->factory->createNamed('name', static::TESTED_TYPE, null, [
129134
'class' => 'foo',
130135
]);
@@ -219,7 +224,7 @@ public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
219224

220225
public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
221226
{
222-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\InvalidOptionsException::class);
227+
$this->expectException(InvalidOptionsException::class);
223228
$this->factory->createNamed('name', static::TESTED_TYPE, null, [
224229
'em' => 'default',
225230
'class' => self::SINGLE_IDENT_CLASS,
@@ -229,7 +234,7 @@ public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
229234

230235
public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
231236
{
232-
$this->expectException(\Symfony\Component\Form\Exception\UnexpectedTypeException::class);
237+
$this->expectException(UnexpectedTypeException::class);
233238
$field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
234239
'em' => 'default',
235240
'class' => self::SINGLE_IDENT_CLASS,
@@ -1242,7 +1247,7 @@ public function testLoaderCaching()
12421247
$choiceLoader2 = $form->get('property2')->getConfig()->getOption('choice_loader');
12431248
$choiceLoader3 = $form->get('property3')->getConfig()->getOption('choice_loader');
12441249

1245-
$this->assertInstanceOf(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class, $choiceLoader1);
1250+
$this->assertInstanceOf(ChoiceLoaderInterface::class, $choiceLoader1);
12461251
$this->assertSame($choiceLoader1, $choiceLoader2);
12471252
$this->assertSame($choiceLoader1, $choiceLoader3);
12481253
}
@@ -1302,7 +1307,7 @@ public function testLoaderCachingWithParameters()
13021307
$choiceLoader2 = $form->get('property2')->getConfig()->getOption('choice_loader');
13031308
$choiceLoader3 = $form->get('property3')->getConfig()->getOption('choice_loader');
13041309

1305-
$this->assertInstanceOf(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class, $choiceLoader1);
1310+
$this->assertInstanceOf(ChoiceLoaderInterface::class, $choiceLoader1);
13061311
$this->assertSame($choiceLoader1, $choiceLoader2);
13071312
$this->assertSame($choiceLoader1, $choiceLoader3);
13081313
}

‎src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\Logger;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Psr\Log\LoggerInterface;
1516
use Symfony\Bridge\Doctrine\Logger\DbalLogger;
1617

1718
class DbalLoggerTest extends TestCase
@@ -21,7 +22,7 @@ class DbalLoggerTest extends TestCase
2122
*/
2223
public function testLog($sql, $params, $logParams)
2324
{
24-
$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
25+
$logger = $this->createMock(LoggerInterface::class);
2526

2627
$dbalLogger = $this
2728
->getMockBuilder(DbalLogger::class)
@@ -53,7 +54,7 @@ public function getLogFixtures()
5354

5455
public function testLogNonUtf8()
5556
{
56-
$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
57+
$logger = $this->createMock(LoggerInterface::class);
5758

5859
$dbalLogger = $this
5960
->getMockBuilder(DbalLogger::class)
@@ -76,7 +77,7 @@ public function testLogNonUtf8()
7677

7778
public function testLogNonUtf8Array()
7879
{
79-
$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
80+
$logger = $this->createMock(LoggerInterface::class);
8081

8182
$dbalLogger = $this
8283
->getMockBuilder(DbalLogger::class)
@@ -107,7 +108,7 @@ public function testLogNonUtf8Array()
107108

108109
public function testLogLongString()
109110
{
110-
$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
111+
$logger = $this->createMock(LoggerInterface::class);
111112

112113
$dbalLogger = $this
113114
->getMockBuilder(DbalLogger::class)
@@ -135,7 +136,7 @@ public function testLogLongString()
135136

136137
public function testLogUTF8LongString()
137138
{
138-
$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
139+
$logger = $this->createMock(LoggerInterface::class);
139140

140141
$dbalLogger = $this
141142
->getMockBuilder(DbalLogger::class)

‎src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\Security\User;
1313

14+
use Doctrine\ORM\EntityManager;
1415
use Doctrine\ORM\Tools\SchemaTool;
1516
use Doctrine\Persistence\ManagerRegistry;
1617
use Doctrine\Persistence\ObjectManager;
@@ -20,6 +21,7 @@
2021
use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
2122
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
2223
use Symfony\Bridge\Doctrine\Tests\Fixtures\User;
24+
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
2325
use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
2426
use Symfony\Component\Security\Core\User\UserInterface;
2527

@@ -71,7 +73,7 @@ public function testLoadUserByUsernameWithUserLoaderRepositoryAndWithoutProperty
7173
->with('user1')
7274
->willReturn($user);
7375

74-
$em = $this->createMock(\Doctrine\ORM\EntityManager::class);
76+
$em = $this->createMock(EntityManager::class);
7577
$em
7678
->expects($this->once())
7779
->method('getRepository')
@@ -123,7 +125,7 @@ public function testRefreshInvalidUser()
123125
$provider = new EntityUserProvider($this->getManager($em), 'Symfony\Bridge\Doctrine\Tests\Fixtures\User', 'name');
124126

125127
$user2 = new User(1, 2, 'user2');
126-
$this->expectException(\Symfony\Component\Security\Core\Exception\UsernameNotFoundException::class);
128+
$this->expectException(UsernameNotFoundException::class);
127129
$this->expectExceptionMessage('User with id {"id1":1,"id2":2} not found');
128130

129131
$provider->refreshUser($user2);

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Bridge\Doctrine\Test\TestRepositoryFactory;
2323
use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity;
2424
use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity2;
25+
use Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity;
2526
use Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeObjectNoToStringIdEntity;
2627
use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNameEntity;
2728
use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNullableNameEntity;
@@ -30,9 +31,12 @@
3031
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
3132
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
3233
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdStringWrapperNameEntity;
34+
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity;
3335
use Symfony\Bridge\Doctrine\Tests\Fixtures\Type\StringWrapper;
36+
use Symfony\Bridge\Doctrine\Tests\Fixtures\Type\StringWrapperType;
3437
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
3538
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
39+
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
3640
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
3741

3842
/**
@@ -67,7 +71,7 @@ protected function setUp(): void
6771
$config->setRepositoryFactory($this->repositoryFactory);
6872

6973
if (!Type::hasType('string_wrapper')) {
70-
Type::addType('string_wrapper', 'Symfony\Bridge\Doctrine\Tests\Fixtures\Type\StringWrapperType');
74+
Type::addType('string_wrapper', StringWrapperType::class);
7175
}
7276

7377
$this->em = DoctrineTestHelper::createTestEntityManager($config);
@@ -135,17 +139,17 @@ private function createSchema($em)
135139
{
136140
$schemaTool = new SchemaTool($em);
137141
$schemaTool->createSchema([
138-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity'),
139-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity'),
140-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNameEntity'),
141-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNullableNameEntity'),
142-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity'),
143-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity'),
144-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity2'),
145-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\Person'),
146-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\Employee'),
147-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeObjectNoToStringIdEntity'),
148-
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdStringWrapperNameEntity'),
142+
$em->getClassMetadata(SingleIntIdEntity::class),
143+
$em->getClassMetadata(SingleIntIdNoToStringEntity::class),
144+
$em->getClassMetadata(DoubleNameEntity::class),
145+
$em->getClassMetadata(DoubleNullableNameEntity::class),
146+
$em->getClassMetadata(CompositeIntIdEntity::class),
147+
$em->getClassMetadata(AssociationEntity::class),
148+
$em->getClassMetadata(AssociationEntity2::class),
149+
$em->getClassMetadata(Person::class),
150+
$em->getClassMetadata(Employee::class),
151+
$em->getClassMetadata(CompositeObjectNoToStringIdEntity::class),
152+
$em->getClassMetadata(SingleIntIdStringWrapperNameEntity::class),
149153
]);
150154
}
151155

@@ -267,7 +271,7 @@ public function testValidateUniquenessWithIgnoreNullDisabled()
267271

268272
public function testAllConfiguredFieldsAreCheckedOfBeingMappedByDoctrineWithIgnoreNullEnabled()
269273
{
270-
$this->expectException(\Symfony\Component\Validator\Exception\ConstraintDefinitionException::class);
274+
$this->expectException(ConstraintDefinitionException::class);
271275
$constraint = new UniqueEntity([
272276
'message' => 'myMessage',
273277
'fields' => ['name', 'name2'],
@@ -538,7 +542,7 @@ public function testAssociatedEntityWithNull()
538542
public function testValidateUniquenessWithArrayValue()
539543
{
540544
$repository = $this->createRepositoryMock();
541-
$this->repositoryFactory->setRepository($this->em, 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity', $repository);
545+
$this->repositoryFactory->setRepository($this->em, SingleIntIdEntity::class, $repository);
542546

543547
$constraint = new UniqueEntity([
544548
'message' => 'myMessage',
@@ -576,7 +580,7 @@ public function testValidateUniquenessWithArrayValue()
576580

577581
public function testDedicatedEntityManagerNullObject()
578582
{
579-
$this->expectException(\Symfony\Component\Validator\Exception\ConstraintDefinitionException::class);
583+
$this->expectException(ConstraintDefinitionException::class);
580584
$this->expectExceptionMessage('Object manager "foo" does not exist.');
581585
$constraint = new UniqueEntity([
582586
'message' => 'myMessage',
@@ -596,7 +600,7 @@ public function testDedicatedEntityManagerNullObject()
596600

597601
public function testEntityManagerNullObject()
598602
{
599-
$this->expectException(\Symfony\Component\Validator\Exception\ConstraintDefinitionException::class);
603+
$this->expectException(ConstraintDefinitionException::class);
600604
$this->expectExceptionMessage('Unable to find the object manager associated with an entity of class "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity"');
601605
$constraint = new UniqueEntity([
602606
'message' => 'myMessage',
@@ -648,7 +652,7 @@ public function testValidateInheritanceUniqueness()
648652
'message' => 'myMessage',
649653
'fields' => ['name'],
650654
'em' => self::EM_NAME,
651-
'entityClass' => 'Symfony\Bridge\Doctrine\Tests\Fixtures\Person',
655+
'entityClass' => Person::class,
652656
]);
653657

654658
$entity1 = new Person(1, 'Foo');
@@ -678,13 +682,13 @@ public function testValidateInheritanceUniqueness()
678682

679683
public function testInvalidateRepositoryForInheritance()
680684
{
681-
$this->expectException(\Symfony\Component\Validator\Exception\ConstraintDefinitionException::class);
685+
$this->expectException(ConstraintDefinitionException::class);
682686
$this->expectExceptionMessage('The "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity" entity repository does not support the "Symfony\Bridge\Doctrine\Tests\Fixtures\Person" entity. The entity should be an instance of or extend "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity".');
683687
$constraint = new UniqueEntity([
684688
'message' => 'myMessage',
685689
'fields' => ['name'],
686690
'em' => self::EM_NAME,
687-
'entityClass' => 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity',
691+
'entityClass' => SingleStringIdEntity::class,
688692
]);
689693

690694
$entity = new Person(1, 'Foo');

0 commit comments

Comments
 (0)