Skip to content

Commit 7caf47e

Browse files
fre5hnicolas-grekas
fre5h
authored and
nicolas-grekas
committed
Use ::class constants instead of __NAMESPACE__ when possible
1 parent 4a98c8c commit 7caf47e

File tree

3 files changed

+53
-53
lines changed

3 files changed

+53
-53
lines changed

‎Tests/Compiler/AutowirePassTest.php

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testProcess()
3737
$container = new ContainerBuilder();
3838

3939
$container->register(Foo::class);
40-
$barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
40+
$barDefinition = $container->register('bar', Bar::class);
4141
$barDefinition->setAutowired(true);
4242

4343
(new ResolveClassPass())->process($container);
@@ -75,7 +75,7 @@ public function testProcessAutowireParent()
7575
$container = new ContainerBuilder();
7676

7777
$container->register(B::class);
78-
$cDefinition = $container->register('c', __NAMESPACE__.'\C');
78+
$cDefinition = $container->register('c', C::class);
7979
$cDefinition->setAutowired(true);
8080

8181
(new ResolveClassPass())->process($container);
@@ -97,7 +97,7 @@ public function testProcessLegacyAutowireWithAvailableInterface()
9797

9898
$container->setAlias(AInterface::class, B::class);
9999
$container->register(B::class);
100-
$cDefinition = $container->register('c', __NAMESPACE__.'\C');
100+
$cDefinition = $container->register('c', C::class);
101101
$cDefinition->setAutowired(true);
102102

103103
(new ResolveClassPass())->process($container);
@@ -118,7 +118,7 @@ public function testProcessAutowireInterface()
118118
$container = new ContainerBuilder();
119119

120120
$container->register(F::class);
121-
$gDefinition = $container->register('g', __NAMESPACE__.'\G');
121+
$gDefinition = $container->register('g', G::class);
122122
$gDefinition->setAutowired(true);
123123

124124
(new ResolveClassPass())->process($container);
@@ -134,9 +134,9 @@ public function testCompleteExistingDefinition()
134134
{
135135
$container = new ContainerBuilder();
136136

137-
$container->register('b', __NAMESPACE__.'\B');
137+
$container->register('b', B::class);
138138
$container->register(DInterface::class, F::class);
139-
$hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument(new Reference('b'));
139+
$hDefinition = $container->register('h', H::class)->addArgument(new Reference('b'));
140140
$hDefinition->setAutowired(true);
141141

142142
(new ResolveClassPass())->process($container);
@@ -153,7 +153,7 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
153153

154154
$container->register(B::class);
155155
$container->register(DInterface::class, F::class);
156-
$hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument('')->addArgument('');
156+
$hDefinition = $container->register('h', H::class)->addArgument('')->addArgument('');
157157
$hDefinition->setAutowired(true);
158158

159159
(new ResolveClassPass())->process($container);
@@ -171,10 +171,10 @@ public function testExceptionsAreStored()
171171
{
172172
$container = new ContainerBuilder();
173173

174-
$container->register('c1', __NAMESPACE__.'\CollisionA');
175-
$container->register('c2', __NAMESPACE__.'\CollisionB');
176-
$container->register('c3', __NAMESPACE__.'\CollisionB');
177-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
174+
$container->register('c1', CollisionA::class);
175+
$container->register('c2', CollisionB::class);
176+
$container->register('c3', CollisionB::class);
177+
$aDefinition = $container->register('a', CannotBeAutowired::class);
178178
$aDefinition->setAutowired(true);
179179

180180
$pass = new AutowirePass(false);
@@ -188,7 +188,7 @@ public function testPrivateConstructorThrowsAutowireException()
188188
$this->expectExceptionMessage('Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.');
189189
$container = new ContainerBuilder();
190190

191-
$container->autowire('private_service', __NAMESPACE__.'\PrivateConstructor');
191+
$container->autowire('private_service', PrivateConstructor::class);
192192

193193
$pass = new AutowirePass(true);
194194
$pass->process($container);
@@ -200,10 +200,10 @@ public function testTypeCollision()
200200
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2", "c3".');
201201
$container = new ContainerBuilder();
202202

203-
$container->register('c1', __NAMESPACE__.'\CollisionA');
204-
$container->register('c2', __NAMESPACE__.'\CollisionB');
205-
$container->register('c3', __NAMESPACE__.'\CollisionB');
206-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
203+
$container->register('c1', CollisionA::class);
204+
$container->register('c2', CollisionB::class);
205+
$container->register('c3', CollisionB::class);
206+
$aDefinition = $container->register('a', CannotBeAutowired::class);
207207
$aDefinition->setAutowired(true);
208208

209209
$pass = new AutowirePass();
@@ -216,9 +216,9 @@ public function testTypeNotGuessable()
216216
$this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgument::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
217217
$container = new ContainerBuilder();
218218

219-
$container->register('a1', __NAMESPACE__.'\Foo');
220-
$container->register('a2', __NAMESPACE__.'\Foo');
221-
$aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
219+
$container->register('a1', Foo::class);
220+
$container->register('a2', Foo::class);
221+
$aDefinition = $container->register('a', NotGuessableArgument::class);
222222
$aDefinition->setAutowired(true);
223223

224224
$pass = new AutowirePass();
@@ -231,9 +231,9 @@ public function testTypeNotGuessableWithSubclass()
231231
$this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgumentForSubclass::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\A" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
232232
$container = new ContainerBuilder();
233233

234-
$container->register('a1', __NAMESPACE__.'\B');
235-
$container->register('a2', __NAMESPACE__.'\B');
236-
$aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgumentForSubclass');
234+
$container->register('a1', B::class);
235+
$container->register('a2', B::class);
236+
$aDefinition = $container->register('a', NotGuessableArgumentForSubclass::class);
237237
$aDefinition->setAutowired(true);
238238

239239
$pass = new AutowirePass();
@@ -246,7 +246,7 @@ public function testTypeNotGuessableNoServicesFound()
246246
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists.');
247247
$container = new ContainerBuilder();
248248

249-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
249+
$aDefinition = $container->register('a', CannotBeAutowired::class);
250250
$aDefinition->setAutowired(true);
251251

252252
$pass = new AutowirePass();
@@ -257,10 +257,10 @@ public function testTypeNotGuessableWithTypeSet()
257257
{
258258
$container = new ContainerBuilder();
259259

260-
$container->register('a1', __NAMESPACE__.'\Foo');
261-
$container->register('a2', __NAMESPACE__.'\Foo');
260+
$container->register('a1', Foo::class);
261+
$container->register('a2', Foo::class);
262262
$container->register(Foo::class, Foo::class);
263-
$aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
263+
$aDefinition = $container->register('a', NotGuessableArgument::class);
264264
$aDefinition->setAutowired(true);
265265

266266
$pass = new AutowirePass();
@@ -274,10 +274,10 @@ public function testWithTypeSet()
274274
{
275275
$container = new ContainerBuilder();
276276

277-
$container->register('c1', __NAMESPACE__.'\CollisionA');
278-
$container->register('c2', __NAMESPACE__.'\CollisionB');
277+
$container->register('c1', CollisionA::class);
278+
$container->register('c2', CollisionB::class);
279279
$container->setAlias(CollisionInterface::class, 'c2');
280-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
280+
$aDefinition = $container->register('a', CannotBeAutowired::class);
281281
$aDefinition->setAutowired(true);
282282

283283
$pass = new AutowirePass();
@@ -296,7 +296,7 @@ public function testCreateDefinition()
296296
{
297297
$container = new ContainerBuilder();
298298

299-
$coopTilleulsDefinition = $container->register('coop_tilleuls', __NAMESPACE__.'\LesTilleuls');
299+
$coopTilleulsDefinition = $container->register('coop_tilleuls', LesTilleuls::class);
300300
$coopTilleulsDefinition->setAutowired(true);
301301

302302
$pass = new AutowirePass();
@@ -307,13 +307,13 @@ public function testCreateDefinition()
307307
$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));
308308

309309
$dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
310-
$this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
310+
$this->assertEquals(Dunglas::class, $dunglasDefinition->getClass());
311311
$this->assertFalse($dunglasDefinition->isPublic());
312312
$this->assertCount(1, $dunglasDefinition->getArguments());
313313
$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille', $dunglasDefinition->getArgument(0));
314314

315315
$lilleDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille');
316-
$this->assertEquals(__NAMESPACE__.'\Lille', $lilleDefinition->getClass());
316+
$this->assertEquals(Lille::class, $lilleDefinition->getClass());
317317
}
318318

319319
public function testResolveParameter()
@@ -337,7 +337,7 @@ public function testOptionalParameter()
337337

338338
$container->register(A::class);
339339
$container->register(Foo::class);
340-
$optDefinition = $container->register('opt', __NAMESPACE__.'\OptionalParameter');
340+
$optDefinition = $container->register('opt', OptionalParameter::class);
341341
$optDefinition->setAutowired(true);
342342

343343
(new ResolveClassPass())->process($container);
@@ -354,7 +354,7 @@ public function testDontTriggerAutowiring()
354354
$container = new ContainerBuilder();
355355

356356
$container->register(Foo::class);
357-
$container->register('bar', __NAMESPACE__.'\Bar');
357+
$container->register('bar', Bar::class);
358358

359359
(new ResolveClassPass())->process($container);
360360
(new AutowirePass())->process($container);
@@ -368,7 +368,7 @@ public function testClassNotFoundThrowsException()
368368
$this->expectExceptionMessage('Cannot autowire service "a": argument "$r" of method "Symfony\Component\DependencyInjection\Tests\Compiler\BadTypeHintedArgument::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.');
369369
$container = new ContainerBuilder();
370370

371-
$aDefinition = $container->register('a', __NAMESPACE__.'\BadTypeHintedArgument');
371+
$aDefinition = $container->register('a', BadTypeHintedArgument::class);
372372
$aDefinition->setAutowired(true);
373373

374374
$container->register(Dunglas::class, Dunglas::class);
@@ -384,7 +384,7 @@ public function testParentClassNotFoundThrowsException()
384384

385385
$container = new ContainerBuilder();
386386

387-
$aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');
387+
$aDefinition = $container->register('a', BadParentTypeHintedArgument::class);
388388
$aDefinition->setAutowired(true);
389389

390390
$container->register(Dunglas::class, Dunglas::class);
@@ -404,8 +404,8 @@ public function testDontUseAbstractServices()
404404
$container = new ContainerBuilder();
405405

406406
$container->register(Foo::class)->setAbstract(true);
407-
$container->register('foo', __NAMESPACE__.'\Foo');
408-
$container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
407+
$container->register('foo', Foo::class);
408+
$container->register('bar', Bar::class)->setAutowired(true);
409409

410410
(new ResolveClassPass())->process($container);
411411
(new AutowirePass())->process($container);
@@ -418,7 +418,7 @@ public function testSomeSpecificArgumentsAreSet()
418418
$container->register('foo', Foo::class);
419419
$container->register(A::class);
420420
$container->register(Dunglas::class);
421-
$container->register('multiple', __NAMESPACE__.'\MultipleArguments')
421+
$container->register('multiple', MultipleArguments::class)
422422
->setAutowired(true)
423423
// set the 2nd (index 1) argument only: autowire the first and third
424424
// args are: A, Foo, Dunglas
@@ -450,7 +450,7 @@ public function testScalarArgsCannotBeAutowired()
450450

451451
$container->register(A::class);
452452
$container->register(Dunglas::class);
453-
$container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
453+
$container->register('arg_no_type_hint', MultipleArguments::class)
454454
->setArguments([1 => 'foo'])
455455
->setAutowired(true);
456456

@@ -466,7 +466,7 @@ public function testNoTypeArgsCannotBeAutowired()
466466

467467
$container->register(A::class);
468468
$container->register(Dunglas::class);
469-
$container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
469+
$container->register('arg_no_type_hint', MultipleArguments::class)
470470
->setAutowired(true);
471471

472472
(new ResolveClassPass())->process($container);
@@ -479,7 +479,7 @@ public function testOptionalScalarNotReallyOptionalUsesDefaultValue()
479479

480480
$container->register(A::class);
481481
$container->register(Lille::class);
482-
$definition = $container->register('not_really_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalarNotReallyOptional')
482+
$definition = $container->register('not_really_optional_scalar', MultipleArgumentsOptionalScalarNotReallyOptional::class)
483483
->setAutowired(true);
484484

485485
(new ResolveClassPass())->process($container);
@@ -494,7 +494,7 @@ public function testOptionalScalarArgsDontMessUpOrder()
494494

495495
$container->register(A::class);
496496
$container->register(Lille::class);
497-
$container->register('with_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
497+
$container->register('with_optional_scalar', MultipleArgumentsOptionalScalar::class)
498498
->setAutowired(true);
499499

500500
(new ResolveClassPass())->process($container);
@@ -518,7 +518,7 @@ public function testOptionalScalarArgsNotPassedIfLast()
518518

519519
$container->register(A::class);
520520
$container->register(Lille::class);
521-
$container->register('with_optional_scalar_last', __NAMESPACE__.'\MultipleArgumentsOptionalScalarLast')
521+
$container->register('with_optional_scalar_last', MultipleArgumentsOptionalScalarLast::class)
522522
->setAutowired(true);
523523

524524
(new ResolveClassPass())->process($container);
@@ -659,7 +659,7 @@ public function testTypedReference()
659659
public function testCreateResourceForClass($className, $isEqual)
660660
{
661661
$startingResource = AutowirePass::createResourceForClass(
662-
new \ReflectionClass(__NAMESPACE__.'\ClassForResource')
662+
new \ReflectionClass(ClassForResource::class)
663663
);
664664
$newResource = AutowirePass::createResourceForClass(
665665
new \ReflectionClass(__NAMESPACE__.'\\'.$className)
@@ -690,9 +690,9 @@ public function testIgnoreServiceWithClassNotExisting()
690690
{
691691
$container = new ContainerBuilder();
692692

693-
$container->register('class_not_exist', __NAMESPACE__.'\OptionalServiceClass');
693+
$container->register('class_not_exist', OptionalServiceClass::class);
694694

695-
$barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
695+
$barDefinition = $container->register('bar', Bar::class);
696696
$barDefinition->setAutowired(true);
697697

698698
$container->register(Foo::class, Foo::class);
@@ -750,8 +750,8 @@ public function testProcessDoesNotTriggerDeprecations()
750750
{
751751
$container = new ContainerBuilder();
752752
$container->register('deprecated', 'Symfony\Component\DependencyInjection\Tests\Fixtures\DeprecatedClass')->setDeprecated(true);
753-
$container->register('foo', __NAMESPACE__.'\Foo');
754-
$container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
753+
$container->register('foo', Foo::class);
754+
$container->register('bar', Bar::class)->setAutowired(true);
755755

756756
$pass = new AutowirePass();
757757
$pass->process($container);
@@ -767,7 +767,7 @@ public function testEmptyStringIsKept()
767767

768768
$container->register(A::class);
769769
$container->register(Lille::class);
770-
$container->register('foo', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
770+
$container->register('foo', MultipleArgumentsOptionalScalar::class)
771771
->setAutowired(true)
772772
->setArguments(['', '']);
773773

‎Tests/Config/AutowireServiceResourceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected function setUp()
3434
$this->time = time();
3535
touch($this->file, $this->time);
3636

37-
$this->class = __NAMESPACE__.'\Foo';
37+
$this->class = Foo::class;
3838
$this->resource = new AutowireServiceResource(
3939
$this->class,
4040
$this->file,
@@ -83,7 +83,7 @@ public function testIsNotFreshChangedResource()
8383
public function testIsFreshSameConstructorArgs()
8484
{
8585
$oldResource = AutowirePass::createResourceForClass(
86-
new \ReflectionClass(__NAMESPACE__.'\Foo')
86+
new \ReflectionClass(Foo::class)
8787
);
8888

8989
// test with a stale file *but* the resource will not be changed

‎Tests/ContainerBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,7 @@ public function testAutowiring()
12381238
$container = new ContainerBuilder();
12391239

12401240
$container->register(A::class)->setPublic(true);
1241-
$bDefinition = $container->register('b', __NAMESPACE__.'\B');
1241+
$bDefinition = $container->register('b', B::class);
12421242
$bDefinition->setAutowired(true);
12431243
$bDefinition->setPublic(true);
12441244

0 commit comments

Comments
 (0)