cleanup

Author: vearutop

src/Constraint/Constraint.php

@@ -2,15 +2,6 @@
 
 namespace Yaoi\Schema\Constraint;
 
-use Yaoi\Schema\Schema;
-
 interface Constraint
 {
-    /**
-     * @param Schema $schema
-     * @return mixed
-     * @todo justify existence
-     */
-    public function setToSchema(Schema $schema);
-
 }

src/Constraint/InvalidValue.php

@@ -2,11 +2,8 @@
 
 namespace Yaoi\Schema\Constraint;
 
-use Yaoi\Schema\InvalidValue;
 use Yaoi\Schema\MagicMap;
 use Yaoi\Schema\Schema;
-use Yaoi\Schema\SchemaLoader;
-use Yaoi\Schema\Structure\ObjectItem;
 
 /**
  * @method Schema __get($key)
@@ -18,79 +15,14 @@ class Properties extends MagicMap implements Constraint
 
     public function __set($name, $column)
     {
-        if ($column instanceof Constraint) {
-            $schema = new Schema();
-            $column->setToSchema($schema);
-            return parent::__set($name, $schema);
-        }
-
         return parent::__set($name, $column);
     }
 
-    public function setToSchema(Schema $schema)
-    {
-        $schema->properties = $this;
-    }
-
     public static function create()
     {
         return new static;
     }
 
-    /**
-     * @param $data
-     * @param ObjectItem $result
-     * @param Schema|null $schema
-     * @throws InvalidValue
-     * @throws \Exception
-     * @deprecated move relevant code to Schema
-     */
-    public function import($data, ObjectItem $result, Schema $schema = null)
-    {
-        $traceHelper = Schema::$traceHelper;
-
-        $additionalProperties = $schema->additionalProperties;
-
-        foreach ($data as $key => $value) {
-            if (isset($this->_arrayOfData[$key])) {
-                $traceHelper->push()->addData(SchemaLoader::PROPERTIES . ':' . $key);
-                $result->$key = $this->_arrayOfData[$key]->import($value);
-                $traceHelper->pop();
-            } else {
-                // todo remove code duplication
-
-                $found = false;
-                if ($schema->patternProperties !== null) {
-                    foreach ($schema->patternProperties as $pattern => $propertySchema) {
-                        if (preg_match($pattern, $key)) {
-                            $found = true;
-                            $value = $propertySchema->import($value);
-                            //break; // todo manage multiple import data properly (pattern accessor)
-                        }
-                    }
-                }
-                if (!$found && null !== $additionalProperties) {
-                    $traceHelper->push()->addData(SchemaLoader::ADDITIONAL_PROPERTIES);
-                    if ($additionalProperties === false) {
-                        throw new InvalidValue('Additional properties not allowed', InvalidValue::INVALID_VALUE);
-                    }
-                    $value = $additionalProperties->import($value);
-                    $traceHelper->pop();
-                }
-                $result->$key = $value;
-            }
-        }
-    }
-
-    public function export(ObjectItem $data)
-    {
-        $result = array();
-        foreach ($this->_arrayOfData as $key => $value) {
-            $result[$key] = $value->export($data->$key);
-        }
-        return $result;
-    }
-
     /** @var Schema */
     private $additionalProperties;
 

src/Constraint/Properties.php

@@ -13,12 +13,6 @@ public function __construct($ref, Schema $schema)
         $this->schema = $schema;
     }
 
-    public function setToSchema(Schema $schema)
-    {
-        $schema->ref = $this;
-    }
-
-
     /** @var Schema */
     private $schema;
 

src/Constraint/Ref.php

@@ -22,11 +22,6 @@ public function __construct($type)
         $this->types = is_array($type) ? $type : array($type);
     }
 
-    public function setToSchema(Schema $schema)
-    {
-        $schema->type = $this;
-    }
-
     public function has($type)
     {
         return in_array($type, $this->types);

src/Constraint/Type.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Yaoi\Schema\Exception;
+
+
+use Yaoi\Schema\InvalidValue;
+
+class ArrayException extends InvalidValue
+{
+
+}

src/Exception/ArrayException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Yaoi\Schema\Exception;
+
+
+use Yaoi\Schema\InvalidValue;
+
+class TypeException extends InvalidValue
+{
+
+}

src/Exception/TypeException.php

@@ -4,6 +4,18 @@
 
 class InvalidValue extends \Exception
 {
+    private $path;
+
+    public function addPath($path)
+    {
+        $this->message .= ' at ' . $path;
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+
     const INVALID_VALUE = 1;
     const NOT_IMPLEMENTED = 2;
 }