From c582f7d75f1fc147e968f4689e06fb4e1cb66787 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 12:53:33 +0000 Subject: [PATCH 1/4] Update dependency php to ~8.1.0 || ~8.2.0 || ~8.3.0 | datasource | package | from | to | | ----------- | -------------------------- | ------ | ----- | | github-tags | containerbase/php-prebuild | 8.2.14 | 8.3.1 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.json | 4 ++-- composer.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 0e579aa..4068c7e 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "config": { "sort-packages": true, "platform": { - "php": "8.0.99" + "php": "8.1.99" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -38,7 +38,7 @@ } }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-dom": "*", "ext-json": "*", "psr/container": "^1.1.2 || ^2.0.2", diff --git a/composer.lock b/composer.lock index 7e39f79..de2105f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2c351601b923410887d04df6b4a65737", + "content-hash": "aa494206308860461861ac5f84187ecd", "packages": [ { "name": "psr/container", @@ -6000,13 +6000,13 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-dom": "*", "ext-json": "*" }, "platform-dev": [], "platform-overrides": { - "php": "8.0.99" + "php": "8.1.99" }, "plugin-api-version": "2.6.0" } From 789dab9009ad2b69f0a55984f964c3d139887be4 Mon Sep 17 00:00:00 2001 From: Aleksei Khudiakov Date: Mon, 8 Jan 2024 22:54:58 +1000 Subject: [PATCH 2/4] Drop ci platform ignore Signed-off-by: Aleksei Khudiakov --- .laminas-ci.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.laminas-ci.json b/.laminas-ci.json index 89ee608..7a73a41 100644 --- a/.laminas-ci.json +++ b/.laminas-ci.json @@ -1,5 +1,2 @@ { - "ignore_php_platform_requirements": { - "8.2": true - } } \ No newline at end of file From 520a321c412610c99f28af7c82a90e8c85365380 Mon Sep 17 00:00:00 2001 From: Aleksei Khudiakov Date: Mon, 8 Jan 2024 23:04:01 +1000 Subject: [PATCH 3/4] Drop noop Reflection::setAccessible Signed-off-by: Aleksei Khudiakov --- test/HalResponseFactoryFactoryTest.php | 2 +- test/LinkGenerator/MezzioUrlGeneratorTest.php | 1 - test/Metadata/MetadataMapFactoryTest.php | 2 -- test/PHPUnitDeprecatedAssertions.php | 6 +----- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/test/HalResponseFactoryFactoryTest.php b/test/HalResponseFactoryFactoryTest.php index da30ff5..c511e95 100644 --- a/test/HalResponseFactoryFactoryTest.php +++ b/test/HalResponseFactoryFactoryTest.php @@ -26,7 +26,7 @@ class HalResponseFactoryFactoryTest extends TestCase public static function assertResponseFactoryReturns(ResponseInterface $expected, HalResponseFactory $factory): void { $r = new ReflectionProperty($factory, 'responseFactory'); - $r->setAccessible(true); + $responseFactory = $r->getValue($factory); self::assertInstanceOf(CallableResponseFactoryDecorator::class, $responseFactory); diff --git a/test/LinkGenerator/MezzioUrlGeneratorTest.php b/test/LinkGenerator/MezzioUrlGeneratorTest.php index 629d181..b5d8834 100644 --- a/test/LinkGenerator/MezzioUrlGeneratorTest.php +++ b/test/LinkGenerator/MezzioUrlGeneratorTest.php @@ -92,7 +92,6 @@ public function testCanGenerateFullyQualifiedURIWhenServerUrlHelperIsComposed(): // The helper should be cloned on each invocation, ensuring that the URI // is not persisted. $reflectionProperty = new ReflectionProperty($serverUrlHelper, 'uri'); - $reflectionProperty->setAccessible(true); self::assertNull($reflectionProperty->getValue($serverUrlHelper)); } } diff --git a/test/Metadata/MetadataMapFactoryTest.php b/test/Metadata/MetadataMapFactoryTest.php index 67f4bf4..e1bd150 100644 --- a/test/Metadata/MetadataMapFactoryTest.php +++ b/test/Metadata/MetadataMapFactoryTest.php @@ -43,7 +43,6 @@ public function testFactoryReturnsEmptyMetadataMapWhenNoConfigServicePresent(): $metadataMap = ($this->factory)($this->container); $r = new ReflectionProperty($metadataMap, 'map'); - $r->setAccessible(true); self::assertSame([], $r->getValue($metadataMap)); } @@ -54,7 +53,6 @@ public function testFactoryReturnsEmptyMetadataMapWhenConfigServiceHasNoMetadata $metadataMap = ($this->factory)($this->container); $r = new ReflectionProperty($metadataMap, 'map'); - $r->setAccessible(true); self::assertSame([], $r->getValue($metadataMap)); } diff --git a/test/PHPUnitDeprecatedAssertions.php b/test/PHPUnitDeprecatedAssertions.php index 9cb9cf8..a48927a 100644 --- a/test/PHPUnitDeprecatedAssertions.php +++ b/test/PHPUnitDeprecatedAssertions.php @@ -227,11 +227,7 @@ public static function getObjectAttribute($object, string $attributeName) return $object->$attributeName; } - $attribute->setAccessible(true); - $value = $attribute->getValue($object); - $attribute->setAccessible(false); - - return $value; + return $attribute->getValue($object); } catch (ReflectionException $e) { } } while ($reflector = $reflector->getParentClass()); From e9a7f7144397ac189e5c45d60ab11a9092584e53 Mon Sep 17 00:00:00 2001 From: Aleksei Khudiakov Date: Mon, 8 Jan 2024 23:06:59 +1000 Subject: [PATCH 4/4] Update baseline Signed-off-by: Aleksei Khudiakov --- psalm-baseline.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 6198502..0979e05 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -759,9 +759,6 @@ ) )]]> - - $value - $value