Skip to content

Commit 53b8304

Browse files
fabpotfabpot
committed
Merge branch '5.1' into 5.2
* 5.1: Use ::class keyword when possible
2 parents d421cad + 8068ac5 commit 53b8304

15 files changed

+47
-47
lines changed

‎PropertyInfo/DoctrineExtractor.php‎

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

4949
$properties = array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());
5050

51-
if ($metadata instanceof ClassMetadataInfo && class_exists('Doctrine\ORM\Mapping\Embedded') && $metadata->embeddedClasses) {
51+
if ($metadata instanceof ClassMetadataInfo && class_exists(\Doctrine\ORM\Mapping\Embedded::class) && $metadata->embeddedClasses) {
5252
$properties = array_filter($properties, function ($property) {
5353
return false === strpos($property, '.');
5454
});
@@ -124,7 +124,7 @@ public function getTypes(string $class, string $property, array $context = [])
124124
)];
125125
}
126126

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

‎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
@@ -46,7 +46,7 @@ protected function checkIdentifierType($classname, $expectedType)
4646
{
4747
$em = DoctrineTestHelper::createTestEntityManager();
4848

49-
$query = $this->getMockBuilder('QueryMock')
49+
$query = $this->getMockBuilder(\QueryMock::class)
5050
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
5151
->getMock();
5252

@@ -59,7 +59,7 @@ protected function checkIdentifierType($classname, $expectedType)
5959
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2], $expectedType)
6060
->willReturn($query);
6161

62-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
62+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
6363
->setConstructorArgs([$em])
6464
->setMethods(['getQuery'])
6565
->getMock();
@@ -79,7 +79,7 @@ public function testFilterNonIntegerValues()
7979
{
8080
$em = DoctrineTestHelper::createTestEntityManager();
8181

82-
$query = $this->getMockBuilder('QueryMock')
82+
$query = $this->getMockBuilder(\QueryMock::class)
8383
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
8484
->getMock();
8585

@@ -92,7 +92,7 @@ public function testFilterNonIntegerValues()
9292
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2, 3, '9223372036854775808'], Connection::PARAM_INT_ARRAY)
9393
->willReturn($query);
9494

95-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
95+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
9696
->setConstructorArgs([$em])
9797
->setMethods(['getQuery'])
9898
->getMock();
@@ -115,7 +115,7 @@ public function testFilterEmptyUuids($entityClass)
115115
{
116116
$em = DoctrineTestHelper::createTestEntityManager();
117117

118-
$query = $this->getMockBuilder('QueryMock')
118+
$query = $this->getMockBuilder(\QueryMock::class)
119119
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
120120
->getMock();
121121

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

131-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
131+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
132132
->setConstructorArgs([$em])
133133
->setMethods(['getQuery'])
134134
->getMock();
@@ -234,7 +234,7 @@ public function testEmbeddedIdentifierName()
234234

235235
$em = DoctrineTestHelper::createTestEntityManager();
236236

237-
$query = $this->getMockBuilder('QueryMock')
237+
$query = $this->getMockBuilder(\QueryMock::class)
238238
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
239239
->getMock();
240240

@@ -247,7 +247,7 @@ public function testEmbeddedIdentifierName()
247247
->with('ORMQueryBuilderLoader_getEntitiesByIds_id_value', [1, 2, 3], Connection::PARAM_INT_ARRAY)
248248
->willReturn($query);
249249

250-
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
250+
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
251251
->setConstructorArgs([$em])
252252
->setMethods(['getQuery'])
253253
->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
@@ -62,21 +62,21 @@ public function requiredProvider()
6262
$return = [];
6363

6464
// Simple field, not nullable
65-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
65+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
6666
$classMetadata->fieldMappings['field'] = true;
6767
$classMetadata->expects($this->once())->method('isNullable')->with('field')->willReturn(false);
6868

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

7171
// Simple field, nullable
72-
$classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
72+
$classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
7373
$classMetadata->fieldMappings['field'] = true;
7474
$classMetadata->expects($this->once())->method('isNullable')->with('field')->willReturn(true);
7575

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

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

8282
$mapping = ['joinColumns' => [[]]];
@@ -85,7 +85,7 @@ public function requiredProvider()
8585
$return[] = [$classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE)];
8686

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

9191
$mapping = ['joinColumns' => [['nullable' => true]]];
@@ -94,7 +94,7 @@ public function requiredProvider()
9494
$return[] = [$classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE)];
9595

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

100100
$mapping = ['joinColumns' => [['nullable' => false]]];
@@ -103,7 +103,7 @@ public function requiredProvider()
103103
$return[] = [$classMetadata, new ValueGuess(true, Guess::HIGH_CONFIDENCE)];
104104

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

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

0 commit comments

Comments
 (0)