From e71478a149682c4d2189abdc1fcbbeb2e4e981ad Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 9 Dec 2025 10:43:22 +0000 Subject: [PATCH 1/4] CI: add PHP 8.4 and 8.5 to test matrix --- .github/workflows/tests.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a574bd1..7f75a28 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,6 +11,18 @@ on: - cron: "0 8 * * 1" jobs: + test85: + name: "Nette Tester" + uses: contributte/.github/.github/workflows/nette-tester.yml@master + with: + php: "8.5" + + test84: + name: "Nette Tester" + uses: contributte/.github/.github/workflows/nette-tester.yml@master + with: + php: "8.4" + test83: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester.yml@master From 36cf87c3ec6f9fc84f26473d655b526568d6ba29 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 13 Dec 2025 14:33:30 +0000 Subject: [PATCH 2/4] Bump minimum PHP version to 8.2 - Remove PHP 8.1 from CI test matrix - Update testlower to use PHP 8.2 - Update composer.json requirement - Update README.md versions table --- .github/workflows/tests.yml | 8 +------- README.md | 4 ++-- composer.json | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7f75a28..0bdeea0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,15 +35,9 @@ jobs: with: php: "8.2" - test81: - name: "Nette Tester" - uses: contributte/.github/.github/workflows/nette-tester.yml@master - with: - php: "8.1" - testlower: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester.yml@master with: - php: "8.1" + php: "8.2" composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest" diff --git a/README.md b/README.md index 7afe2ea..c5659ed 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ For details on how to use this package, check out our [documentation](.docs). | State | Version | Branch | Nette | PHP | |--------|----------|----------|--------|---------| -| dev | `^6.2.0` | `master` | `3.2+` | `>=8.1` | -| stable | `^6.1.0` | `master` | `3.2+` | `>=8.1` | +| dev | `^6.2.0` | `master` | `3.2+` | `>=8.2` | +| stable | `^6.1.0` | `master` | `3.2+` | `>=8.2` | ## Development diff --git a/composer.json b/composer.json index 272f51e..678a417 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": ">=8.1", + "php": ">=8.2", "nette/di": "^3.1.8", "nette/utils": "^4.0.3", "nette/bootstrap": "^3.2.1", From 5e74ba091d7f25358b6b154d2a149594db84eb42 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 13 Dec 2025 14:36:21 +0000 Subject: [PATCH 3/4] Composer: upgrade contributte/qa to 0.5 - Update ruleset.xml to use ruleset-8.2.xml --- composer.json | 2 +- ruleset.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 678a417..5e69a96 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require-dev": { "mockery/mockery": "^1.6.6", - "contributte/qa": "^0.4", + "contributte/qa": "^0.5", "contributte/tester": "^0.4", "contributte/phpstan": "^0.2", "predis/predis": "^2.2.2" diff --git a/ruleset.xml b/ruleset.xml index 7380753..fe25abc 100644 --- a/ruleset.xml +++ b/ruleset.xml @@ -1,7 +1,7 @@ - + From 5edd3f5fafc28dca53e1dda46bae5a1fcabc7188 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 13 Dec 2025 14:40:46 +0000 Subject: [PATCH 4/4] Fix PHP 8.5 deprecation: replace SplObjectStorage::attach() with offsetSet() --- src/Request/RequestCollectionFactory.php | 4 ++-- tests/Cases/Unit/Response/ResponseDataBuilderTest.phpt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Request/RequestCollectionFactory.php b/src/Request/RequestCollectionFactory.php index df9e185..3f35270 100644 --- a/src/Request/RequestCollectionFactory.php +++ b/src/Request/RequestCollectionFactory.php @@ -30,7 +30,7 @@ public function create(string $rawRequest): RequestCollection if (is_array($requestData)) { /** @var mixed[] $oneRequestData */ foreach ($requestData as $oneRequestData) { - $collection->attach( + $collection->offsetSet( $this->createRequestFromRequestData($oneRequestData), ); } @@ -38,7 +38,7 @@ public function create(string $rawRequest): RequestCollection /** * Even when there is a single command, put it into RequestCollection */ - $collection->attach($this->createRequestFromRequestData($requestData)); + $collection->offsetSet($this->createRequestFromRequestData($requestData)); $collection->setIsBatchedRequest(false); } else { throw new RequestCollectionCreationException('Invalid payload data - invalid json'); diff --git a/tests/Cases/Unit/Response/ResponseDataBuilderTest.phpt b/tests/Cases/Unit/Response/ResponseDataBuilderTest.phpt index 73d8f04..0d8034f 100644 --- a/tests/Cases/Unit/Response/ResponseDataBuilderTest.phpt +++ b/tests/Cases/Unit/Response/ResponseDataBuilderTest.phpt @@ -115,7 +115,7 @@ class ResponseDataBuilderTest extends TestCase $collection = new RequestCollection(); - $collection->attach($request); + $collection->offsetSet($request); $collection[$request] = $response; $collection->setIsBatchedRequest(false);