Skip to content

Commit 8068ac5

Browse files
fabpotfabpot
committed
Merge branch '4.4' into 5.1
* 4.4: Use ::class keyword when possible
2 parents 699f979 + 85896c5 commit 8068ac5

16 files changed

+51
-51
lines changed

‎PropertyInfo/DoctrineExtractor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function getProperties(string $class, array $context = [])
5454

5555
$properties = array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());
5656

57-
if ($metadata instanceof ClassMetadataInfo && class_exists('Doctrine\ORM\Mapping\Embedded') && $metadata->embeddedClasses) {
57+
if ($metadata instanceof ClassMetadataInfo && class_exists(\Doctrine\ORM\Mapping\Embedded::class) && $metadata->embeddedClasses) {
5858
$properties = array_filter($properties, function ($property) {
5959
return false === strpos($property, '.');
6060
});
@@ -130,7 +130,7 @@ public function getTypes(string $class, string $property, array $context = [])
130130
)];
131131
}
132132

133-
if ($metadata instanceof ClassMetadataInfo && class_exists('Doctrine\ORM\Mapping\Embedded') && isset($metadata->embeddedClasses[$property])) {
133+
if ($metadata instanceof ClassMetadataInfo && class_exists(\Doctrine\ORM\Mapping\Embedded::class) && isset($metadata->embeddedClasses[$property])) {
134134
return [new Type(Type::BUILTIN_TYPE_OBJECT, false, $metadata->embeddedClasses[$property]['class'])];
135135
}
136136

‎Tests/DataCollector/DoctrineDataCollectorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public function paramProvider()
229229

230230
private function createCollector($queries)
231231
{
232-
$connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
232+
$connection = $this->getMockBuilder(\Doctrine\DBAL\Connection::class)
233233
->disableOriginalConstructor()
234234
->getMock();
235235
$connection->expects($this->any())
@@ -249,7 +249,7 @@ private function createCollector($queries)
249249
->method('getConnection')
250250
->willReturn($connection);
251251

252-
$logger = $this->getMockBuilder('Doctrine\DBAL\Logging\DebugStack')->getMock();
252+
$logger = $this->getMockBuilder(\Doctrine\DBAL\Logging\DebugStack::class)->getMock();
253253
$logger->queries = $queries;
254254

255255
$collector = new DoctrineDataCollector($registry);

‎Tests/DataFixtures/ContainerAwareLoaderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ContainerAwareLoaderTest extends TestCase
1919
{
2020
public function testShouldSetContainerOnContainerAwareFixture()
2121
{
22-
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
22+
$container = $this->getMockBuilder(\Symfony\Component\DependencyInjection\ContainerInterface::class)->getMock();
2323
$loader = new ContainerAwareLoader($container);
2424
$fixture = new ContainerAwareFixture();
2525

‎Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class RegisterEventListenersAndSubscribersPassTest extends TestCase
2323
{
2424
public function testExceptionOnAbstractTaggedSubscriber()
2525
{
26-
$this->expectException('InvalidArgumentException');
26+
$this->expectException(\InvalidArgumentException::class);
2727
$container = $this->createBuilder();
2828

2929
$abstractDefinition = new Definition('stdClass');
@@ -37,7 +37,7 @@ public function testExceptionOnAbstractTaggedSubscriber()
3737

3838
public function testExceptionOnAbstractTaggedListener()
3939
{
40-
$this->expectException('InvalidArgumentException');
40+
$this->expectException(\InvalidArgumentException::class);
4141
$container = $this->createBuilder();
4242

4343
$abstractDefinition = new Definition('stdClass');

‎Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class RegisterMappingsPassTest extends TestCase
1111
{
1212
public function testNoDriverParmeterException()
1313
{
14-
$this->expectException('InvalidArgumentException');
14+
$this->expectException(\InvalidArgumentException::class);
1515
$this->expectExceptionMessage('Could not find the manager name parameter in the container. Tried the following parameter names: "manager.param.one", "manager.param.two"');
1616
$container = $this->createBuilder();
1717
$this->process($container, [

‎Tests/DependencyInjection/DoctrineExtensionTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function setUp(): void
3131
parent::setUp();
3232

3333
$this->extension = $this
34-
->getMockBuilder('Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension')
34+
->getMockBuilder(\Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension::class)
3535
->setMethods([
3636
'getMappingResourceConfigDirectory',
3737
'getObjectManagerElementName',
@@ -52,7 +52,7 @@ protected function setUp(): void
5252

5353
public function testFixManagersAutoMappingsWithTwoAutomappings()
5454
{
55-
$this->expectException('LogicException');
55+
$this->expectException(\LogicException::class);
5656
$emConfigs = [
5757
'em1' => [
5858
'auto_mapping' => true,
@@ -235,7 +235,7 @@ public function testServiceCacheDriver()
235235

236236
public function testUnrecognizedCacheDriverException()
237237
{
238-
$this->expectException('InvalidArgumentException');
238+
$this->expectException(\InvalidArgumentException::class);
239239
$this->expectExceptionMessage('"unrecognized_type" is an unrecognized Doctrine cache driver.');
240240
$cacheName = 'metadata_cache';
241241
$container = $this->createContainer();

‎Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ class DoctrineChoiceLoaderTest extends TestCase
7777

7878
protected function setUp(): void
7979
{
80-
$this->factory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
80+
$this->factory = $this->getMockBuilder(ChoiceListFactoryInterface::class)->getMock();
8181
$this->om = $this->getMockBuilder(ObjectManager::class)->getMock();
8282
$this->repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
8383
$this->class = 'stdClass';
84-
$this->idReader = $this->getMockBuilder('Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader')
84+
$this->idReader = $this->getMockBuilder(IdReader::class)
8585
->disableOriginalConstructor()
8686
->getMock();
8787
$this->idReader->expects($this->any())
8888
->method('isSingleId')
8989
->willReturn(true)
9090
;
9191

92-
$this->objectLoader = $this->getMockBuilder('Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface')->getMock();
92+
$this->objectLoader = $this->getMockBuilder(EntityLoaderInterface::class)->getMock();
9393
$this->obj1 = (object) ['name' => 'A'];
9494
$this->obj2 = (object) ['name' => 'B'];
9595
$this->obj3 = (object) ['name' => 'C'];

‎Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected function checkIdentifierType($classname, $expectedType)
3333
{
3434
$em = DoctrineTestHelper::createTestEntityManager();
3535

36-
$query = $this->getMockBuilder('QueryMock')
36+
$query = $this->getMockBuilder(\QueryMock::class)
3737
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
3838
->getMock();
3939

@@ -46,7 +46,7 @@ protected function checkIdentifierType($classname, $expectedType)
4646
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2], $expectedType)
4747
->willReturn($query);
4848

49-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
49+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
5050
->setConstructorArgs([$em])
5151
->setMethods(['getQuery'])
5252
->getMock();
@@ -66,7 +66,7 @@ public function testFilterNonIntegerValues()
6666
{
6767
$em = DoctrineTestHelper::createTestEntityManager();
6868

69-
$query = $this->getMockBuilder('QueryMock')
69+
$query = $this->getMockBuilder(\QueryMock::class)
7070
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
7171
->getMock();
7272

@@ -79,7 +79,7 @@ public function testFilterNonIntegerValues()
7979
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2, 3, '9223372036854775808'], Connection::PARAM_INT_ARRAY)
8080
->willReturn($query);
8181

82-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
82+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
8383
->setConstructorArgs([$em])
8484
->setMethods(['getQuery'])
8585
->getMock();
@@ -102,7 +102,7 @@ public function testFilterEmptyUuids($entityClass)
102102
{
103103
$em = DoctrineTestHelper::createTestEntityManager();
104104

105-
$query = $this->getMockBuilder('QueryMock')
105+
$query = $this->getMockBuilder(\QueryMock::class)
106106
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
107107
->getMock();
108108

@@ -115,7 +115,7 @@ public function testFilterEmptyUuids($entityClass)
115115
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', 'b98e8e11-2897-44df-ad24-d2627eb7f499'], Connection::PARAM_STR_ARRAY)
116116
->willReturn($query);
117117

118-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
118+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
119119
->setConstructorArgs([$em])
120120
->setMethods(['getQuery'])
121121
->getMock();
@@ -141,7 +141,7 @@ public function testEmbeddedIdentifierName()
141141

142142
$em = DoctrineTestHelper::createTestEntityManager();
143143

144-
$query = $this->getMockBuilder('QueryMock')
144+
$query = $this->getMockBuilder(\QueryMock::class)
145145
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
146146
->getMock();
147147

@@ -154,7 +154,7 @@ public function testEmbeddedIdentifierName()
154154
->with('ORMQueryBuilderLoader_getEntitiesByIds_id_value', [1, 2, 3], Connection::PARAM_INT_ARRAY)
155155
->willReturn($query);
156156

157-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
157+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
158158
->setConstructorArgs([$em])
159159
->setMethods(['getQuery'])
160160
->getMock();

‎Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testTransformNull()
6464

6565
public function testTransformExpectsArrayOrCollection()
6666
{
67-
$this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
67+
$this->expectException(\Symfony\Component\Form\Exception\TransformationFailedException::class);
6868
$this->transformer->transform('Foo');
6969
}
7070

‎Tests/Form/DoctrineOrmTypeGuesserTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ public function requiredProvider()
3434
$return = [];
3535

3636
// Simple field, not nullable
37-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
37+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
3838
$classMetadata->fieldMappings['field'] = true;
3939
$classMetadata->expects($this->once())->method('isNullable')->with('field')->willReturn(false);
4040

4141
$return[] = [$classMetadata, new ValueGuess(true, Guess::HIGH_CONFIDENCE)];
4242

4343
// Simple field, nullable
44-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
44+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
4545
$classMetadata->fieldMappings['field'] = true;
4646
$classMetadata->expects($this->once())->method('isNullable')->with('field')->willReturn(true);
4747

4848
$return[] = [$classMetadata, new ValueGuess(false, Guess::MEDIUM_CONFIDENCE)];
4949

5050
// One-to-one, nullable (by default)
51-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
51+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
5252
$classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->willReturn(true);
5353

5454
$mapping = ['joinColumns' => [[]]];
@@ -57,7 +57,7 @@ public function requiredProvider()
5757
$return[] = [$classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE)];
5858

5959
// One-to-one, nullable (explicit)
60-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
60+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
6161
$classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->willReturn(true);
6262

6363
$mapping = ['joinColumns' => [['nullable' => true]]];
@@ -66,7 +66,7 @@ public function requiredProvider()
6666
$return[] = [$classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE)];
6767

6868
// One-to-one, not nullable
69-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
69+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
7070
$classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->willReturn(true);
7171

7272
$mapping = ['joinColumns' => [['nullable' => false]]];
@@ -75,7 +75,7 @@ public function requiredProvider()
7575
$return[] = [$classMetadata, new ValueGuess(true, Guess::HIGH_CONFIDENCE)];
7676

7777
// One-to-many, no clue
78-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
78+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
7979
$classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->willReturn(false);
8080

8181
$return[] = [$classMetadata, null];

0 commit comments

Comments
 (0)