fix(tests): ignore composer.json files in nested vendor folders

alekitto · Jun 13, 2024 · 869d5a5 · 869d5a5
1 parent 11bd5c7
commit 869d5a5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 33 deletions.
diff --git a/tests/functional/nested-composer-projects/composer.json b/tests/functional/nested-composer-projects/composer.json
@@ -6,6 +6,6 @@
         }
     ],
     "require": {
-        "kcs/class-finder": "^0.5@dev"
+        "kcs/class-finder": "dev-master"
     }
 }
diff --git a/tests/install-deps.php b/tests/install-deps.php
@@ -3,37 +3,43 @@
 declare(strict_types=1);
 
 foreach (glob(__DIR__ . '/*') as $path) {
-    if (is_dir($path)) {
-        $files = new RecursiveIteratorIterator(
-            new RecursiveCallbackFilterIterator(
-                new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS),
-                static fn (SplFileInfo $file): bool => $file->getBasename()[0] !== '.',
-            ),
-            RecursiveIteratorIterator::LEAVES_ONLY | RecursiveIteratorIterator::CHILD_FIRST,
-        );
-
-        foreach ($files as $filepath => $info) {
-            if (! $info->isFile()) {
-                continue;
-            }
-
-            if ($info->getFilename() === 'composer.json') {
-                if (basename(dirname($info->getPath())) === 'vendor') {
-                    continue;
-                }
-
-                $descriptorspec = [STDIN, STDOUT, STDERR];
-                $proc = proc_open(trim('composer install ' . getenv('COMPOSER_FLAGS') ?: ''), $descriptorspec, $pipes, $info->getPath());
-                for ($running = true; $running;) {
-                    $status = proc_get_status($proc);
-                    $running = $status['running'];
-                    $exitcode = $status['exitcode'];
-                }
-
-                if ($exitcode !== 0) {
-                    return;
-                }
-            }
+    if (! is_dir($path)) {
+        continue;
+    }
+
+    $files = new RecursiveIteratorIterator(
+        new RecursiveCallbackFilterIterator(
+            new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS),
+            static fn (SplFileInfo $file): bool => $file->getBasename()[0] !== '.',
+        ),
+        RecursiveIteratorIterator::LEAVES_ONLY | RecursiveIteratorIterator::CHILD_FIRST,
+    );
+
+    foreach ($files as $filepath => $info) {
+        if (! $info->isFile()) {
+            continue;
+        }
+
+        if ($info->getFilename() !== 'composer.json') {
+            continue;
+        }
+
+        if (str_contains(dirname($info->getPath()), '/vendor/')) {
+            continue;
+        }
+
+        echo 'Processing ' . $info->getPath() . "...\n";
+
+        $descriptorspec = [STDIN, STDOUT, STDERR];
+        $proc = proc_open(trim('composer install ' . getenv('COMPOSER_FLAGS') ?: ''), $descriptorspec, $pipes, $info->getPath());
+        for ($running = true; $running;) {
+            $status = proc_get_status($proc);
+            $running = $status['running'];
+            $exitcode = $status['exitcode'];
+        }
+
+        if ($exitcode !== 0) {
+            return;
         }
     }
 }
diff --git a/tests/issue-13/composer.json b/tests/issue-13/composer.json
@@ -7,6 +7,6 @@
     ],
     "require": {
         "symfony/cache": "^6.4 || ^7.0",
-        "kcs/class-finder": "^1.0@dev"
+        "kcs/class-finder": "dev-master"
     }
 }