Fix whitelisting usages (#287)

Author: theofidry

README.md

@@ -324,6 +324,8 @@ return [
         'PHPUnit\Framework\TestCase',
         'PHPUNIT_VERSION',
         'iter\count',
+        'Acme\Foo*', // Warning: will not whitelist sub namespaces like Acme\Foo\Bar but will whitelist symbols like
+                     // Acme\Foo or Acme\Fooo
     ],
 ];
 ```
@@ -517,6 +519,21 @@ And whitelist the namespace `PHPUnit\Framework\*`, then the autoloading for this
 will be faulty and will not work. For this to work, the whole package `PHPUnit\*` would
 need to be whitelisted.
 
+**Warning:** the following _is not_ a namespace whitelist:
+
+```php
+<?php declare(strict_types=1);
+
+// scoper.inc.php
+
+return [
+    'whitelist' => [
+        'PHPUnit\F*',   // Will only whitelist symbols such as PHPUnit\F or PHPunit\Foo, but not symbols belonging to
+                        // sub-namespaces like PHPunit\Foo\Bar
+    ],
+];
+```
+
 
 ## Building a Scoped PHAR
 

src/PhpParser/NodeVisitor/NamespaceStmtPrefixer.php

@@ -97,7 +97,7 @@ private function isWhitelistedNode(Node $node): bool
 
     private function shouldPrefixStmt(Namespace_ $namespace): bool
     {
-        if ($this->whitelist->belongsToWhitelistedNamespace((string) $namespace->name)) {
+        if ($this->whitelist->isWhitelistedNamespace((string) $namespace->name)) {
             return false;
         }
 

src/Scoper/Composer/AutoloadPrefixer.php

@@ -90,7 +90,7 @@ private static function prefixAutoload(array $autoload, string $prefix, Whitelis
         $loader = [];
 
         foreach ($autoload as $namespace => $paths) {
-            $newNamespace = $whitelist->belongsToWhitelistedNamespace($namespace)
+            $newNamespace = $whitelist->isWhitelistedNamespace($namespace)
                 ? $namespace
                 : sprintf('%s\\%s', $prefix, $namespace)
             ;
@@ -213,7 +213,7 @@ private static function prefixLaravelProviders(array $providers, string $prefix,
     {
         return array_map(
             static function (string $provider) use ($prefix, $whitelist): string {
-                return $whitelist->belongsToWhitelistedNamespace($provider)
+                return $whitelist->isWhitelistedNamespace($provider)
                     ? $provider
                     : sprintf('%s\\%s', $prefix, $provider)
                 ;

src/Whitelist.php

@@ -17,7 +17,6 @@
 use Countable;
 use InvalidArgumentException;
 use PhpParser\Node\Name\FullyQualified;
-use const SORT_REGULAR;
 use function array_flip;
 use function array_key_exists;
 use function array_map;
@@ -153,6 +152,19 @@ private function __construct(
     }
 
     public function belongsToWhitelistedNamespace(string $name): bool
+    {
+        $nameNamespace = $this->retrieveNameNamespace($name);
+
+        foreach ($this->namespaces as $namespace) {
+            if ('' === $namespace || 0 === strpos($nameNamespace, $namespace)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function isWhitelistedNamespace(string $name): bool
     {
         $name = strtolower($name);
 
@@ -161,9 +173,24 @@ public function belongsToWhitelistedNamespace(string $name): bool
         }
 
         foreach ($this->namespaces as $namespace) {
-            if ('' === $namespace || 0 === strpos($name, $namespace)) {
+            if ('' === $namespace) {
                 return true;
             }
+
+            if ('' !== $namespace && 0 !== strpos($name, $namespace)) {
+                continue;
+            }
+
+            $nameParts = explode('\\', $name);
+            $namespaceParts = explode('\\', $namespace);
+
+            foreach ($namespaceParts as $index => $namespacePart) {
+                if ($nameParts[$index] !== $namespacePart) {
+                    return false;
+                }
+            }
+
+            return true;
         }
 
         return false;
@@ -184,17 +211,12 @@ public function isGlobalWhitelistedFunction(string $functionName): bool
 
     public function recordWhitelistedFunction(FullyQualified $original, FullyQualified $alias): void
     {
-        $this->whitelistedFunctions[] = [(string) $original, (string) $alias];
+        $this->whitelistedFunctions[(string) $original] = [(string) $original, (string) $alias];
     }
 
     public function getRecordedWhitelistedFunctions(): array
     {
-        return array_values(
-            array_unique(
-                $this->whitelistedFunctions,
-                SORT_REGULAR
-            )
-        );
+        return array_values($this->whitelistedFunctions);
     }
 
     /**
@@ -225,12 +247,12 @@ public function isGlobalWhitelistedClass(string $className): bool
 
     public function recordWhitelistedClass(FullyQualified $original, FullyQualified $alias): void
     {
-        $this->whitelistedClasses[] = [(string) $original, (string) $alias];
+        $this->whitelistedClasses[(string) $original] = [(string) $original, (string) $alias];
     }
 
     public function getRecordedWhitelistedClasses(): array
     {
-        return $this->whitelistedClasses;
+        return array_values($this->whitelistedClasses);
     }
 
     /**
@@ -307,4 +329,19 @@ private static function lowerConstantName(string $name): string
 
         return implode('\\', $parts);
     }
+
+    private function retrieveNameNamespace(string $name): string
+    {
+        $name = strtolower($name);
+
+        if (0 === strpos($name, '\\')) {
+            $name = substr($name, 1);
+        }
+
+        $nameParts = explode('\\', $name);
+
+        array_pop($nameParts);
+
+        return [] === $nameParts ? '' : implode('\\', $nameParts);
+    }
 }