further

vearutop · vearutop · commit b6da16178b6e · 2016-06-24T01:06:42.000+07:00
diff --git a/src/ArrayFlavour/Items.php b/src/ArrayFlavour/Items.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Yaoi\Schema;
+namespace Yaoi\Schema\ArrayFlavour;
 
 
-class Items extends AbstractConstraint implements Constraint
+use Yaoi\Schema\AbstractConstraint;
+use Yaoi\Schema\Schema;
+
+class Items extends AbstractConstraint
 {
     const KEY = 'items';
 
diff --git a/src/ArrayFlavour/MinItems.php b/src/ArrayFlavour/MinItems.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Yaoi\Schema\ArrayFlavour;
+
+
+use Yaoi\Schema\AbstractConstraint;
+use Yaoi\Schema\Validator;
+
+class MinItems extends AbstractConstraint implements Validator
+{
+    /** @var int */
+    private $minItems;
+    public function __construct($minItems)
+    {
+        $this->minItems = $minItems;
+    }
+
+
+    public function isValid($data)
+    {
+        return count($data) >= $this->minItems;
+    }
+
+}
diff --git a/src/CodeBuilder/PHPCodeBuilder.php b/src/CodeBuilder/PHPCodeBuilder.php
@@ -4,7 +4,7 @@
 
 use Yaoi\Schema\CodeBuilder\Templates\ClassStructurePhp;
 use Yaoi\Schema\Exception;
-use Yaoi\Schema\Properties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Ref;
 use Yaoi\Schema\Schema;
 use Yaoi\Schema\Types\ArrayType;
diff --git a/src/CodeBuilder/Templates/ClassStructurePhp.php b/src/CodeBuilder/Templates/ClassStructurePhp.php
@@ -5,7 +5,7 @@
 
 use Yaoi\Schema\Base;
 use Yaoi\Schema\CodeBuilder\PHPCodeBuilder;
-use Yaoi\Schema\Properties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Schema;
 
 /**
diff --git a/src/ObjectFlavour/AdditionalProperties.php b/src/ObjectFlavour/AdditionalProperties.php
@@ -1,8 +1,12 @@
 <?php
 
-namespace Yaoi\Schema;
+namespace Yaoi\Schema\ObjectFlavour;
 
 
+use Yaoi\Schema\AbstractConstraint;
+use Yaoi\Schema\Constraint;
+use Yaoi\Schema\Schema;
+
 class AdditionalProperties extends AbstractConstraint implements Constraint
 {
     const KEY = 'additionalProperties';
diff --git a/src/ObjectFlavour/Properties.php b/src/ObjectFlavour/Properties.php
@@ -1,8 +1,13 @@
 <?php
 
-namespace Yaoi\Schema;
+namespace Yaoi\Schema\ObjectFlavour;
 
 
+use Yaoi\Schema\AbstractConstraint;
+use Yaoi\Schema\Constraint;
+use Yaoi\Schema\Exception;
+use Yaoi\Schema\Schema;
+
 class Properties extends AbstractConstraint implements Constraint
 {
     const KEY = 'properties';
diff --git a/src/Schema.php b/src/Schema.php
@@ -3,7 +3,10 @@
 namespace Yaoi\Schema;
 
 
+use Yaoi\Schema\ArrayFlavour\Items;
 use Yaoi\Schema\Logic\AllOf;
+use Yaoi\Schema\ObjectFlavour\AdditionalProperties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 
 /**
  * @method static Schema create($schemaValue = null, Schema $parentSchema = null)
@@ -85,6 +88,9 @@ public function __construct($schemaValue = null, Schema $parentSchema = null)
                 case AdditionalProperties::KEY:
                     $constraint = new AdditionalProperties($constraintData, $this);
                     break;
+                case Items::KEY:
+                    $constraint = new Items($constraintData, $this);
+                    break;
                 case Ref::KEY:
                     $constraint = new Ref($constraintData, $this);
                     break;
diff --git a/src/Structure/ClassStructure.php b/src/Structure/ClassStructure.php
@@ -3,7 +3,7 @@
 namespace Yaoi\Schema\Structure;
 
 use Yaoi\Schema\Base;
-use Yaoi\Schema\Properties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Schema;
 use Yaoi\Schema\Types\ObjectType;
 
diff --git a/src/Structure/ClassStructureContract.php b/src/Structure/ClassStructureContract.php
@@ -2,7 +2,7 @@
 
 namespace Yaoi\Schema\Structure;
 
-use Yaoi\Schema\Properties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Schema;
 
 interface ClassStructureContract
diff --git a/src/Type.php b/src/Type.php
@@ -21,17 +21,17 @@ public static function factory($schemaValue, Schema $parentSchema = null)
         }
         
         switch ($schemaValue) {
-            case ObjectType::TYPE_OBJECT:
+            case ObjectType::TYPE:
                 return new ObjectType($parentSchema);
-            case StringType::TYPE_STRING:
+            case StringType::TYPE:
                 return new StringType($parentSchema);
-            case IntegerType::TYPE_INTEGER:
+            case IntegerType::TYPE:
                 return new IntegerType($parentSchema);
-            case NumberType::TYPE_NUMBER:
+            case NumberType::TYPE:
                 return new NumberType($parentSchema);
-            case BooleanType::TYPE_BOOLEAN:
+            case BooleanType::TYPE:
                 return new BooleanType($parentSchema);
-            case ArrayType::TYPE_ARRAY:
+            case ArrayType::TYPE:
                 return new ArrayType($parentSchema);
             default:
                 throw new Exception('Unknown type ' . $schemaValue);
diff --git a/src/Types/AbstractType.php b/src/Types/AbstractType.php
@@ -3,20 +3,34 @@
 namespace Yaoi\Schema\Types;
 
 use Yaoi\Schema\AbstractConstraint;
+use Yaoi\Schema\Constraint;
 use Yaoi\Schema\Schema;
 use Yaoi\Schema\Type;
 use Yaoi\Schema\TypeConstraint;
 
 class AbstractType extends AbstractConstraint implements TypeConstraint
 {
+    const TYPE = null;
+
     public function __construct(Schema $ownerSchema = null)
     {
         $this->ownerSchema = $ownerSchema;
     }
 
-    public static function makeSchema()
+    /**
+     * @param Constraint $constraint
+     * @return Schema
+     */
+    public static function makeSchema($constraint = null)
     {
-        return new Schema(array(Type::KEY => StringType::TYPE_STRING));
+        $schema = new Schema(array(Type::KEY => static::TYPE));
+        if ($constraint) {
+            $constraints = func_get_args();
+            foreach ($constraints as $constraintItem) {
+                $schema->setConstraint($constraintItem);
+            }
+        }
+        return $schema;
     }
 
 
diff --git a/src/Types/ArrayType.php b/src/Types/ArrayType.php
@@ -3,26 +3,41 @@
 namespace Yaoi\Schema\Types;
 
 use Yaoi\Schema\Exception;
+use Yaoi\Schema\ArrayFlavour\Items;
 use Yaoi\Schema\Transformer;
 
 class ArrayType extends AbstractType implements Transformer
 {
-    const TYPE_ARRAY = 'array';
+    const TYPE = 'array';
 
     public function import($data)
     {
         if (!is_array($data)) {
             throw new Exception('Array expected');
         }
-        return $data;
+        $result = array();
+        if ($items = Items::getFromSchema($this->ownerSchema)) {
+            foreach ($data as $name => $value) {
+                $result[$name] = $items->itemsSchema->import($value);
+                unset($data[$name]);
+            }
+        }
+        return $result;
     }
 
     public function export($data)
     {
         if (!is_array($data)) {
             throw new Exception('Array expected');
         }
-        return $data;
+        $result = array();
+        if ($items = Items::getFromSchema($this->ownerSchema)) {
+            foreach ($data as $name => $value) {
+                $result[$name] = $items->itemsSchema->export($value);
+                unset($data[$name]);
+            }
+        }
+        return $result;
     }
 
 
diff --git a/src/Types/BooleanType.php b/src/Types/BooleanType.php
@@ -6,7 +6,7 @@
 
 class BooleanType extends AbstractType implements Validator
 {
-    const TYPE_BOOLEAN = 'boolean';
+    const TYPE = 'boolean';
 
     public function isValid($data)
     {
diff --git a/src/Types/IntegerType.php b/src/Types/IntegerType.php
@@ -6,7 +6,7 @@
 
 class IntegerType extends AbstractType implements Validator
 {
-    const TYPE_INTEGER = 'integer';
+    const TYPE = 'integer';
 
     public function isValid($data)
     {
diff --git a/src/Types/MultiType.php b/src/Types/MultiType.php
@@ -2,6 +2,7 @@
 
 namespace Yaoi\Schema\Types;
 
+use Yaoi\Schema\Exception;
 use Yaoi\Schema\Transformer;
 
 // TODO build automatically
@@ -11,13 +12,20 @@ class MultiType extends AbstractType implements Transformer
 
     public function import($data)
     {
+        throw new Exception('Implement me');
         // TODO: Implement import() method.
     }
 
     public function export($data)
     {
+        throw new Exception('Implement me');
         // TODO: Implement export() method.
     }
 
+    public static function makeSchema()
+    {
+        throw new Exception('Implement me');
+        // TODO: Change the autogenerated stub
+    }
 
 }
diff --git a/src/Types/NumberType.php b/src/Types/NumberType.php
@@ -6,7 +6,7 @@
 
 class NumberType extends AbstractType implements Validator
 {
-    const TYPE_NUMBER = 'number';
+    const TYPE = 'number';
 
     public function isValid($data)
     {
diff --git a/src/Types/ObjectType.php b/src/Types/ObjectType.php
@@ -2,14 +2,14 @@
 
 namespace Yaoi\Schema\Types;
 
-use Yaoi\Schema\AdditionalProperties;
+use Yaoi\Schema\ObjectFlavour\AdditionalProperties;
 use Yaoi\Schema\Exception;
-use Yaoi\Schema\Properties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Transformer;
 
 class ObjectType extends AbstractType implements Transformer
 {
-    const TYPE_OBJECT = 'object';
+    const TYPE = 'object';
 
     public function import($data)
     {
diff --git a/src/Types/StringType.php b/src/Types/StringType.php
@@ -6,7 +6,7 @@
 
 class StringType extends AbstractType implements Validator, TypeConstraint
 {
-    const TYPE_STRING = 'string';
+    const TYPE = 'string';
 
     public function isValid($data)
     {
diff --git a/tests/src/ArrayTest.php b/tests/src/ArrayTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Yaoi\Schema\Tests;
+
+use Yaoi\Schema\ArrayFlavour\Items;
+use Yaoi\Schema\Schema;
+use Yaoi\Schema\Types\ArrayType;
+use Yaoi\Schema\Types\IntegerType;
+use Yaoi\Schema\Types\StringType;
+
+class ArrayTest extends \PHPUnit_Framework_TestCase
+{
+    public function testItems()
+    {
+        $data = array(1, 2, 3);
+        $schema = ArrayType::makeSchema(new Items(IntegerType::makeSchema()));
+        $this->assertSame($data, $schema->import($data));
+    }
+
+    public function testItemsInvalid()
+    {
+        $data = array(1, 2, 3);
+        $schema = ArrayType::makeSchema(new Items(StringType::makeSchema()));
+        $this->assertSame($data, $schema->import($data));
+    }
+
+}
diff --git a/tests/src/Helper/SampleStructure.php b/tests/src/Helper/SampleStructure.php
@@ -15,7 +15,7 @@
 class SampleStructure extends ClassStructure
 {
     /**
-     * @param \Yaoi\Schema\Properties|static $properties
+     * @param \Yaoi\Schema\ObjectFlavour\Properties|static $properties
      * @param Schema $schema
      */
     public static function setUpProperties($properties, Schema $schema)
diff --git a/tests/src/Schema/ParentTest.php b/tests/src/Schema/ParentTest.php
@@ -4,7 +4,7 @@
 
 
 use Yaoi\Schema\Exception;
-use Yaoi\Schema\Properties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Schema;
 
 class ParentTest extends \PHPUnit_Framework_TestCase
