php-java · m3m0r7 · May 2, 2019 · May 2, 2019 · May 2, 2019 · May 2, 2019
diff --git a/src/Exceptions/ConverterException.php b/src/Exceptions/ConverterException.php
diff --git a/src/Exceptions/NormalizerException.php b/src/Exceptions/NormalizerException.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Exceptions;
+
+class NormalizerException extends \Exception
+{
+}
diff --git a/src/Kernel/Mnemonics/_invokevirtual.php b/src/Kernel/Mnemonics/_invokevirtual.php
@@ -10,7 +10,7 @@
 use PHPJava\Utilities\AttributionResolver;
 use PHPJava\Utilities\BinaryTool;
 use PHPJava\Utilities\ClassResolver;
-use PHPJava\Utilities\Converter;
+use PHPJava\Utilities\Normalizer;
 use PHPJava\Utilities\Formatter;
 use PHPJava\Utilities\TypeResolver;
 
@@ -37,7 +37,7 @@ public function execute(): void
                 $arguments[$i] = $this->popFromOperandStack();
             }
 
-            $arguments = Converter::normalizeArguments(
+            $arguments = Normalizer::normalizeValues(
                 $arguments,
                 $signature['arguments']
             );

diff --git a/src/Kernel/Types/_Array/Collection.php b/src/Kernel/Types/_Array/Collection.php
@@ -6,9 +6,10 @@
 use PHPJava\Utilities\Extractor;
 use PHPJava\Utilities\TypeResolver;
 
-class Collection implements \ArrayAccess
+class Collection implements \ArrayAccess, \Countable, \IteratorAggregate
 {
     private $data;
+    private $position = 0;
 
     public function __construct(array &$data, string $type = null)
     {
@@ -54,4 +55,14 @@ public function offsetSet($offset, $value)
     {
         $this->data[$offset] = $value;
     }
+
+    public function count()
+    {
+        return count($this->data);
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->data);
+    }
 }
diff --git a/src/Utilities/Converter.php b/src/Utilities/Converter.php
diff --git a/src/Utilities/Normalizer.php b/src/Utilities/Normalizer.php
@@ -0,0 +1,57 @@
+<?php
+namespace PHPJava\Utilities;
+
+use PHPJava\Exceptions\NormalizerException;
+use PHPJava\Kernel\Types\_Array\Collection;
+use PHPJava\Kernel\Types\Type;
+
+class Normalizer
+{
+
+    /**
+     * @param array|Collection $values
+     * @param array $normalizeTypes
+     * @return array|Collection
+     * @throws NormalizerException
+     */
+    public static function normalizeValues($values, array $normalizeTypes)
+    {
+        if (count($values) !== count($normalizeTypes)) {
+            throw new NormalizerException('Does not match arguments.');
+        }
+
+        foreach ($values as $key => &$value) {
+            $realType = $normalizeTypes[$key] ?? null;
+            if ($realType === null) {
+                throw new NormalizerException('Broken arguments parser.');
+            }
+            /**
+             * @var Type|Collection $value
+             */
+            if ($value instanceof Collection) {
+                $value = static::normalizeValues(
+                    $value,
+                    array_fill(
+                        0,
+                        count($value),
+                        $realType
+                    )
+                );
+                continue;
+            }
+            if ($realType['type'] === 'class') {
+                // TODO: implements up-cast and down-cast
+                continue;
+            }
+            $initiateClass = TypeResolver::TYPES_MAP[$realType['type']];
+            if ($value instanceof $initiateClass) {
+                continue;
+            }
+            $value = new $initiateClass(
+                Extractor::realValue($value)
+            );
+        }
+
+        return $values;
+    }
+}