Support for PHPUnit 12

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": {

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',

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(

tests/InvalidAdapterTest.php

@@ -25,9 +25,6 @@
  */
 final class InvalidAdapterTest extends TestCase
 {
-    /**
-     * @var array<string, string>
-     */
     private const CONFIG = [
         'key' => 'aW52YWxpZC1rZXk=',
         'secret' => 'aW52YWxpZC1zZWNyZXQ=',

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;
 
 /**
@@ -524,16 +525,6 @@ public function testWriteStream(): void
         $this->assertSame('write', $this->obsAdapter->read('file.txt'));
     }
 
-    /**
-     * @return \Iterator<string[]>
-     */
-    public static function provideWriteStreamWithVisibilityCases(): \Iterator
-    {
-        yield [Visibility::PUBLIC];
-
-        yield [Visibility::PRIVATE];
-    }
-
     private function mockGetVisibility(string $path, string $visibility): void
     {
         $model = new Model([
@@ -591,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');
@@ -602,6 +594,16 @@ public function testWriteStreamWithVisibility(string $visibility): void
         $this->assertSame($visibility, $this->obsAdapter->visibility('file.txt')['visibility']);
     }
 
+    /**
+     * @return \Iterator<string[]>
+     */
+    public static function provideWriteStreamWithVisibilityCases(): \Iterator
+    {
+        yield [Visibility::PUBLIC];
+
+        yield [Visibility::PRIVATE];
+    }
+
     public function testWriteStreamWithExpires(): void
     {
         $contents = $this->streamForResource('write');

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()

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
@@ -147,19 +148,10 @@
         $this->assertSame('write', $this->obsAdapter->read('fixture/file.txt'));
     }
 
-    /**
-     * @return \Iterator<string[]>
-     */
-    public static function provideWriteStreamWithVisibilityCases(): \Iterator
-    {
-        yield [Visibility::PUBLIC];
-
-        yield [Visibility::PRIVATE];
-    }
-
     /**
      * @dataProvider provideWriteStreamWithVisibilityCases
      */
+    #[DataProvider('provideWriteStreamWithVisibilityCases')]
     public function testWriteStreamWithVisibility(string $visibility): void
     {
         $this->obsAdapter->writeStream('fixture/file.txt', $this->streamForResource('write'), new Config([
@@ -168,6 +160,16 @@
         $this->assertSame($visibility, $this->obsAdapter->visibility('fixture/file.txt')['visibility']);
     }
 
+    /**
+     * @return \Iterator<string[]>
+     */
+    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([
@@ -261,7 +263,7 @@
 
     public function testGetTemporaryUrl(): void
     {
         $this->assertSame(
             'read-test',
             file_get_contents($this->obsAdapter->getTemporaryUrl('fixture/read.txt', 10, []))
         );
@@ -279,7 +281,7 @@
         $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]);
     }