refactor(ArrayLikeTransformerTrait): Cleanup.

rekalogika · Jan 31, 2024 · fbe6c50 · fbe6c50
1 parent 77ea752
commit fbe6c50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * refactor(`ArrayLikeMetadata`): Add `$type`.
 * refactor(`PropertyMapping`): Add `$sourceTypes`.
 * refactor(`TraversableToArrayAccessTransformer`): Refactor for clarity.
+* refactor(`ArrayLikeTransformerTrait`): Cleanup.
 
 ## 0.5.22
 

diff --git a/src/Transformer/Trait/ArrayLikeTransformerTrait.php b/src/Transformer/Trait/ArrayLikeTransformerTrait.php
@@ -44,7 +44,11 @@ private function transformTraversableSource(
          * @var mixed $sourceMemberValue
          */
         foreach ($source as $sourceMemberKey => $sourceMemberValue) {
-            $result = $this->transformMember(
+            /**
+             * @var mixed $key
+             * @var mixed $value
+             */
+            [$key, $value] = $this->transformMember(
                 counter: $i,
                 sourceMemberKey: $sourceMemberKey,
                 sourceMemberValue: $sourceMemberValue,
@@ -53,15 +57,15 @@ private function transformTraversableSource(
                 context: $context,
             );
 
-            yield $result['key'] => $result['value'];
+            yield $key => $value;
 
             $i++;
         }
     }
 
     /**
      * @param null|\ArrayAccess<mixed,mixed>|array<mixed,mixed> $target
-     * @return array{key:mixed,value:mixed}
+     * @return array{0:mixed,1:mixed}
      */
     private function transformMember(
         mixed $sourceMemberKey,
@@ -165,21 +169,15 @@ private function transformMember(
         // the target value
 
         if ($targetMetadata->memberValueIsUntyped()) {
-            return [
-                'key' => $targetMemberKey,
-                'value' => $sourceMemberValue,
-            ];
+            return [$targetMemberKey, $sourceMemberValue];
         }
 
         // if the target value types has a type compatible with the source
         // value, then we use the source value as the target value
 
         foreach ($targetMetadata->getMemberValueTypes() as $memberValueType) {
             if (TypeCheck::isVariableInstanceOf($sourceMemberValue, $memberValueType)) {
-                return [
-                    'key' => $targetMemberKey,
-                    'value' => $sourceMemberValue,
-                ];
+                return [$targetMemberKey, $sourceMemberValue];
             }
         }
 
@@ -219,9 +217,6 @@ private function transformMember(
             path: $path,
         );
 
-        return [
-            'key' => $targetMemberKey,
-            'value' => $targetMemberValue,
-        ];
+        return [$targetMemberKey, $targetMemberValue];
     }
 }