improve

yiisoft · Mar 3, 2024 · 23e3ff7 · 23e3ff7
1 parent e6c3e9b
commit 23e3ff7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/src/ArrayDefinition.php b/src/ArrayDefinition.php
@@ -60,20 +60,16 @@ public function withReferenceContainer(?ContainerInterface $referenceContainer):
     }
 
     /**
-     * Create ArrayDefinition from array config.
+     * Create `ArrayDefinition` from array config.
      *
      * @psalm-param ArrayDefinitionConfig $config
      */
     public static function fromConfig(array $config): self
     {
-        /**
-         * @psalm-suppress MixedArgument
-         */
         return new self(
             $config[self::CLASS_NAME],
             $config[self::CONSTRUCTOR] ?? [],
-            // Already normalized config. Ignore all the rest parameters
-            $config['methodsAndProperties'] ?? self::getMethodsAndPropertiesFromConfig($config),
+            self::getMethodsAndPropertiesFromConfig($config),
         );
     }
 

diff --git a/src/LazyDefinition.php b/src/LazyDefinition.php
@@ -25,19 +25,12 @@ public function resolve(ContainerInterface $container): VirtualProxyInterface
     {
         /** @var LazyLoadingValueHolderFactory $factory */
         $factory = $container->get(LazyLoadingValueHolderFactory::class);
-        /**
-         * @var mixed $definition
-         */
         $definition = $this->definition;
-        $class = $this->class;
 
         return $factory->createProxy(
-            $class,
-            static function (mixed &$wrappedObject) use ($container, $class, $definition) {
-                $definition = Normalizer::normalize($definition, $class);
-                /**
-                 * @var mixed $wrappedObject
-                 */
+            $this->class,
+            static function (mixed &$wrappedObject) use ($container, $definition) {
+                $definition = Normalizer::normalize($definition);
                 $wrappedObject = $definition->resolve($container);
                 return true;
             }