refactor: replace setAccessible calls with ReflectionHelper utility

Author: michalbundyra

classes/DefaultArgumentRemoverReturnTypes100.php

@@ -98,13 +98,13 @@ public static function removeDefaultArgumentsWithReflection(Invocation $invocati
         $reflection = new ReflectionClass($invocation);
 
         $reflectionReturnType = $reflection->getProperty('returnType');
-        $reflectionReturnType->setAccessible(true);
+        ReflectionHelper::setAccessible($reflectionReturnType);
 
         $reflectionIsOptional = $reflection->getProperty('isReturnTypeNullable');
-        $reflectionIsOptional->setAccessible(true);
+        ReflectionHelper::setAccessible($reflectionIsOptional);
 
         $reflectionIsProxied = $reflection->getProperty('proxiedCall');
-        $reflectionIsProxied->setAccessible(true);
+        ReflectionHelper::setAccessible($reflectionIsProxied);
 
         $returnType = $reflectionReturnType->getValue($invocation);
         $proxiedCall = $reflectionIsProxied->getValue($invocation);

classes/DefaultArgumentRemoverReturnTypes120.php

@@ -98,10 +98,10 @@ public static function removeDefaultArgumentsWithReflection(Invocation $invocati
         $reflection = new ReflectionClass($invocation);
 
         $reflectionReturnType = $reflection->getProperty('returnType');
-        $reflectionReturnType->setAccessible(true);
+        ReflectionHelper::setAccessible($reflectionReturnType);
 
         $reflectionIsOptional = $reflection->getProperty('isReturnTypeNullable');
-        $reflectionIsOptional->setAccessible(true);
+        ReflectionHelper::setAccessible($reflectionIsOptional);
 
         $returnType = $reflectionReturnType->getValue($invocation);
 

classes/PHPMock.php

@@ -116,19 +116,19 @@ public function registerForTearDown(Deactivatable $deactivatable)
             $facade = Facade::instance();
 
             $property = new ReflectionProperty(Facade::class, 'sealed');
-            $property->setAccessible(true);
+            ReflectionHelper::setAccessible($property);
             $property->setValue($facade, false);
 
             $method = new ReflectionMethod($facade, 'deferredDispatcher');
-            $method->setAccessible(true);
+            ReflectionHelper::setAccessible($method);
             $dispatcher = $method->invoke($facade);
 
             $propDispatcher = new ReflectionProperty($dispatcher, 'dispatcher');
-            $propDispatcher->setAccessible(true);
+            ReflectionHelper::setAccessible($propDispatcher);
             $directDispatcher = $propDispatcher->getValue($dispatcher);
 
             $propSubscribers = new ReflectionProperty($directDispatcher, 'subscribers');
-            $propSubscribers->setAccessible(true);
+            ReflectionHelper::setAccessible($propSubscribers);
 
             $facade->registerSubscriber(
                 new MockDisabler(
@@ -239,7 +239,7 @@ private function prepareCustomTemplates()
                 $reflection = new ReflectionClass($mockMethodClass);
 
                 $reflectionTemplates = $reflection->getProperty('templates');
-                $reflectionTemplates->setAccessible(true);
+                ReflectionHelper::setAccessible($reflectionTemplates);
 
                 $reflectionTemplates->setValue(null, $templates);
 

classes/ReflectionHelper.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace phpmock\phpunit;
+
+/**
+ * @internal
+ */
+final class ReflectionHelper
+{
+    private function __construct()
+    {
+    }
+
+    public static function setAccessible($reflection)
+    {
+        // As of PHP 8.1.0, reflection setAccessible is no-op; all properties are accessible by default.
+        if (PHP_VERSION_ID >= 80100) {
+            return;
+        }
+
+        $reflection->setAccessible(true);
+    }
+}

tests/MockObjectProxyTest.php

@@ -91,7 +91,7 @@ private function getMethodMatcher($invocationMocker)
         ) {
             $reflection = new \ReflectionClass(InvocationMocker::class);
             $property = $reflection->getProperty('matcher');
-            $property->setAccessible(true);
+            ReflectionHelper::setAccessible($property);
             return $property->getValue($invocationMocker)->methodNameRule();
         }
 
@@ -100,7 +100,7 @@ private function getMethodMatcher($invocationMocker)
         ) {
             $reflection = new \ReflectionClass(InvocationMocker::class);
             $property = $reflection->getProperty('matcher');
-            $property->setAccessible(true);
+            ReflectionHelper::setAccessible($property);
             return $property->getValue($invocationMocker)->getMethodNameRule();
         }