Fix handling of *Of schemas (#50)

Author: vearutop

composer.json

@@ -19,7 +19,7 @@
     "php": ">=5.6.0"
   },
   "require-dev": {
-    "phperf/phpunit": "4.8.37"
+    "phperf/phpunit": "4.8.38"
   },
   "autoload": {
     "psr-4": {

composer.lock

@@ -40,18 +40,21 @@ public function __construct($schema, $path, PhpBuilder $phpBuilder)
      */
     private function processLogicType()
     {
-        $orSchemas = null;
         if ($this->schema->allOf !== null) {
-            $orSchemas = $this->schema->allOf;
-        } elseif ($this->schema->anyOf !== null) {
-            $orSchemas = $this->schema->anyOf;
-        } elseif ($this->schema->oneOf !== null) {
-            $orSchemas = $this->schema->oneOf;
+            foreach ($this->schema->allOf as $i => $item) {
+                $this->result->add($this->phpBuilder->getType($item, $this->path . '->allOf[' . $i . ']'));
+            }
+        }
+
+        if ($this->schema->anyOf !== null) {
+            foreach ($this->schema->anyOf as $i => $item) {
+                $this->result->add($this->phpBuilder->getType($item, $this->path . '->anyOf[' . $i . ']'));
+            }
         }
 
-        if ($orSchemas !== null) {
-            foreach ($orSchemas as $item) {
-                $this->result->add($this->phpBuilder->getType($item, $this->path));
+        if ($this->schema->oneOf !== null) {
+            foreach ($this->schema->oneOf as $i => $item) {
+                $this->result->add($this->phpBuilder->getType($item, $this->path . '->oneOf[' . $i . ']'));
             }
         }
     }

src/JsonSchema/TypeBuilder.php

@@ -49,7 +49,13 @@ protected function toString()
             $tail = (new PhpDocTag(PhpDoc::TAG_CODE_COVERAGE_IGNORE_END))->render() . "\n";
         }
 
-        $body = trim($this->body);
+        $body = $this->body;
+        if ($body === null) {
+            $body = '';
+        }
+
+        $body = trim($body);
+
         if ($body !== '') {
             $body = $this->indentLines($body . "\n");
         }

src/PhpFunction.php

@@ -60,7 +60,6 @@ function (PhpClass $class, $path, $schema) use ($app, $appNs) {
         exec('git diff ' . $appPath, $out);
         $out = implode("\n", $out);
         $this->assertSame('', $out, "Generated files changed");
-
     }