Check directory exists with minimum max keys (#69)

zingimmick · Mar 6, 2022 · e204eb5 · e204eb5
1 parent 81590a4
commit e204eb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/ObsAdapter.php b/src/ObsAdapter.php
@@ -287,6 +287,7 @@ public function directoryExists(string $path): bool
                 'Bucket' => $this->bucket,
                 'Prefix' => $prefix,
                 'Delimiter' => '/',
+                'MaxKeys' => 1,
             ];
             $model = $this->client->listObjects($options);
 
@@ -434,6 +435,7 @@ public function lastModified(string $path): FileAttributes
     protected function getObject(string $path): StreamInterface
     {
         try {
+            /** @var array{Body: \Psr\Http\Message\StreamInterface} $model */
             $model = $this->client->getObject([
                 'Bucket' => $this->bucket,
                 'Key' => $this->pathPrefixer->prefixPath($path),
@@ -471,6 +473,7 @@ public function listDirObjects(string $dirname = '', bool $recursive = false): a
         while (true) {
             $options['Marker'] = $nextMarker;
 
+            /** @var array{Contents: array<array{Key: string|null, Prefix: string|null, ContentLength?: int, Size?: int, LastModified?: string, ContentType?: string}>|null, CommonPrefixes: array<array<string, string>>|null, NextMarker: ?string} $model */
             $model = $this->client->listObjects($options);
 
             $nextMarker = $model['NextMarker'];
@@ -595,6 +598,7 @@ public function signUrl(string $path, $expiration, array $options = [], string $
     {
         $expires = $expiration instanceof DateTimeInterface ? $expiration->getTimestamp() - time() : $expiration;
 
+        /** @var array{SignedUrl: string} $model */
         $model = $this->client->createSignedUrl([
             'Method' => $method,
             'Bucket' => $this->bucket,

diff --git a/tests/MockAdapterTest.php b/tests/MockAdapterTest.php
@@ -134,6 +134,7 @@ public function testCreateDir(): void
                     'Bucket' => 'test',
                     'Prefix' => 'path/',
                     'Delimiter' => '/',
+                    'MaxKeys' => 1,
                 ],
             ])->andReturn(
                 new Model([
@@ -1070,6 +1071,7 @@ public function testDirectoryExists(): void
                     'Bucket' => 'test',
                     'Prefix' => 'fixture/exists-directory/',
                     'Delimiter' => '/',
+                    'MaxKeys' => 1,
                 ],
             ])->andReturn(new Model([
                 'ContentLength' => '302',