Rename

m3m0r7 · m3m0r7 · commit e7c3a432f9f1 · 2019-05-02T11:21:39.000+09:00
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/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/Normalizer.php b/src/Utilities/Normalizer.php
@@ -1,48 +1,57 @@
 <?php
 namespace PHPJava\Utilities;
 
-use PHPJava\Exceptions\ConverterException;
+use PHPJava\Exceptions\NormalizerException;
 use PHPJava\Kernel\Types\_Array\Collection;
 use PHPJava\Kernel\Types\Type;
 
 class Normalizer
 {
 
     /**
-     * @param array $arguments
-     * @param array $acceptedArguments
+     * @param array|Collection $values
+     * @param array $normalizeTypes
      * @return array
-     * @throws ConverterException
+     * @throws NormalizerException
      */
-    public static function normalizeArguments(array $arguments, array $acceptedArguments): array
+    public static function normalizeValues($values, array $normalizeTypes)
     {
-        if (count($arguments) !== count($acceptedArguments)) {
-            throw new ConverterException('Does not match arguments.');
+        if (count($values) !== count($normalizeTypes)) {
+            throw new NormalizerException('Does not match arguments.');
         }
 
-        foreach ($arguments as $key => &$argument) {
+        foreach ($values as $key => &$value) {
+            $realType = $normalizeTypes[$key] ?? null;
+            if ($realType === null) {
+                throw new NormalizerException('Broken arguments parser.');
+            }
             /**
-             * @var Type|Collection $argument
+             * @var Type|Collection $value
              */
-            if ($argument instanceof Collection) {
-                // TODO: convert an array contents.
+            if ($value instanceof Collection) {
+                $value = static::normalizeValues(
+                    $value,
+                    array_fill(
+                        0,
+                        count($value),
+                        $realType
+                    )
+                );
                 continue;
             }
-            $realType = $acceptedArguments[$key] ?? null;
-            if ($realType === null) {
-                throw new ConverterException('Broken arguments parser.');
-            }
             if ($realType['type'] === 'class') {
                 // TODO: implements up-cast and down-cast
                 continue;
             }
             $initiateClass = TypeResolver::TYPES_MAP[$realType['type']];
-            if ($argument instanceof $initiateClass) {
+            if ($value instanceof $initiateClass) {
                 continue;
             }
-            $argument = new $initiateClass(Extractor::realValue($argument));
+            $value = new $initiateClass(
+                Extractor::realValue($value)
+            );
         }
 
-        return $arguments;
+        return $values;
     }
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
 +namespace PHPJava\Exceptions;
++
 +class NormalizerException extends \Exception
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,10 @@`
`6`	`6`	`use PHPJava\Utilities\Extractor;`
`7`	`7`	`use PHPJava\Utilities\TypeResolver;`
`8`	`8`
`9`		`-class Collection implements \ArrayAccess`
	`9`	`+class Collection implements \ArrayAccess, \Countable, \IteratorAggregate`
`10`	`10`	`{`
`11`	`11`	`private $data;`
	`12`	`+ private $position = 0;`
`12`	`13`
`13`	`14`	`public function __construct(array &$data, string $type = null)`
`14`	`15`	`{`
`@@ -54,4 +55,14 @@ public function offsetSet($offset, $value)`
`54`	`55`	`{`
`55`	`56`	`$this->data[$offset] = $value;`
`56`	`57`	`}`
	`58`	`+`
	`59`	`+ public function count()`
	`60`	`+ {`
	`61`	`+ return count($this->data);`
	`62`	`+ }`
	`63`	`+`
	`64`	`+ public function getIterator()`
	`65`	`+ {`
	`66`	`+ return new \ArrayIterator($this->data);`
	`67`	`+ }`
`57`	`68`	`}`