[6.x] Use Laravel disks for asset I/O

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Updated core asset I/O to resolve Craft filesystem definitions and configured storage targets through Laravel filesystem disks.
 - Added `Illuminate\Contracts\Translation\HasLocalePreference` support to user elements, allowing Laravel notifications to use users’ Language preferences. ([#19228](https://github.com/craftcms/cms/pull/19228))
 - Fixed a bug where site routes weren't being registered for each localized site value.
 - Fixed a bug where POST requests to the `loginPath` weren’t being handled properly. ([#19220](https://github.com/craftcms/cms/pull/19220))

resources/css/cp.css

@@ -154,8 +154,8 @@ Form controls
   overflow: clip;
 }
 
-/**
-Select
- */
-.cp-form-control--select {
+.selectize-dropdown.cp-form-control {
+  position: absolute;
+  min-height: 0;
+  overflow: visible;
 }

resources/js/pages/settings/filesystems/Index.vue

@@ -31,7 +31,7 @@
   }
 
   const props = defineProps<{
-    filesystems: Array<FileSystemData>;
+    filesystems: {data: Array<FileSystemData>};
     readOnly: boolean;
   }>();
 
@@ -85,7 +85,7 @@
   ]);
   const table = useVueTable<FileSystemData>({
     get data() {
-      return props.filesystems;
+      return props.filesystems.data;
     },
     get columns() {
       return columns.value;

src/Asset/AssetIndexer.php

@@ -66,8 +66,6 @@ public function getIndexListOnVolume(Volume $volume, string $directory = ''): Ge
             return;
         }
 
-        $fsSubpath = $volume->getSubpath();
-
         try {
             foreach ($fileList as $listing) {
                 if (! $listing instanceof StorageAttributes) {
@@ -92,7 +90,7 @@ public function getIndexListOnVolume(Volume $volume, string $directory = ''): Ge
                     'fileSize' => ! $listing->isDir() && method_exists($listing, 'fileSize') ? $listing->fileSize() : null,
                 ]);
 
-                $path = $listing->getAdjustedUri($fsSubpath);
+                $path = $listing->getUri();
                 $segments = preg_split('/\\\\|\//', $path);
                 $lastSegmentIndex = count($segments) - 1;
 
@@ -211,7 +209,6 @@ public function createIndexingSession(
     public function storeIndexList(Generator $indexList, int $sessionId, Volume $volume): int
     {
         $values = [];
-        $fsSubpath = $volume->getSubpath();
         $now = now();
 
         /** @var FsListing $volumeListing */
@@ -226,7 +223,7 @@ public function storeIndexList(Generator $indexList, int $sessionId, Volume $vol
             $values[] = [
                 'volumeId' => $volume->id,
                 'sessionId' => $sessionId,
-                'uri' => $volumeListing->getAdjustedUri($fsSubpath),
+                'uri' => $volumeListing->getUri(),
                 'size' => $volumeListing->getFileSize(),
                 'timestamp' => $timestamp,
                 'isDir' => $volumeListing->getIsDir(),
@@ -513,7 +510,7 @@ public function indexFileByListing(
         $indexEntry = new AssetIndexEntry([
             'volumeId' => $volume->id,
             'sessionId' => $sessionId,
-            'uri' => $listing->getAdjustedUri($volume->getSubpath()),
+            'uri' => $listing->getUri(),
             'size' => $listing->getFileSize(),
             'timestamp' => $listing->getDateModified(),
             'isDir' => $listing->getIsDir(),
@@ -541,7 +538,7 @@ public function indexFolderByListing(
         $indexEntry = new AssetIndexEntry([
             'volumeId' => $volume->id,
             'sessionId' => $sessionId,
-            'uri' => $listing->getAdjustedUri($volume->getSubpath()),
+            'uri' => $listing->getUri(),
             'size' => $listing->getFileSize(),
             'timestamp' => $listing->getDateModified(),
             'isDir' => $listing->getIsDir(),

src/Asset/Assets.php

@@ -25,13 +25,13 @@
 use CraftCms\Cms\Element\Elements;
 use CraftCms\Cms\Element\Queries\AssetQuery;
 use CraftCms\Cms\Filesystem\Contracts\FsInterface;
+use CraftCms\Cms\Filesystem\Filesystems as FilesystemsService;
 use CraftCms\Cms\Filesystem\Filesystems\Temp;
 use CraftCms\Cms\Image\Data\ImageTransform;
 use CraftCms\Cms\Image\FallbackTransformer;
 use CraftCms\Cms\Image\ImageHelper;
 use CraftCms\Cms\Support\Env;
 use CraftCms\Cms\Support\Facades\Filesystems;
-use CraftCms\Cms\Support\Facades\Path;
 use CraftCms\Cms\Support\File;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\Support\Typecast;
@@ -40,7 +40,6 @@
 use Illuminate\Container\Attributes\Singleton;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
 use InvalidArgumentException;
 use RuntimeException;
 use Throwable;
@@ -184,7 +183,7 @@ public function getImagePreviewUrl(Asset $asset, int $maxWidth, int $maxHeight):
 
         if (
             ! $isWebSafe ||
-            ! $asset->getVolume()->getFs()->hasUrls ||
+            ! $asset->getVolume()->sourceHasUrls() ||
             $originalWidth > $width ||
             $originalHeight > $height
         ) {
@@ -309,7 +308,9 @@ public function getTempAssetUploadFs(): FsInterface
         $handle = Env::parse(Cms::config()->tempAssetUploadFs);
 
         if (! $handle) {
-            return new Temp;
+            return new Temp([
+                'handle' => 'disk:'.FilesystemsService::TEMP_ASSET_DISK,
+            ]);
         }
 
         return Filesystems::resolve($handle)
@@ -323,17 +324,7 @@ public function getTempAssetUploadDisk(): FilesystemAdapter
     {
         $handle = Env::parse(Cms::config()->tempAssetUploadFs);
 
-        if (! $handle) {
-            return Storage::build([ // @phpstan-ignore return.type
-                'driver' => 'local',
-                'root' => Path::tempAssetUploads(),
-            ]);
-        }
-
-        return Storage::disk(
-            Filesystems::resolveDiskName($handle)
-                ?? throw new RuntimeException("The tempAssetUploadFs config setting is set to an invalid filesystem value: $handle")
-        );
+        return Filesystems::disk($handle ?: 'disk:'.FilesystemsService::TEMP_ASSET_DISK);
     }
 
     public function createTempAssetQuery(): AssetQuery

src/Asset/AssetsHelper.php

@@ -145,11 +145,11 @@ public static function revUrl(string $url, Asset $asset, ?DateTimeInterface $dat
         $baseUrls = Collection::make();
         $volume = $asset->getVolume();
 
-        if ($volume->getFs()->hasUrls) {
+        if ($volume->sourceHasUrls()) {
             $baseUrls->push(self::diskBaseUrl($volume->sourceDisk()));
         }
 
-        if ($volume->getTransformFs()->hasUrls) {
+        if ($volume->transformHasUrls()) {
             $baseUrls->push(self::diskBaseUrl($volume->transformDisk()));
         }
 

src/Asset/Commands/Concerns/IndexesAssets.php

@@ -144,7 +144,6 @@ private function processVolume(
         $this->components->twoColumnDetail("Indexing assets in <fg=cyan>{$volume->name}</>");
 
         $fileList = AssetIndexer::getIndexListOnVolume($volume, $path);
-        $fsSubpath = $volume->getSubpath();
 
         /** @var Collection<MissingAssetException|MissingVolumeFolderException> $missingRecords */
         $missingRecords = Collection::make();
@@ -153,7 +152,7 @@ private function processVolume(
         /** @var FsListing $item */
         foreach ($fileList as $index => $item) {
             $count = $index + 1;
-            $description = "#{$count}: <fg=cyan>{$item->getAdjustedUri($fsSubpath)}".($item->getIsDir() ? '/' : '').'</>';
+            $description = "#{$count}: <fg=cyan>{$item->getUri()}".($item->getIsDir() ? '/' : '').'</>';
 
             if ($count < $startAt) {
                 $this->components->twoColumnDetail($description, '<fg=yellow;options=bold>SKIPPED</>');