Added template annotations to getInstanceOfClass methods

researchgate · Jan 4, 2022 · 4e7165c · 4e7165c
1 parent 8f6a3f9
commit 4e7165c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/src/rg/injektor/DependencyInjectionContainer.php b/src/rg/injektor/DependencyInjectionContainer.php
@@ -139,9 +139,12 @@ protected function checkForInjectionLoop($className) {
     }
 
     /**
-     * @param string $fullClassName
+     * @template InstanceType
+     *
+     * @param class-string<InstanceType> $fullClassName
      * @param array $constructorArguments
-     * @return object
+     *
+     * @return InstanceType
      */
     public function getInstanceOfClass($fullClassName, array $constructorArguments = array()) {
         $this->iterationDepth++;

diff --git a/src/rg/injektor/FactoryDependencyInjectionContainer.php b/src/rg/injektor/FactoryDependencyInjectionContainer.php
@@ -16,19 +16,22 @@ class FactoryDependencyInjectionContainer extends DependencyInjectionContainer {
     public static $prefix = '';
 
     /**
-     * @param string $className
+     * @template InstanceType
+     *
+     * @param class-string<InstanceType> $fullClassName
      * @param array $constructorArguments
-     * @return object
+     *
+     * @return InstanceType
      */
-    public function getInstanceOfClass($className, array $constructorArguments = array()) {
-        $fullFactoryClassName = $this->getFullFactoryClassName($className);
-        $factoryClassName = $this->getFactoryClassName($className);
+    public function getInstanceOfClass($fullClassName, array $constructorArguments = array()) {
+        $fullFactoryClassName = $this->getFullFactoryClassName($fullClassName);
+        $factoryClassName = $this->getFactoryClassName($fullClassName);
 
         if ($this->factoryClassExists($fullFactoryClassName, $factoryClassName)) {
             return $fullFactoryClassName::getInstance($constructorArguments);
         }
 
-        return parent::getInstanceOfClass($className, $constructorArguments);
+        return parent::getInstanceOfClass($fullClassName, $constructorArguments);
     }
 
     /**

diff --git a/src/rg/injektor/FactoryOnlyDependencyInjectionContainer.php b/src/rg/injektor/FactoryOnlyDependencyInjectionContainer.php
@@ -12,17 +12,20 @@
 class FactoryOnlyDependencyInjectionContainer extends FactoryDependencyInjectionContainer {
 
     /**
-     * @param string $className
+     * @template InstanceType
+     *
+     * @param class-string<InstanceType> $fullClassName
      * @param array $constructorArguments
+     *
+     * @return InstanceType
      * @throws InjectionException
-     * @return object
      */
-    public function getInstanceOfClass($className, array $constructorArguments = array()) {
-        $className = trim($className, '\\');
-        $classConfig = $this->config->getClassConfig($className);
-        $className = $this->getRealConfiguredClassName($classConfig, new \ReflectionClass($className));
-        $fullFactoryClassName = $this->getFullFactoryClassName($className);
-        $factoryClassName = $this->getFactoryClassName($className);
+    public function getInstanceOfClass($fullClassName, array $constructorArguments = array()) {
+        $fullClassName = trim($fullClassName, '\\');
+        $classConfig = $this->config->getClassConfig($fullClassName);
+        $fullClassName = $this->getRealConfiguredClassName($classConfig, new \ReflectionClass($fullClassName));
+        $fullFactoryClassName = $this->getFullFactoryClassName($fullClassName);
+        $factoryClassName = $this->getFactoryClassName($fullClassName);
 
         if ($this->factoryClassExists($fullFactoryClassName, $factoryClassName)) {
             return $fullFactoryClassName::getInstance($constructorArguments);