Fix getMetadata() to have data for S3 folders

Author: bryannielsen

Adapter/AbstractS3.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace CloudFiles\Adapter;
+
+use ExpressionEngine\Dependency\League\Flysystem;
+
+abstract class AbstractS3 extends Flysystem\AwsS3v3\AwsS3Adapter
+{
+
+    /**
+     * Get all the meta data of a file or directory.
+     *
+     * @param string $path
+     *
+     * @return false|array
+     */
+    public function getMetadata($path)
+    {
+        $metadata = parent::getMetadata($path);
+
+        if ($metadata !== false) {
+            return $metadata;
+        }
+
+        // AWS looks for metadata with a headObject request, this returns 404 (false) on directories
+        if (!empty($this->listContents($path))) {
+            return ['type' => 'dir', 'path' => $path, 'size' => 0, 'timestamp' => null];
+        }
+
+        return false;
+    }
+}

Adapter/AwsS3.php

@@ -8,7 +8,7 @@
 use ExpressionEngine\Library\Filesystem\Adapter\AdapterTrait;
 use ExpressionEngine\Service\Validation\ValidationAware;
 
-class AwsS3 extends Flysystem\AwsS3v3\AwsS3Adapter implements AdapterInterface, ValidationAware
+class AwsS3 extends AbstractS3 implements AdapterInterface, ValidationAware
 {
     use AdapterTrait;
 
@@ -118,7 +118,9 @@ public static function listAvailableRegions()
             'af-south-1' => 'Africa (Cape Town)',
             'ap-east-1' => 'Asia Pacific (Hong Kong)',
             'ap-southeast-3' => 'Asia Pacific (Jakarta)',
+            'ap-southeast-4' => 'Asia Pacific (Melbourne)',
             'ap-south-1' => 'Asia Pacific (Mumbai)',
+            'ap-south-2' => 'Asia Pacific (Hyderabad)',
             'ap-northeast-3' => 'Asia Pacific (Osaka)',
             'ap-northeast-2' => 'Asia Pacific (Seoul)',
             'ap-southeast-1' => 'Asia Pacific (Singapore)',
@@ -133,7 +135,10 @@ public static function listAvailableRegions()
             'eu-south-1' => 'Europe (Milan)',
             'eu-west-3' => 'Europe (Paris)',
             'eu-north-1' => 'Europe (Stockholm)',
+            'eu-south-2' => 'Europe (Spain)',
+            'eu-central-2' => 'Europe (Zurich)',
             'me-south-1' => 'Middle East (Bahrain)',
+            'me-central-1' => 'Middle East (UAE)',
             'sa-east-1' => 'South America (São Paulo)',
         ];
     }

Adapter/DigitalOcean.php

@@ -8,7 +8,7 @@
 use ExpressionEngine\Library\Filesystem\Adapter\AdapterTrait;
 use ExpressionEngine\Service\Validation\ValidationAware;
 
-class DigitalOcean extends Flysystem\AwsS3v3\AwsS3Adapter implements AdapterInterface, ValidationAware
+class DigitalOcean extends AbstractS3 implements AdapterInterface, ValidationAware
 {
     use AdapterTrait;
 
@@ -125,6 +125,7 @@ public static function listAvailableRegions()
             'fra1' => 'FRA1 - Frankfurt',
             'tor1' => 'TOR1 - Toronto',
             'blr1' => 'BLR1 - Bangalore',
+            'syd1' => 'SYD1 - Sydney',
         ];
     }