Merge pull request #84 from mezzio/renovate/php

Update dependency php to ~8.1.0 || ~8.2.0 || ~8.3.0
mezzio · Jan 8, 2024 · f708d13 · f708d13
2 parents c839a81 + e9a7f71
commit f708d13
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 20 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,5 +1,2 @@
 {
-    "ignore_php_platform_requirements": {
-        "8.2": true
-    }
 }
diff --git 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
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -759,9 +759,6 @@
             )
         )]]></code>
     </InternalClass>
-    <MixedAssignment>
-      <code>$value</code>
-    </MixedAssignment>
     <MixedOperand>
       <code>$value</code>
     </MixedOperand>

diff --git 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
@@ -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
@@ -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
@@ -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());