Merge pull request #442 from skilld-labs/441-type

Fix preg_match() usage when looking for extension type
mglaman · Jul 7, 2022 · 8acaa1e · 8acaa1e
2 parents d675556 + 9c049f7
commit 8acaa1e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Drupal/ExtensionDiscovery.php b/src/Drupal/ExtensionDiscovery.php
@@ -377,9 +377,11 @@ protected function scanDirectory($dir): array
             $type = false;
             $file = $fileinfo->openFile('r');
             while (!$type && !$file->eof()) {
-                preg_match('@^type:\s*(\'|")?(\w+)\1?\s*$@', $file->fgets(), $matches);
-                if (isset($matches[2])) {
-                    $type = $matches[2];
+                if ($line = $file->fgets()) {
+                    preg_match('@^type:\s*(\'|")?(\w+)\1?\s*$@', $line, $matches);
+                    if (isset($matches[2])) {
+                        $type = $matches[2];
+                    }
                 }
             }
             if ($type === false) {