Cleanup

lib/SimpleSAML/Store/StoreFactory.php

@@ -70,7 +70,7 @@ abstract class StoreFactory implements Utils\ClearableState
                         $c
                     );
                 }
-                /** @var \SimpleSAML\Store|false */
+                /** @var \SimpleSAML\Store\StoreInterface|false */
                 self::$instance = new $className();
         }
 

tests/lib/SimpleSAML/Store/RedisStoreTest.php

@@ -112,7 +112,6 @@ class RedisStoreTest extends TestCase
         ], '[ARRAY]', 'simplesaml');
 
         $this->assertInstanceOf(Store\RedisStore::class, $this->store);
-        $this->clearInstance($config, Configuration::class);
     }
 
 
@@ -128,7 +127,6 @@ class RedisStoreTest extends TestCase
         ], '[ARRAY]', 'simplesaml');
 
         $this->assertInstanceOf(Store\RedisStore::class, $this->store);
-        $this->clearInstance($config, Configuration::class);
     }
 
 
@@ -201,18 +199,4 @@ class RedisStoreTest extends TestCase
 
         $this->assertNull($res);
     }
-
-
-    /**
-     * @param \SimpleSAML\Configuration $service
-     * @param class-string $className
-     */
-    protected function clearInstance(Configuration $service, string $className): void
-    {
-        $reflectedClass = new ReflectionClass($className);
-        $reflectedInstance = $reflectedClass->getProperty('instance');
-        $reflectedInstance->setAccessible(true);
-        $reflectedInstance->setValue($service, []);
-        $reflectedInstance->setAccessible(false);
-    }
 }

tests/lib/SimpleSAML/Store/SQLStoreTest.php

@@ -144,26 +144,4 @@ class SQLStoreTest extends TestCase
 
         $this->assertNull($value);
     }
-
-
-    /**
-     */
-    protected function tearDown(): void
-    {
-        $this->clearInstance(Configuration::getInstance(), Configuration::class);
-    }
-
-
-    /**
-     * @param \SimpleSAML\Configuration $service
-     * @param class-string $className
-     */
-    protected function clearInstance(Configuration $service, string $className): void
-    {
-        $reflectedClass = new ReflectionClass($className);
-        $reflectedInstance = $reflectedClass->getProperty('instance');
-        $reflectedInstance->setAccessible(true);
-        $reflectedInstance->setValue($service, []);
-        $reflectedInstance->setAccessible(false);
-    }
 }