some refactorings

Author: vearutop

src/AbstractConstraint.php

@@ -5,6 +5,8 @@
 
 abstract class AbstractConstraint extends Base implements Constraint
 {
+    const KEY = '';
+
     /** @var Schema */
     protected $ownerSchema;
 

src/AbstractFlavour.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Yaoi\Schema;
+
+
+class AbstractFlavour extends AbstractConstraint implements Flavour
+{
+    public $value;
+
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+}

src/ArrayFlavour/Items.php

@@ -4,8 +4,9 @@
 
 use Yaoi\Schema\AbstractConstraint;
 use Yaoi\Schema\Schema;
+use Yaoi\Schema\Schematic;
 
-class Items extends AbstractConstraint
+class Items extends AbstractConstraint implements Schematic
 {
     const KEY = 'items';
 
@@ -27,5 +28,12 @@ public function __construct($schemaValue, Schema $ownerSchema = null)
         }
     }
 
+    public function setOwnerSchema(Schema $ownerSchema)
+    {
+        $this->ownerSchema = $ownerSchema;
+        $this->itemsSchema->setParentSchema($ownerSchema, 'Items');
+        return $this;
+    }
+
 
 }

src/ArrayFlavour/MinItems.php

@@ -4,12 +4,15 @@
 
 
 use Yaoi\Schema\AbstractConstraint;
+use Yaoi\Schema\Flavour;
 use Yaoi\Schema\Validator;
 
-class MinItems extends AbstractConstraint implements Validator
+class MinItems extends AbstractConstraint implements Flavour
 {
+    const KEY = 'minItems';
+
     /** @var int */
-    private $minItems;
+    public $minItems;
     public function __construct($minItems)
     {
         $this->minItems = $minItems;

src/ArrayFlavour/UniqueItems.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Yaoi\Schema\ArrayFlavour;
+
+use Yaoi\Schema\AbstractFlavour;
+
+class UniqueItems extends AbstractFlavour
+{
+
+}

src/CodeBuilder/PHPCodeBuilder.php

@@ -18,9 +18,19 @@ class PHPCodeBuilder
 {
     public $namespace;
     public $rootClassName;
+    
 
     public function getSchemaInstantiationCode(Schema $schema)
     {
+        foreach ($schema->getConstraints() as $constraintClass => $constraint) {
+            
+        }
+        
+        switch (true) {
+            case StringType::getFromSchema($schema):
+                return StringType::className() . '::makeSchema(' . ');';
+        }
+
         if (ObjectType::getFromSchema($schema)) {
             if (Properties::getFromSchema($schema)) {
                 return $this->getClassName($schema) . '::create()';
@@ -36,10 +46,10 @@ public function getTypeHint(Schema $schema)
 
     }
 
-    public function getPhpDoc(Schema $schema)
+    public function getPhpDocType(Schema $schema)
     {
         if ($ref = Ref::getFromSchema($schema)) {
-            return $this->getPhpDoc($ref->constraintSchema);
+            return $this->getPhpDocType($ref->constraintSchema);
         }
 
         switch (true) {
@@ -53,6 +63,9 @@ public function getPhpDoc(Schema $schema)
                 return 'bool';
             case ArrayType::getFromSchema($schema):
                 return 'array'; // @todo resolve item
+            case ObjectType::getFromSchema($schema):
+                $this->resolveObject($schema);
+                return 'object';
         }
 
         //throw new Exception("Please im");
@@ -61,15 +74,29 @@ public function getPhpDoc(Schema $schema)
 
     public $classes = array();
 
-    public function makeClass(Schema $schema, $className) {
+    public function resolveObject(Schema $schema)
+    {
+        if (Properties::getFromSchema($schema)) {
+
+
+        }
+        $path = $schema->getPath();
+        //print_r($path);
+        //print_r($schema->getSchemaData());
+        return;
+    }
+
+    public function makeClass(Schema $schema, $className)
+    {
         if ($objectType = ObjectType::getFromSchema($schema)) {
             if ($properties = Properties::getFromSchema($schema)) {
                 $this->classes[$this->rootClassName] = ClassStructurePhp::create($schema, $this, $className, $this->namespace)->toString();
             }
         }
     }
 
-    public function getClassName(Schema $schema) {
+    public function getClassName(Schema $schema)
+    {
         $className = $this->rootClassName;
         if (!isset($this->classes[$className])) {
             $this->makeClass($schema, $className);
@@ -129,4 +156,11 @@ public function makeClassName($tracePath)
     }
 
 
+    public function storeToDisk($srcPath)
+    {
+        print_r($this->classes);
+        
+    }
+
+
 }

src/CodeBuilder/Templates/ClassStructurePhp.php

@@ -36,7 +36,7 @@ private function getPhpDocHead()
 
         if ($properties = Properties::getFromSchema($this->schema)) {
             foreach ($properties->properties as $name => $property) {
-                $phpDocType = $this->codeBuilder->getPhpDoc($property);
+                $phpDocType = $this->codeBuilder->getPhpDocType($property);
                 $result .= <<<PHPDOC
  * @property $phpDocType $$name
 
@@ -45,21 +45,18 @@ private function getPhpDocHead()
         }
 
         return $result;
-
     }
 
     public function toString()
     {
         $result = '';
         $phpDocHead = $this->getPhpDocHead();
-        
 
         $result .= /** @lang PHP */<<<PHP
 namespace $this->namespace;
 
 /**
-$phpDocHead
- */
+$phpDocHead */
 class $this->className
 {
     
@@ -68,7 +65,5 @@ class $this->className
 
 PHP;
         return $result;
-
-
     }
 }

src/Exception.php

@@ -26,4 +26,11 @@ public function getStructureTrace()
     {
         return $this->structureTrace;
     }
+
+    public $constraint;
+    public function setConstraint(Constraint $constraint)
+    {
+        $this->constraint = $constraint;
+        return $this;
+    }
 }

src/Flavour.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Yaoi\Schema;
+
+interface Flavour extends Constraint
+{
+    public function __construct($value);
+}

src/NumberFlavour/Minimum.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Yaoi\Schema\NumberFlavour;
+
+use Yaoi\Schema\AbstractFlavour;
+
+class Minimum extends AbstractFlavour
+{
+
+}