Garbage collector now removes all empty temporary upload folders.

Resolve #10746

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Added `craft\base\FsInterface::write()`.
 - Added `craft\services\Assets::getImagePreviewUrl()`.
 - Added `craft\web\CpScreenResponseBehavior::selectedSubnavItem()`. ([#10784](https://github.com/craftcms/cms/discussions/10784))
+- Garbage collector now removes all empty temporary upload folders. ([#10746](https://github.com/craftcms/cms/issues/10746))
 
 ### Changed
 - Sites’ Language settings now use Selectize inputs. ([#10810](https://github.com/craftcms/cms/discussions/10810))

src/services/Gc.php

@@ -21,6 +21,7 @@
 use craft\elements\MatrixBlock;
 use craft\elements\Tag;
 use craft\elements\User;
+use craft\fs\Temp;
 use craft\helpers\DateTimeHelper;
 use craft\helpers\Db;
 use craft\records\Volume;
@@ -138,6 +139,8 @@ public function run(bool $force = false): void
         ]);
 
         $this->hardDeleteVolumes();
+
+        $this->removeEmptyTempFolders();
     }
 
     /**
@@ -293,6 +296,34 @@ public function deletePartialElements(string $elementType, string $table, string
         $this->db->createCommand($sql, ['type' => $elementType])->execute();
     }
 
+    /**
+     * Find all temp upload folders with no assets in them and remove them.
+     *
+     * @throws \craft\errors\FsException
+     * @throws \yii\base\Exception
+     * @throws \yii\base\InvalidConfigException
+     */
+    public function removeEmptyTempFolders(): void
+    {
+        $emptyFolders = (new Query())
+            ->from(['folders' => Table::VOLUMEFOLDERS])
+            ->select(['folders.id', 'folders.path'])
+            ->leftJoin(['assets' => Table::ASSETS], '[[assets.folderId]] = [[folders.id]]')
+            ->where(['folders.volumeId' => null, 'assets.id' => null])
+            ->andWhere(['not', ['folders.parentId' => null]])
+            ->pairs();
+
+        $fs = Craft::createObject(Temp::class);
+
+        foreach ($emptyFolders as $emptyFolderPath) {
+            if ($fs->directoryExists($emptyFolderPath)) {
+                $fs->deleteDirectory($emptyFolderPath);
+            }
+        }
+
+        VolumeFolder::deleteAll(['id' => array_keys($emptyFolders)]);
+    }
+
     /**
      * Returns whether we should be hard-deleting soft-deleted objects.
      *