Refactored "Finder" class to "TransformerContainer" methods

Author: WalterWoshid

src/Service/AutoloadInterceptor.php

@@ -4,7 +4,6 @@
 
 use Composer\Autoload\ClassLoader as ComposerClassLoader;
 use Okapi\CodeTransformer\Service\AutoloadInterceptor\ClassLoader;
-use Okapi\CodeTransformer\Util\Finder;
 use Okapi\Singleton\Singleton;
 
 /**
@@ -46,8 +45,6 @@ public static function register(): void
      */
     private function overloadComposerLoaders(): void
     {
-        $finder = $this->getFinder();
-
         // Get existing composer loaders
         $loaders = spl_autoload_functions();
         foreach ($loaders as $loader) {
@@ -64,7 +61,7 @@ private function overloadComposerLoaders(): void
             }
 
             // Register the AOP class loader
-            $loader[0] = new ClassLoader($loader[0], $finder);
+            $loader[0] = new ClassLoader($loader[0]);
 
             // Unregister the original composer loader
             spl_autoload_unregister($loaderToUnregister);
@@ -73,15 +70,4 @@ private function overloadComposerLoaders(): void
             spl_autoload_register($loader);
         }
     }
-
-    /**
-     * Get class finder.
-     *
-     * @return Finder
-     */
-    private function getFinder(): Finder
-    {
-        return (new Finder)
-            ->includeClass(TransformerContainer::getTargetClasses());
-    }
 }

src/Service/AutoloadInterceptor/ClassLoader.php

@@ -8,8 +8,9 @@
 use Okapi\CodeTransformer\Service\Options;
 use Okapi\CodeTransformer\Service\StreamFilter;
 use Okapi\CodeTransformer\Service\StreamFilter\FilterInjector;
-use Okapi\CodeTransformer\Util\Finder;
+use Okapi\CodeTransformer\Service\TransformerContainer;
 use Okapi\Path\Path;
+use Okapi\Wildcards\Regex;
 
 /**
  * # Code Transformer Class Loader
@@ -27,13 +28,11 @@ class ClassLoader extends ComposerClassLoader
      * Code Transformer class loader constructor.
      *
      * @param ComposerClassLoader $original
-     * @param Finder              $finder
      *
      * @noinspection PhpMissingParentConstructorInspection (Parent already constructed)
      */
     public function __construct(
         private readonly ComposerClassLoader $original,
-        private readonly Finder              $finder,
     ) {}
 
     /**
@@ -68,6 +67,11 @@ public function findFile($class): false|string
     {
         $filePath = $this->original->findFile($class);
 
+        // Prevent infinite recursion
+        if ($class === Regex::class) {
+            return $filePath;
+        }
+
         // @codeCoverageIgnoreStart
         // Not sure how to test this
         if ($filePath === false) {
@@ -78,7 +82,7 @@ public function findFile($class): false|string
         $filePath = Path::resolve($filePath);
 
         // Check if the class should be transformed
-        if ($this->finder->hasClass($class)) {
+        if (TransformerContainer::shouldTransform($class)) {
             $cacheState = CacheStateManager::queryCacheState($filePath);
 
             // Check if the file is cached and up to date

src/Service/TransformerContainer.php

@@ -116,16 +116,18 @@ private function loadTransformers(): void
     // endregion
 
     /**
-     * Get the list of target classes.
+     * Check if the class should be transformed.
      *
-     * @return class-string[]
+     * @param string $className
+     *
+     * @return bool
      */
-    public static function getTargetClasses(): array
+    public static function shouldTransform(string $className): bool
     {
         $instance = self::getInstance();
         $instance->ensureInitialized();
 
-        return array_keys($instance->transformerTargets);
+        return $instance->matchTransformers($className) !== [];
     }
 
     // region Transform Code