- fixes the ReflectionParameter::getClass() deprecation (PHP 8)

- uses the extended container interface
- visibility lowered for some methods

Author: kodeart

DIReflector.php

@@ -21,9 +21,9 @@
 use ReflectionParameter;
 use Throwable;
 
-final class DIReflector
+class DIReflector
 {
-    public function newInstance(DIContainer $container, string $class, array $arguments): object
+    public function newInstance(DIContainerInterface $container, string $class, array $arguments): object
     {
         $dependency  = new ReflectionClass($class);
         $constructor = $dependency->getConstructor();
@@ -44,14 +44,14 @@ public function newInstance(DIContainer $container, string $class, array $argume
     }
 
     /**
-     * @param DIContainer                           $container
+     * @param DIContainerInterface                  $container
      * @param ReflectionFunction | ReflectionMethod $method
      * @param array                                 $arguments
      *
      * @return array
      */
     public function processMethodArguments(
-        DIContainer $container,
+        DIContainerInterface $container,
         ReflectionFunctionAbstract $method,
         array $arguments
     ): array {
@@ -102,9 +102,12 @@ public function newMethodFromCallable(callable $callable): ReflectionFunctionAbs
         }
     }
 
-    private function getFromParameterType(DIContainer $container, ReflectionParameter $parameter, array $arguments)
-    {
-        if (!$dependency = $parameter->getClass()) {
+    protected function getFromParameterType(
+        DIContainerInterface $container,
+        ReflectionParameter $parameter,
+        array $arguments
+    ) {
+        if (!$class = $parameter->getType()) {
             return $arguments[$parameter->getPosition()]
                 ?? $this->getFromParameter($container, $parameter);
         }
@@ -118,13 +121,13 @@ private function getFromParameterType(DIContainer $container, ReflectionParamete
             return $parameter->getDefaultValue();
         }
 
-        return $container->new($dependency->name);
+        return $container->new($class);
     }
 
-    private function getFromParameter(DIContainer $container, ReflectionParameter $parameter)
+    protected function getFromParameter(DIContainerInterface $container, ReflectionParameter $parameter)
     {
         $storage = $container->getStorage();
-        $name    = ($parameter->getClass() ?: $parameter)->name;
+        $name    = ($parameter->getType() ?? $parameter)->getName();
 
         if (isset($storage[DIContainer::BINDINGS][$name])) {
             $name = $storage[DIContainer::BINDINGS][$name];