removed fix for skip abstract class in ClassFinder

added a reflection class to check if configurator class is instantiable and has method

Author: prisis

src/Discovery/ClassFinder.php

@@ -50,10 +50,12 @@ private static function findClassOrTraitOrInterface(string $path): ?string
         $tokens    = \token_get_all(\file_get_contents($path));
 
         foreach ($tokens as $key => $token) {
-            if (self::tokenIsNamespace($token)) {
-                $namespace = self::getNamespace($key + 2, $tokens);
-            } elseif (self::tokenIsClassOrTraitOrInterface($token)) {
-                return \ltrim($namespace . '\\' . self::getClass($key + 2, $tokens), '\\');
+            if (\is_array($token)) {
+                if (self::tokenIsNamespace($token)) {
+                    $namespace = self::getNamespace($key + 2, $tokens);
+                } elseif (self::tokenIsClassOrTraitOrInterface($token)) {
+                    return \ltrim($namespace . '\\' . self::getClass($key + 2, $tokens), '\\');
+                }
             }
         }
 
@@ -68,7 +70,7 @@ private static function findClassOrTraitOrInterface(string $path): ?string
      *
      * @return null|string
      */
-    private static function getNamespace($key, array $tokens): ?string
+    private static function getNamespace(int $key, array $tokens): ?string
     {
         $namespace  = null;
         $tokenCount = \count($tokens);
@@ -123,13 +125,13 @@ private static function getClass($key, array $tokens): ?string
     /**
      * Determine if the given token is a namespace keyword.
      *
-     * @param array|string $token
+     * @param array $token
      *
      * @return bool
      */
-    private static function tokenIsNamespace($token): bool
+    private static function tokenIsNamespace(array $token): bool
     {
-        return \is_array($token) && $token[0] === T_NAMESPACE;
+        return $token[0] === T_NAMESPACE;
     }
 
     /**
@@ -147,13 +149,13 @@ private static function isPartOfClass($token): bool
     /**
      * Determine if the given token is a class or interface keyword.
      *
-     * @param array|string $token
+     * @param array $token
      *
      * @return bool
      */
-    private static function tokenIsClassOrTraitOrInterface($token): bool
+    private static function tokenIsClassOrTraitOrInterface(array $token): bool
     {
-        return \is_array($token) && ($token[0] === T_CLASS || $token[0] === T_INTERFACE || $token[0] === T_TRAIT);
+        return $token[0] === T_CLASS || $token[0] === T_INTERFACE || $token[0] === T_TRAIT;
     }
 
     /**

src/Discovery/Discovery.php

@@ -36,6 +36,7 @@
 use Narrowspark\Discovery\Traits\GetGenericPropertyReaderTrait;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
+use ReflectionClass;
 
 class Discovery implements PluginInterface, EventSubscriberInterface
 {
@@ -383,7 +384,15 @@ public function onPostUpdate(Event $event, array $operations = []): void
         foreach ((array) $this->lock->get(ConfiguratorInstaller::LOCK_KEY) as $path => $class) {
             require_once $this->vendorPath . $path;
 
-            $this->configurator->add($class::getName(), $class);
+            if (! \class_exists($class)) {
+                continue;
+            }
+
+            $reflectionClass = new ReflectionClass($class);
+
+            if ($reflectionClass->isInstantiable() && $reflectionClass->hasMethod('getName')) {
+                $this->configurator->add($class::getName(), $class);
+            }
         }
 
         foreach ($packages as $package) {

tests/Discovery/ClassFinderTest.php

@@ -3,6 +3,7 @@
 namespace Narrowspark\Discovery\Test;
 
 use Narrowspark\Discovery\ClassFinder;
+use Narrowspark\Discovery\Test\Fixtures\Finder\AbstractClass;
 use Narrowspark\Discovery\Test\Fixtures\Finder\DummyClass;
 use Narrowspark\Discovery\Test\Fixtures\Finder\DummyClassTwo;
 use Narrowspark\Discovery\Test\Fixtures\Finder\FooTrait;
@@ -19,6 +20,7 @@ public function testItFindsAllClassesInDirectoryWithGivenNamespace(): void
         self::assertContains(DummyClassTwo::class, $classes);
         self::assertContains(DummyClassNested::class, $classes);
         self::assertContains(FooTrait::class, $classes);
+        self::assertContains(AbstractClass::class, $classes);
     }
 
     public function testWithEmptyFolder(): void

tests/Discovery/Fixtures/Finder/AbstractClass.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+namespace Narrowspark\Discovery\Test\Fixtures\Finder;
+
+use Narrowspark\Discovery\Common\Contract\Configurator as ConfiguratorContract;
+
+abstract class AbstractClass implements ConfiguratorContract
+{
+}