Fix: Changes in subdirectories are not detected (#13)

Author: olvlvl

Makefile

@@ -33,7 +33,7 @@ test-cleanup:
 	@rm -rf tests/sandbox/*
 
 .PHONY: test-container
-test-container: test-container82
+test-container: test-container80
 
 .PHONY: test-container80
 test-container80:

src/MemoizeClassMapGenerator.php

@@ -4,6 +4,7 @@
 
 use Composer\ClassMapGenerator\ClassMapGenerator;
 use Composer\IO\IOInterface;
+use DirectoryIterator;
 use RuntimeException;
 
 use function array_filter;
@@ -89,13 +90,9 @@ public function scanPaths(
         ?string $namespace = null
     ): void {
         $this->paths[$path] = true;
-        [ $timestamp ] = $this->state[$path] ?? [ 0, [ ] ];
+        [ $timestamp ] = $this->state[$path] ?? [ 0 ];
 
-        $mtime = filemtime($path);
-        assert(is_int($mtime));
-
-        if ($timestamp < $mtime) {
-            $this->io->debug("Refresh class map for path '$path' ($timestamp < $mtime)");
+        if ($this->should_update($timestamp, $path)) {
             $inner = new ClassMapGenerator();
             $inner->avoidDuplicateScans();
             $inner->scanPaths($path, $excluded, $autoloadType, $namespace);
@@ -104,4 +101,32 @@ public function scanPaths(
             $this->state[$path] = [ time(), $map ];
         }
     }
+
+    private function should_update(int $timestamp, string $path): bool
+    {
+        if (!$timestamp) {
+            return true;
+        }
+
+        $mtime = filemtime($path);
+
+        assert(is_int($mtime));
+
+        if ($timestamp < $mtime) {
+            $diff = $mtime - $timestamp;
+            $this->io->debug("Refresh class map for path '$path' ($diff sec ago)");
+
+            return true;
+        }
+
+        foreach (new DirectoryIterator($path) as $di) {
+            if ($di->isDir() && !$di->isDot()) {
+                if ($this->should_update($timestamp, $di->getPathname())) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }

tests/MemoizeClassMapGeneratorTest.php

@@ -7,9 +7,11 @@
 use olvlvl\ComposerAttributeCollector\MemoizeClassMapGenerator;
 use PHPUnit\Framework\TestCase;
 
+use function file_exists;
 use function file_put_contents;
 use function time;
 use function touch;
+use function unlink;
 
 final class MemoizeClassMapGeneratorTest extends TestCase
 {
@@ -19,14 +21,24 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        clear_directory(self::DIR);
+        $remove = [
+            self::DIR . 'a.php',
+            self::DIR . 'a/b/c/b.php',
+        ];
+
+        foreach ($remove as $filename) {
+            if (file_exists($filename)) {
+                unlink($filename);
+            }
+        }
     }
 
     public function testMemoize(): void
     {
         $map = $this->map();
         $this->assertEmpty($map);
 
+        // check changes in the directory are detected
         self::write(
             "a.php",
             <<<PHP
@@ -45,8 +57,9 @@ class A {
             'App\A' => self::DIR . 'a.php',
         ], $map);
 
+        // check changes in subdirectories are detected
         self::write(
-            "b.php",
+            "a/b/c/b.php",
             <<<PHP
             <?php
 
@@ -61,7 +74,7 @@ class B {
         $map = $this->map();
         $this->assertEquals([
             'App\A' => self::DIR . 'a.php',
-            'App\B' => self::DIR . 'b.php',
+            'App\B' => self::DIR . 'a/b/c/b.php',
         ], $map);
     }
 

tests/bootstrap.php

@@ -13,6 +13,9 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
+/**
+ * @return non-empty-string
+ */
 function get_cache_dir(): string
 {
     $dir = dirname(__DIR__) . '/.composer-attribute-collector';
@@ -24,8 +27,10 @@ function get_cache_dir(): string
     return $dir;
 }
 
-/*
+/**
  * Clean up cache
+ *
+ * @param non-empty-string $dir
  */
 function clear_directory(string $dir): void
 {

tests/sandbox-memoize-classmap/a/b/c/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore