Fix null returning from generator

silverstripe · Apr 10, 2019 · 8d61fd1 · 8d61fd1
1 parent 3f8b46a
commit 8d61fd1
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/FilenameParsing/FileIDHelperResolutionStrategy.php b/src/FilenameParsing/FileIDHelperResolutionStrategy.php
@@ -330,16 +330,13 @@ public function findVariants($tuple, Filesystem $filesystem)
             }
         }
 
-        if (!$helper) {
-            // Could not find the file,
-            return null;
-        }
-
-        $folder = $helper->lookForVariantIn($parsedFileID);
-        $possibleVariants = $filesystem->listContents($folder, true);
-        foreach ($possibleVariants as $possibleVariant) {
-            if ($possibleVariant['type'] !== 'dir' && $helper->isVariantOf($possibleVariant['path'], $parsedFileID)) {
-                yield $helper->parseFileID($possibleVariant['path'])->setHash($parsedFileID->getHash());
+        if ($helper) {
+            $folder = $helper->lookForVariantIn($parsedFileID);
+            $possibleVariants = $filesystem->listContents($folder, true);
+            foreach ($possibleVariants as $possibleVariant) {
+                if ($possibleVariant['type'] !== 'dir' && $helper->isVariantOf($possibleVariant['path'], $parsedFileID)) {
+                    yield $helper->parseFileID($possibleVariant['path'])->setHash($parsedFileID->getHash());
+                }
             }
         }
     }