Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 4eadeb7

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.0
* 4.4: Use `::class` constants instead of `__NAMESPACE__` when possible
2 parents 525d7bf + c05245d commit 4eadeb7
Copy full SHA for 4eadeb7

File tree

Expand file treeCollapse file tree

78 files changed

+197
-197
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

78 files changed

+197
-197
lines changed

‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(ManagerRegistry $registry)
4040
public function validate($entity, Constraint $constraint)
4141
{
4242
if (!$constraint instanceof UniqueEntity) {
43-
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UniqueEntity');
43+
throw new UnexpectedTypeException($constraint, UniqueEntity::class);
4444
}
4545

4646
if (!\is_array($constraint->fields) && !\is_string($constraint->fields)) {

‎src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ class NodeBuilder implements NodeParentInterface
2424
public function __construct()
2525
{
2626
$this->nodeMapping = [
27-
'variable' => __NAMESPACE__.'\\VariableNodeDefinition',
28-
'scalar' => __NAMESPACE__.'\\ScalarNodeDefinition',
29-
'boolean' => __NAMESPACE__.'\\BooleanNodeDefinition',
30-
'integer' => __NAMESPACE__.'\\IntegerNodeDefinition',
31-
'float' => __NAMESPACE__.'\\FloatNodeDefinition',
32-
'array' => __NAMESPACE__.'\\ArrayNodeDefinition',
33-
'enum' => __NAMESPACE__.'\\EnumNodeDefinition',
27+
'variable' => VariableNodeDefinition::class,
28+
'scalar' => ScalarNodeDefinition::class,
29+
'boolean' => BooleanNodeDefinition::class,
30+
'integer' => IntegerNodeDefinition::class,
31+
'float' => FloatNodeDefinition::class,
32+
'array' => ArrayNodeDefinition::class,
33+
'enum' => EnumNodeDefinition::class,
3434
];
3535
}
3636

‎src/Symfony/Component/Config/Tests/Definition/Builder/NodeBuilderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Tests/Definition/Builder/NodeBuilderTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testThrowsAnExceptionWhenTheNodeClassIsNotFound()
3535

3636
public function testAddingANewNodeType()
3737
{
38-
$class = __NAMESPACE__.'\\SomeNodeDefinition';
38+
$class = SomeNodeDefinition::class;
3939

4040
$builder = new BaseNodeBuilder();
4141
$node = $builder
@@ -47,7 +47,7 @@ public function testAddingANewNodeType()
4747

4848
public function testOverridingAnExistingNodeType()
4949
{
50-
$class = __NAMESPACE__.'\\SomeNodeDefinition';
50+
$class = SomeNodeDefinition::class;
5151

5252
$builder = new BaseNodeBuilder();
5353
$node = $builder
@@ -66,7 +66,7 @@ public function testNodeTypesAreNotCaseSensitive()
6666

6767
$this->assertInstanceOf(\get_class($node1), $node2);
6868

69-
$builder->setNodeClass('CuStOm', __NAMESPACE__.'\\SomeNodeDefinition');
69+
$builder->setNodeClass('CuStOm', SomeNodeDefinition::class);
7070

7171
$node1 = $builder->node('', 'CUSTOM');
7272
$node2 = $builder->node('', 'custom');

‎src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function testLoadFile()
4848
$this->assertStringContainsString('XSD file or callable', $e->getMessage());
4949
}
5050

51-
$mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
51+
$mock = $this->getMockBuilder(Validator::class)->getMock();
5252
$mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
5353

5454
try {
@@ -68,7 +68,7 @@ public function testParseWithInvalidValidatorCallable()
6868
$this->expectExceptionMessage('The XML is not valid');
6969
$fixtures = __DIR__.'/../Fixtures/Util/';
7070

71-
$mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
71+
$mock = $this->getMockBuilder(Validator::class)->getMock();
7272
$mock->expects($this->once())->method('validate')->willReturn(false);
7373

7474
XmlUtils::parse(file_get_contents($fixtures.'valid.xml'), [$mock, 'validate']);

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+44-44Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testProcess()
4040
$container = new ContainerBuilder();
4141

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

4646
(new ResolveClassPass())->process($container);
@@ -55,15 +55,15 @@ public function testProcessNotExistingActionParam()
5555
$container = new ContainerBuilder();
5656

5757
$container->register(Foo::class);
58-
$barDefinition = $container->register(__NAMESPACE__.'EslaAction', __NAMESPACE__.'\ElsaAction');
58+
$barDefinition = $container->register(ElsaAction::class, ElsaAction::class);
5959
$barDefinition->setAutowired(true);
6060

6161
(new ResolveClassPass())->process($container);
6262
try {
6363
(new AutowirePass())->process($container);
6464
$this->fail('AutowirePass should have thrown an exception');
6565
} catch (AutowiringFailedException $e) {
66-
$this->assertSame('Cannot autowire service "Symfony\Component\DependencyInjection\Tests\CompilerEslaAction": argument "$notExisting" of method "Symfony\Component\DependencyInjection\Tests\Compiler\ElsaAction::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotExisting" but this class was not found.', (string) $e->getMessage());
66+
$this->assertSame('Cannot autowire service "Symfony\Component\DependencyInjection\Tests\Compiler\ElsaAction": argument "$notExisting" of method "__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotExisting" but this class was not found.', (string) $e->getMessage());
6767
}
6868
}
6969

@@ -86,7 +86,7 @@ public function testProcessAutowireParent()
8686
$container = new ContainerBuilder();
8787

8888
$container->register(B::class);
89-
$cDefinition = $container->register('c', __NAMESPACE__.'\C');
89+
$cDefinition = $container->register('c', C::class);
9090
$cDefinition->setAutowired(true);
9191

9292
(new ResolveClassPass())->process($container);
@@ -103,7 +103,7 @@ public function testProcessAutowireInterface()
103103
$container = new ContainerBuilder();
104104

105105
$container->register(F::class);
106-
$gDefinition = $container->register('g', __NAMESPACE__.'\G');
106+
$gDefinition = $container->register('g', G::class);
107107
$gDefinition->setAutowired(true);
108108

109109
(new ResolveClassPass())->process($container);
@@ -119,9 +119,9 @@ public function testCompleteExistingDefinition()
119119
{
120120
$container = new ContainerBuilder();
121121

122-
$container->register('b', __NAMESPACE__.'\B');
122+
$container->register('b', B::class);
123123
$container->register(DInterface::class, F::class);
124-
$hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument(new Reference('b'));
124+
$hDefinition = $container->register('h', H::class)->addArgument(new Reference('b'));
125125
$hDefinition->setAutowired(true);
126126

127127
(new ResolveClassPass())->process($container);
@@ -138,7 +138,7 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
138138

139139
$container->register(B::class);
140140
$container->register(DInterface::class, F::class);
141-
$hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument('')->addArgument('');
141+
$hDefinition = $container->register('h', H::class)->addArgument('')->addArgument('');
142142
$hDefinition->setAutowired(true);
143143

144144
(new ResolveClassPass())->process($container);
@@ -153,7 +153,7 @@ public function testPrivateConstructorThrowsAutowireException()
153153
{
154154
$container = new ContainerBuilder();
155155

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

158158
$pass = new AutowirePass(true);
159159
try {
@@ -168,10 +168,10 @@ public function testTypeCollision()
168168
{
169169
$container = new ContainerBuilder();
170170

171-
$container->register('c1', __NAMESPACE__.'\CollisionA');
172-
$container->register('c2', __NAMESPACE__.'\CollisionB');
173-
$container->register('c3', __NAMESPACE__.'\CollisionB');
174-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
171+
$container->register('c1', CollisionA::class);
172+
$container->register('c2', CollisionB::class);
173+
$container->register('c3', CollisionB::class);
174+
$aDefinition = $container->register('a', CannotBeAutowired::class);
175175
$aDefinition->setAutowired(true);
176176

177177
$pass = new AutowirePass();
@@ -187,9 +187,9 @@ public function testTypeNotGuessable()
187187
{
188188
$container = new ContainerBuilder();
189189

190-
$container->register('a1', __NAMESPACE__.'\Foo');
191-
$container->register('a2', __NAMESPACE__.'\Foo');
192-
$aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
190+
$container->register('a1', Foo::class);
191+
$container->register('a2', Foo::class);
192+
$aDefinition = $container->register('a', NotGuessableArgument::class);
193193
$aDefinition->setAutowired(true);
194194

195195
$pass = new AutowirePass();
@@ -205,9 +205,9 @@ public function testTypeNotGuessableWithSubclass()
205205
{
206206
$container = new ContainerBuilder();
207207

208-
$container->register('a1', __NAMESPACE__.'\B');
209-
$container->register('a2', __NAMESPACE__.'\B');
210-
$aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgumentForSubclass');
208+
$container->register('a1', B::class);
209+
$container->register('a2', B::class);
210+
$aDefinition = $container->register('a', NotGuessableArgumentForSubclass::class);
211211
$aDefinition->setAutowired(true);
212212

213213
$pass = new AutowirePass();
@@ -223,7 +223,7 @@ public function testTypeNotGuessableNoServicesFound()
223223
{
224224
$container = new ContainerBuilder();
225225

226-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
226+
$aDefinition = $container->register('a', CannotBeAutowired::class);
227227
$aDefinition->setAutowired(true);
228228

229229
$pass = new AutowirePass();
@@ -239,10 +239,10 @@ public function testTypeNotGuessableWithTypeSet()
239239
{
240240
$container = new ContainerBuilder();
241241

242-
$container->register('a1', __NAMESPACE__.'\Foo');
243-
$container->register('a2', __NAMESPACE__.'\Foo');
242+
$container->register('a1', Foo::class);
243+
$container->register('a2', Foo::class);
244244
$container->register(Foo::class, Foo::class);
245-
$aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
245+
$aDefinition = $container->register('a', NotGuessableArgument::class);
246246
$aDefinition->setAutowired(true);
247247

248248
$pass = new AutowirePass();
@@ -256,10 +256,10 @@ public function testWithTypeSet()
256256
{
257257
$container = new ContainerBuilder();
258258

259-
$container->register('c1', __NAMESPACE__.'\CollisionA');
260-
$container->register('c2', __NAMESPACE__.'\CollisionB');
259+
$container->register('c1', CollisionA::class);
260+
$container->register('c2', CollisionB::class);
261261
$container->setAlias(CollisionInterface::class, 'c2');
262-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
262+
$aDefinition = $container->register('a', CannotBeAutowired::class);
263263
$aDefinition->setAutowired(true);
264264

265265
$pass = new AutowirePass();
@@ -273,7 +273,7 @@ public function testServicesAreNotAutoCreated()
273273
{
274274
$container = new ContainerBuilder();
275275

276-
$coopTilleulsDefinition = $container->register('coop_tilleuls', __NAMESPACE__.'\LesTilleuls');
276+
$coopTilleulsDefinition = $container->register('coop_tilleuls', LesTilleuls::class);
277277
$coopTilleulsDefinition->setAutowired(true);
278278

279279
$pass = new AutowirePass();
@@ -306,7 +306,7 @@ public function testOptionalParameter()
306306

307307
$container->register(A::class);
308308
$container->register(Foo::class);
309-
$optDefinition = $container->register('opt', __NAMESPACE__.'\OptionalParameter');
309+
$optDefinition = $container->register('opt', OptionalParameter::class);
310310
$optDefinition->setAutowired(true);
311311

312312
(new ResolveClassPass())->process($container);
@@ -323,7 +323,7 @@ public function testDontTriggerAutowiring()
323323
$container = new ContainerBuilder();
324324

325325
$container->register(Foo::class);
326-
$container->register('bar', __NAMESPACE__.'\Bar');
326+
$container->register('bar', Bar::class);
327327

328328
(new ResolveClassPass())->process($container);
329329
(new AutowirePass())->process($container);
@@ -335,7 +335,7 @@ public function testClassNotFoundThrowsException()
335335
{
336336
$container = new ContainerBuilder();
337337

338-
$aDefinition = $container->register('a', __NAMESPACE__.'\BadTypeHintedArgument');
338+
$aDefinition = $container->register('a', BadTypeHintedArgument::class);
339339
$aDefinition->setAutowired(true);
340340

341341
$container->register(Dunglas::class, Dunglas::class);
@@ -353,7 +353,7 @@ public function testParentClassNotFoundThrowsException()
353353
{
354354
$container = new ContainerBuilder();
355355

356-
$aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');
356+
$aDefinition = $container->register('a', BadParentTypeHintedArgument::class);
357357
$aDefinition->setAutowired(true);
358358

359359
$container->register(Dunglas::class, Dunglas::class);
@@ -372,8 +372,8 @@ public function testDontUseAbstractServices()
372372
$container = new ContainerBuilder();
373373

374374
$container->register(Foo::class)->setAbstract(true);
375-
$container->register('foo', __NAMESPACE__.'\Foo');
376-
$container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
375+
$container->register('foo', Foo::class);
376+
$container->register('bar', Bar::class)->setAutowired(true);
377377

378378
(new ResolveClassPass())->process($container);
379379
try {
@@ -391,7 +391,7 @@ public function testSomeSpecificArgumentsAreSet()
391391
$container->register('foo', Foo::class);
392392
$container->register(A::class);
393393
$container->register(Dunglas::class);
394-
$container->register('multiple', __NAMESPACE__.'\MultipleArguments')
394+
$container->register('multiple', MultipleArguments::class)
395395
->setAutowired(true)
396396
// set the 2nd (index 1) argument only: autowire the first and third
397397
// args are: A, Foo, Dunglas
@@ -421,7 +421,7 @@ public function testScalarArgsCannotBeAutowired()
421421

422422
$container->register(A::class);
423423
$container->register(Dunglas::class);
424-
$container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
424+
$container->register('arg_no_type_hint', MultipleArguments::class)
425425
->setArguments([1 => 'foo'])
426426
->setAutowired(true);
427427

@@ -440,7 +440,7 @@ public function testNoTypeArgsCannotBeAutowired()
440440

441441
$container->register(A::class);
442442
$container->register(Dunglas::class);
443-
$container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
443+
$container->register('arg_no_type_hint', MultipleArguments::class)
444444
->setAutowired(true);
445445

446446
(new ResolveClassPass())->process($container);
@@ -458,7 +458,7 @@ public function testOptionalScalarNotReallyOptionalUsesDefaultValue()
458458

459459
$container->register(A::class);
460460
$container->register(Lille::class);
461-
$definition = $container->register('not_really_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalarNotReallyOptional')
461+
$definition = $container->register('not_really_optional_scalar', MultipleArgumentsOptionalScalarNotReallyOptional::class)
462462
->setAutowired(true);
463463

464464
(new ResolveClassPass())->process($container);
@@ -473,7 +473,7 @@ public function testOptionalScalarArgsDontMessUpOrder()
473473

474474
$container->register(A::class);
475475
$container->register(Lille::class);
476-
$container->register('with_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
476+
$container->register('with_optional_scalar', MultipleArgumentsOptionalScalar::class)
477477
->setAutowired(true);
478478

479479
(new ResolveClassPass())->process($container);
@@ -497,7 +497,7 @@ public function testOptionalScalarArgsNotPassedIfLast()
497497

498498
$container->register(A::class);
499499
$container->register(Lille::class);
500-
$container->register('with_optional_scalar_last', __NAMESPACE__.'\MultipleArgumentsOptionalScalarLast')
500+
$container->register('with_optional_scalar_last', MultipleArgumentsOptionalScalarLast::class)
501501
->setAutowired(true);
502502

503503
(new ResolveClassPass())->process($container);
@@ -624,9 +624,9 @@ public function testIgnoreServiceWithClassNotExisting()
624624
{
625625
$container = new ContainerBuilder();
626626

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

629-
$barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
629+
$barDefinition = $container->register('bar', Bar::class);
630630
$barDefinition->setAutowired(true);
631631

632632
$container->register(Foo::class, Foo::class);
@@ -680,8 +680,8 @@ public function testProcessDoesNotTriggerDeprecations()
680680
{
681681
$container = new ContainerBuilder();
682682
$container->register('deprecated', 'Symfony\Component\DependencyInjection\Tests\Fixtures\DeprecatedClass')->setDeprecated(true);
683-
$container->register('foo', __NAMESPACE__.'\Foo');
684-
$container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
683+
$container->register('foo', Foo::class);
684+
$container->register('bar', Bar::class)->setAutowired(true);
685685

686686
$pass = new AutowirePass();
687687
try {
@@ -702,7 +702,7 @@ public function testEmptyStringIsKept()
702702

703703
$container->register(A::class);
704704
$container->register(Lille::class);
705-
$container->register('foo', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
705+
$container->register('foo', MultipleArgumentsOptionalScalar::class)
706706
->setAutowired(true)
707707
->setArguments(['', '']);
708708

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ public function testAutowiring()
12451245
$container = new ContainerBuilder();
12461246

12471247
$container->register(A::class)->setPublic(true);
1248-
$bDefinition = $container->register('b', __NAMESPACE__.'\B');
1248+
$bDefinition = $container->register('b', B::class);
12491249
$bDefinition->setAutowired(true);
12501250
$bDefinition->setPublic(true);
12511251

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.