Also check for interfaces and traits in existence checks (#417)

Author: discordier

fixtures/set011/composer.json

@@ -3,6 +3,7 @@
         "bin/greet.php"
     ],
     "autoload": {
+        "classmap": ["polyfill"],
         "psr-4": {
             "Set011\\": "src/"
         }

fixtures/set011/polyfill/Iterator.php

@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Let's polyfill the iterator interface.
+ *
+ * We use it as example to alias an interface into the root namespace.
+ * It will never get loaded for real as it exists on all PHP versions.
+ *
+ * @link https://php.net/manual/en/class.iterator.php.
+ * @link https://github.com/humbug/php-scoper/issues/403
+ */
+interface Iterator extends Traversable {
+    public function current();
+    public function next(): void;
+    public function key();
+    public function valid(): bool;
+    public function rewind(): void;
+}

src/Autoload/ScoperAutoloadGenerator.php

@@ -113,8 +113,8 @@ static function (array $pair): string {
 
                 return sprintf(
                     <<<'PHP'
-if (!class_exists('%s', false)) {
-    class_exists('%s');
+if (!class_exists('%1$s', false) && !interface_exists('%1$s', false) && !trait_exists('%1$s', false)) {
+    spl_autoload_call('%2$s');
 }
 PHP
                     ,

tests/Autoload/ScoperAutoloadGeneratorTest.php

@@ -187,8 +187,8 @@ function baz() {
 
 // Aliases for the whitelisted classes. For more information see:
 // https://github.com/humbug/php-scoper/blob/master/README.md#class-whitelisting
-if (!class_exists('A\Foo', false)) {
-    class_exists('Humbug\A\Foo');
+if (!class_exists('A\Foo', false) && !interface_exists('A\Foo', false) && !trait_exists('A\Foo', false)) {
+    spl_autoload_call('Humbug\A\Foo');
 }
 
 return $loader;
@@ -221,11 +221,11 @@ class_exists('Humbug\A\Foo');
 
 // Aliases for the whitelisted classes. For more information see:
 // https://github.com/humbug/php-scoper/blob/master/README.md#class-whitelisting
-if (!class_exists('Foo', false)) {
-    class_exists('Humbug\Foo');
+if (!class_exists('Foo', false) && !interface_exists('Foo', false) && !trait_exists('Foo', false)) {
+    spl_autoload_call('Humbug\Foo');
 }
-if (!class_exists('Bar', false)) {
-    class_exists('Humbug\Bar');
+if (!class_exists('Bar', false) && !interface_exists('Bar', false) && !trait_exists('Bar', false)) {
+    spl_autoload_call('Humbug\Bar');
 }
 
 return $loader;
@@ -281,8 +281,8 @@ class_exists('Humbug\Bar');
 // Aliases for the whitelisted classes. For more information see:
 // https://github.com/humbug/php-scoper/blob/master/README.md#class-whitelisting
 namespace {
-    if (!class_exists('A\Foo', false)) {
-        class_exists('Humbug\A\Foo');
+    if (!class_exists('A\Foo', false) && !interface_exists('A\Foo', false) && !trait_exists('A\Foo', false)) {
+        spl_autoload_call('Humbug\A\Foo');
     }
 }