Merge branch 'refac'

# Conflicts:
#	src/Constraint.php

Author: vearutop

src/AbstractConstraint.php

@@ -20,7 +20,7 @@ public function setOwnerSchema(Schema $ownerSchema)
      */
     public static function getFromSchema(Schema $schema)
     {
-        $class = self::className();
+        $class = static::className();
         if (isset($schema->constraints[$class])) {
             return $schema->constraints[$class];
         }

src/AbstractFlavour.php

@@ -3,13 +3,13 @@
 namespace Yaoi\Schema;
 
 
-class AbstractFlavour extends AbstractConstraint implements Flavour
+abstract class AbstractFlavour extends AbstractConstraint implements Flavour
 {
     public $value;
 
-    public function __construct($value)
+    public function __construct($schemaValue, Schema $ownerSchema = null)
     {
-        $this->value = $value;
+        $this->value = $schemaValue;
     }
 
 }

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

@@ -3,25 +3,13 @@
 namespace Yaoi\Schema\ArrayFlavour;
 
 
-use Yaoi\Schema\AbstractConstraint;
+use Yaoi\Schema\AbstractFlavour;
 use Yaoi\Schema\Flavour;
-use Yaoi\Schema\Validator;
 
-class MinItems extends AbstractConstraint implements Flavour
+class MinItems extends AbstractFlavour implements Flavour
 {
-    const KEY = 'minItems';
-
-    /** @var int */
-    public $minItems;
-    public function __construct($minItems)
-    {
-        $this->minItems = $minItems;
-    }
-
-
-    public function isValid($data)
+    public static function getSchemaKey()
     {
-        return count($data) >= $this->minItems;
+        return 'minItems';
     }
-
 }

src/CodeBuilder/PHPCodeBuilder.php

@@ -4,6 +4,7 @@
 
 use Yaoi\Schema\CodeBuilder\Templates\ClassStructurePhp;
 use Yaoi\Schema\Exception;
+use Yaoi\Schema\Logic\AllOf;
 use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Ref;
 use Yaoi\Schema\Schema;
@@ -22,10 +23,6 @@ class PHPCodeBuilder
 
     public function getSchemaInstantiationCode(Schema $schema)
     {
-        foreach ($schema->getConstraints() as $constraintClass => $constraint) {
-            
-        }
-        
         switch (true) {
             case StringType::getFromSchema($schema):
                 return StringType::className() . '::makeSchema(' . ');';
@@ -48,10 +45,18 @@ public function getTypeHint(Schema $schema)
 
     public function getPhpDocType(Schema $schema)
     {
+        if (!$contraints = $schema->getConstraints()) {
+            return '';
+        }
+
         if ($ref = Ref::getFromSchema($schema)) {
             return $this->getPhpDocType($ref->constraintSchema);
         }
 
+        if ($allOf = AllOf::getFromSchema($schema)) {
+            return 'bitch';
+        }
+
         switch (true) {
             case StringType::getFromSchema($schema):
                 return 'string';
@@ -68,7 +73,9 @@ public function getPhpDocType(Schema $schema)
                 return 'object';
         }
 
-        //throw new Exception("Please im");
+        //print_r($schema->getPath());
+        //print_r($schema->getSchemaData());
+        throw new Exception("Please im");
         return '';
     }
 
@@ -158,7 +165,7 @@ public function makeClassName($tracePath)
 
     public function storeToDisk($srcPath)
     {
-        print_r($this->classes);
+        //print_r($this->classes);
 
     }
 

src/Constraint.php

@@ -4,5 +4,6 @@
 
 interface Constraint
 {
+    public static function getSchemaKey();
     public function setOwnerSchema(Schema $ownerSchema);
 }

src/Flavour.php

@@ -2,7 +2,6 @@
 
 namespace Yaoi\Schema;
 
-interface Flavour extends Constraint
+interface Flavour extends Schematic
 {
-    public function __construct($value);
 }

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;
@@ -29,6 +32,9 @@ public function __construct($schemaValue, Schema $ownerSchema = null)
 
     public function import($data)
     {
+        foreach ($this->composition as $item) {
+
+        }
         // @todo implement
         return $data;
     }

src/NumberFlavour/Minimum.php

@@ -6,5 +6,8 @@
 
 class Minimum extends AbstractFlavour
 {
-
+    public static function getSchemaKey()
+    {
+        return 'minimum';
+    }
 }

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