Merge pull request #264 from boesing/qa/remove-php-8.0

Remove PHP 8.0 support
laminas · Jul 17, 2023 · 1e687c0 · 1e687c0
2 parents 970b4a9 + d91638e
commit 1e687c0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "process-timeout": 600,
         "sort-packages": true,
         "platform": {
-            "php": "8.0.99"
+            "php": "8.1.99"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
@@ -34,10 +34,10 @@
         }
     },
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0",
         "laminas/laminas-cache-storage-implementation": "1.0",
         "laminas/laminas-eventmanager": "^3.4",
-        "laminas/laminas-servicemanager": "^3.18.0",
+        "laminas/laminas-servicemanager": "^3.21",
         "laminas/laminas-stdlib": "^3.6",
         "psr/cache": "^1.0",
         "psr/simple-cache": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/test/Psr/SimpleCache/SimpleCacheDecoratorTest.php b/test/Psr/SimpleCache/SimpleCacheDecoratorTest.php
@@ -128,7 +128,6 @@ private function mockCapabilities(
     public function setSuccessReference(SimpleCacheDecorator $cache, bool $success): void
     {
         $r = new ReflectionProperty($cache, 'success');
-        $r->setAccessible(true);
         $r->setValue($cache, $success);
     }
 

diff --git a/test/Storage/Adapter/AbstractAdapterTest.php b/test/Storage/Adapter/AbstractAdapterTest.php
@@ -161,8 +161,7 @@ public function testInternalTriggerPre(): void
         ]);
 
         // call protected method
-        $method = new ReflectionMethod($storage::class, 'triggerPre');
-        $method->setAccessible(true);
+        $method       = new ReflectionMethod($storage::class, 'triggerPre');
         $rsCollection = $method->invoke($storage, 'setItem', $params);
         self::assertInstanceOf(ResponseCollection::class, $rsCollection);
 
@@ -192,7 +191,6 @@ public function testInternalTriggerPost(): void
 
         // call protected method
         $method = new ReflectionMethod($storage::class, 'triggerPost');
-        $method->setAccessible(true);
         $result = $method->invokeArgs($storage, ['setItem', $params, &$result]);
 
         // test called event
@@ -225,7 +223,6 @@ public function testInternalTriggerExceptionThrowRuntimeException(): void
 
         // call protected method
         $method = new ReflectionMethod($storage::class, 'triggerException');
-        $method->setAccessible(true);
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('test');

diff --git a/test/Storage/AdapterPluginManagerTest.php b/test/Storage/AdapterPluginManagerTest.php
@@ -34,7 +34,7 @@ public function testPluginAliasesResolve(string $alias, string $expected)
         $this->addToAssertionCount(1);
     }
 
-    protected function getPluginManager(): AdapterPluginManager
+    protected static function getPluginManager(): AdapterPluginManager
     {
         return new AdapterPluginManager(new ServiceManager());
     }

diff --git a/test/Storage/PluginManagerTest.php b/test/Storage/PluginManagerTest.php
@@ -14,7 +14,7 @@ class PluginManagerTest extends TestCase
 {
     use CommonPluginManagerTrait;
 
-    protected function getPluginManager(): PluginManager
+    protected static function getPluginManager(): PluginManager
     {
         return new PluginManager(new ServiceManager());
     }