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 7d9945e

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.3
* 3.4: Use `::class` constants instead of `__NAMESPACE__` when possible
2 parents 64410ed + cfd4194 commit 7d9945e
Copy full SHA for 7d9945e

File tree

Expand file treeCollapse file tree

78 files changed

+194
-194
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

+194
-194
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/Debug/Tests/DebugClassLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
+32-32Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,21 @@ public function testThrowingClass()
6363
$this->expectException('Exception');
6464
$this->expectExceptionMessage('boo');
6565
try {
66-
class_exists(__NAMESPACE__.'\Fixtures\Throwing');
66+
class_exists(Fixtures\Throwing::class);
6767
$this->fail('Exception expected');
6868
} catch (\Exception $e) {
6969
$this->assertSame('boo', $e->getMessage());
7070
}
7171

7272
// the second call also should throw
73-
class_exists(__NAMESPACE__.'\Fixtures\Throwing');
73+
class_exists(Fixtures\Throwing::class);
7474
}
7575

7676
public function testNameCaseMismatch()
7777
{
7878
$this->expectException('RuntimeException');
7979
$this->expectExceptionMessage('Case mismatch between loaded and declared class names');
80-
class_exists(__NAMESPACE__.'\TestingCaseMismatch', true);
80+
class_exists(TestingCaseMismatch::class, true);
8181
}
8282

8383
public function testFileCaseMismatch()
@@ -88,7 +88,7 @@ public function testFileCaseMismatch()
8888
$this->markTestSkipped('Can only be run on case insensitive filesystems');
8989
}
9090

91-
class_exists(__NAMESPACE__.'\Fixtures\CaseMismatch', true);
91+
class_exists(Fixtures\CaseMismatch::class, true);
9292
}
9393

9494
public function testPsr4CaseMismatch()
@@ -110,7 +110,7 @@ public function testNotPsr0Bis()
110110

111111
public function testClassAlias()
112112
{
113-
$this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\ClassAlias', true));
113+
$this->assertTrue(class_exists(Fixtures\ClassAlias::class, true));
114114
}
115115

116116
/**
@@ -152,7 +152,7 @@ public function testInterfaceExtendsDeprecatedInterface()
152152
$e = error_reporting(0);
153153
trigger_error('', E_USER_NOTICE);
154154

155-
class_exists('Test\\'.__NAMESPACE__.'\\NonDeprecatedInterfaceClass', true);
155+
class_exists('Test\\'.NonDeprecatedInterfaceClass::class, true);
156156

157157
error_reporting($e);
158158
restore_error_handler();
@@ -199,7 +199,7 @@ public function testExtendedFinalClass()
199199
require __DIR__.'/Fixtures/FinalClasses.php';
200200

201201
$i = 1;
202-
while (class_exists($finalClass = __NAMESPACE__.'\\Fixtures\\FinalClass'.$i++, false)) {
202+
while (class_exists($finalClass = Fixtures\FinalClass::class.$i++, false)) {
203203
spl_autoload_call($finalClass);
204204
class_exists('Test\\'.__NAMESPACE__.'\\Extends'.substr($finalClass, strrpos($finalClass, '\\') + 1), true);
205205
}
@@ -225,7 +225,7 @@ public function testExtendedFinalMethod()
225225
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
226226
$e = error_reporting(E_USER_DEPRECATED);
227227

228-
class_exists(__NAMESPACE__.'\\Fixtures\\ExtendedFinalMethod', true);
228+
class_exists(Fixtures\ExtendedFinalMethod::class, true);
229229

230230
error_reporting($e);
231231
restore_error_handler();
@@ -244,7 +244,7 @@ public function testExtendedDeprecatedMethodDoesntTriggerAnyNotice()
244244
$e = error_reporting(0);
245245
trigger_error('', E_USER_NOTICE);
246246

247-
class_exists('Test\\'.__NAMESPACE__.'\\ExtendsAnnotatedClass', true);
247+
class_exists('Test\\'.ExtendsAnnotatedClass::class, true);
248248

249249
error_reporting($e);
250250
restore_error_handler();
@@ -261,7 +261,7 @@ public function testInternalsUse()
261261
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
262262
$e = error_reporting(E_USER_DEPRECATED);
263263

264-
class_exists('Test\\'.__NAMESPACE__.'\\ExtendsInternals', true);
264+
class_exists('Test\\'.ExtendsInternals::class, true);
265265

266266
error_reporting($e);
267267
restore_error_handler();
@@ -280,7 +280,7 @@ public function testExtendedMethodDefinesNewParameters()
280280
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
281281
$e = error_reporting(E_USER_DEPRECATED);
282282

283-
class_exists(__NAMESPACE__.'\\Fixtures\SubClassWithAnnotatedParameters', true);
283+
class_exists(Fixtures\SubClassWithAnnotatedParameters::class, true);
284284

285285
error_reporting($e);
286286
restore_error_handler();
@@ -303,7 +303,7 @@ public function testUseTraitWithInternalMethod()
303303
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
304304
$e = error_reporting(E_USER_DEPRECATED);
305305

306-
class_exists('Test\\'.__NAMESPACE__.'\\UseTraitWithInternalMethod', true);
306+
class_exists('Test\\'.UseTraitWithInternalMethod::class, true);
307307

308308
error_reporting($e);
309309
restore_error_handler();
@@ -317,7 +317,7 @@ public function testVirtualUse()
317317
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
318318
$e = error_reporting(E_USER_DEPRECATED);
319319

320-
class_exists('Test\\'.__NAMESPACE__.'\\ExtendsVirtual', true);
320+
class_exists('Test\\'.ExtendsVirtual::class, true);
321321

322322
error_reporting($e);
323323
restore_error_handler();
@@ -343,7 +343,7 @@ public function testVirtualUseWithMagicCall()
343343
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
344344
$e = error_reporting(E_USER_DEPRECATED);
345345

346-
class_exists('Test\\'.__NAMESPACE__.'\\ExtendsVirtualMagicCall', true);
346+
class_exists('Test\\'.ExtendsVirtualMagicCall::class, true);
347347

348348
error_reporting($e);
349349
restore_error_handler();
@@ -353,7 +353,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\ExtendsVirtualMagicCall', true);
353353

354354
public function testEvaluatedCode()
355355
{
356-
$this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\DefinitionInEvaluatedCode', true));
356+
$this->assertTrue(class_exists(Fixtures\DefinitionInEvaluatedCode::class, true));
357357
}
358358
}
359359

@@ -372,11 +372,11 @@ public function findFile($class)
372372
{
373373
$fixtureDir = __DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
374374

375-
if (__NAMESPACE__.'\TestingUnsilencing' === $class) {
375+
if (TestingUnsilencing::class === $class) {
376376
eval('-- parse error --');
377-
} elseif (__NAMESPACE__.'\TestingStacking' === $class) {
377+
} elseif (TestingStacking::class === $class) {
378378
eval('namespace '.__NAMESPACE__.'; class TestingStacking { function foo() {} }');
379-
} elseif (__NAMESPACE__.'\TestingCaseMismatch' === $class) {
379+
} elseif (TestingCaseMismatch::class === $class) {
380380
eval('namespace '.__NAMESPACE__.'; class TestingCaseMisMatch {}');
381381
} elseif (__NAMESPACE__.'\Fixtures\Psr4CaseMismatch' === $class) {
382382
return $fixtureDir.'psr4'.\DIRECTORY_SEPARATOR.'Psr4CaseMismatch.php';
@@ -386,55 +386,55 @@ public function findFile($class)
386386
return $fixtureDir.'notPsr0Bis.php';
387387
} elseif ('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent' === $class) {
388388
eval('namespace Symfony\Bridge\Debug\Tests\Fixtures; class ExtendsDeprecatedParent extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
389-
} elseif ('Test\\'.__NAMESPACE__.'\DeprecatedParentClass' === $class) {
389+
} elseif ('Test\\'.DeprecatedParentClass::class === $class) {
390390
eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedParentClass extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
391-
} elseif ('Test\\'.__NAMESPACE__.'\DeprecatedInterfaceClass' === $class) {
391+
} elseif ('Test\\'.DeprecatedInterfaceClass::class === $class) {
392392
eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\DeprecatedInterface {}');
393-
} elseif ('Test\\'.__NAMESPACE__.'\NonDeprecatedInterfaceClass' === $class) {
393+
} elseif ('Test\\'.NonDeprecatedInterfaceClass::class === $class) {
394394
eval('namespace Test\\'.__NAMESPACE__.'; class NonDeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\NonDeprecatedInterface {}');
395-
} elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
395+
} elseif ('Test\\'.Float::class === $class) {
396396
eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
397-
} elseif (0 === strpos($class, 'Test\\'.__NAMESPACE__.'\ExtendsFinalClass')) {
397+
} elseif (0 === strpos($class, 'Test\\'.ExtendsFinalClass::class)) {
398398
$classShortName = substr($class, strrpos($class, '\\') + 1);
399399
eval('namespace Test\\'.__NAMESPACE__.'; class '.$classShortName.' extends \\'.__NAMESPACE__.'\Fixtures\\'.substr($classShortName, 7).' {}');
400-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsAnnotatedClass' === $class) {
400+
} elseif ('Test\\'.ExtendsAnnotatedClass::class === $class) {
401401
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsAnnotatedClass extends \\'.__NAMESPACE__.'\Fixtures\AnnotatedClass {
402402
public function deprecatedMethod() { }
403403
}');
404-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternals' === $class) {
404+
} elseif ('Test\\'.ExtendsInternals::class === $class) {
405405
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternals extends ExtendsInternalsParent {
406406
use \\'.__NAMESPACE__.'\Fixtures\InternalTrait;
407407
408408
public function internalMethod() { }
409409
}');
410-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternalsParent' === $class) {
410+
} elseif ('Test\\'.ExtendsInternalsParent::class === $class) {
411411
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternalsParent extends \\'.__NAMESPACE__.'\Fixtures\InternalClass implements \\'.__NAMESPACE__.'\Fixtures\InternalInterface { }');
412-
} elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) {
412+
} elseif ('Test\\'.UseTraitWithInternalMethod::class === $class) {
413413
eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }');
414-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtual' === $class) {
414+
} elseif ('Test\\'.ExtendsVirtual::class === $class) {
415415
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsVirtual extends ExtendsVirtualParent implements \\'.__NAMESPACE__.'\Fixtures\VirtualSubInterface {
416416
public function ownClassMethod() { }
417417
public function classMethod() { }
418418
public function sameLineInterfaceMethodNoBraces() { }
419419
}');
420-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualParent' === $class) {
420+
} elseif ('Test\\'.ExtendsVirtualParent::class === $class) {
421421
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsVirtualParent extends ExtendsVirtualAbstract {
422422
public function ownParentMethod() { }
423423
public function traitMethod() { }
424424
public function sameLineInterfaceMethod() { }
425425
public function staticMethodNoBraces() { } // should be static
426426
}');
427-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualAbstract' === $class) {
427+
} elseif ('Test\\'.ExtendsVirtualAbstract::class === $class) {
428428
eval('namespace Test\\'.__NAMESPACE__.'; abstract class ExtendsVirtualAbstract extends ExtendsVirtualAbstractBase {
429429
public static function staticMethod() { }
430430
public function ownAbstractMethod() { }
431431
public function interfaceMethod() { }
432432
}');
433-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualAbstractBase' === $class) {
433+
} elseif ('Test\\'.ExtendsVirtualAbstractBase::class === $class) {
434434
eval('namespace Test\\'.__NAMESPACE__.'; abstract class ExtendsVirtualAbstractBase extends \\'.__NAMESPACE__.'\Fixtures\VirtualClass implements \\'.__NAMESPACE__.'\Fixtures\VirtualInterface {
435435
public function ownAbstractBaseMethod() { }
436436
}');
437-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualMagicCall' === $class) {
437+
} elseif ('Test\\'.ExtendsVirtualMagicCall::class === $class) {
438438
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsVirtualMagicCall extends \\'.__NAMESPACE__.'\Fixtures\VirtualClassMagicCall implements \\'.__NAMESPACE__.'\Fixtures\VirtualInterface {
439439
}');
440440
}

0 commit comments

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