fix: metadata cache loading

bednic · Aug 31, 2020 · 7fb43eb · 7fb43eb
1 parent 800dcc0
commit 7fb43eb
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 31 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,8 @@
         "psr/http-server-middleware": "^1.0",
         "psr/log": "^1.1",
         "psr/simple-cache": "^1.0",
-        "swaggest/json-schema": "^0.12.29"
+        "swaggest/json-schema": "^0.12.29",
+        "symfony/class-loader": "^3.4"
     },
     "require-dev": {
         "doctrine/cache": "^1.8",

diff --git a/json-api.iml b/json-api.iml
@@ -62,6 +62,7 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/squizlabs/php_codesniffer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/swaggest/json-diff" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/swaggest/json-schema" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/class-loader" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-grapheme" />

diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
@@ -15,8 +15,7 @@
 use Psr\Log\NullLogger;
 use Psr\SimpleCache\CacheInterface;
 use Psr\SimpleCache\InvalidArgumentException as CacheException;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
+use Symfony\Component\ClassLoader\ClassMapGenerator;
 
 /**
  * Class MetadataFactory
@@ -153,28 +152,8 @@ private function createMetadataCache(): void
             if (!is_dir($path)) {
                 throw new InvalidArgumentException("Path '$path' is not directory.");
             }
-            $predeclaredClasses = get_declared_classes();
-            $it                 = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
-            $it->rewind();
-            while ($it->valid()) {
-                /** @var $it RecursiveDirectoryIterator */
-                if (!$it->isDot()) {
-                    $file = $it->key();
-                    if (
-                        is_file($file)
-                        && (
-                            isset(pathinfo($file)["extension"])
-                            && pathinfo($file)["extension"] === "php"
-                        )
-                    ) {
-                        require_once $file;
-                    }
-                }
-                $it->next();
-            }
-            $newLoadedClasses = array_diff(get_declared_classes(), $predeclaredClasses);
-
-            foreach ($newLoadedClasses as $className) {
+            $map = ClassMapGenerator::createMap($path);
+            foreach ($map as $className => $file) {
                 try {
                     $this->loadMetadata($className);
                 } catch (ClassNotResource $ignored) {

diff --git a/tests/Exception/Driver/AnnotationMisplaceTest.php b/tests/Exception/Driver/AnnotationMisplaceTest.php
@@ -12,7 +12,7 @@
 class AnnotationMisplaceTest extends TestCase
 {
 
-    protected $runTestInSeparateProcess = true;
+
 
     public function testConstruct()
     {

diff --git a/tests/Exception/Driver/BadMethodSignatureTest.php b/tests/Exception/Driver/BadMethodSignatureTest.php
@@ -18,7 +18,7 @@
 class BadMethodSignatureTest extends TestCase
 {
 
-    protected $runTestInSeparateProcess = true;
+
 
     public function testConstruct()
     {

diff --git a/tests/Exception/Driver/ClassNotExistTest.php b/tests/Exception/Driver/ClassNotExistTest.php
@@ -10,7 +10,7 @@
 
 class ClassNotExistTest extends TestCase
 {
-    protected $runTestInSeparateProcess = true;
+
 
     public function testConstruct()
     {

diff --git a/tests/Exception/Driver/ClassNotResourceTest.php b/tests/Exception/Driver/ClassNotResourceTest.php
@@ -11,7 +11,7 @@
 
 class ClassNotResourceTest extends TestCase
 {
-    protected $runTestInSeparateProcess = true;
+
 
     public function testConstruct()
     {

diff --git a/tests/Exception/Driver/MethodNotExistTest.php b/tests/Exception/Driver/MethodNotExistTest.php
@@ -11,7 +11,7 @@
 
 class MethodNotExistTest extends TestCase
 {
-    protected $runTestInSeparateProcess = true;
+
 
     public function testConstruct()
     {

diff --git a/tests/Exception/Metadata/NameUsedAlreadyTest.php b/tests/Exception/Metadata/NameUsedAlreadyTest.php
@@ -11,7 +11,7 @@
 
 class NameUsedAlreadyTest extends TestCase
 {
-    protected $runTestInSeparateProcess = true;
+
 
     public function testConstruct()
     {