Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions classes/DefaultArgumentRemoverReturnTypes100.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions classes/DefaultArgumentRemoverReturnTypes120.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions classes/PHPMock.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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);

Expand Down
23 changes: 23 additions & 0 deletions classes/ReflectionHelper.php
Original file line number Diff line number Diff line change
@@ -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);
}
}
3 changes: 2 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.3/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
displayDetailsOnTestsThatTriggerDeprecations="true"
bootstrap="vendor/autoload.php">
<testsuite name="Unit tests">
<directory>tests/</directory>
Expand Down
4 changes: 2 additions & 2 deletions tests/MockObjectProxyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand All @@ -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();
}

Expand Down