Migrate unit tests to PHPunit 11.x

tvdijen · tvdijen · commit 77b3d3a9ea72 · 2024-04-06T20:22:52.000+02:00
diff --git a/tests/src/SimpleSAML/Store/StoreFactoryTest.php b/tests/src/SimpleSAML/Store/StoreFactoryTest.php
@@ -173,13 +173,10 @@ protected function tearDown(): void
     protected function clearInstance($service, string $className): void
     {
         $reflectedClass = new ReflectionClass($className);
-        $reflectedInstance = $reflectedClass->getProperty('instance');
-        $reflectedInstance->setAccessible(true);
         if ($service instanceof Configuration) {
-            $reflectedInstance->setValue($service, []);
+            $reflectedClass->setStaticPropertyValue('instance', []);
         } else {
-            $reflectedInstance->setValue($service, null);
+            $reflectedClass->setStaticPropertyValue('instance', null);
         }
-        $reflectedInstance->setAccessible(false);
     }
 }
diff --git a/tests/src/SimpleSAML/Utils/TimeTest.php b/tests/src/SimpleSAML/Utils/TimeTest.php
@@ -6,7 +6,7 @@
 
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
-use ReflectionProperty;
+use ReflectionClass;
 use SimpleSAML\{Configuration, Error, Utils};
 
 use function date_default_timezone_get;
@@ -56,9 +56,8 @@ public function testInitTimezone(): void
         $this->assertEquals($os, @date_default_timezone_get());
 
         // clear initialization
-        $c = new ReflectionProperty('\SimpleSAML\Utils\Time', 'tz_initialized');
-        $c->setAccessible(true);
-        $c->setValue(false);
+        $c = new ReflectionClass(Utils\Time::class);
+        $c->setStaticPropertyValue('tz_initialized', false);
 
         // test unknown timezone
         Configuration::loadFromArray(['timezone' => 'INVALID'], '[ARRAY]', 'simplesaml');

Original file line number	Diff line number	Diff line change
`@@ -173,13 +173,10 @@ protected function tearDown(): void`
`173`	`173`	`protected function clearInstance($service, string $className): void`
`174`	`174`	`{`
`175`	`175`	`$reflectedClass = new ReflectionClass($className);`
`176`		`- $reflectedInstance = $reflectedClass->getProperty('instance');`
`177`		`- $reflectedInstance->setAccessible(true);`
`178`	`176`	`if ($service instanceof Configuration) {`
`179`		`- $reflectedInstance->setValue($service, []);`
	`177`	`+ $reflectedClass->setStaticPropertyValue('instance', []);`
`180`	`178`	`} else {`
`181`		`- $reflectedInstance->setValue($service, null);`
	`179`	`+ $reflectedClass->setStaticPropertyValue('instance', null);`
`182`	`180`	`}`
`183`		`- $reflectedInstance->setAccessible(false);`
`184`	`181`	`}`
`185`	`182`	`}`