From 9fc8253c9ca2c6f32169ca63483414e579e545e6 Mon Sep 17 00:00:00 2001 From: Zing Date: Tue, 8 Apr 2025 22:19:11 +0800 Subject: [PATCH 1/3] Support for PHPUnit 12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 744e6b6..5530290 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "league/flysystem-adapter-test-utilities": "^3.7", "mockery/mockery": "~1.3.3 || ^1.4.2", "phpstan/phpstan-mockery": "^1.0 || ^2.0", - "phpunit/phpunit": "^9.3.3 || ^10.0 || ^11.0", + "phpunit/phpunit": "^9.3.3 || ^10.0 || ^11.0 || ^12.0", "zing/coding-standard": "^6.4 || ^7.0" }, "autoload": { From 375e65406f2ddcf7801cb07bd15a3f8b96be5753 Mon Sep 17 00:00:00 2001 From: zingimmick Date: Tue, 8 Apr 2025 14:20:06 +0000 Subject: [PATCH 2/3] Rector Rectify --- src/ObsAdapter.php | 12 ------------ src/PortableVisibilityConverter.php | 12 ------------ tests/InvalidAdapterTest.php | 3 --- tests/MockAdapterTest.php | 20 ++++++++++---------- tests/ValidAdapterTest.php | 20 ++++++++++---------- 5 files changed, 20 insertions(+), 47 deletions(-) diff --git a/src/ObsAdapter.php b/src/ObsAdapter.php index 4713e21..4944311 100644 --- a/src/ObsAdapter.php +++ b/src/ObsAdapter.php @@ -39,24 +39,12 @@ class ObsAdapter implements FilesystemAdapter, PublicUrlGenerator, ChecksumProvider, TemporaryUrlGenerator { - /** - * @var string[] - */ private const EXTRA_METADATA_FIELDS = ['Metadata', 'StorageClass', 'ETag', 'VersionId']; - /** - * @var string - */ private const DELIMITER = '/'; - /** - * @var int - */ private const MAX_KEYS = 1000; - /** - * @var string[] - */ private const AVAILABLE_OPTIONS = [ 'ACL', 'StorageClass', diff --git a/src/PortableVisibilityConverter.php b/src/PortableVisibilityConverter.php index b3d14bb..118fd27 100644 --- a/src/PortableVisibilityConverter.php +++ b/src/PortableVisibilityConverter.php @@ -9,24 +9,12 @@ class PortableVisibilityConverter implements VisibilityConverter { - /** - * @var string - */ private const PUBLIC_GRANTEE_URI = 'http://acs.amazonaws.com/groups/global/AllUsers'; - /** - * @var string - */ private const PUBLIC_GRANTS_PERMISSION = 'READ'; - /** - * @var string - */ private const PUBLIC_ACL = ObsClient::AclPublicRead; - /** - * @var string - */ private const PRIVATE_ACL = ObsClient::AclPrivate; public function __construct( diff --git a/tests/InvalidAdapterTest.php b/tests/InvalidAdapterTest.php index 2283ba2..e0e0924 100644 --- a/tests/InvalidAdapterTest.php +++ b/tests/InvalidAdapterTest.php @@ -25,9 +25,6 @@ */ final class InvalidAdapterTest extends TestCase { - /** - * @var array - */ private const CONFIG = [ 'key' => 'aW52YWxpZC1rZXk=', 'secret' => 'aW52YWxpZC1zZWNyZXQ=', diff --git a/tests/MockAdapterTest.php b/tests/MockAdapterTest.php index a2306ee..9b0fba9 100644 --- a/tests/MockAdapterTest.php +++ b/tests/MockAdapterTest.php @@ -524,16 +524,6 @@ public function testWriteStream(): void $this->assertSame('write', $this->obsAdapter->read('file.txt')); } - /** - * @return \Iterator - */ - public static function provideWriteStreamWithVisibilityCases(): \Iterator - { - yield [Visibility::PUBLIC]; - - yield [Visibility::PRIVATE]; - } - private function mockGetVisibility(string $path, string $visibility): void { $model = new Model([ @@ -602,6 +592,16 @@ public function testWriteStreamWithVisibility(string $visibility): void $this->assertSame($visibility, $this->obsAdapter->visibility('file.txt')['visibility']); } + /** + * @return \Iterator + */ + public static function provideWriteStreamWithVisibilityCases(): \Iterator + { + yield [Visibility::PUBLIC]; + + yield [Visibility::PRIVATE]; + } + public function testWriteStreamWithExpires(): void { $contents = $this->streamForResource('write'); diff --git a/tests/ValidAdapterTest.php b/tests/ValidAdapterTest.php index 95e4d78..d023841 100644 --- a/tests/ValidAdapterTest.php +++ b/tests/ValidAdapterTest.php @@ -147,16 +147,6 @@ public function testWriteStream(): void $this->assertSame('write', $this->obsAdapter->read('fixture/file.txt')); } - /** - * @return \Iterator - */ - public static function provideWriteStreamWithVisibilityCases(): \Iterator - { - yield [Visibility::PUBLIC]; - - yield [Visibility::PRIVATE]; - } - /** * @dataProvider provideWriteStreamWithVisibilityCases */ @@ -168,6 +158,16 @@ public function testWriteStreamWithVisibility(string $visibility): void $this->assertSame($visibility, $this->obsAdapter->visibility('fixture/file.txt')['visibility']); } + /** + * @return \Iterator + */ + public static function provideWriteStreamWithVisibilityCases(): \Iterator + { + yield [Visibility::PUBLIC]; + + yield [Visibility::PRIVATE]; + } + public function testWriteStreamWithExpires(): void { $this->obsAdapter->writeStream('fixture/file.txt', $this->streamForResource('write'), new Config([ From f6815baaae46ff2099afd479fa2820b02b979bb7 Mon Sep 17 00:00:00 2001 From: zingimmick Date: Wed, 16 Apr 2025 00:25:56 +0800 Subject: [PATCH 3/3] wip --- tests/MockAdapterTest.php | 2 ++ tests/ObsAdapterTest.php | 2 ++ tests/ValidAdapterTest.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tests/MockAdapterTest.php b/tests/MockAdapterTest.php index 9b0fba9..6fcb0fc 100644 --- a/tests/MockAdapterTest.php +++ b/tests/MockAdapterTest.php @@ -15,6 +15,7 @@ use Obs\Internal\Common\Model; use Obs\ObsClient; use Obs\ObsException; +use PHPUnit\Framework\Attributes\DataProvider; use Zing\Flysystem\Obs\ObsAdapter; /** @@ -581,6 +582,7 @@ private function mockGetVisibility(string $path, string $visibility): void /** * @dataProvider provideWriteStreamWithVisibilityCases */ + #[DataProvider('provideWriteStreamWithVisibilityCases')] public function testWriteStreamWithVisibility(string $visibility): void { $contents = $this->streamForResource('write'); diff --git a/tests/ObsAdapterTest.php b/tests/ObsAdapterTest.php index 3d70cf3..f92544b 100644 --- a/tests/ObsAdapterTest.php +++ b/tests/ObsAdapterTest.php @@ -8,6 +8,7 @@ use League\Flysystem\Config; use League\Flysystem\FilesystemAdapter; use Obs\ObsClient; +use PHPUnit\Framework\Attributes\Test; use Zing\Flysystem\Obs\ObsAdapter; /** @@ -62,6 +63,7 @@ protected function tearDown(): void /** * @test */ + #[Test] public function fetching_unknown_mime_type_of_a_file(): void { $this->adapter() diff --git a/tests/ValidAdapterTest.php b/tests/ValidAdapterTest.php index d023841..c6ee68e 100644 --- a/tests/ValidAdapterTest.php +++ b/tests/ValidAdapterTest.php @@ -10,6 +10,7 @@ use League\Flysystem\StorageAttributes; use League\Flysystem\Visibility; use Obs\ObsClient; +use PHPUnit\Framework\Attributes\DataProvider; use Zing\Flysystem\Obs\ObsAdapter; class ValidAdapterTest extends TestCase @@ -150,6 +151,7 @@ public function testWriteStream(): void /** * @dataProvider provideWriteStreamWithVisibilityCases */ + #[DataProvider('provideWriteStreamWithVisibilityCases')] public function testWriteStreamWithVisibility(string $visibility): void { $this->obsAdapter->writeStream('fixture/file.txt', $this->streamForResource('write'), new Config([