Refactor type hints in InstanceContainer, MethodInvoker, and ObjectFactory

Author: rkrx

src/InstanceContainer.php

@@ -9,9 +9,10 @@ interface InstanceContainer {
 	 * If no matching class could be found, it must throw an Ioc\Exceptions\DefinitionNotFoundException.
 	 * $className must be an fully qualified class-name.
 	 *
-	 * @param string $className
+	 * @template T of object
+	 * @param class-string<T> $className
 	 * @throws DefinitionNotFoundException
-	 * @return object
+	 * @return T
 	 */
-	public function get($className);
+	public function get(string $className);
 }

src/MethodInvoker.php

@@ -22,11 +22,12 @@ interface MethodInvoker {
 	 * mixed together. Scalar-types and array-types can not be determined automatically. They must be provided through
 	 * $arguments.
 	 *
-	 * @param callable $callable
-	 * @param array $arguments Must be an array were the keys match to the Variable-Names of the __construct'ors parameters.
-	 * @return mixed
-	 *@throws MissingParameterException
+	 * @template T
+	 * @param callable(mixed ...$args): T $callable
+	 * @param list<mixed> $arguments Must be an array were the keys match to the Variable-Names of the __construct'ors parameters.
+	 * @return T
+	 * @throws MissingParameterException
 	 * @throws DefinitionNotFoundException
 	 */
-	public function invoke($callable, array $arguments = array());
+	public function invoke($callable, array $arguments = []);
 }

src/ObjectFactory.php

@@ -10,11 +10,12 @@ interface ObjectFactory {
 	 * arguments were missing in $arguments, the method-invoker tries to fill the missing arguments by itself.
 	 * If no matching class could be found, it must throw an Ioc\Exceptions\DefinitionNotFoundException.
 	 *
-	 * @param string $className Must be an fully qualified class-name.
-	 * @param array $arguments Must be an array were the keys match to the Variable-Names of the __construct'ors parameters.
-	 * @return mixed
-	 *@throws MissingParameterException
+	 * @template T of object
+	 * @param class-string<T> $className Must be an fully qualified class-name.
+	 * @param list<mixed> $arguments Must be an array were the keys match to the Variable-Names of the __construct'ors parameters.
+	 * @return T
+	 * @throws MissingParameterException
 	 * @throws DefinitionNotFoundException
 	 */
-	public function create($className, array $arguments = array());
+	public function create(string $className, array $arguments = []);
 }