Merge pull request #27 from localheinz/feature/classy

Enhancement: Use localheinz/classy
ergebnis · Oct 11, 2017 · 055aee1 · 055aee1
2 parents 551e41e + e44f381
commit 055aee1
Show file tree

Hide file tree

Showing 3 changed files with 148 additions and 108 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
   },
   "require": {
     "php": "^7.0",
-    "zendframework/zend-file": "^2.7.1"
+    "localheinz/classy": "0.2.0"
   },
   "require-dev": {
     "breerly/factory-girl-php": "^1.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Definitions.php b/src/Definitions.php
@@ -14,7 +14,7 @@
 namespace Localheinz\FactoryGirl\Definition;
 
 use FactoryGirl\Provider\Doctrine\FixtureFactory;
-use Zend\File;
+use Localheinz\Classy;
 
 final class Definitions
 {
@@ -43,36 +43,33 @@ public static function in(string $directory)
             throw Exception\InvalidDirectory::notDirectory($directory);
         }
 
-        $locator = new File\ClassFileLocator($directory);
+        $instance = new self();
 
-        /** @var File\PhpClassFile[] $files */
-        $files = \iterator_to_array($locator);
+        $constructs = Classy\Constructs::fromDirectory($directory);
 
-        $instance = new self();
+        foreach ($constructs as $construct) {
+            $className = $construct->name();
+
+            try {
+                $reflection = new \ReflectionClass($className);
+            } catch (\ReflectionException $exception) {
+                continue;
+            }
 
-        foreach ($files as $file) {
-            foreach ($file->getClasses() as $className) {
-                try {
-                    $reflection = new \ReflectionClass($className);
-                } catch (\ReflectionException $exception) {
-                    continue;
-                }
-
-                if (!$reflection->isSubclassOf(Definition::class) || !$reflection->isInstantiable()) {
-                    continue;
-                }
-
-                try {
-                    $definition = $reflection->newInstance();
-                } catch (\Exception $exception) {
-                    throw Exception\InvalidDefinition::fromClassNameAndException(
-                        $className,
-                        $exception
-                    );
-                }
-
-                $instance->definitions[] = $definition;
+            if (!$reflection->isSubclassOf(Definition::class) || !$reflection->isInstantiable()) {
+                continue;
             }
+
+            try {
+                $definition = $reflection->newInstance();
+            } catch (\Exception $exception) {
+                throw Exception\InvalidDefinition::fromClassNameAndException(
+                    $className,
+                    $exception
+                );
+            }
+
+            $instance->definitions[] = $definition;
         }
 
         return $instance;