Update phpstan/phpstan-mockery requirement from ^1.0 to ^1.0 || ^2.0 (#…

…140) * Update phpstan/phpstan-mockery requirement from ^1.0 to ^1.0 || ^2.0 Updates the requirements on [phpstan/phpstan-mockery](https://github.com/phpstan/phpstan-mockery) to permit the latest version. - [Release notes](https://github.com/phpstan/phpstan-mockery/releases) - [Commits](phpstan/phpstan-mockery@1.0.0...2.0.0) --- updated-dependencies: - dependency-name: phpstan/phpstan-mockery dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * Fix phpstan issues * Fix phpstan issues --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: zingimmick <[email protected]>
zingimmick · Jan 22, 2025 · 879bf61 · 879bf61
1 parent 127680a
commit 879bf61
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "league/flysystem-adapter-test-utilities": "^3.7",
         "mockery/mockery": "~1.3.3 || ^1.4.2",
-        "phpstan/phpstan-mockery": "^1.0",
+        "phpstan/phpstan-mockery": "^1.0 || ^2.0",
         "phpunit/phpunit": "^9.3.3 || ^10.0 || ^11.0",
         "zing/coding-standard": "^6.4 || ^7.0"
     },

diff --git a/phpstan.neon b/phpstan.neon
@@ -8,3 +8,4 @@ parameters:
         - tests
     ignoreErrors:
         - '#unction GuzzleHttp\\Psr7\\stream_for not found.#'
+        - '#Method Zing\\Flysystem\\Obs\\Tests\\TestCase::streamFor\(\) should return Psr\\Http\\Message\\StreamInterface but returns mixed.#'
diff --git a/src/ObsAdapter.php b/src/ObsAdapter.php
@@ -282,7 +282,9 @@ public function visibility(string $path): FileAttributes
             throw UnableToRetrieveMetadata::visibility($path, $obsException->getMessage(), $obsException);
         }
 
-        $visibility = $this->visibilityConverter->aclToVisibility((array) $result->get('Grants'));
+        /** @var array<array{Grantee?: array<string, mixed>, Permission?: string}> $grants */
+        $grants = (array) $result->get('Grants');
+        $visibility = $this->visibilityConverter->aclToVisibility($grants);
 
         return new FileAttributes($path, null, $visibility);
     }
@@ -362,15 +364,16 @@ public function listContents(string $path, bool $deep): iterable
     private function getMetadata(string $path, string $type): FileAttributes
     {
         try {
+            /** @var array{Key: string|null, Prefix: string|null, ContentLength?: int, Size?: int, LastModified?: string, ContentType?: string} $metadata */
             $metadata = $this->obsClient->getObjectMetadata([
                 'Bucket' => $this->bucket,
                 'Key' => $this->pathPrefixer->prefixPath($path),
-            ]);
+            ])->toArray();
         } catch (ObsException $obsException) {
             throw UnableToRetrieveMetadata::create($path, $type, $obsException->getMessage(), $obsException);
         }
 
-        $attributes = $this->mapObjectMetadata($metadata->toArray(), $path);
+        $attributes = $this->mapObjectMetadata($metadata, $path);
 
         if (! $attributes instanceof FileAttributes) {
             throw UnableToRetrieveMetadata::create($path, $type);
@@ -704,6 +707,7 @@ public function checksum(string $path, Config $config): string
         }
 
         try {
+            /** @var array{ETag?: string} $metadata */
             $metadata = $this->getMetadata($path, 'checksum')
                 ->extraMetadata();
         } catch (UnableToRetrieveMetadata $unableToRetrieveMetadata) {

diff --git a/tests/BucketEndpointTest.php b/tests/BucketEndpointTest.php
@@ -19,7 +19,7 @@ protected function isBucketEndpoint(): bool
         return true;
     }
 
-    protected function signature(): ?string
+    protected function signature(): string
     {
         return 'v4';
     }

diff --git a/tests/MockAdapterTest.php b/tests/MockAdapterTest.php
@@ -9,6 +9,7 @@
 use League\Flysystem\FileAttributes;
 use League\Flysystem\StorageAttributes;
 use League\Flysystem\UnableToCopyFile;
+use League\Flysystem\UnableToDeleteDirectory;
 use League\Flysystem\UnableToRetrieveMetadata;
 use League\Flysystem\Visibility;
 use Obs\Internal\Common\Model;
@@ -480,6 +481,7 @@ public function testDeleteDir(): void
                 ],
             ])->andThrow(new ObsException());
         $this->legacyMock->shouldReceive('deleteObjects')
+            ->once()
             ->withArgs([
                 [
                     'Bucket' => 'test',
@@ -494,7 +496,23 @@ public function testDeleteDir(): void
                 ],
             ])->andReturn(new Model());
         $this->obsAdapter->deleteDirectory('path');
-        $this->assertTrue(true);
+        $this->legacyMock->shouldReceive('deleteObjects')
+            ->once()
+            ->withArgs([
+                [
+                    'Bucket' => 'test',
+                    'Objects' => [
+                        [
+                            'Key' => 'path/',
+                        ],
+                        [
+                            'Key' => 'path/file.txt',
+                        ],
+                    ],
+                ],
+            ])->andThrow(new ObsException());
+        $this->expectException(UnableToDeleteDirectory::class);
+        $this->obsAdapter->deleteDirectory('path');
     }
 
     public function testWriteStream(): void

diff --git a/tests/ValidAdapterTest.php b/tests/ValidAdapterTest.php
@@ -235,7 +235,6 @@ public function testListContents(): void
         $this->assertNull($file->mimeType());
         $this->assertNotNull($file->lastModified());
         $this->assertNull($file->visibility());
-        $this->assertIsArray($file->extraMetadata());
         $this->assertInstanceOf(DirectoryAttributes::class, $directory);
         $this->assertSame('fixture/path/dir', $directory->path());
     }
@@ -277,11 +276,10 @@ public function testImage(): void
 
         $this->obsAdapter->write('fixture/image.png', $contents, new Config());
 
-        /** @var array{int, int} $info */
         $info = getimagesize($this->obsAdapter->getTemporaryUrl('fixture/image.png', 10, [
             'x-image-process' => 'image/crop,w_200,h_100',
         ]));
-
+        $this->assertNotFalse($info);
         $this->assertSame(200, $info[0]);
         $this->assertSame(100, $info[1]);
     }