type object

Author: vearutop

src/Constraint/Type.php

@@ -22,6 +22,7 @@ public static function getSchemaKey()
     }
 
     private $types;
+
     public function __construct($schemaValue, Schema $ownerSchema = null)
     {
         $this->ownerSchema = $ownerSchema;
@@ -34,19 +35,29 @@ public function importFailed($data, &$entity)
         foreach ($this->types as $type) {
             switch ($type) {
                 case self::OBJECT:
-                    $ok = is_object($data) || is_array($data);break;
+                    $ok = is_object($data) || is_array($data);
+                    if ($ok && !is_object($entity)) {
+                        $entity = (object)$entity;
+                    }
+                    break;
                 case self::_ARRAY:
-                    $ok = is_array($data);break;
+                    $ok = is_array($data);
+                    break;
                 case self::STRING:
-                    $ok = is_string($data);break;
+                    $ok = is_string($data);
+                    break;
                 case self::INTEGER:
-                    $ok = is_int($data);break;
+                    $ok = is_int($data);
+                    break;
                 case self::NUMBER:
-                    $ok = is_int($data) || is_float($data);break;
+                    $ok = is_int($data) || is_float($data);
+                    break;
                 case self::BOOLEAN:
-                    $ok = is_bool($data);break;
+                    $ok = is_bool($data);
+                    break;
                 case self::NULL:
-                    $ok = null === $data;break;
+                    $ok = null === $data;
+                    break;
             }
             if ($ok) {
                 return false;
@@ -57,7 +68,39 @@ public function importFailed($data, &$entity)
 
     public function exportFailed($data, &$entity)
     {
-        return $this->importFailed($data, $entity);
+        $ok = false;
+        foreach ($this->types as $type) {
+            switch ($type) {
+                case self::OBJECT:
+                    $ok = is_object($data) || is_array($data);
+                    if ($ok && !is_array($entity)) {
+                        $entity = (array)$entity;
+                    }
+                    break;
+                case self::_ARRAY:
+                    $ok = is_array($data);
+                    break;
+                case self::STRING:
+                    $ok = is_string($data);
+                    break;
+                case self::INTEGER:
+                    $ok = is_int($data);
+                    break;
+                case self::NUMBER:
+                    $ok = is_int($data) || is_float($data);
+                    break;
+                case self::BOOLEAN:
+                    $ok = is_bool($data);
+                    break;
+                case self::NULL:
+                    $ok = null === $data;
+                    break;
+            }
+            if ($ok) {
+                return false;
+            }
+        }
+        return 'Wrong type';
     }
 
     public static function getPriority()

src/README.md

@@ -60,4 +60,8 @@ $structure->import('http://sfsdf.sdfsd/'); // OK
 ## Solid detection
 
 Use `\stdClass` instead of `array` for `JSON` objects, 
-cast to `array` on iteration
+cast to `array` on iteration
+
+## Road map
+ * Exceptions-less mode
+ 

src/Schema.php

@@ -135,10 +135,20 @@ public function import($data, $deepValidation = false)
 
     public function export($data, $deepValidation = false)
     {
+        if (self::$debug) {
+            print_r($data);
+        }
+        $result = $data;
         foreach ($this->constraints as $constraint) {
-            $data = $constraint->export($data);
+            $failReason = $constraint->exportFailed($data, $result);
+            if ($failReason && !$deepValidation) {
+                throw new Exception($failReason, Exception::INVALID_VALUE);
+            }
+            if (self::$debug) {
+                var_dump(get_class($constraint), $data);
+            }
         }
-        return $data;
+        return $result;
     }
 
 

tests/src/Naive/TypeObjectTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Yaoi\Schema\Tests\Naive;
+
+
+use Yaoi\Schema\Exception;
+use Yaoi\Schema\Schema;
+
+class TypeObjectTest extends \PHPUnit_Framework_TestCase
+{
+    public function testValid()
+    {
+        $schema = new Schema(array('type' => 'object'));
+        $this->assertSame('123', $schema->import(array('aaa' => '123'))->aaa);
+
+        $object = $schema->import(array('3.45' => '123'));
+        $this->assertSame('123', $object->{3.45});
+
+        $data = $schema->export($object);
+        $this->assertSame(array('3.45' => '123'), $data);
+    }
+
+    public function testInvalidObject()
+    {
+        $this->setExpectedException(get_class(new Exception()), 'Wrong type', Exception::INVALID_VALUE);
+        $schema = new Schema(array('type' => 'object'));
+        $this->assertSame(123, $schema->import(123));
+    }
+}