Merge pull request #9 from jakzal/issue/3

Fix an issue with traits referencing class constants

Author: jakzal

src/Symfony/Compiler/Discovery/ClassFinder.php

@@ -35,45 +35,59 @@ private function find(callable $predicate): array
         $classes = [];
 
         foreach ($this->findPhpFiles() as $phpFile) {
-            $classes[] = $this->findClassesInFile($predicate, $phpFile);
+            $classes[] = $this->findClassInFile($phpFile);
         }
 
-        $classes = \array_merge([], ...$classes);
+        $classes = \array_filter($classes, function (?string $class) use ($predicate) {
+            return !empty($class) && $predicate($class);
+        });
 
         \sort($classes);
 
         return $classes;
     }
 
-    private function findClassesInFile(callable $predicate, \SplFileInfo $phpFile): array
+    private function findClassInFile(\SplFileInfo $phpFile): ?string
     {
         // @see https://stackoverflow.com/a/27440555/330267
-        $classes = [];
         $tokens = \token_get_all(\file_get_contents($phpFile->getRealPath()));
         $namespace = '';
 
         for ($index = 0; isset($tokens[$index]); $index++) {
             if (!\is_array($tokens[$index])) {
                 continue;
             }
-            if (T_NAMESPACE === $tokens[$index][0]) {
-                $index += 2; // Skip namespace keyword and whitespace
-                while (isset($tokens[$index]) && \is_array($tokens[$index]) && T_WHITESPACE !== $tokens[$index][0]) {
+            if ($this->isNamespaceToken($tokens, $index)) {
+                while ($this->isNotWhitespaceToken($tokens, $index)) {
                     $namespace .= $tokens[$index++][1];
                 }
             }
-            if (T_CLASS === $tokens[$index][0]) {
-                $index += 2; // Skip class keyword and whitespace
-                $class = $namespace . '\\' . $tokens[$index][1];
-                if ($predicate($class)) {
-                    $classes[] = $class;
-                }
-
-                break;
+            if ($this->isClassNameToken($tokens, $index)) {
+                return $namespace . '\\' . $tokens[$index][1];
             }
         }
 
-        return $classes;
+        return null;
+    }
+
+    private function isNamespaceToken($tokens, int $index): bool
+    {
+        return $this->extractTokens($tokens, $index - 2, 3) === [T_NAMESPACE, T_WHITESPACE, T_STRING];
+    }
+
+    private function isClassNameToken($tokens, int $index): bool
+    {
+        return $this->extractTokens($tokens, $index - 2, 3) === [T_CLASS, T_WHITESPACE, T_STRING];
+    }
+
+    private function extractTokens($tokens, int $startIndex, int $count): array
+    {
+        return \array_column(\array_slice($tokens, $startIndex, $count), 0);
+    }
+
+    private function isNotWhitespaceToken($tokens, int $index): bool
+    {
+        return isset($tokens[$index]) && \is_array($tokens[$index]) && T_WHITESPACE !== $tokens[$index][0];
     }
 
     /**

tests/Symfony/Compiler/Fixtures/FooTrait.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Zalas\Injector\PHPUnit\Tests\Symfony\Compiler\Fixtures;
+
+trait FooTrait
+{
+    /**
+     * Reproduces https://github.com/jakzal/phpunit-injector/issues/3
+     */
+    protected function bar(): string
+    {
+        return Service1::class;
+    }
+}