Merge 9747ec9 into 2c21586

nepada · Aug 6, 2023 · d12756c · d12756c
2 parents 2c21586 + 9747ec9
commit d12756c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "nette/application": "^3.1.8@dev",
         "nette/forms": "^3.1.6@dev",
         "nette/http": "^3.1@dev",
-        "nette/utils": "^3.2.2@dev",
+        "nette/utils": "^3.2.2@dev || ^4.0@dev",
         "nextras/form-components": "^1.0@dev"
     },
     "require-dev": {
@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev"
+            "dev-master": "1.5-dev"
         }
     }
 }
diff --git a/src/FileUploadControl/Storage/FileSystemStorageManager.php b/src/FileUploadControl/Storage/FileSystemStorageManager.php
@@ -92,16 +92,20 @@ private function collectGarbage(): void
             return;
         }
 
+        $expiredNamespaces = [];
         $currentTimestamp = $this->dateTimeProvider->getNow()->getTimestamp();
         /** @var \SplFileInfo $directory */
         foreach ($this->finder->findDirectoriesInDirectory($this->directory, '*' . self::NAMESPACE_DIRECTORY_SUFFIX) as $directory) {
             $age = $currentTimestamp - $directory->getMTime();
             if ($age < $this->namespaceTtl) {
                 continue;
             }
+            $expiredNamespaces[] = UploadNamespace::fromString($directory->getBasename(self::NAMESPACE_DIRECTORY_SUFFIX));
+        }
+
+        foreach ($expiredNamespaces as $expiredNamespace) {
             try {
-                $namespace = UploadNamespace::fromString($directory->getBasename(self::NAMESPACE_DIRECTORY_SUFFIX));
-                $storage = $this->getStorage($namespace);
+                $storage = $this->getStorage($expiredNamespace);
                 $storage->destroy();
             } catch (StorageDoesNotExistException $exception) {
                 // noop