Enhance callPrivateConstructor() test helper method

Author: cedric-anne

phpunit/GLPITestCase.php

@@ -191,12 +191,13 @@ protected function callPrivateMethod($instance, string $methodName, ...$args)
     /**
      * Call a private constructor, and get the created instance.
      *
-     * @param string    $classname  Class to instanciate
-     * @param mixed     $arg        Constructor arguments
+     * @template T
+     * @param class-string<T>   $classname  Class to instanciate
+     * @param array             $args       Constructor arguments
      *
-     * @return mixed
+     * @return T
      */
-    protected function callPrivateConstructor($classname, $args)
+    protected function callPrivateConstructor(string $classname, array $args = [])
     {
         $class = new ReflectionClass($classname);
         $instance = $class->newInstanceWithoutConstructor();

tests/GLPITestCase.php

@@ -148,26 +148,6 @@ protected function callPrivateMethod($instance, string $methodName, ...$args)
         return $method->invoke($instance, ...$args);
     }
 
-    /**
-     * Call a private constructor, and get the created instance.
-     *
-     * @param string    $classname  Class to instanciate
-     * @param mixed     $arg        Constructor arguments
-     *
-     * @return mixed
-     */
-    protected function callPrivateConstructor($classname, $args)
-    {
-        $class = new ReflectionClass($classname);
-        $instance = $class->newInstanceWithoutConstructor();
-
-        $constructor = $class->getConstructor();
-        $constructor->setAccessible(true);
-        $constructor->invokeArgs($instance, $args);
-
-        return $instance;
-    }
-
     protected function resetSession()
     {
         Session::destroy();