types refactoring

Author: vearutop

src/ArrayFlavour/Items.php

@@ -8,7 +8,10 @@
 
 class Items extends AbstractConstraint implements Schematic
 {
-    const KEY = 'items';
+    public static function getSchemaKey()
+    {
+        return 'items';
+    }
 
     /**
      * @var Schema

src/ArrayFlavour/MinItems.php

@@ -9,7 +9,10 @@
 
 class MinItems extends AbstractConstraint implements Flavour
 {
-    const KEY = 'minItems';
+    public static function getSchemaKey()
+    {
+        return 'minItems';
+    }
 
     /** @var int */
     public $minItems;

src/Constraint.php

@@ -4,7 +4,6 @@
 
 interface Constraint
 {
-    const KEY = '';
-
+    public static function getSchemaKey();
     public function setOwnerSchema(Schema $ownerSchema);
 }

src/Logic/AllOf.php

@@ -10,7 +10,10 @@
 
 class AllOf extends AbstractConstraint implements Transformer, Constraint
 {
-    const KEY = 'allOf';
+    public static function getSchemaKey()
+    {
+        return 'allOf';
+    }
 
     /** @var Schema[] */
     private $composition;

src/ObjectFlavour/AdditionalProperties.php

@@ -9,7 +9,10 @@
 
 class AdditionalProperties extends AbstractConstraint implements Schematic
 {
-    const KEY = 'additionalProperties';
+    public static function getSchemaKey()
+    {
+        return 'additionalProperties';
+    }
 
     /**
      * @var Schema

src/ObjectFlavour/Properties.php

@@ -10,7 +10,10 @@
 
 class Properties extends AbstractConstraint implements Schematic
 {
-    const KEY = 'properties';
+    public static function getSchemaKey()
+    {
+        return 'properties';
+    }
 
     /**
      * @var Schema[]

src/Ref.php

@@ -5,7 +5,10 @@
 
 class Ref extends AbstractConstraint implements Transformer, Constraint
 {
-    const KEY = '$ref';
+    public static function getSchemaKey()
+    {
+        return '$ref';
+    }
 
     public $ref;
 

src/Schema.php

@@ -92,25 +92,25 @@ public function __construct($schemaValue = null, Schema $parentSchema = null)
         foreach ($schemaValue as $constraintName => $constraintData) {
             $constraint = null;
             switch ($constraintName) {
-                case Type::KEY:
-                    $constraint = Type::factory($constraintData, $this);
+                case Type::getSchemaKey():
+                    $constraint = new Type($constraintData, $this);
                     break;
-                case Properties::KEY:
+                case Properties::getSchemaKey():
                     $constraint = new Properties($constraintData, $this);
                     break;
-                case AdditionalProperties::KEY:
+                case AdditionalProperties::getSchemaKey():
                     $constraint = new AdditionalProperties($constraintData, $this);
                     break;
-                case Items::KEY:
+                case Items::getSchemaKey():
                     $constraint = new Items($constraintData, $this);
                     break;
-                case Ref::KEY:
+                case Ref::getSchemaKey():
                     $constraint = new Ref($constraintData, $this);
                     break;
-                case AllOf::KEY:
+                case AllOf::getSchemaKey():
                     $constraint = new AllOf($constraintData, $this);
                     break;
-                case MinItems::KEY:
+                case MinItems::getSchemaKey():
                     $constraint = new MinItems($constraintData);
                     break;
             }

src/Structure/ClassStructure.php

@@ -5,6 +5,7 @@
 use Yaoi\Schema\Base;
 use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Schema;
+use Yaoi\Schema\Type;
 use Yaoi\Schema\Types\ObjectType;
 
 abstract class ClassStructure extends Base implements ClassStructureContract
@@ -17,7 +18,7 @@ public static function makeSchema()
         $schema = new Schema();
         $properties = new Properties();
         static::setUpProperties($properties, $schema);
-        $schema->setConstraint(new ObjectType());
+        $schema->setConstraint(new Type(ObjectType::TYPE));
         $schema->setConstraint($properties);
         return $schema;
     }

src/Type.php

@@ -3,16 +3,42 @@
 namespace Yaoi\Schema;
 
 
+use Yaoi\Schema\Types\AbstractType;
 use Yaoi\Schema\Types\ArrayType;
 use Yaoi\Schema\Types\BooleanType;
 use Yaoi\Schema\Types\IntegerType;
 use Yaoi\Schema\Types\NumberType;
 use Yaoi\Schema\Types\ObjectType;
 use Yaoi\Schema\Types\StringType;
 
-class Type
+class Type extends AbstractConstraint implements Transformer
 {
-    const KEY = 'type';
+    public static function getSchemaKey()
+    {
+        return 'type';
+    }
+
+    public function __construct($schemaValue, Schema $ownerSchema = null)
+    {
+        $this->ownerSchema = $ownerSchema;
+        $this->typeHandler = self::factory($schemaValue, $ownerSchema);
+    }
+
+    /**
+     * @var AbstractType
+     */
+    private $typeHandler;
+
+    public function import($data)
+    {
+        return $this->typeHandler->import($data);
+    }
+
+    public function export($data)
+    {
+        return $this->typeHandler->export($data);
+    }
+
 
     public static function factory($schemaValue, Schema $parentSchema = null)
     {
@@ -38,5 +64,7 @@ public static function factory($schemaValue, Schema $parentSchema = null)
         }
     }
 
+    
+    
 
 }