From 20086856b1adc81cf0c4da0bc0c9a59530fd191e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= <theo.fidry@gmail.com>
Date: Fri, 3 Aug 2018 14:43:48 +0200
Subject: [PATCH] Record whitelisted classes (#251)

---
 .../string-literal/array-var.php              |  0
 .../string-literal/class-const-array.php      |  0
 .../string-literal/class-const.php            |  0
 .../string-literal/class-prop.php             |  0
 .../string-literal/class-var.php              |  0
 {specs => fixtures}/string-literal/const.php  |  3 +
 .../string-literal/define-value.php           |  0
 .../string-literal/func-arg.php               |  3 +
 .../string-literal/method-arg.php             |  0
 {specs => fixtures}/string-literal/misc.php   |  0
 {specs => fixtures}/string-literal/new.php    |  3 +
 {specs => fixtures}/string-literal/var.php    |  3 +
 specs/class-FQ.php                            | 15 ++++
 ...-level-with-single-level-use-and-alias.php |  3 +
 ...-scope-two-level-with-single-level-use.php |  6 ++
 specs/class-const/global-scope-two-level.php  |  6 ++
 ...-level-with-single-level-use-and-alias.php |  3 +
 ...-scope-two-level-with-single-level-use.php |  6 ++
 .../class-const/namespace-scope-two-level.php |  6 ++
 ...-level-with-single-level-use-and-alias.php |  3 +
 ...-scope-two-level-with-single-level-use.php |  6 ++
 .../global-scope-two-level.php                |  6 ++
 ...-level-with-single-level-use-and-alias.php |  3 +
 ...-scope-two-level-with-single-level-use.php |  6 ++
 .../namespace-scope-two-level.php             |  6 ++
 specs/class/abstract.php                      | 72 +++++++++++++++-
 specs/class/anonymous.php                     |  4 +
 specs/class/conditional.php                   |  6 ++
 specs/class/final.php                         |  3 +
 specs/class/interface.php                     | 56 ++++++++++++
 specs/class/regular-extend.php                |  3 +
 specs/class/regular.php                       | 12 +++
 specs/func-declaration/global.php             |  9 ++
 specs/func-declaration/method.php             |  6 ++
 specs/func-declaration/namespace.php          | 12 +++
 ...-parts-with-single-level-use-and-alias.php |  6 ++
 ...-scope-two-parts-with-single-level-use.php | 12 +++
 specs/new/global-scope-two-parts.php          |  6 ++
 ...namespace-two-parts-with-two-level-use.php |  3 +
 ...-parts-with-single-level-use-and-alias.php |  9 ++
 ...-scope-two-parts-with-single-level-use.php | 12 +++
 .../static-method/global-scope-two-parts.php  |  6 ++
 ...namespace-two-parts-with-two-level-use.php |  3 +
 specs/static-method/namespace-two-parts.php   |  3 +
 specs/use/use-class.php                       |  9 ++
 specs/whitelist-case-sensitiveness.php        |  3 +
 .../NodeVisitor/ClassIdentifierRecorder.php   | 85 +++++++++++++++++++
 .../FunctionIdentifierRecorder.php            |  2 +-
 src/PhpParser/TraverserFactory.php            |  1 +
 tests/Scoper/PhpScoperSpecTest.php            | 74 +++++++++++-----
 50 files changed, 480 insertions(+), 24 deletions(-)
 rename {specs => fixtures}/string-literal/array-var.php (100%)
 rename {specs => fixtures}/string-literal/class-const-array.php (100%)
 rename {specs => fixtures}/string-literal/class-const.php (100%)
 rename {specs => fixtures}/string-literal/class-prop.php (100%)
 rename {specs => fixtures}/string-literal/class-var.php (100%)
 rename {specs => fixtures}/string-literal/const.php (97%)
 rename {specs => fixtures}/string-literal/define-value.php (100%)
 rename {specs => fixtures}/string-literal/func-arg.php (99%)
 rename {specs => fixtures}/string-literal/method-arg.php (100%)
 rename {specs => fixtures}/string-literal/misc.php (100%)
 rename {specs => fixtures}/string-literal/new.php (98%)
 rename {specs => fixtures}/string-literal/var.php (97%)
 create mode 100644 src/PhpParser/NodeVisitor/ClassIdentifierRecorder.php

diff --git a/specs/string-literal/array-var.php b/fixtures/string-literal/array-var.php
similarity index 100%
rename from specs/string-literal/array-var.php
rename to fixtures/string-literal/array-var.php
diff --git a/specs/string-literal/class-const-array.php b/fixtures/string-literal/class-const-array.php
similarity index 100%
rename from specs/string-literal/class-const-array.php
rename to fixtures/string-literal/class-const-array.php
diff --git a/specs/string-literal/class-const.php b/fixtures/string-literal/class-const.php
similarity index 100%
rename from specs/string-literal/class-const.php
rename to fixtures/string-literal/class-const.php
diff --git a/specs/string-literal/class-prop.php b/fixtures/string-literal/class-prop.php
similarity index 100%
rename from specs/string-literal/class-prop.php
rename to fixtures/string-literal/class-prop.php
diff --git a/specs/string-literal/class-var.php b/fixtures/string-literal/class-var.php
similarity index 100%
rename from specs/string-literal/class-var.php
rename to fixtures/string-literal/class-var.php
diff --git a/specs/string-literal/const.php b/fixtures/string-literal/const.php
similarity index 97%
rename from specs/string-literal/const.php
rename to fixtures/string-literal/const.php
index f9f5d87b..c9f316df 100644
--- a/specs/string-literal/const.php
+++ b/fixtures/string-literal/const.php
@@ -153,6 +153,9 @@ class Yaml
 
     'FQC constant call on whitelisted class' => [
         'whitelist' => ['Symfony\Component\Yaml\Yaml'],
+        'registered-classes' => [
+            ['Symfony\Component\Yaml\Yaml', 'Humbug\Symfony\Component\Yaml\Yaml'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/string-literal/define-value.php b/fixtures/string-literal/define-value.php
similarity index 100%
rename from specs/string-literal/define-value.php
rename to fixtures/string-literal/define-value.php
diff --git a/specs/string-literal/func-arg.php b/fixtures/string-literal/func-arg.php
similarity index 99%
rename from specs/string-literal/func-arg.php
rename to fixtures/string-literal/func-arg.php
index e59c691f..dec9fafc 100644
--- a/specs/string-literal/func-arg.php
+++ b/fixtures/string-literal/func-arg.php
@@ -529,6 +529,9 @@ class Yaml
 
     'FQC constant call on whitelisted class' => [
         'whitelist' => ['Symfony\Component\Yaml\Yaml'],
+        'registered-classes' => [
+            ['Symfony\Component\Yaml\Yaml', 'Humbug\Symfony\Component\Yaml\Yaml'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/string-literal/method-arg.php b/fixtures/string-literal/method-arg.php
similarity index 100%
rename from specs/string-literal/method-arg.php
rename to fixtures/string-literal/method-arg.php
diff --git a/specs/string-literal/misc.php b/fixtures/string-literal/misc.php
similarity index 100%
rename from specs/string-literal/misc.php
rename to fixtures/string-literal/misc.php
diff --git a/specs/string-literal/new.php b/fixtures/string-literal/new.php
similarity index 98%
rename from specs/string-literal/new.php
rename to fixtures/string-literal/new.php
index fe3e2bee..d53fe1d2 100644
--- a/specs/string-literal/new.php
+++ b/fixtures/string-literal/new.php
@@ -153,6 +153,9 @@ class Yaml
 
     'FQC constant call on whitelisted class' => [
         'whitelist' => ['Symfony\Component\Yaml\Yaml'],
+        'registered-classes' => [
+            ['Symfony\Component\Yaml\Yaml', 'Humbug\Symfony\Component\Yaml\Yaml'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/string-literal/var.php b/fixtures/string-literal/var.php
similarity index 97%
rename from specs/string-literal/var.php
rename to fixtures/string-literal/var.php
index f9ba49ce..3b6cb913 100644
--- a/specs/string-literal/var.php
+++ b/fixtures/string-literal/var.php
@@ -170,6 +170,9 @@ class Yaml
 
     'FQC constant call on whitelisted class' => [
         'whitelist' => ['Symfony\Component\Yaml\Yaml'],
+        'registered-classes' => [
+            ['Symfony\Component\Yaml\Yaml', 'Humbug\Symfony\Component\Yaml\Yaml'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-FQ.php b/specs/class-FQ.php
index dd6a3129..1618abc5 100644
--- a/specs/class-FQ.php
+++ b/specs/class-FQ.php
@@ -26,6 +26,10 @@
 
     'Different kind of whitelisted class constant calls in the global scope' => [
         'whitelist' => ['Foo\Bar', 'Foo\Bar\Poz'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+            ['Foo\Bar\Poz', 'Humbug\Foo\Bar\Poz'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -184,6 +188,17 @@ class Poz
             'A\Aoz',
             'A\Aoo\Aoz\Poz',
         ],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+            ['Foo\Bar\Poz', 'Humbug\Foo\Bar\Poz'],
+
+            ['A\Foo', 'Humbug\A\Foo'],
+            ['A\Foo\Bar', 'Humbug\A\Foo\Bar'],
+            ['A\Foo\Bar\Poz', 'Humbug\A\Foo\Bar\Poz'],
+            ['A\Aoo', 'Humbug\A\Aoo'],
+            ['A\Aoo\Aoz', 'Humbug\A\Aoo\Aoz'],
+            ['A\Aoo\Aoz\Poz', 'Humbug\A\Aoo\Aoz\Poz'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-const/global-scope-two-level-with-single-level-use-and-alias.php b/specs/class-const/global-scope-two-level-with-single-level-use-and-alias.php
index e0580cef..89068029 100644
--- a/specs/class-const/global-scope-two-level-with-single-level-use-and-alias.php
+++ b/specs/class-const/global-scope-two-level-with-single-level-use-and-alias.php
@@ -131,6 +131,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-const/global-scope-two-level-with-single-level-use.php b/specs/class-const/global-scope-two-level-with-single-level-use.php
index 74f1bc40..7be1fb62 100644
--- a/specs/class-const/global-scope-two-level-with-single-level-use.php
+++ b/specs/class-const/global-scope-two-level-with-single-level-use.php
@@ -140,6 +140,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -180,6 +183,9 @@ class Bar
 
     'FQ constant call on a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-const/global-scope-two-level.php b/specs/class-const/global-scope-two-level.php
index c477ee7a..23cd268b 100644
--- a/specs/class-const/global-scope-two-level.php
+++ b/specs/class-const/global-scope-two-level.php
@@ -78,6 +78,9 @@ class Command
 
     'Constant call on a whitelisted namespaced class' => [
         'whitelist' => ['PHPUnit\Command'],
+        'registered-classes' => [
+            ['PHPUnit\Command', 'Humbug\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -106,6 +109,9 @@ class Command
 
     'FQ constant call on a whitelisted namespaced class' => [
         'whitelist' => ['PHPUnit\Command'],
+        'registered-classes' => [
+            ['PHPUnit\Command', 'Humbug\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-const/namespace-scope-two-level-with-single-level-use-and-alias.php b/specs/class-const/namespace-scope-two-level-with-single-level-use-and-alias.php
index f597e41f..02c45b4a 100644
--- a/specs/class-const/namespace-scope-two-level-with-single-level-use-and-alias.php
+++ b/specs/class-const/namespace-scope-two-level-with-single-level-use-and-alias.php
@@ -131,6 +131,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-const/namespace-scope-two-level-with-single-level-use.php b/specs/class-const/namespace-scope-two-level-with-single-level-use.php
index 6a8201d8..f60340eb 100644
--- a/specs/class-const/namespace-scope-two-level-with-single-level-use.php
+++ b/specs/class-const/namespace-scope-two-level-with-single-level-use.php
@@ -140,6 +140,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -180,6 +183,9 @@ class Bar
 
     'FQ constant call on a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-const/namespace-scope-two-level.php b/specs/class-const/namespace-scope-two-level.php
index a886aa1a..e3ceac35 100644
--- a/specs/class-const/namespace-scope-two-level.php
+++ b/specs/class-const/namespace-scope-two-level.php
@@ -78,6 +78,9 @@ class Command
 
     'Constant call on a whitelisted namespaced class' => [
         'whitelist' => ['X\PHPUnit\Command'],
+        'registered-classes' => [
+            ['X\PHPUnit\Command', 'Humbug\X\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -160,6 +163,9 @@ class Command
 
     'FQ constant call on a whitelisted namespaced class' => [
         'whitelist' => ['PHPUnit\Command'],
+        'registered-classes' => [
+            ['PHPUnit\Command', 'Humbug\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-static-prop/global-scope-two-level-with-single-level-use-and-alias.php b/specs/class-static-prop/global-scope-two-level-with-single-level-use-and-alias.php
index fd77534b..43da4183 100644
--- a/specs/class-static-prop/global-scope-two-level-with-single-level-use-and-alias.php
+++ b/specs/class-static-prop/global-scope-two-level-with-single-level-use-and-alias.php
@@ -128,6 +128,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-static-prop/global-scope-two-level-with-single-level-use.php b/specs/class-static-prop/global-scope-two-level-with-single-level-use.php
index db75b941..f046931a 100644
--- a/specs/class-static-prop/global-scope-two-level-with-single-level-use.php
+++ b/specs/class-static-prop/global-scope-two-level-with-single-level-use.php
@@ -137,6 +137,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -177,6 +180,9 @@ class Bar
 
     'FQ constant call on a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-static-prop/global-scope-two-level.php b/specs/class-static-prop/global-scope-two-level.php
index 97b54811..9185701f 100644
--- a/specs/class-static-prop/global-scope-two-level.php
+++ b/specs/class-static-prop/global-scope-two-level.php
@@ -76,6 +76,9 @@ class Command
 
     'Constant call on a whitelisted namespaced class' => [
         'whitelist' => ['PHPUnit\Command'],
+        'registered-classes' => [
+            ['PHPUnit\Command', 'Humbug\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -104,6 +107,9 @@ class Command
 
     'FQ constant call on a whitelisted namespaced class' => [
         'whitelist' => ['PHPUnit\Command'],
+        'registered-classes' => [
+            ['PHPUnit\Command', 'Humbug\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-static-prop/namespace-scope-two-level-with-single-level-use-and-alias.php b/specs/class-static-prop/namespace-scope-two-level-with-single-level-use-and-alias.php
index b2656150..840cee23 100644
--- a/specs/class-static-prop/namespace-scope-two-level-with-single-level-use-and-alias.php
+++ b/specs/class-static-prop/namespace-scope-two-level-with-single-level-use-and-alias.php
@@ -128,6 +128,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-static-prop/namespace-scope-two-level-with-single-level-use.php b/specs/class-static-prop/namespace-scope-two-level-with-single-level-use.php
index 1f860f50..3ad9e6e0 100644
--- a/specs/class-static-prop/namespace-scope-two-level-with-single-level-use.php
+++ b/specs/class-static-prop/namespace-scope-two-level-with-single-level-use.php
@@ -137,6 +137,9 @@ class Bar
 
     'FQ Constant call on a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -177,6 +180,9 @@ class Bar
 
     'FQ constant call on a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class-static-prop/namespace-scope-two-level.php b/specs/class-static-prop/namespace-scope-two-level.php
index 7c3352a4..e7dabc01 100644
--- a/specs/class-static-prop/namespace-scope-two-level.php
+++ b/specs/class-static-prop/namespace-scope-two-level.php
@@ -76,6 +76,9 @@ class Command
 
     'Constant call on a whitelisted namespaced class' => [
         'whitelist' => ['X\PHPUnit\Command'],
+        'registered-classes' => [
+            ['X\PHPUnit\Command', 'Humbug\X\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -104,6 +107,9 @@ class Command
 
     'FQ constant call on a whitelisted namespaced class' => [
         'whitelist' => ['PHPUnit\Command'],
+        'registered-classes' => [
+            ['PHPUnit\Command', 'Humbug\PHPUnit\Command'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class/abstract.php b/specs/class/abstract.php
index 3707e21a..419fed07 100644
--- a/specs/class/abstract.php
+++ b/specs/class/abstract.php
@@ -74,6 +74,9 @@ public abstract function b();
 
     'Declaration of a whitelisted class in the global namespace' => [
         'whitelist' => ['A'],
+        'registered-classes' => [
+            ['A', 'Humbug\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -100,6 +103,9 @@ public abstract function b();
 
     'Declaration of a whitelisted class in the global namespace which is whitelisted' => [
         'whitelist' => ['A', '\*'],
+        'registered-classes' => [
+            ['A', 'Humbug\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -177,6 +183,9 @@ public abstract function b();
 
     'Declaration of a whitelisted class in a namespace' => [
         'whitelist' => ['Foo\A'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -203,8 +212,64 @@ public abstract function b();
 PHP
     ],
 
-    'Declaration of a whitelisted class in a namespace with FQCNfor the whitelist' => [
+    'Declaration of a namespaced class whitelisted with a pattern' => [
+        'whitelist' => ['Foo\A*'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+            ['Foo\AA', 'Humbug\Foo\AA'],
+            ['Foo\A\B', 'Humbug\Foo\A\B'],
+        ],
+        'payload' => <<<'PHP'
+<?php
+
+namespace Foo;
+
+abstract class A {
+    public function a() {}
+}
+
+abstract class AA {}
+
+abstract class B {}
+
+namespace Foo\A;
+
+abstract class B {}
+
+----
+<?php
+
+namespace Humbug\Foo;
+
+abstract class A
+{
+    public function a()
+    {
+    }
+}
+\class_alias('Humbug\\Foo\\A', 'Foo\\A', \false);
+abstract class AA
+{
+}
+\class_alias('Humbug\\Foo\\AA', 'Foo\\AA', \false);
+abstract class B
+{
+}
+namespace Humbug\Foo\A;
+
+abstract class B
+{
+}
+\class_alias('Humbug\\Foo\\A\\B', 'Foo\\A\\B', \false);
+
+PHP
+    ],
+
+    'Declaration of a whitelisted class in a namespace with FQCN for the whitelist' => [
         'whitelist' => ['\Foo\A'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -260,6 +325,11 @@ public abstract function b();
 
     'Multiple declarations in different namespaces with whitelisted classes' => [
         'whitelist' => ['Foo\WA', 'Bar\WB', 'WC'],
+        'registered-classes' => [
+            ['Foo\WA', 'Humbug\Foo\WA'],
+            ['Bar\WB', 'Humbug\Bar\WB'],
+            ['WC', 'Humbug\WC'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class/anonymous.php b/specs/class/anonymous.php
index 33104724..4a61f26f 100644
--- a/specs/class/anonymous.php
+++ b/specs/class/anonymous.php
@@ -160,6 +160,10 @@ public function test()
 
     'Declaration in the global namespace with some whitelisted classes' => [
         'whitelist' => ['A', 'C'],
+        'registered-classes' => [
+            ['A', 'Humbug\A'],
+            ['C', 'Humbug\C'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class/conditional.php b/specs/class/conditional.php
index c453ca3f..28e03393 100644
--- a/specs/class/conditional.php
+++ b/specs/class/conditional.php
@@ -46,6 +46,9 @@ class A
 
     'Declaration of a whitelisted class in the global namespace' => [
         'whitelist' => ['A'],
+        'registered-classes' => [
+            ['A', 'Humbug\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -90,6 +93,9 @@ class A
 
     'Declaration of a whitelisted class' => [
         'whitelist' => ['Foo\A'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class/final.php b/specs/class/final.php
index c3518da9..2a0812c8 100644
--- a/specs/class/final.php
+++ b/specs/class/final.php
@@ -60,6 +60,9 @@ final class A
 
     'Declaration of a whitelisted final class' => [
         'whitelist' => ['Foo\A'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class/interface.php b/specs/class/interface.php
index cba471cf..507e0064 100644
--- a/specs/class/interface.php
+++ b/specs/class/interface.php
@@ -88,6 +88,9 @@ public function a();
 
     'Declaration of a whitelisted interface' => [
         'whitelist' => ['Foo\A'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -121,7 +124,60 @@ public function a();
 \class_alias('Humbug\\Foo\\A', 'Foo\\A', \false);
 
 PHP
+    ],
+
+    'Declaration of a whitelisted interface whitelisted with a pattern' => [
+        'whitelist' => ['Foo\A*'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+            ['Foo\AA', 'Humbug\Foo\AA'],
+            ['Foo\A\B', 'Humbug\Foo\A\B'],
         ],
+        'payload' => <<<'PHP'
+<?php
+
+namespace Foo;
+
+interface A {
+    public function a() {}
+}
+
+interface AA {}
+
+interface B {}
+
+namespace Foo\A;
+
+interface B {}
+
+----
+<?php
+
+namespace Humbug\Foo;
+
+interface A
+{
+    public function a()
+    {
+    }
+}
+\class_alias('Humbug\\Foo\\A', 'Foo\\A', \false);
+interface AA
+{
+}
+\class_alias('Humbug\\Foo\\AA', 'Foo\\AA', \false);
+interface B
+{
+}
+namespace Humbug\Foo\A;
+
+interface B
+{
+}
+\class_alias('Humbug\\Foo\\A\\B', 'Foo\\A\\B', \false);
+
+PHP
+    ],
 
     'Multiple declarations in different namespaces' => <<<'PHP'
 <?php
diff --git a/specs/class/regular-extend.php b/specs/class/regular-extend.php
index b982a81b..afbad796 100644
--- a/specs/class/regular-extend.php
+++ b/specs/class/regular-extend.php
@@ -85,6 +85,9 @@ class B extends \Humbug\Foo\A implements \Iterator
 
     'Declaration of a whitelisted class' => [
         'whitelist' => ['Foo\B'],
+        'registered-classes' => [
+            ['Foo\B', 'Humbug\Foo\B'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/class/regular.php b/specs/class/regular.php
index 5c1bbc79..0886e8b1 100644
--- a/specs/class/regular.php
+++ b/specs/class/regular.php
@@ -70,6 +70,9 @@ public function a()
 
     'Declaration of a whitelisted class' => [
         'whitelist' => ['Foo\A'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -96,6 +99,11 @@ public function a()
 
     'Declaration of a whitelisted class whitelisted with a pattern' => [
         'whitelist' => ['Foo\A*'],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+            ['Foo\AA', 'Humbug\Foo\AA'],
+            ['Foo\A\B', 'Humbug\Foo\A\B'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -201,6 +209,10 @@ public function c()
             'Foo\A',
             'Bar\B',
         ],
+        'registered-classes' => [
+            ['Foo\A', 'Humbug\Foo\A'],
+            ['Bar\B', 'Humbug\Bar\B'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/func-declaration/global.php b/specs/func-declaration/global.php
index f7044c86..b42d1286 100644
--- a/specs/func-declaration/global.php
+++ b/specs/func-declaration/global.php
@@ -92,6 +92,9 @@ function foo()
 
     'Function declaration in the global namespace' => [
         'whitelist' => ['X\Y', 'BAR_CONST'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'registered-functions' => [
             ['foo', 'Humbug\foo'],
         ],
@@ -180,6 +183,9 @@ function foo(string $foo = \FOO_CONST)
 
     'Function declaration in the global namespace with use statements' => [
         'whitelist' => ['X\Y'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'registered-functions' => [
             ['foo', 'Humbug\foo'],
         ],
@@ -268,6 +274,9 @@ function foo(string $arg0, ?string $arg1, ?string $arg2 = null, \Humbug\Foo $arg
 
     'Function declarations with return types in the global namespace with use statements' => [
         'whitelist' => ['X\Y'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'registered-functions' => [
             ['foo', 'Humbug\foo'],
         ],
diff --git a/specs/func-declaration/method.php b/specs/func-declaration/method.php
index b5cbfa29..93893b38 100644
--- a/specs/func-declaration/method.php
+++ b/specs/func-declaration/method.php
@@ -26,6 +26,9 @@
 
     'Method declarations' => [
         'whitelist' => ['X\Y', 'BAR_CONST'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -111,6 +114,9 @@ static function foo(\Humbug\Foo $arg0, \Humbug\Foo $arg1, \Humbug\Foo\Bar $arg2,
 
     'Method declarations with return types' => [
         'whitelist' => ['X\Y'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/func-declaration/namespace.php b/specs/func-declaration/namespace.php
index bfe9476b..01c77b71 100644
--- a/specs/func-declaration/namespace.php
+++ b/specs/func-declaration/namespace.php
@@ -69,6 +69,9 @@ function foo()
 
     'Function declaration in a namespace' => [
         'whitelist' => ['X\Y'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -153,6 +156,9 @@ function foo(\Humbug\Pi\Foo $arg0 = null, \Humbug\Foo $arg1, \Humbug\Pi\Foo\Bar
 
     'Function declaration in a namespace with whitelisted classes' => [
         'whitelist' => ['X\Y'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -237,6 +243,9 @@ function foo(\Humbug\Pi\Foo $arg0 = null, \Humbug\Foo $arg1, \Humbug\Pi\Foo\Bar
 
     'Function declaration in a namespace with use statements' => [
         'whitelist' => ['X\Y'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -396,6 +405,9 @@ function foo(\Pi\Foo $arg0 = null, \Humbug\Foo $arg1, \Pi\Foo\Bar $arg2, \Humbug
 
     'Function declarations with return types in a namespace with use statements' => [
         'whitelist' => ['X\Y'],
+        'registered-classes' => [
+            ['X\Y', 'Humbug\X\Y'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/new/global-scope-two-parts-with-single-level-use-and-alias.php b/specs/new/global-scope-two-parts-with-single-level-use-and-alias.php
index 11de9daf..85d12fa6 100644
--- a/specs/new/global-scope-two-parts-with-single-level-use-and-alias.php
+++ b/specs/new/global-scope-two-parts-with-single-level-use-and-alias.php
@@ -178,6 +178,9 @@ class Bar
 
     'New statement call of a whitelisted namespaced class partially imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -218,6 +221,9 @@ class Bar
 
     'New statement call of a whitelisted namespaced class imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/new/global-scope-two-parts-with-single-level-use.php b/specs/new/global-scope-two-parts-with-single-level-use.php
index 13b245a2..33bf6331 100644
--- a/specs/new/global-scope-two-parts-with-single-level-use.php
+++ b/specs/new/global-scope-two-parts-with-single-level-use.php
@@ -64,6 +64,9 @@ class Bar
 
     'New statement call of a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -142,6 +145,9 @@ class Bar
 
     'FQ new statement call of a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -220,6 +226,9 @@ class Bar
 
     'New statement call of a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -302,6 +311,9 @@ class Bar
 
     'FQ new statement call of a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/new/global-scope-two-parts.php b/specs/new/global-scope-two-parts.php
index a65d0e0d..21744270 100644
--- a/specs/new/global-scope-two-parts.php
+++ b/specs/new/global-scope-two-parts.php
@@ -78,6 +78,9 @@ class Bar
 
     'New statement call of a whitelisted namespaced class' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -106,6 +109,9 @@ class Bar
 
     'FQ new statement call of a whitelisted namespaced class' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/new/namespace-two-parts-with-two-level-use.php b/specs/new/namespace-two-parts-with-two-level-use.php
index 5256d0bf..02f0458f 100644
--- a/specs/new/namespace-two-parts-with-two-level-use.php
+++ b/specs/new/namespace-two-parts-with-two-level-use.php
@@ -102,6 +102,9 @@ class Bar
 
     'New statement call of a whitelisted class via a use statement' => [
         'whitelist' => ['X\Foo\Bar'],
+        'registered-classes' => [
+            ['X\Foo\Bar', 'Humbug\X\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/static-method/global-scope-two-parts-with-single-level-use-and-alias.php b/specs/static-method/global-scope-two-parts-with-single-level-use-and-alias.php
index e0d633ad..366bed52 100644
--- a/specs/static-method/global-scope-two-parts-with-single-level-use-and-alias.php
+++ b/specs/static-method/global-scope-two-parts-with-single-level-use-and-alias.php
@@ -161,6 +161,9 @@ class A
 
     'Static method call statement of a whitelisted namespaced class partially imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -201,6 +204,9 @@ class Bar
 
     'Static method call statement of a whitelisted namespaced class imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -271,6 +277,9 @@ class Bar
 
     'FQ static method call statement of a whitelisted namespaced class imported with an aliased use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/static-method/global-scope-two-parts-with-single-level-use.php b/specs/static-method/global-scope-two-parts-with-single-level-use.php
index 03834fe3..b85c54ca 100644
--- a/specs/static-method/global-scope-two-parts-with-single-level-use.php
+++ b/specs/static-method/global-scope-two-parts-with-single-level-use.php
@@ -161,6 +161,9 @@ class Bar
 
     'Static method call statement of a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -201,6 +204,9 @@ class Bar
 
     'Static method call statement of a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -232,6 +238,9 @@ class Bar
 
     'FQ static method call statement of a whitelisted namespaced class partially imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -272,6 +281,9 @@ class Bar
 
     'FQ static method call statement of a whitelisted namespaced class imported with a use statement' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/static-method/global-scope-two-parts.php b/specs/static-method/global-scope-two-parts.php
index e9b86d22..1027e51b 100644
--- a/specs/static-method/global-scope-two-parts.php
+++ b/specs/static-method/global-scope-two-parts.php
@@ -71,6 +71,9 @@ class Bar {}
 
     'Static method call statement of a namespaced class which has been whitelisted' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -99,6 +102,9 @@ class Bar
 
     'FQ static method call statement of a namespaced class which has been whitelisted' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/static-method/namespace-two-parts-with-two-level-use.php b/specs/static-method/namespace-two-parts-with-two-level-use.php
index 2cac939e..3d87f16e 100644
--- a/specs/static-method/namespace-two-parts-with-two-level-use.php
+++ b/specs/static-method/namespace-two-parts-with-two-level-use.php
@@ -100,6 +100,9 @@ class Bar
 
     'Static method call statement of a whitelisted class via a use statement' => [
         'whitelist' => ['X\Foo\Bar'],
+        'registered-classes' => [
+            ['X\Foo\Bar', 'Humbug\X\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/static-method/namespace-two-parts.php b/specs/static-method/namespace-two-parts.php
index 0b70890a..eaca518c 100644
--- a/specs/static-method/namespace-two-parts.php
+++ b/specs/static-method/namespace-two-parts.php
@@ -76,6 +76,9 @@ class Bar
 
     'Static method call statement of a whitelisted class' => [
         'whitelist' => ['X\Foo\Bar'],
+        'registered-classes' => [
+            ['X\Foo\Bar', 'Humbug\X\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/use/use-class.php b/specs/use/use-class.php
index f3a84190..50b25385 100644
--- a/specs/use/use-class.php
+++ b/specs/use/use-class.php
@@ -111,6 +111,9 @@ class Foo
 
     'Use statement of a whitelisted class belonging to the global scope' => [
         'whitelist' => ['Foo'],
+        'registered-classes' => [
+            ['Foo', 'Humbug\Foo'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -156,6 +159,9 @@ class Foo
 
     'Use statement of a whitelisted class belonging to the global scope which has been whitelisted' => [
         'whitelist' => ['Foo', '\*'],
+        'registered-classes' => [
+            ['Foo', 'Humbug\Foo'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
@@ -230,6 +236,9 @@ class Bar
 
     'Use statement of two-level class which has been whitelisted' => [
         'whitelist' => ['Foo\Bar'],
+        'registered-classes' => [
+            ['Foo\Bar', 'Humbug\Foo\Bar'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/specs/whitelist-case-sensitiveness.php b/specs/whitelist-case-sensitiveness.php
index 793e80c4..1fb159d2 100644
--- a/specs/whitelist-case-sensitiveness.php
+++ b/specs/whitelist-case-sensitiveness.php
@@ -26,6 +26,9 @@
 
     'Class whitelists are case insensitive' => [
         'whitelist' => ['acme\foo'],
+        'registered-classes' => [
+            ['Acme\Foo', 'Humbug\Acme\Foo'],
+        ],
         'payload' => <<<'PHP'
 <?php
 
diff --git a/src/PhpParser/NodeVisitor/ClassIdentifierRecorder.php b/src/PhpParser/NodeVisitor/ClassIdentifierRecorder.php
new file mode 100644
index 00000000..02f99890
--- /dev/null
+++ b/src/PhpParser/NodeVisitor/ClassIdentifierRecorder.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the humbug/php-scoper package.
+ *
+ * Copyright (c) 2017 Théo FIDRY <theo.fidry@gmail.com>,
+ *                    Pádraic Brady <padraic.brady@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Humbug\PhpScoper\PhpParser\NodeVisitor;
+
+use Humbug\PhpScoper\PhpParser\NodeVisitor\Resolver\FullyQualifiedNameResolver;
+use Humbug\PhpScoper\Whitelist;
+use PhpParser\Node;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\Stmt\ClassLike;
+use PhpParser\Node\Stmt\Trait_;
+use PhpParser\NodeVisitorAbstract;
+
+/**
+ * Records the user classes registered in the global namespace which have been whitelisted and whitelisted classes.
+ *
+ * @private
+ */
+final class ClassIdentifierRecorder extends NodeVisitorAbstract
+{
+    private $prefix;
+    private $nameResolver;
+    private $whitelist;
+
+    public function __construct(
+        string $prefix,
+        FullyQualifiedNameResolver $nameResolver,
+        Whitelist $whitelist
+    ) {
+        $this->prefix = $prefix;
+        $this->nameResolver = $nameResolver;
+        $this->whitelist = $whitelist;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enterNode(Node $node): Node
+    {
+        if (false === ($node instanceof Identifier) || false === ParentNodeAppender::hasParent($node)) {
+            return $node;
+        }
+
+        $parent = ParentNodeAppender::getParent($node);
+
+        if (false === ($parent instanceof ClassLike) || $parent instanceof Trait_) {
+            return $node;
+        }
+        /** @var ClassLike $parent */
+        if (null === $parent->name) {
+            return $node;
+        }
+
+        /** @var Identifier $node */
+        $resolvedName = $this->nameResolver->resolveName($node)->getName();
+
+        if (false === ($resolvedName instanceof FullyQualified)) {
+            return $node;
+        }
+
+        /** @var FullyQualified $resolvedName */
+        if ($this->whitelist->isGlobalWhitelistedClass((string) $resolvedName)
+            || $this->whitelist->isSymbolWhitelisted((string) $resolvedName)
+        ) {
+            $this->whitelist->recordWhitelistedClass(
+                $resolvedName,
+                FullyQualified::concat($this->prefix, $resolvedName)
+            );
+        }
+
+        return $node;
+    }
+}
diff --git a/src/PhpParser/NodeVisitor/FunctionIdentifierRecorder.php b/src/PhpParser/NodeVisitor/FunctionIdentifierRecorder.php
index aa2c4668..5e2808ef 100644
--- a/src/PhpParser/NodeVisitor/FunctionIdentifierRecorder.php
+++ b/src/PhpParser/NodeVisitor/FunctionIdentifierRecorder.php
@@ -23,7 +23,7 @@
 use PhpParser\NodeVisitorAbstract;
 
 /**
- * Records the user functions registered in the global namespace which have been whitelisted.
+ * Records the user functions registered in the global namespace which have been whitelisted and whitelisted functions.
  *
  * @private
  */
diff --git a/src/PhpParser/TraverserFactory.php b/src/PhpParser/TraverserFactory.php
index 5a557af7..9f0470dd 100644
--- a/src/PhpParser/TraverserFactory.php
+++ b/src/PhpParser/TraverserFactory.php
@@ -50,6 +50,7 @@ public function create(string $prefix, Whitelist $whitelist): NodeTraverserInter
         $traverser->addVisitor(new NodeVisitor\UseStmt\UseStmtPrefixer($prefix, $whitelist, $this->reflector));
 
         $traverser->addVisitor(new NodeVisitor\FunctionIdentifierRecorder($prefix, $nameResolver, $whitelist));
+        $traverser->addVisitor(new NodeVisitor\ClassIdentifierRecorder($prefix, $nameResolver, $whitelist));
         $traverser->addVisitor(new NodeVisitor\NameStmtPrefixer($prefix, $whitelist, $nameResolver, $this->reflector));
         $traverser->addVisitor(new NodeVisitor\StringScalarPrefixer($prefix, $whitelist, $this->reflector));
 
diff --git a/tests/Scoper/PhpScoperSpecTest.php b/tests/Scoper/PhpScoperSpecTest.php
index 02047145..9f21292b 100644
--- a/tests/Scoper/PhpScoperSpecTest.php
+++ b/tests/Scoper/PhpScoperSpecTest.php
@@ -27,18 +27,21 @@
 use Roave\BetterReflection\SourceLocator\Type\PhpInternalSourceLocator;
 use Roave\BetterReflection\SourceLocator\Type\StringSourceLocator;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
 use Throwable;
 use UnexpectedValueException;
 use const PHP_EOL;
 use function array_diff;
 use function array_keys;
 use function array_map;
+use function basename;
 use function current;
 use function Humbug\PhpScoper\create_fake_patcher;
 use function Humbug\PhpScoper\create_parser;
 use function implode;
 use function is_array;
 use function sprintf;
+use function usort;
 
 class PhpScoperSpecTest extends TestCase
 {
@@ -80,6 +83,7 @@ public function test_it_uses_the_right_specs_directory()
      * @dataProvider provideValidFiles
      */
     public function test_can_scope_valid_files(
+        string $file,
         string $spec,
         string $contents,
         string $prefix,
@@ -111,6 +115,7 @@ public function test_can_scope_valid_files(
         }
 
         $specMessage = $this->createSpecMessage(
+            $file,
             $spec,
             $contents,
             $whitelist,
@@ -120,34 +125,33 @@ public function test_can_scope_valid_files(
             $expectedRegisteredFunctions
         );
 
-        $this->assertSame(
-            $expected,
-            $actual,
-            $specMessage
-        );
-        $this->assertSame(
-            $whitelist->getRecordedWhitelistedClasses(),
-            $expectedRegisteredClasses,
-            $specMessage
-        );
-        $this->assertSame(
-            $whitelist->getRecordedWhitelistedFunctions(),
-            $expectedRegisteredFunctions,
-            $specMessage
-        );
+        $this->assertSame($expected, $actual, $specMessage);
+
+        $actualRecordedWhitelistedClasses = $whitelist->getRecordedWhitelistedClasses();
+
+        $this->assertSameRecordedSymbols($actualRecordedWhitelistedClasses, $expectedRegisteredClasses, $specMessage);
+
+        $actualRecordedWhitelistedFunctions = $whitelist->getRecordedWhitelistedFunctions();
+
+        $this->assertSameRecordedSymbols($actualRecordedWhitelistedFunctions, $expectedRegisteredFunctions, $specMessage);
     }
 
     public function provideValidFiles()
     {
-        $files = (new Finder())->files()->in(self::SECONDARY_SPECS_PATH);
+        $sourceDir = self::SECONDARY_SPECS_PATH;
+
+        $files = (new Finder())->files()->in($sourceDir);
 
         if (0 === count($files)) {
-            $files = (new Finder())->files()->in(self::SPECS_PATH);
+            $sourceDir = self::SPECS_PATH;
+
+            $files = (new Finder())->files()->in($sourceDir);
         }
 
         $files->sortByName();
 
         foreach ($files as $file) {
+            /* @var SplFileInfo $file */
             try {
                 $fixtures = include $file;
 
@@ -155,7 +159,12 @@ public function provideValidFiles()
                 unset($fixtures['meta']);
 
                 foreach ($fixtures as $fixtureTitle => $fixtureSet) {
-                    yield $this->parseSpecFile($meta, $fixtureTitle, $fixtureSet)->current();
+                    yield $this->parseSpecFile(
+                        basename($sourceDir).'/'.$file->getRelativePathname(),
+                        $meta,
+                        $fixtureTitle,
+                        $fixtureSet
+                    )->current();
                 }
             } catch (Throwable $throwable) {
                 $this->fail(
@@ -193,13 +202,10 @@ private function createScoper(string $contents): Scoper
     }
 
     /**
-     * @param array        $meta
      * @param string|int   $fixtureTitle
      * @param string|array $fixtureSet
-     *
-     * @return Generator
      */
-    private function parseSpecFile(array $meta, $fixtureTitle, $fixtureSet): Generator
+    private function parseSpecFile(string $file, array $meta, $fixtureTitle, $fixtureSet): Generator
     {
         $spec = sprintf(
             '[%s] %s',
@@ -238,6 +244,7 @@ private function parseSpecFile(array $meta, $fixtureTitle, $fixtureSet): Generat
         }
 
         yield [
+            $file,
             $spec,
             $payloadParts[0],   // Input
             $fixtureSet['prefix'] ?? $meta['prefix'],
@@ -257,6 +264,7 @@ private function parseSpecFile(array $meta, $fixtureTitle, $fixtureSet): Generat
      * @param string[][] $expectedRegisteredFunctions
      */
     private function createSpecMessage(
+        string $file,
         string $spec,
         string $contents,
         Whitelist $whitelist,
@@ -292,6 +300,7 @@ private function createSpecMessage(
 SPECIFICATION
 $titleSeparator
 $spec
+$file
 
 $titleSeparator
 INPUT
@@ -383,4 +392,25 @@ private function convertBoolToString(bool $bool): string
     {
         return true === $bool ? 'true' : 'false';
     }
+
+    /**
+     * @param string[][] $expected
+     * @param string[][] $actual
+     */
+    private function assertSameRecordedSymbols(array $expected, array $actual, string $message): void
+    {
+        $sort = function (array $a, array $b): int {
+            /*
+             * @var string[] $a
+             * @var string[] $b
+             */
+
+            return $a[0] <=> $b[0];
+        };
+
+        usort($expected, $sort);
+        usort($actual, $sort);
+
+        $this->assertSame($expected, $actual, $message);
+    }
 }