Skip to content

Commit 50c02e0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.0
* 4.4: Use `::class` constants instead of `__NAMESPACE__` when possible
2 parents f0d818c + 3fe2fa8 commit 50c02e0

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

‎Tests/DebugClassLoaderTest.php

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ public function testThrowingClass()
6565
$this->expectException('Exception');
6666
$this->expectExceptionMessage('boo');
6767
try {
68-
class_exists(__NAMESPACE__.'\Fixtures\Throwing');
68+
class_exists(Fixtures\Throwing::class);
6969
$this->fail('Exception expected');
7070
} catch (\Exception $e) {
7171
$this->assertSame('boo', $e->getMessage());
7272
}
7373

7474
// the second call also should throw
75-
class_exists(__NAMESPACE__.'\Fixtures\Throwing');
75+
class_exists(Fixtures\Throwing::class);
7676
}
7777

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

8585
public function testFileCaseMismatch()
@@ -90,7 +90,7 @@ public function testFileCaseMismatch()
9090
$this->markTestSkipped('Can only be run on case insensitive filesystems');
9191
}
9292

93-
class_exists(__NAMESPACE__.'\Fixtures\CaseMismatch', true);
93+
class_exists(Fixtures\CaseMismatch::class, true);
9494
}
9595

9696
public function testPsr4CaseMismatch()
@@ -112,7 +112,7 @@ public function testNotPsr0Bis()
112112

113113
public function testClassAlias()
114114
{
115-
$this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\ClassAlias', true));
115+
$this->assertTrue(class_exists(Fixtures\ClassAlias::class, true));
116116
}
117117

118118
/**
@@ -154,7 +154,7 @@ public function testInterfaceExtendsDeprecatedInterface()
154154
$e = error_reporting(0);
155155
trigger_error('', E_USER_NOTICE);
156156

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

159159
error_reporting($e);
160160
restore_error_handler();
@@ -201,7 +201,7 @@ public function testExtendedFinalClass()
201201
require __DIR__.'/Fixtures/FinalClasses.php';
202202

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

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

232232
error_reporting($e);
233233
restore_error_handler();
@@ -246,7 +246,7 @@ public function testExtendedDeprecatedMethodDoesntTriggerAnyNotice()
246246
$e = error_reporting(0);
247247
trigger_error('', E_USER_NOTICE);
248248

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

251251
error_reporting($e);
252252
restore_error_handler();
@@ -263,7 +263,7 @@ public function testInternalsUse()
263263
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
264264
$e = error_reporting(E_USER_DEPRECATED);
265265

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

268268
error_reporting($e);
269269
restore_error_handler();
@@ -282,7 +282,7 @@ public function testExtendedMethodDefinesNewParameters()
282282
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
283283
$e = error_reporting(E_USER_DEPRECATED);
284284

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

287287
error_reporting($e);
288288
restore_error_handler();
@@ -305,7 +305,7 @@ public function testUseTraitWithInternalMethod()
305305
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
306306
$e = error_reporting(E_USER_DEPRECATED);
307307

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

310310
error_reporting($e);
311311
restore_error_handler();
@@ -319,7 +319,7 @@ public function testVirtualUse()
319319
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
320320
$e = error_reporting(E_USER_DEPRECATED);
321321

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

324324
error_reporting($e);
325325
restore_error_handler();
@@ -345,7 +345,7 @@ public function testVirtualUseWithMagicCall()
345345
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
346346
$e = error_reporting(E_USER_DEPRECATED);
347347

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

350350
error_reporting($e);
351351
restore_error_handler();
@@ -355,7 +355,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\ExtendsVirtualMagicCall', true);
355355

356356
public function testEvaluatedCode()
357357
{
358-
$this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\DefinitionInEvaluatedCode', true));
358+
$this->assertTrue(class_exists(Fixtures\DefinitionInEvaluatedCode::class, true));
359359
}
360360

361361
public function testReturnType()
@@ -364,7 +364,7 @@ public function testReturnType()
364364
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
365365
$e = error_reporting(E_USER_DEPRECATED);
366366

367-
class_exists('Test\\'.__NAMESPACE__.'\\ReturnType', true);
367+
class_exists('Test\\'.ReturnType::class, true);
368368

369369
error_reporting($e);
370370
restore_error_handler();
@@ -408,11 +408,11 @@ public function findFile($class)
408408
{
409409
$fixtureDir = __DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
410410

411-
if (__NAMESPACE__.'\TestingUnsilencing' === $class) {
411+
if (TestingUnsilencing::class === $class) {
412412
eval('-- parse error --');
413-
} elseif (__NAMESPACE__.'\TestingStacking' === $class) {
413+
} elseif (TestingStacking::class === $class) {
414414
eval('namespace '.__NAMESPACE__.'; class TestingStacking { function foo() {} }');
415-
} elseif (__NAMESPACE__.'\TestingCaseMismatch' === $class) {
415+
} elseif (TestingCaseMismatch::class === $class) {
416416
eval('namespace '.__NAMESPACE__.'; class TestingCaseMisMatch {}');
417417
} elseif (__NAMESPACE__.'\Fixtures\Psr4CaseMismatch' === $class) {
418418
return $fixtureDir.'psr4'.\DIRECTORY_SEPARATOR.'Psr4CaseMismatch.php';
@@ -422,60 +422,60 @@ public function findFile($class)
422422
return $fixtureDir.'notPsr0Bis.php';
423423
} elseif ('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent' === $class) {
424424
eval('namespace Symfony\Bridge\Debug\Tests\Fixtures; class ExtendsDeprecatedParent extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
425-
} elseif ('Test\\'.__NAMESPACE__.'\DeprecatedParentClass' === $class) {
425+
} elseif ('Test\\'.DeprecatedParentClass::class === $class) {
426426
eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedParentClass extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
427-
} elseif ('Test\\'.__NAMESPACE__.'\DeprecatedInterfaceClass' === $class) {
427+
} elseif ('Test\\'.DeprecatedInterfaceClass::class === $class) {
428428
eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\DeprecatedInterface {}');
429-
} elseif ('Test\\'.__NAMESPACE__.'\NonDeprecatedInterfaceClass' === $class) {
429+
} elseif ('Test\\'.NonDeprecatedInterfaceClass::class === $class) {
430430
eval('namespace Test\\'.__NAMESPACE__.'; class NonDeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\NonDeprecatedInterface {}');
431-
} elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
431+
} elseif ('Test\\'.Float::class === $class) {
432432
eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
433-
} elseif (0 === strpos($class, 'Test\\'.__NAMESPACE__.'\ExtendsFinalClass')) {
433+
} elseif (0 === strpos($class, 'Test\\'.ExtendsFinalClass::class)) {
434434
$classShortName = substr($class, strrpos($class, '\\') + 1);
435435
eval('namespace Test\\'.__NAMESPACE__.'; class '.$classShortName.' extends \\'.__NAMESPACE__.'\Fixtures\\'.substr($classShortName, 7).' {}');
436-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsAnnotatedClass' === $class) {
436+
} elseif ('Test\\'.ExtendsAnnotatedClass::class === $class) {
437437
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsAnnotatedClass extends \\'.__NAMESPACE__.'\Fixtures\AnnotatedClass {
438438
public function deprecatedMethod() { }
439439
}');
440-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternals' === $class) {
440+
} elseif ('Test\\'.ExtendsInternals::class === $class) {
441441
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternals extends ExtendsInternalsParent {
442442
use \\'.__NAMESPACE__.'\Fixtures\InternalTrait;
443443
444444
public function internalMethod() { }
445445
}');
446-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternalsParent' === $class) {
446+
} elseif ('Test\\'.ExtendsInternalsParent::class === $class) {
447447
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternalsParent extends \\'.__NAMESPACE__.'\Fixtures\InternalClass implements \\'.__NAMESPACE__.'\Fixtures\InternalInterface { }');
448-
} elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) {
448+
} elseif ('Test\\'.UseTraitWithInternalMethod::class === $class) {
449449
eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }');
450-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtual' === $class) {
450+
} elseif ('Test\\'.ExtendsVirtual::class === $class) {
451451
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsVirtual extends ExtendsVirtualParent implements \\'.__NAMESPACE__.'\Fixtures\VirtualSubInterface {
452452
public function ownClassMethod() { }
453453
public function classMethod() { }
454454
public function sameLineInterfaceMethodNoBraces() { }
455455
}');
456-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualParent' === $class) {
456+
} elseif ('Test\\'.ExtendsVirtualParent::class === $class) {
457457
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsVirtualParent extends ExtendsVirtualAbstract {
458458
public function ownParentMethod() { }
459459
public function traitMethod() { }
460460
public function sameLineInterfaceMethod() { }
461461
public function staticMethodNoBraces() { } // should be static
462462
}');
463-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualAbstract' === $class) {
463+
} elseif ('Test\\'.ExtendsVirtualAbstract::class === $class) {
464464
eval('namespace Test\\'.__NAMESPACE__.'; abstract class ExtendsVirtualAbstract extends ExtendsVirtualAbstractBase {
465465
public static function staticMethod() { }
466466
public function ownAbstractMethod() { }
467467
public function interfaceMethod() { }
468468
}');
469-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualAbstractBase' === $class) {
469+
} elseif ('Test\\'.ExtendsVirtualAbstractBase::class === $class) {
470470
eval('namespace Test\\'.__NAMESPACE__.'; abstract class ExtendsVirtualAbstractBase extends \\'.__NAMESPACE__.'\Fixtures\VirtualClass implements \\'.__NAMESPACE__.'\Fixtures\VirtualInterface {
471471
public function ownAbstractBaseMethod() { }
472472
}');
473-
} elseif ('Test\\'.__NAMESPACE__.'\ExtendsVirtualMagicCall' === $class) {
473+
} elseif ('Test\\'.ExtendsVirtualMagicCall::class === $class) {
474474
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsVirtualMagicCall extends \\'.__NAMESPACE__.'\Fixtures\VirtualClassMagicCall implements \\'.__NAMESPACE__.'\Fixtures\VirtualInterface {
475475
}');
476-
} elseif ('Test\\'.__NAMESPACE__.'\ReturnType' === $class) {
476+
} elseif ('Test\\'.ReturnType::class === $class) {
477477
return $fixtureDir.\DIRECTORY_SEPARATOR.'ReturnType.php';
478-
} elseif ('Test\\'.__NAMESPACE__.'\Fixtures\OutsideInterface' === $class) {
478+
} elseif ('Test\\'.Fixtures\OutsideInterface::class === $class) {
479479
return $fixtureDir.\DIRECTORY_SEPARATOR.'OutsideInterface.php';
480480
}
481481
}

0 commit comments

Comments
 (0)