From 4b20e3fbcc126707ff5bd6d7807db8b762039994 Mon Sep 17 00:00:00 2001 From: Jakob Givoni Date: Mon, 10 Feb 2025 16:58:29 +0100 Subject: [PATCH 1/2] 19-support-for-php-84 --- .github/workflows/ci.yml | 4 ++-- composer.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73d51e3..36c569e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: job1: strategy: matrix: - php_version: ["8.1", "8.2", "8.3"] + php_version: ["8.1", "8.2", "8.3", "8.4"] name: PhpStan static analyzer ${{ matrix.php_version }} runs-on: ubuntu-latest steps: @@ -39,7 +39,7 @@ jobs: job2: strategy: matrix: - php_version: ["8.1", "8.2", "8.3"] + php_version: ["8.1", "8.2", "8.3", "8.4"] name: PhpUnit unit tests ${{ matrix.php_version }} runs-on: ubuntu-latest steps: diff --git a/composer.json b/composer.json index b1f47f8..97ad371 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,7 @@ ], "keywords": [ "flysystem", + "flysystem 3", "filesystem", "cache", "adapter", From 477cc7bd96d5255bf91078afba75cb6e3157fc1f Mon Sep 17 00:00:00 2001 From: Jakob Givoni Date: Tue, 11 Feb 2025 08:31:10 +0100 Subject: [PATCH 2/2] fixing unit test --- docker-compose.yml | 2 -- tests/GetChecksum_Test.php | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7c410d7..a4d0c3a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.2' - name: flysystem-cache-adapter services: diff --git a/tests/GetChecksum_Test.php b/tests/GetChecksum_Test.php index 3533fb9..7fdaa0b 100644 --- a/tests/GetChecksum_Test.php +++ b/tests/GetChecksum_Test.php @@ -51,11 +51,8 @@ public static function dataProvider(): iterable */ public function with_mock_aws_adapter(string $path, string $expectedChecksum): void { - /** @var AwsS3V3Adapter&MockInterface $awsAdapter */ - $awsAdapter = Mockery::mock(AwsS3V3Adapter::class); - $awsAdapter->shouldReceive([ - 'checksum' => 'my-aws-etag', - ]); + $awsAdapter = $this->createMock(AwsS3V3Adapter::class); + $awsAdapter->method('checksum')->with('non-cached-file')->willReturn('my-aws-etag'); $this->cacheAdapter = new CacheAdapter($awsAdapter, $this->cachePool);