Updated to phootwork/collection v1.3.1

src/AbstractModel.php

@@ -1,6 +1,8 @@
 <?php
 namespace gossi\swagger;
 
+use phootwork\collection\Collection;
+
 abstract class AbstractModel {
 
 	protected function export() {
@@ -26,7 +28,9 @@ protected function export() {
 				$prop->setAccessible(true);
 				$val = $prop->getValue($this);
 
-				if (method_exists($val, 'toArray')) {
+				if ($val instanceof Collection) {
+					$val = $this->exportRecursiveArray($val->toArray());
+				} else if (method_exists($val, 'toArray')) {
 					$val = $val->toArray();
 				}
 			}
@@ -42,4 +46,13 @@ protected function export() {
 
 		return $out;
 	}
+
+	protected function exportRecursiveArray($array) {
+		return array_map(function ($v) {
+			if (is_object($v) && method_exists($v, 'toArray')) {
+				return $v->toArray();
+			}
+			return $v;
+		}, $array);
+	}
 }

src/Path.php

@@ -35,12 +35,15 @@ private function parse($contents) {
 	}
 
 	public function toArray() {
-		return array_merge($this->operations->toArray(), $this->getExtensions()->toArray());
+		return array_merge(
+			$this->exportRecursiveArray($this->operations->toArray()),
+			$this->exportRecursiveArray($this->getExtensions()->toArray())
+		);
 	}
 
 	/**
 	 * Returns this path
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getPath() {
@@ -49,7 +52,7 @@ public function getPath() {
 
 	/**
 	 * Gets the operation for the given method, creates one if none exists
-	 * 
+	 *
 	 * @param string $method
 	 * @return Operation
 	 */
@@ -62,7 +65,7 @@ public function getOperation($method) {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param string $method
 	 * @return bool
 	 */
@@ -72,7 +75,7 @@ public function hasOperation($method) {
 
 	/**
 	 * Removes an operation for the given method
-	 * 
+	 *
 	 * @param string $method
 	 */
 	public function removeOperation($method) {

src/collections/Definitions.php

@@ -5,8 +5,9 @@
 use phootwork\collection\CollectionUtils;
 use phootwork\collection\Map;
 use phootwork\lang\Arrayable;
+use gossi\swagger\AbstractModel;
 
-class Definitions implements Arrayable, \Iterator {
+class Definitions extends AbstractModel implements Arrayable, \Iterator {
 
 	/** @var Map */
 	private $definitions;
@@ -25,7 +26,7 @@ private function parse($contents) {
 	}
 
 	public function toArray() {
-		return $this->definitions->toArray();
+		return $this->exportRecursiveArray($this->definitions->toArray());
 	}
 
 	public function size() {
@@ -34,7 +35,7 @@ public function size() {
 
 	/**
 	 * Returns the schema for the given field
-	 * 
+	 *
 	 * @param string $name
 	 * @return Schema
 	 */
@@ -47,7 +48,7 @@ public function get($name) {
 
 	/**
 	 * Sets the field
-	 * 
+	 *
 	 * @param string name
 	 * @param Schema $schame
 	 */
@@ -57,7 +58,7 @@ public function set($name, Schema $schema) {
 
 	/**
 	 * Removes the given field
-	 * 
+	 *
 	 * @param string $name
 	 */
 	public function remove($name) {
@@ -66,7 +67,7 @@ public function remove($name) {
 
 	/**
 	 * Returns definitions has a schema with the given name
-	 * 
+	 *
 	 * @param string $name
 	 * @return bool
 	 */
@@ -76,7 +77,7 @@ public function has($name) {
 
 	/**
 	 * Returns whether the given schema exists
-	 * 
+	 *
 	 * @param Schema $schema
 	 * @return bool
 	 */

src/collections/Headers.php

@@ -5,8 +5,9 @@
 use phootwork\collection\CollectionUtils;
 use phootwork\collection\Map;
 use phootwork\lang\Arrayable;
+use gossi\swagger\AbstractModel;
 
-class Headers implements Arrayable, \Iterator {
+class Headers extends AbstractModel implements Arrayable, \Iterator {
 
 	/** @var Map */
 	private $headers;
@@ -26,7 +27,7 @@ private function parse($contents) {
 	}
 
 	public function toArray() {
-		return $this->headers->toArray();
+		return $this->exportRecursiveArray($this->headers->toArray());
 	}
 
 	public function size() {
@@ -35,7 +36,7 @@ public function size() {
 
 	/**
 	 * Returns whether a header with the given name exists
-	 * 
+	 *
 	 * @param string $header
 	 * @return bool
 	 */
@@ -55,7 +56,7 @@ public function contains(Header $header) {
 
 	/**
 	 * Returns the header info for the given code
-	 * 
+	 *
 	 * @param string $header
 	 * @return Header
 	 */
@@ -65,7 +66,7 @@ public function get($header) {
 
 	/**
 	 * Sets the header
-	 * 
+	 *
 	 * @param Header $header
 	 */
 	public function add(Header $header) {
@@ -74,7 +75,7 @@ public function add(Header $header) {
 
 	/**
 	 * Removes the given header
-	 * 
+	 *
 	 * @param string $header
 	 */
 	public function remove($header) {

src/collections/Parameters.php

@@ -6,8 +6,9 @@
 use phootwork\collection\ArrayList;
 use phootwork\collection\CollectionUtils;
 use phootwork\lang\Arrayable;
+use gossi\swagger\AbstractModel;
 
-class Parameters implements Arrayable, \Iterator {
+class Parameters extends AbstractModel implements Arrayable, \Iterator {
 
 	use RefPart;
 
@@ -36,7 +37,7 @@ public function toArray() {
 			return ['$ref' => $this->getRef()];
 		}
 
-		return $this->parameters->toArray();
+		return $this->exportRecursiveArray($this->parameters->toArray());
 	}
 
 	public function size() {

src/collections/Paths.php

@@ -7,8 +7,9 @@
 use phootwork\collection\Map;
 use phootwork\lang\Arrayable;
 use phootwork\lang\Text;
+use gossi\swagger\AbstractModel;
 
-class Paths implements Arrayable, \Iterator {
+class Paths extends AbstractModel implements Arrayable, \Iterator {
 
 	use ExtensionPart;
 
@@ -35,9 +36,10 @@ private function parse($contents) {
 	}
 
 	public function toArray() {
-		$paths = clone $this->paths;
+// 		$paths = clone $this->paths;
 // 		$paths->setAll($this->getExtensions());
-		return $paths->toArray();
+// 		return $paths->toArray();
+		return $this->exportRecursiveArray($this->paths->toArray());
 	}
 
 	public function size() {
@@ -46,7 +48,7 @@ public function size() {
 
 	/**
 	 * Returns whether a path with the given name exists
-	 * 
+	 *
 	 * @param string $path
 	 * @return bool
 	 */
@@ -56,7 +58,7 @@ public function has($path) {
 
 	/**
 	 * Returns whether the given path exists
-	 * 
+	 *
 	 * @param Path $path
 	 * @return bool
 	 */
@@ -66,7 +68,7 @@ public function contains(Path $path) {
 
 	/**
 	 * Returns the path info for the given path
-	 * 
+	 *
 	 * @param string $path
 	 * @return Path
 	 */
@@ -79,7 +81,7 @@ public function get($path) {
 
 	/**
 	 * Sets the path
-	 * 
+	 *
 	 * @param Path $path
 	 * @return $this
 	 */
@@ -90,7 +92,7 @@ public function add(Path $path) {
 
 	/**
 	 * Removes the given path
-	 * 
+	 *
 	 * @param string $path
 	 */
 	public function remove($path) {

src/collections/Responses.php

@@ -7,8 +7,9 @@
 use phootwork\collection\Map;
 use phootwork\lang\Arrayable;
 use phootwork\lang\Text;
+use gossi\swagger\AbstractModel;
 
-class Responses implements Arrayable, \Iterator {
+class Responses extends AbstractModel implements Arrayable, \Iterator {
 
 	use ExtensionPart;
 
@@ -37,7 +38,8 @@ private function parse($contents) {
 	public function toArray() {
 		$responses = clone $this->responses;
 		$responses->setAll($this->getExtensions());
-		return $responses->toArray();
+
+		return $this->exportRecursiveArray($responses->toArray());
 	}
 
 	public function size() {
@@ -46,7 +48,7 @@ public function size() {
 
 	/**
 	 * Returns whether the given response exists
-	 * 
+	 *
 	 * @param string $code
 	 * @return bool
 	 */
@@ -56,7 +58,7 @@ public function has($code) {
 
 	/**
 	 * Returns whether the given response exists
-	 * 
+	 *
 	 * @param Response $response
 	 * @return bool
 	 */
@@ -66,7 +68,7 @@ public function contains(Response $response) {
 
 	/**
 	 * Returns the reponse info for the given code
-	 * 
+	 *
 	 * @param string $code
 	 * @return Response
 	 */
@@ -80,7 +82,7 @@ public function get($code) {
 
 	/**
 	 * Sets the response
-	 * 
+	 *
 	 * @param Response $code
 	 */
 	public function add(Response $response) {
@@ -89,7 +91,7 @@ public function add(Response $response) {
 
 	/**
 	 * Removes the given repsonse
-	 * 
+	 *
 	 * @param string $code
 	 */
 	public function remove($code) {

tests/CollectionsTest.php

@@ -30,6 +30,8 @@ public function testDefinitions() {
 		$this->assertSame($user, $definitions->get('User'));
 		$this->assertTrue($definitions->contains($user));
 
+		$this->assertTrue(is_array($definitions->toArray()['User']));
+
 		$definitions->remove('User');
 		$this->assertEquals(0, $definitions->size());
 		$this->assertFalse($definitions->has('User'));
@@ -52,6 +54,8 @@ public function testPaths() {
 		$this->assertSame($pets, $paths->get('/pets'));
 		$this->assertTrue($paths->contains($pets));
 
+		$this->assertTrue(is_array($paths->toArray()['/pets']));
+
 		$paths->remove('/pets');
 		$this->assertEquals(0, $paths->size());
 		$this->assertFalse($paths->has('/pets'));
@@ -94,6 +98,9 @@ public function testParameters() {
 		$this->assertEquals('bar', $parameter->getName());
 		$this->assertEquals('query', $parameter->getIn());
 
+		$this->assertTrue(is_array($parameters->toArray()[0]));
+		$this->assertTrue(is_array($parameters->toArray()[1]));
+
 		$parameters->remove($id);
 		$parameters->remove($id2);
 		$parameters->remove($parameter);
@@ -121,6 +128,8 @@ public function testResponses() {
 		$this->assertSame($ok, $responses->get('200'));
 		$this->assertTrue($responses->contains($ok));
 
+		$this->assertTrue(is_array($responses->toArray()['200']));
+
 		$responses->remove('200');
 		$this->assertEquals(0, $responses->size());
 		$this->assertFalse($responses->has('200'));