Merge pull request swaggest#29 from swaggest/meta-refactoring

meta refactoring, schema exporter interface resolves swaggest#22
marcispauls · Mar 20, 2018 · f03e5a6 · f03e5a6
2 parents 99da151 + f2c34af
commit f03e5a6
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 36 deletions.
diff --git a/src/AbstractMeta.php → src/Meta/AbstractMeta.php b/src/AbstractMeta.php → src/Meta/AbstractMeta.php
@@ -1,11 +1,9 @@
 <?php
 
-namespace Swaggest\JsonSchema;
+namespace Swaggest\JsonSchema\Meta;
 
-use Swaggest\JsonSchema\Meta\Meta;
-use Swaggest\JsonSchema\Meta\MetaHolder;
 
-abstract class AbstractMeta implements Meta
+abstract class AbstractMeta
 {
     /**
      * @param MetaHolder $schema

diff --git a/src/Meta/Meta.php b/src/Meta/Meta.php
diff --git a/src/Meta/MetaHolder.php b/src/Meta/MetaHolder.php
@@ -5,7 +5,7 @@
 
 interface MetaHolder
 {
-    public function addMeta(Meta $meta);
+    public function addMeta($meta, $name = null);
 
     public function getMeta($name);
 

diff --git a/src/Schema.php b/src/Schema.php
@@ -18,7 +18,6 @@
 use Swaggest\JsonSchema\Exception\ObjectException;
 use Swaggest\JsonSchema\Exception\StringException;
 use Swaggest\JsonSchema\Exception\TypeException;
-use Swaggest\JsonSchema\Meta\Meta;
 use Swaggest\JsonSchema\Meta\MetaHolder;
 use Swaggest\JsonSchema\Path\PointerUtil;
 use Swaggest\JsonSchema\Structure\ClassStructure;
@@ -1179,19 +1178,22 @@ public function setProperty($name, $schema)
         return $this;
     }
 
-    /** @var Meta[] */
+    /** @var mixed[] */
     private $metaItems = array();
 
-    public function addMeta(Meta $meta)
+    public function addMeta($meta, $name = null)
     {
-        $this->metaItems[get_class($meta)] = $meta;
+        if ($name === null) {
+            $name = get_class($meta);
+        }
+        $this->metaItems[$name] = $meta;
         return $this;
     }
 
-    public function getMeta($className)
+    public function getMeta($name)
     {
-        if (isset($this->metaItems[$className])) {
-            return $this->metaItems[$className];
+        if (isset($this->metaItems[$name])) {
+            return $this->metaItems[$name];
         }
         return null;
     }

diff --git a/src/SchemaExporter.php b/src/SchemaExporter.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Swaggest\JsonSchema;
+
+
+interface SchemaExporter
+{
+    /**
+     * @return Schema
+     */
+    public function exportSchema();
+}
diff --git a/src/TODO.md b/src/TODO.md
diff --git a/src/Wrapper.php b/src/Wrapper.php
@@ -2,7 +2,6 @@
 
 namespace Swaggest\JsonSchema;
 
-use Swaggest\JsonSchema\Meta\Meta;
 use Swaggest\JsonSchema\Meta\MetaHolder;
 use Swaggest\JsonSchema\Structure\Nested;
 
@@ -179,9 +178,9 @@ public function __isset($name)
         throw new Exception('Unexpected isset: ' . $name);
     }
 
-    public function addMeta(Meta $meta)
+    public function addMeta($meta, $name = null)
     {
-        $this->originalSchema->addMeta($meta);
+        $this->originalSchema->addMeta($meta, $name);
         return $this;
     }
 

diff --git a/tests/src/Helper/DbId.php b/tests/src/Helper/DbId.php
@@ -3,7 +3,7 @@
 namespace Swaggest\JsonSchema\Tests\Helper;
 
 use Swaggest\JsonSchema\Constraint\Properties;
-use Swaggest\JsonSchema\AbstractMeta;
+use Swaggest\JsonSchema\Meta\AbstractMeta;
 use Swaggest\JsonSchema\Schema;
 use Swaggest\JsonSchema\Structure\ClassStructureContract;
 use Swaggest\JsonSchema\Structure\ClassStructureTrait;

diff --git a/tests/src/Helper/DbTable.php b/tests/src/Helper/DbTable.php
@@ -2,7 +2,7 @@
 
 namespace Swaggest\JsonSchema\Tests\Helper;
 
-use Swaggest\JsonSchema\AbstractMeta;
+use Swaggest\JsonSchema\Meta\AbstractMeta;
 use Swaggest\JsonSchema\Schema;
 use Swaggest\JsonSchema\Structure\ClassStructureContract;
 use Swaggest\JsonSchema\Structure\ClassStructureTrait;