cs and static analise fixes

CuyZ · Sep 9, 2024 · 5c89b51 · 5c89b51
1 parent 6615a0f
commit 5c89b51
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/src/InterfaceResolver.php b/src/InterfaceResolver.php
@@ -2,11 +2,24 @@
 
 namespace CuyZ\Valinor;
 
+/**
+ * @api
+ */
 interface InterfaceResolver
 {
-    public function resolve(string $interface, ?array $props) : ?string;
+    /**
+     * @param array<string,mixed>|null $props
+     * @return class-string|null
+     */
+    public function resolve(string $interface, ?array $props): ?string;
 
-    public function getResolverProps(string $interface) : array;
+    /**
+     * @return string[]
+     */
+    public function getResolverProps(string $interface): array;
 
-    public function transform(object $input, callable $next) : array;
+    /**
+     * @return array<string|int,mixed>
+     */
+    public function transform(object $input, callable $next): array;
 }
diff --git a/src/Library/Settings.php b/src/Library/Settings.php
@@ -60,7 +60,6 @@ final class Settings
     /** @var array<class-string, null> */
     public array $transformerAttributes = [];
 
-    /** @var InterfaceResolver|null */
     public ?InterfaceResolver $interfaceResolver = null;
 
     public function __construct()

diff --git a/src/Mapper/Tree/Builder/InterfaceNodeBuilder.php b/src/Mapper/Tree/Builder/InterfaceNodeBuilder.php
@@ -28,7 +28,7 @@ public function __construct(
         private ObjectImplementations $implementations,
         private ClassDefinitionRepository $classDefinitionRepository,
         private FunctionsContainer $constructors,
-        private InterfaceResolver $interfaceResolver,
+        private ?InterfaceResolver $interfaceResolver,
     ) {}
 
     public function build(Shell $shell, RootNodeBuilder $rootBuilder): TreeNode
@@ -55,17 +55,19 @@ public function build(Shell $shell, RootNodeBuilder $rootBuilder): TreeNode
 
         if (! $this->implementations->has($className)) {
             if ($type instanceof InterfaceType || $this->classDefinitionRepository->for($type)->isAbstract) {
-                 if ($this->interfaceResolver){
+                if ($this->interfaceResolver) {
                     $value = $shell->value();
-                     $resolver_props = [];
-                    foreach($this->interfaceResolver->getResolverProps($className) as $prop){
-                         $resolver_props[$prop] = $value[$prop];
-                         unset($value[$prop]);
-                    }
-                    $resolvedClassName = $this->interfaceResolver->resolve($className, $resolver_props);
-                    if ($resolvedClassName !== null) {
-                        $shell = $shell->withType(new NativeClassType($resolvedClassName))->withValue($value);
-                        return $this->delegate->build($shell, $rootBuilder);
+                    if (is_array($value)) {
+                        $resolver_props = [];
+                        foreach($this->interfaceResolver->getResolverProps($className) as $prop) {
+                            $resolver_props[$prop] = $value[$prop];
+                            unset($value[$prop]);
+                        }
+                        $resolvedClassName = $this->interfaceResolver->resolve($className, $resolver_props);
+                        if ($resolvedClassName !== null) {
+                            $shell = $shell->withType(new NativeClassType($resolvedClassName))->withValue($value);
+                            return $this->delegate->build($shell, $rootBuilder);
+                        }
                     }
                 }
                 throw new CannotResolveObjectType($className);

diff --git a/src/MapperBuilder.php b/src/MapperBuilder.php
@@ -4,7 +4,6 @@
 
 namespace CuyZ\Valinor;
 
-use CuyZ\Valinor\InterfaceResolver;
 use CuyZ\Valinor\Library\Container;
 use CuyZ\Valinor\Library\Settings;
 use CuyZ\Valinor\Mapper\ArgumentsMapper;
@@ -531,10 +530,6 @@ public function registerTransformer(callable|string $transformer, int $priority
         return $clone;
     }
 
-    /**
-     * @param string $factoryClass
-     * @return void
-     */
     public function withInterfaceResolver(InterfaceResolver $resolver): self
     {