Export additional and pattern properties (#99)

Author: vearutop

src/Schema.php

@@ -911,7 +911,9 @@ private function processObject($data, Context $options, $path, $result = null)
                     if ($found || !$import) {
                         $result->$propertyName = $value;
                     } elseif (!isset($result->$propertyName)) {
-                        $result->$propertyName = $value;
+                        if (self::PROP_REF !== $propertyName || empty($result->__fromRef)) {
+                            $result->$propertyName = $value;
+                        }
                     }
                 }
             }

src/Structure/ClassStructureTrait.php

@@ -100,12 +100,15 @@ public function jsonSerialize()
         $result = new \stdClass();
         $schema = static::schema();
         $properties = $schema->getProperties();
+        $processed = array();
         if (null !== $properties) {
             foreach ($properties->getDataKeyMap() as $propertyName => $dataName) {
                 $value = $this->$propertyName;
+
                 // Value is exported if exists.
                 if (null !== $value || array_key_exists($propertyName, $this->__arrayOfData)) {
                     $result->$dataName = $value;
+                    $processed[$propertyName] = true;
                     continue;
                 }
 
@@ -129,6 +132,14 @@ public function jsonSerialize()
             }
         }
 
+        if (!empty($this->__arrayOfData)) {
+            foreach ($this->__arrayOfData as $name => $value) {
+                if (!isset($processed[$name])) {
+                    $result->$name = $this->{$name};
+                }
+            }
+        }
+
         return $result;
     }
 

tests/src/Helper/DbId.php

@@ -22,7 +22,7 @@ class DbId extends AbstractMeta implements ClassStructureContract
     public static function setUpProperties($properties, Schema $ownerSchema)
     {
         $properties->table = DbTable::schema();
-        $ownerSchema->__fromRef = null;
+        $ownerSchema->setFromRef(false);
     }
 
 

tests/src/Helper/SampleProperties.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\Helper;
+
+use Swaggest\JsonSchema\Helper;
+use Swaggest\JsonSchema\Schema;
+use Swaggest\JsonSchema\Exception\StringException;
+use Swaggest\JsonSchema\Structure\ClassStructure;
+
+/**
+ * @property string $propOne
+ * @property int $propTwo
+ * @property $recursion
+ */
+class SampleProperties extends ClassStructure
+{
+    const X_PROPERTY_PATTERN = '^x-';
+
+    /**
+     * @param \Swaggest\JsonSchema\Constraint\Properties|static $properties
+     * @param Schema $schema
+     */
+    public static function setUpProperties($properties, Schema $schema)
+    {
+        $schema->type = Schema::OBJECT;
+        $schema->additionalProperties = Schema::object();
+        $schema->setPatternProperty('^x-', Schema::string());
+    }
+
+    /**
+     * @param string $name
+     * @param string $value
+     * @return self
+     * @throws InvalidValue
+     * @codeCoverageIgnoreStart
+     */
+    public function setXValue($name, $value)
+    {
+        if (!preg_match(Helper::toPregPattern(self::X_PROPERTY_PATTERN), $name)) {
+            throw new StringException('Pattern mismatch', StringException::PATTERN_MISMATCH);
+        }
+        $this->addPatternPropertyName(self::X_PROPERTY_PATTERN, $name);
+        $this->{$name} = $value;
+        return $this;
+    }
+    /** @codeCoverageIgnoreEnd */
+
+}

tests/src/PHPUnit/ClassStructure/ClassStructureTest.php

@@ -2,10 +2,10 @@
 
 namespace Swaggest\JsonSchema\Tests\PHPUnit\ClassStructure;
 
-
 use Swaggest\JsonSchema\Exception\TypeException;
 use Swaggest\JsonSchema\Tests\Helper\ClassWithAllOf;
 use Swaggest\JsonSchema\Tests\Helper\LevelThreeClass;
+use Swaggest\JsonSchema\Tests\Helper\SampleProperties;
 use Swaggest\JsonSchema\Tests\Helper\SampleStructure;
 use Swaggest\JsonSchema\Tests\Helper\StructureWithItems;
 
@@ -91,10 +91,55 @@ public function testSampleInvalid()
 
     public function testAllOfClassInstance()
     {
-        $value = ClassWithAllOf::import((object)array('myProperty'=>'abc'));
+        $value = ClassWithAllOf::import((object)array('myProperty' => 'abc'));
         $this->assertSame('abc', $value->myProperty);
         $this->assertTrue($value instanceof ClassWithAllOf);
     }
 
+    public function testAdditionalProperties()
+    {
+        $properties = new SampleProperties();
+        $properties->propOne = (object)array(
+            'subOne' => 'one',
+            'subTwo' => 'two'
+        );
+
+        $exported = SampleProperties::export($properties);
+        $json = <<<JSON
+{
+    "propOne": {
+        "subOne": "one",
+        "subTwo": "two"
+    }
+}
+JSON;
+        $this->assertSame($json, json_encode($exported, JSON_PRETTY_PRINT), 'With flag to true');
+    }
+
+    public function testPatternProperties()
+    {
+        $properties = new SampleProperties();
+        $properties->setXValue('x-foo', 'bar');
+        $properties->setXValue('x-baz', 'gnu');
+
+        $exported = SampleProperties::export($properties);
+        $json = <<<JSON
+{
+    "x-foo": "bar",
+    "x-baz": "gnu"
+}
+JSON;
+        $this->assertSame($json, json_encode($exported, JSON_PRETTY_PRINT), 'With flag to true');
+    }
+
+    /**
+     * @expectedException        Swaggest\JsonSchema\Exception\StringException
+     * @expectedExceptionMessage Pattern mismatch
+     */
+    public function testPatternPropertiesMismatch()
+    {
+        $properties = new SampleProperties();
+        $properties->setXValue('xfoo', 'bar');
+    }
 
 }