vanderlee / PHPSwaggerGen

tests/output/docblock comment in method/source.php

Indentation +12 added lines, -12 removed lines

@@ -13,17 +13,17 @@
 class Example
 {
 
-    public function Dummy()
-    {
-        /**
-         * @rest\endpoint /v1/users/{id}
-         * @rest\method GET Return a JSON with all the user attributes
-         * @rest\path Int id The ID of the User
-         * @rest\response 200 User
-         */
-        $app->get('/v1/users/{id:[0-9]+}', function ($request, $response, $args) {
-            // ...
-        });
-    }
+	public function Dummy()
+	{
+		/**
+		 * @rest\endpoint /v1/users/{id}
+		 * @rest\method GET Return a JSON with all the user attributes
+		 * @rest\path Int id The ID of the User
+		 * @rest\response 200 User
+		 */
+		$app->get('/v1/users/{id:[0-9]+}', function ($request, $response, $args) {
+			// ...
+		});
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
          * @rest\path Int id The ID of the User
          * @rest\response 200 User
          */
-        $app->get('/v1/users/{id:[0-9]+}', function ($request, $response, $args) {
+        $app->get('/v1/users/{id:[0-9]+}', function($request, $response, $args) {
             // ...
         });
     }

tests/Parser/Text/ParserTest.php

Indentation +186 added lines, -186 removed lines

@@ -5,191 +5,191 @@
 class ParserTest extends \SwaggerGen_TestCase
 {
 
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::__construct
-     */
-    public function testConstructor_Empty()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::__construct
-     */
-    public function testConstructor_Dirs()
-    {
-        $this->markTestIncomplete('Not yet implemented.');
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::addDirs
-     */
-    public function testAddDirs()
-    {
-        $this->markTestIncomplete('Not yet implemented.');
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parseText
-     */
-    public function testParseText()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parseText('title Some words');
-
-        $this->assertCount(1, $statements);
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parseText
-     */
-    public function testParseText_Whitespace()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parseText(" \t title   \t\t Some words \t ");
-
-        $this->assertCount(1, $statements);
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parseText
-     */
-    public function testParseText_Multiple_LF()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parseText("title Some words\nSome Random words");
-
-        $this->assertCount(2, $statements);
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
-        $this->assertSame('Some', $statements[1]->getCommand());
-        $this->assertSame('Random words', $statements[1]->getData());
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parseText
-     */
-    public function testParseText_Multiple_CR()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parseText("title Some words\rSome Random words");
-
-        $this->assertCount(2, $statements);
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
-        $this->assertSame('Some', $statements[1]->getCommand());
-        $this->assertSame('Random words', $statements[1]->getData());
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parseText
-     */
-    public function testParseText_Multiple_CRLF()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parseText("title Some words\r\nSome Random words");
-
-        $this->assertCount(2, $statements);
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
-        $this->assertSame('Some', $statements[1]->getCommand());
-        $this->assertSame('Random words', $statements[1]->getData());
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parseText
-     */
-    public function testParseText_Multiple_BlankLines()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parseText("title Some words\r\n\n\n\rSome Random words");
-
-        $this->assertCount(2, $statements);
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
-        $this->assertSame('Some', $statements[1]->getCommand());
-        $this->assertSame('Random words', $statements[1]->getData());
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parseText
-     */
-    public function testParseText_Dirs()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parseText("title Some words\r\n\n\n\rSome Random words", array(
-            __DIR__ . '/ParserTest/not used by text parser',
-        ));
-
-        $this->assertCount(2, $statements);
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
-        $this->assertSame('Some', $statements[1]->getCommand());
-        $this->assertSame('Random words', $statements[1]->getData());
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Parser::parse
-     */
-    public function testParse()
-    {
-        $object = new \SwaggerGen\Parser\Text\Parser();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
-
-        $statements = $object->parse(__DIR__ . '/ParserTest/testParse.txt', array(
-            __DIR__ . '/ParserTest/not used by text parser',
-        ));
-
-        $this->assertCount(2, $statements);
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
-        $this->assertSame('title', $statements[0]->getCommand());
-        $this->assertSame('Some words', $statements[0]->getData());
-
-        $this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
-        $this->assertSame('Some', $statements[1]->getCommand());
-        $this->assertSame('Random words', $statements[1]->getData());
-    }
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::__construct
+	 */
+	public function testConstructor_Empty()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::__construct
+	 */
+	public function testConstructor_Dirs()
+	{
+		$this->markTestIncomplete('Not yet implemented.');
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::addDirs
+	 */
+	public function testAddDirs()
+	{
+		$this->markTestIncomplete('Not yet implemented.');
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parseText
+	 */
+	public function testParseText()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parseText('title Some words');
+
+		$this->assertCount(1, $statements);
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parseText
+	 */
+	public function testParseText_Whitespace()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parseText(" \t title   \t\t Some words \t ");
+
+		$this->assertCount(1, $statements);
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parseText
+	 */
+	public function testParseText_Multiple_LF()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parseText("title Some words\nSome Random words");
+
+		$this->assertCount(2, $statements);
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
+		$this->assertSame('Some', $statements[1]->getCommand());
+		$this->assertSame('Random words', $statements[1]->getData());
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parseText
+	 */
+	public function testParseText_Multiple_CR()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parseText("title Some words\rSome Random words");
+
+		$this->assertCount(2, $statements);
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
+		$this->assertSame('Some', $statements[1]->getCommand());
+		$this->assertSame('Random words', $statements[1]->getData());
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parseText
+	 */
+	public function testParseText_Multiple_CRLF()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parseText("title Some words\r\nSome Random words");
+
+		$this->assertCount(2, $statements);
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
+		$this->assertSame('Some', $statements[1]->getCommand());
+		$this->assertSame('Random words', $statements[1]->getData());
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parseText
+	 */
+	public function testParseText_Multiple_BlankLines()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parseText("title Some words\r\n\n\n\rSome Random words");
+
+		$this->assertCount(2, $statements);
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
+		$this->assertSame('Some', $statements[1]->getCommand());
+		$this->assertSame('Random words', $statements[1]->getData());
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parseText
+	 */
+	public function testParseText_Dirs()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parseText("title Some words\r\n\n\n\rSome Random words", array(
+			__DIR__ . '/ParserTest/not used by text parser',
+		));
+
+		$this->assertCount(2, $statements);
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
+		$this->assertSame('Some', $statements[1]->getCommand());
+		$this->assertSame('Random words', $statements[1]->getData());
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Parser::parse
+	 */
+	public function testParse()
+	{
+		$object = new \SwaggerGen\Parser\Text\Parser();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Parser', $object);
+
+		$statements = $object->parse(__DIR__ . '/ParserTest/testParse.txt', array(
+			__DIR__ . '/ParserTest/not used by text parser',
+		));
+
+		$this->assertCount(2, $statements);
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[0]);
+		$this->assertSame('title', $statements[0]->getCommand());
+		$this->assertSame('Some words', $statements[0]->getData());
+
+		$this->assertInstanceOf('\SwaggerGen\Statement', $statements[1]);
+		$this->assertSame('Some', $statements[1]->getCommand());
+		$this->assertSame('Random words', $statements[1]->getData());
+	}
 
 }

tests/output/global response/source.php

Indentation +9 added lines, -9 removed lines

@@ -11,15 +11,15 @@
 class Example
 {
 
-    /**
-     * @rest\endpoint /endpoint/{listid}
-     * @rest\method GET Something
-     * @rest\param listid
-     * @rest\response 200
-     */
-    public function Dummy()
-    {
+	/**
+	 * @rest\endpoint /endpoint/{listid}
+	 * @rest\method GET Something
+	 * @rest\param listid
+	 * @rest\response 200
+	 */
+	public function Dummy()
+	{
 
-    }
+	}
 
 }

SwaggerGen/Swagger/ExternalDocumentation.php

Indentation +39 added lines, -39 removed lines

@@ -14,44 +14,44 @@
 class ExternalDocumentation extends AbstractObject
 {
 
-    private $url;
-    private $description;
-
-    public function __construct(AbstractObject $parent, $url, $description = null)
-    {
-        parent::__construct($parent);
-        $this->url = $url;
-        $this->description = $description;
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'url':
-            case 'description':
-                $this->$command = $data;
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'url' => $this->url,
-            'description' => empty($this->description) ? null : $this->description,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' ' . $this->url;
-    }
+	private $url;
+	private $description;
+
+	public function __construct(AbstractObject $parent, $url, $description = null)
+	{
+		parent::__construct($parent);
+		$this->url = $url;
+		$this->description = $description;
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'url':
+			case 'description':
+				$this->$command = $data;
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'url' => $this->url,
+			'description' => empty($this->description) ? null : $this->description,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' ' . $this->url;
+	}
 
 }

SwaggerGen/Swagger/Type/AbstractType.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
             if ($data === '') {
                 throw new Exception("Missing content for type example");
             }
-            $json = preg_replace_callback('/([^{}:,]+)/', static function ($match) {
+            $json = preg_replace_callback('/([^{}:,]+)/', static function($match) {
                 json_decode($match[1]);
                 return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
             }, trim($data));

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 
         if (isset(self::$classTypes[$format])) {
             $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}type";
             return new $class($parent, $definition);
         }
 

Indentation +190 added lines, -190 removed lines

@@ -15,195 +15,195 @@
  */
 abstract class AbstractType extends AbstractObject
 {
-    protected const REGEX_START = '/^';
-    protected const REGEX_FORMAT = '([a-z][a-z0-9]*)';
-    protected const REGEX_CONTENT = '(?:\((.*)\))?';
-    protected const REGEX_RANGE = '(?:([[<])(\\d*),(\\d*)([\\]>]))?';
-    protected const REGEX_DEFAULT = '(?:=(.+))?';
-    protected const REGEX_END = '$/i';
-
-    private static $classTypes = array(
-        'integer' => 'Integer',
-        'int' => 'Integer',
-        'int32' => 'Integer',
-        'int64' => 'Integer',
-        'long' => 'Integer',
-        'float' => 'Number',
-        'double' => 'Number',
-        'string' => 'String',
-        'uuid' => 'StringUuid',
-        'byte' => 'String',
-        'binary' => 'String',
-        'password' => 'String',
-        'enum' => 'String',
-        'boolean' => 'Boolean',
-        'bool' => 'Boolean',
-        'array' => 'Array',
-        'csv' => 'Array',
-        'ssv' => 'Array',
-        'tsv' => 'Array',
-        'pipes' => 'Array',
-        'date' => 'Date',
-        'datetime' => 'Date',
-        'date-time' => 'Date',
-        'object' => 'Object',
-        'refobject' => 'ReferenceObject',
-        'allof' => 'AllOf',
-    );
-
-    private $example;
-
-    /**
-     * @param AbstractObject $parent
-     * @param $definition
-     * @constructor
-     */
-    public function __construct(AbstractObject $parent, $definition)
-    {
-        parent::__construct($parent);
-
-        $this->parseDefinition($definition);
-    }
-
-    abstract protected function parseDefinition($definition);
-
-    /**
-     * @param AbstractObject $parent
-     * @param string $definition
-     * @param string $error
-     * @return self
-     * @throws Exception
-     */
-    public static function typeFactory($parent, $definition, $error = "Unparseable schema type definition: '%s'")
-    {
-        // Parse regex
-        $match = [];
-        if (preg_match('/^([a-z]+)/i', $definition, $match) === 1) {
-            $format = strtolower($match[1]);
-        } elseif (preg_match('/^(\[)(?:.*?)\]$/', $definition, $match) === 1) {
-            $format = 'array';
-        } elseif (preg_match('/^(\{)(?:.*?)\}$/', $definition, $match) === 1) {
-            $format = 'object';
-        } else {
-            throw new Exception(sprintf($error, $definition));
-        }
-
-        // Internal type if type known and not overwritten by definition
-        if ($parent->getTypeRegistry()->has($format)) {
-            $class = $parent->getTypeRegistry()->get($format);
-            return new $class($parent, $definition);
-        }
-
-        if (isset(self::$classTypes[$format])) {
-            $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
-            return new $class($parent, $definition);
-        }
-
-        return new ReferenceObjectType($parent, $definition);
-    }
-
-    /**
-     * Swap values of two variables.
-     * Used for sorting.
-     * @param mixed $a
-     * @param mixed $b
-     */
-    protected static function swap(&$a, &$b): void
-    {
-        $tmp = $a;
-        $a = $b;
-        $b = $tmp;
-    }
-
-    /**
-     * @param string $list
-     * @return array
-     */
-    protected static function parseList($list): array
-    {
-        $ret = [];
-        while ($item = self::parseListItem($list)) {
-            $ret[] = $item;
-        }
-        return $ret;
-    }
-
-    /**
-     * Extract an item from a comma-separated list of items.
-     *
-     * i.e. `a(x(x,x)),b(x)` returns `a(x(x,x))` and changes `$list` into `b(x)`.
-     * Note: brace nesting is not checked, e.g. `a{b(})` is a valid list item.
-     *
-     * @param string $list the list to parse
-     * @return string the extracted item
-     */
-    protected static function parseListItem(&$list): string
-    {
-        $item = '';
-
-        $depth = 0;
-        $index = 0;
-        while ($index < strlen($list)) {
-            $c = $list[$index++];
-
-            if (str_contains('{([<', $c)) {
-                ++$depth;
-            } elseif (str_contains('})]>', $c)) {
-                --$depth;
-            } elseif ($c === ',' && $depth === 0) {
-                break;
-            }
-
-            $item .= $c;
-        }
-        $list = substr($list, $index);
-
-        return $item;
-    }
-
-    /**
-     * Overwrites default AbstractObject parser, since Types should not handle
-     * extensions themselves.
-     *
-     * @param string $command
-     * @param string $data
-     * @return AbstractType|boolean
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (strtolower($command) === 'example') {
-            if ($data === '') {
-                throw new Exception("Missing content for type example");
-            }
-            $json = preg_replace_callback('/([^{}:,]+)/', static function ($match) {
-                json_decode($match[1]);
-                return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
-            }, trim($data));
-            $this->example = json_decode($json, true);
-
-            // In case input contains special chars, the above preg_replace would fail
-            //   Input could be a well-formed json already though
-            if ($this->example === null) {
-                $this->example = json_decode($data, true);
-            }
-            // If all fails, use input as-is
-            if ($this->example === null) {
-                $this->example = $data;
-            }
-
-            return $this;
-        }
-
-        return false;
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'example' => $this->example,
-        ), parent::toArray()));
-    }
+	protected const REGEX_START = '/^';
+	protected const REGEX_FORMAT = '([a-z][a-z0-9]*)';
+	protected const REGEX_CONTENT = '(?:\((.*)\))?';
+	protected const REGEX_RANGE = '(?:([[<])(\\d*),(\\d*)([\\]>]))?';
+	protected const REGEX_DEFAULT = '(?:=(.+))?';
+	protected const REGEX_END = '$/i';
+
+	private static $classTypes = array(
+		'integer' => 'Integer',
+		'int' => 'Integer',
+		'int32' => 'Integer',
+		'int64' => 'Integer',
+		'long' => 'Integer',
+		'float' => 'Number',
+		'double' => 'Number',
+		'string' => 'String',
+		'uuid' => 'StringUuid',
+		'byte' => 'String',
+		'binary' => 'String',
+		'password' => 'String',
+		'enum' => 'String',
+		'boolean' => 'Boolean',
+		'bool' => 'Boolean',
+		'array' => 'Array',
+		'csv' => 'Array',
+		'ssv' => 'Array',
+		'tsv' => 'Array',
+		'pipes' => 'Array',
+		'date' => 'Date',
+		'datetime' => 'Date',
+		'date-time' => 'Date',
+		'object' => 'Object',
+		'refobject' => 'ReferenceObject',
+		'allof' => 'AllOf',
+	);
+
+	private $example;
+
+	/**
+	 * @param AbstractObject $parent
+	 * @param $definition
+	 * @constructor
+	 */
+	public function __construct(AbstractObject $parent, $definition)
+	{
+		parent::__construct($parent);
+
+		$this->parseDefinition($definition);
+	}
+
+	abstract protected function parseDefinition($definition);
+
+	/**
+	 * @param AbstractObject $parent
+	 * @param string $definition
+	 * @param string $error
+	 * @return self
+	 * @throws Exception
+	 */
+	public static function typeFactory($parent, $definition, $error = "Unparseable schema type definition: '%s'")
+	{
+		// Parse regex
+		$match = [];
+		if (preg_match('/^([a-z]+)/i', $definition, $match) === 1) {
+			$format = strtolower($match[1]);
+		} elseif (preg_match('/^(\[)(?:.*?)\]$/', $definition, $match) === 1) {
+			$format = 'array';
+		} elseif (preg_match('/^(\{)(?:.*?)\}$/', $definition, $match) === 1) {
+			$format = 'object';
+		} else {
+			throw new Exception(sprintf($error, $definition));
+		}
+
+		// Internal type if type known and not overwritten by definition
+		if ($parent->getTypeRegistry()->has($format)) {
+			$class = $parent->getTypeRegistry()->get($format);
+			return new $class($parent, $definition);
+		}
+
+		if (isset(self::$classTypes[$format])) {
+			$type = self::$classTypes[$format];
+			$class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+			return new $class($parent, $definition);
+		}
+
+		return new ReferenceObjectType($parent, $definition);
+	}
+
+	/**
+	 * Swap values of two variables.
+	 * Used for sorting.
+	 * @param mixed $a
+	 * @param mixed $b
+	 */
+	protected static function swap(&$a, &$b): void
+	{
+		$tmp = $a;
+		$a = $b;
+		$b = $tmp;
+	}
+
+	/**
+	 * @param string $list
+	 * @return array
+	 */
+	protected static function parseList($list): array
+	{
+		$ret = [];
+		while ($item = self::parseListItem($list)) {
+			$ret[] = $item;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Extract an item from a comma-separated list of items.
+	 *
+	 * i.e. `a(x(x,x)),b(x)` returns `a(x(x,x))` and changes `$list` into `b(x)`.
+	 * Note: brace nesting is not checked, e.g. `a{b(})` is a valid list item.
+	 *
+	 * @param string $list the list to parse
+	 * @return string the extracted item
+	 */
+	protected static function parseListItem(&$list): string
+	{
+		$item = '';
+
+		$depth = 0;
+		$index = 0;
+		while ($index < strlen($list)) {
+			$c = $list[$index++];
+
+			if (str_contains('{([<', $c)) {
+				++$depth;
+			} elseif (str_contains('})]>', $c)) {
+				--$depth;
+			} elseif ($c === ',' && $depth === 0) {
+				break;
+			}
+
+			$item .= $c;
+		}
+		$list = substr($list, $index);
+
+		return $item;
+	}
+
+	/**
+	 * Overwrites default AbstractObject parser, since Types should not handle
+	 * extensions themselves.
+	 *
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractType|boolean
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (strtolower($command) === 'example') {
+			if ($data === '') {
+				throw new Exception("Missing content for type example");
+			}
+			$json = preg_replace_callback('/([^{}:,]+)/', static function ($match) {
+				json_decode($match[1]);
+				return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
+			}, trim($data));
+			$this->example = json_decode($json, true);
+
+			// In case input contains special chars, the above preg_replace would fail
+			//   Input could be a well-formed json already though
+			if ($this->example === null) {
+				$this->example = json_decode($data, true);
+			}
+			// If all fails, use input as-is
+			if ($this->example === null) {
+				$this->example = $data;
+			}
+
+			return $this;
+		}
+
+		return false;
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'example' => $this->example,
+		), parent::toArray()));
+	}
 
 }

SwaggerGen/Swagger/Type/Property.php

Indentation +67 added lines, -67 removed lines

@@ -16,82 +16,82 @@
 class Property extends AbstractObject
 {
 
-    /**
-     * Description of this property
-     * @var string
-     */
-    private $description;
+	/**
+	 * Description of this property
+	 * @var string
+	 */
+	private $description;
 
-    /**
-     * Whether property is read only
-     * @var bool
-     */
-    private $readOnly;
+	/**
+	 * Whether property is read only
+	 * @var bool
+	 */
+	private $readOnly;
 
-    /**
-     * Type definition of this property
-     * @var AbstractType
-     */
-    private $Type;
+	/**
+	 * Type definition of this property
+	 * @var AbstractType
+	 */
+	private $Type;
 
-    /**
-     * Create a new property
-     * @param AbstractObject $parent
-     * @param string $definition Either a built-in type or a definition name
-     * @param string $description description of the property
-     * @param bool $readOnly Whether the property is read only
-     * @throws Exception
-     */
-    public function __construct(AbstractObject $parent, $definition, $description = null, $readOnly = null)
-    {
-        parent::__construct($parent);
-        $this->Type = AbstractType::typeFactory($this, $definition, "Not a property: '%s'");
-        $this->description = $description;
-        $this->readOnly = $readOnly;
-    }
+	/**
+	 * Create a new property
+	 * @param AbstractObject $parent
+	 * @param string $definition Either a built-in type or a definition name
+	 * @param string $description description of the property
+	 * @param bool $readOnly Whether the property is read only
+	 * @throws Exception
+	 */
+	public function __construct(AbstractObject $parent, $definition, $description = null, $readOnly = null)
+	{
+		parent::__construct($parent);
+		$this->Type = AbstractType::typeFactory($this, $definition, "Not a property: '%s'");
+		$this->description = $description;
+		$this->readOnly = $readOnly;
+	}
 
-    /**
-     * @param string $command The comment command
-     * @param string $data Any data added after the command
-     * @return self|boolean
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        // Pass through to Type
-        if ($this->Type && $this->Type->handleCommand($command, $data)) {
-            return $this;
-        }
+	/**
+	 * @param string $command The comment command
+	 * @param string $data Any data added after the command
+	 * @return self|boolean
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		// Pass through to Type
+		if ($this->Type && $this->Type->handleCommand($command, $data)) {
+			return $this;
+		}
 
-        return parent::handleCommand($command, $data);
-    }
+		return parent::handleCommand($command, $data);
+	}
 
-    public function toArray(): array
-    {
-        // Reference + readonly/description result in allOf construct
-        // as it's semantically the same and that's what swagger tools
-        // like swagger-ui can understand
-        $requiresWrap =
-            $this->Type instanceof ReferenceObjectType
-            && (!empty($this->description) || !is_null($this->readOnly));
+	public function toArray(): array
+	{
+		// Reference + readonly/description result in allOf construct
+		// as it's semantically the same and that's what swagger tools
+		// like swagger-ui can understand
+		$requiresWrap =
+			$this->Type instanceof ReferenceObjectType
+			&& (!empty($this->description) || !is_null($this->readOnly));
 
-        $valueType = $this->Type->toArray();
+		$valueType = $this->Type->toArray();
 
-        if ($requiresWrap) {
-            $valueType = array(
-                'allOf' => array($valueType),
-            );
-        }
+		if ($requiresWrap) {
+			$valueType = array(
+				'allOf' => array($valueType),
+			);
+		}
 
-        return self::arrayFilterNull(array_merge($valueType, array(
-            'description' => empty($this->description) ? null : $this->description,
-            'readOnly' => $this->readOnly
-        ), parent::toArray()));
-    }
+		return self::arrayFilterNull(array_merge($valueType, array(
+			'description' => empty($this->description) ? null : $this->description,
+			'readOnly' => $this->readOnly
+		), parent::toArray()));
+	}
 
-    public function __toString()
-    {
-        return __CLASS__;
-    }
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
 }

SwaggerGen/Swagger/Type/StringType.php

Spacing +2 added lines, -2 removed lines

@@ -156,8 +156,8 @@
             'format' => empty($this->format) ? null : $this->format,
             'pattern' => $this->pattern,
             'default' => $this->default,
-            'minLength' => $this->minLength ? (int)$this->minLength : null,
-            'maxLength' => $this->maxLength ? (int)$this->maxLength : null,
+            'minLength' => $this->minLength ? (int) $this->minLength : null,
+            'maxLength' => $this->maxLength ? (int) $this->maxLength : null,
             'enum' => $this->enum,
         ), parent::toArray()));
     }

Indentation +194 added lines, -194 removed lines

@@ -15,199 +15,199 @@
 class StringType extends AbstractType
 {
 
-    private static $formats = array(
-        'string' => '',
-        'byte' => 'byte',
-        'binary' => 'binary',
-        'password' => 'password',
-        'enum' => '',
-    );
-
-    /**
-     * Name of the type
-     * @var string
-     */
-    protected $format = '';
-    protected $pattern;
-    protected $default;
-    protected $maxLength;
-    protected $minLength;
-    protected $enum = [];
-
-    /**
-     * @param string $command The comment command
-     * @param string $data Any data added after the command
-     * @return AbstractType|boolean
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'default':
-                $this->default = $this->validateDefault($data);
-                return $this;
-
-            case 'pattern':
-                $this->pattern = $data;
-                return $this;
-
-            case 'enum':
-                if ($this->minLength !== null || $this->maxLength !== null) {
-                    throw new Exception("Enumeration not allowed in ranged string: '{$data}'");
-                }
-                $words = self::wordSplit($data);
-                $this->enum = is_array($this->enum) ? array_merge($this->enum, $words) : $words;
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    /**
-     * Validate a default string value, depending on subtype
-     *
-     * @param string $value the value to validate
-     * @return string the value after validation (might become trimmed)
-     * @throws Exception
-     */
-    protected function validateDefault($value): string
-    {
-        if (empty($value)) {
-            if ($this->format) {
-                $type = $this->format;
-            } else {
-                $type = $this->enum ? 'enum' : 'string';
-            }
-            throw new Exception("Empty {$type} default");
-        }
-
-        if (!empty($this->enum) && !in_array($value, $this->enum, true)) {
-            throw new Exception("Invalid enum default: '{$value}'");
-        }
-
-        if ($this->maxLength !== null && mb_strlen($value) > $this->maxLength) {
-            if ($this->format) {
-                $type = $this->format;
-            } else {
-                $type = $this->enum ? 'enum' : 'string';
-            }
-            throw new Exception("Default {$type} length beyond maximum: '{$value}'");
-        }
-
-        if ($this->minLength !== null && mb_strlen($value) < $this->minLength) {
-            if ($this->format) {
-                $type = $this->format;
-            } else {
-                $type = $this->enum ? 'enum' : 'string';
-            }
-            throw new Exception("Default {$type} length beyond minimum: '{$value}'");
-        }
-
-        return $value;
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'string',
-            'format' => empty($this->format) ? null : $this->format,
-            'pattern' => $this->pattern,
-            'default' => $this->default,
-            'minLength' => $this->minLength ? (int)$this->minLength : null,
-            'maxLength' => $this->maxLength ? (int)$this->maxLength : null,
-            'enum' => $this->enum,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition): void
-    {
-        $definition = self::trim($definition);
-
-        $match = [];
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable string definition: '{$definition}'");
-        }
-
-        $this->parseFormat($definition, $match);
-        $this->parseContent($definition, $match);
-        $this->parseRange($definition, $match);
-        $this->parseDefault($definition, $match);
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseFormat($definition, $match): void
-    {
-        $type = strtolower($match[1]);
-        if (!isset(self::$formats[$type])) {
-            throw new Exception("Not a string: '{$definition}'");
-        }
-        $this->format = self::$formats[$type];
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     */
-    private function parseContent($definition, $match): void
-    {
-        if (strtolower($match[1]) === 'enum') {
-            $this->enum = explode(',', $match[2]);
-        } else {
-            $this->pattern = empty($match[2]) ? null : $match[2];
-        }
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     * @throws Exception
-     */
-    private function parseRange($definition, $match): void
-    {
-
-        if (!empty($match[3])) {
-            if ($match[1] === 'enum') {
-                throw new Exception("Range not allowed in enumeration definition: '{$definition}'");
-            }
-            if ($match[4] === '' && $match[5] === '') {
-                throw new Exception("Empty string range: '{$definition}'");
-            }
-            $exclusiveMinimum = $match[3] === '<';
-            $this->minLength = $match[4] === '' ? null : $match[4];
-            $this->maxLength = $match[5] === '' ? null : $match[5];
-            $exclusiveMaximum = isset($match[6]) ? ($match[6] === '>') : null;
-            if ($this->minLength !== null && $this->maxLength !== null && $this->minLength > $this->maxLength) {
-                self::swap($this->minLength, $this->maxLength);
-                self::swap($exclusiveMinimum, $exclusiveMaximum);
-            }
-            $this->minLength = $this->minLength === null ? null : max(0, $exclusiveMinimum ? $this->minLength + 1 : $this->minLength);
-            $this->maxLength = $this->maxLength === null ? null : max(0, $exclusiveMaximum ? $this->maxLength - 1 : $this->maxLength);
-        }
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseDefault($definition, $match): void
-    {
-        $this->default = isset($match[7]) && $match[7] !== '' ? $this->validateDefault($match[7]) : null;
-    }
+	private static $formats = array(
+		'string' => '',
+		'byte' => 'byte',
+		'binary' => 'binary',
+		'password' => 'password',
+		'enum' => '',
+	);
+
+	/**
+	 * Name of the type
+	 * @var string
+	 */
+	protected $format = '';
+	protected $pattern;
+	protected $default;
+	protected $maxLength;
+	protected $minLength;
+	protected $enum = [];
+
+	/**
+	 * @param string $command The comment command
+	 * @param string $data Any data added after the command
+	 * @return AbstractType|boolean
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'default':
+				$this->default = $this->validateDefault($data);
+				return $this;
+
+			case 'pattern':
+				$this->pattern = $data;
+				return $this;
+
+			case 'enum':
+				if ($this->minLength !== null || $this->maxLength !== null) {
+					throw new Exception("Enumeration not allowed in ranged string: '{$data}'");
+				}
+				$words = self::wordSplit($data);
+				$this->enum = is_array($this->enum) ? array_merge($this->enum, $words) : $words;
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	/**
+	 * Validate a default string value, depending on subtype
+	 *
+	 * @param string $value the value to validate
+	 * @return string the value after validation (might become trimmed)
+	 * @throws Exception
+	 */
+	protected function validateDefault($value): string
+	{
+		if (empty($value)) {
+			if ($this->format) {
+				$type = $this->format;
+			} else {
+				$type = $this->enum ? 'enum' : 'string';
+			}
+			throw new Exception("Empty {$type} default");
+		}
+
+		if (!empty($this->enum) && !in_array($value, $this->enum, true)) {
+			throw new Exception("Invalid enum default: '{$value}'");
+		}
+
+		if ($this->maxLength !== null && mb_strlen($value) > $this->maxLength) {
+			if ($this->format) {
+				$type = $this->format;
+			} else {
+				$type = $this->enum ? 'enum' : 'string';
+			}
+			throw new Exception("Default {$type} length beyond maximum: '{$value}'");
+		}
+
+		if ($this->minLength !== null && mb_strlen($value) < $this->minLength) {
+			if ($this->format) {
+				$type = $this->format;
+			} else {
+				$type = $this->enum ? 'enum' : 'string';
+			}
+			throw new Exception("Default {$type} length beyond minimum: '{$value}'");
+		}
+
+		return $value;
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'string',
+			'format' => empty($this->format) ? null : $this->format,
+			'pattern' => $this->pattern,
+			'default' => $this->default,
+			'minLength' => $this->minLength ? (int)$this->minLength : null,
+			'maxLength' => $this->maxLength ? (int)$this->maxLength : null,
+			'enum' => $this->enum,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$definition = self::trim($definition);
+
+		$match = [];
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable string definition: '{$definition}'");
+		}
+
+		$this->parseFormat($definition, $match);
+		$this->parseContent($definition, $match);
+		$this->parseRange($definition, $match);
+		$this->parseDefault($definition, $match);
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseFormat($definition, $match): void
+	{
+		$type = strtolower($match[1]);
+		if (!isset(self::$formats[$type])) {
+			throw new Exception("Not a string: '{$definition}'");
+		}
+		$this->format = self::$formats[$type];
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 */
+	private function parseContent($definition, $match): void
+	{
+		if (strtolower($match[1]) === 'enum') {
+			$this->enum = explode(',', $match[2]);
+		} else {
+			$this->pattern = empty($match[2]) ? null : $match[2];
+		}
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	private function parseRange($definition, $match): void
+	{
+
+		if (!empty($match[3])) {
+			if ($match[1] === 'enum') {
+				throw new Exception("Range not allowed in enumeration definition: '{$definition}'");
+			}
+			if ($match[4] === '' && $match[5] === '') {
+				throw new Exception("Empty string range: '{$definition}'");
+			}
+			$exclusiveMinimum = $match[3] === '<';
+			$this->minLength = $match[4] === '' ? null : $match[4];
+			$this->maxLength = $match[5] === '' ? null : $match[5];
+			$exclusiveMaximum = isset($match[6]) ? ($match[6] === '>') : null;
+			if ($this->minLength !== null && $this->maxLength !== null && $this->minLength > $this->maxLength) {
+				self::swap($this->minLength, $this->maxLength);
+				self::swap($exclusiveMinimum, $exclusiveMaximum);
+			}
+			$this->minLength = $this->minLength === null ? null : max(0, $exclusiveMinimum ? $this->minLength + 1 : $this->minLength);
+			$this->maxLength = $this->maxLength === null ? null : max(0, $exclusiveMaximum ? $this->maxLength - 1 : $this->maxLength);
+		}
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseDefault($definition, $match): void
+	{
+		$this->default = isset($match[7]) && $match[7] !== '' ? $this->validateDefault($match[7]) : null;
+	}
 
 }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
             } else {
                 $type = $this->enum ? 'enum' : 'string';
             }
-            throw new Exception("Empty {$type} default");
+            throw new Exception("empty {$type} default");
         }
 
         if (!empty($this->enum) && !in_array($value, $this->enum, true)) {
@@ -93,7 +93,7 @@ 
             } else {
                 $type = $this->enum ? 'enum' : 'string';
             }
-            throw new Exception("Default {$type} length beyond maximum: '{$value}'");
+            throw new Exception("default {$type} length beyond maximum: '{$value}'");
         }
 
         if ($this->minLength !== null && mb_strlen($value) < $this->minLength) {
@@ -102,7 +102,7 @@ 
             } else {
                 $type = $this->enum ? 'enum' : 'string';
             }
-            throw new Exception("Default {$type} length beyond minimum: '{$value}'");
+            throw new Exception("default {$type} length beyond minimum: '{$value}'");
         }
 
         return $value;

SwaggerGen/Swagger/Tag.php

Indentation +42 added lines, -42 removed lines

@@ -13,47 +13,47 @@
 class Tag extends AbstractDocumentableObject
 {
 
-    private $name;
-    private $description;
-
-    public function __construct(AbstractObject $parent, $name, $description = null)
-    {
-        parent::__construct($parent);
-        $this->name = $name;
-        $this->description = $description;
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (strtolower($command) === 'description') {
-            $this->description = $data;
-            return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'name' => $this->name,
-            'description' => empty($this->description) ? null : $this->description,
-        ), parent::toArray()));
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' ' . $this->name;
-    }
+	private $name;
+	private $description;
+
+	public function __construct(AbstractObject $parent, $name, $description = null)
+	{
+		parent::__construct($parent);
+		$this->name = $name;
+		$this->description = $description;
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (strtolower($command) === 'description') {
+			$this->description = $data;
+			return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'name' => $this->name,
+			'description' => empty($this->description) ? null : $this->description,
+		), parent::toArray()));
+	}
+
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' ' . $this->name;
+	}
 
 }

SwaggerGen/Swagger/Response.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
         static $lookup = null;
 
         if (is_numeric($search)) {
-            return (int)$search;
+            return (int) $search;
         }
 
         // build static lookup table
@@ -163,7 +163,7 @@ 
                 if ($data === '') {
                     throw new Exception('Missing content for example `' . $name . '`');
                 }
-                $json = preg_replace_callback('/([^{}:]+)/', static function ($match) {
+                $json = preg_replace_callback('/([^{}:]+)/', static function($match) {
                     json_decode($match[1]);
                     return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
                 }, trim($data));

Indentation +172 added lines, -172 removed lines

@@ -16,177 +16,177 @@
 class Response extends AbstractObject
 {
 
-    const OK = 200;
-    const CREATED = 201;
-    const ACCEPTED = 202;
-    const NON_AUTHORITATIVE_INFORMATION = 203;
-    const NO_CONTENT = 204;
-    const RESET_CONTENT = 205;
-    const PARTIAL_CONTENT = 206;
-    const BAD_REQUEST = 400;
-    const UNAUTHORIZED = 401;
-    const PAYMENT_REQUIRED = 402;
-    const FORBIDDEN = 403;
-    const NOT_FOUND = 404;
-    const METHOD_NOT_ALLOWED = 405;
-    const NOT_ACCEPTABLE = 406;
-    const PROXY_AUTHENTICATION_REQUIRED = 407;
-    const REQUEST_TIMEOUT = 408;
-    const CONFLICT = 409;
-    const GONE = 410;
-    const LENGTH_REQUIRED = 411;
-    const PRECONDITION_FAILED = 412;
-    const REQUEST_ENTITY_TOO_LARGE = 413;
-    const REQUEST_URI_TOO_LONG = 414;
-    const UNSUPPORTED_MEDIA_TYPE = 415;
-    const REQUESTED_RANGE_NOT_SATISFIABLE = 416;
-    const EXPECTATION_FAILED = 417;
-    const UNPROCESSABLE_ENTITY = 422;
-    const TOO_MANY_REQUESTS = 429;
-    const INTERNAL_SERVER_ERROR = 500;
-    const NOT_IMPLEMENTED = 501; // When method is supported for none of the resources
-
-    protected static $httpCodes = array(
-        self::OK => 'OK',
-        self::CREATED => 'Created',
-        self::ACCEPTED => 'Accepted',
-        self::NON_AUTHORITATIVE_INFORMATION => 'Non-Authoritative Information',
-        self::NO_CONTENT => 'No Content',
-        self::RESET_CONTENT => 'Reset Content',
-        self::PARTIAL_CONTENT => 'Partial Content',
-        self::BAD_REQUEST => 'Bad Request',
-        self::UNAUTHORIZED => 'Unauthorized',
-        self::PAYMENT_REQUIRED => 'Payment Required',
-        self::FORBIDDEN => 'Forbidden',
-        self::NOT_FOUND => 'Not Found',
-        self::METHOD_NOT_ALLOWED => 'Method Not Allowed',
-        self::NOT_ACCEPTABLE => 'Not Acceptable',
-        self::PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
-        self::REQUEST_TIMEOUT => 'Request Timeout',
-        self::CONFLICT => 'Conflict',
-        self::GONE => 'Gone',
-        self::LENGTH_REQUIRED => 'Length Required',
-        self::PRECONDITION_FAILED => 'Precondition Failed',
-        self::REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
-        self::REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
-        self::UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
-        self::REQUESTED_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
-        self::EXPECTATION_FAILED => 'Expectation Failed',
-        self::UNPROCESSABLE_ENTITY => 'Unprocessable Entity',
-        self::TOO_MANY_REQUESTS => 'Too Many Requests',
-        self::INTERNAL_SERVER_ERROR => 'Internal Server Error',
-        self::NOT_IMPLEMENTED => 'Not Implemented',
-    );
-    private $description = '';
-    private $schema;
-
-    /**
-     * @var Header[]
-     */
-    private $Headers = [];
-
-    /**
-     * JSON examples
-     * @var array
-     */
-    private $examples = [];
-
-    /**
-     * @throws Exception
-     */
-    public function __construct(AbstractObject $parent, $code, $definition = null, $description = null)
-    {
-        parent::__construct($parent);
-
-        if ($definition) {
-            $this->schema = new Schema($this, $definition);
-        }
-
-        if (!empty($description)) {
-            $this->description = $description;
-        } elseif (isset(self::$httpCodes[$code])) {
-            $this->description = self::$httpCodes[$code];
-        }
-    }
-
-    public static function getCode($search)
-    {
-        static $lookup = null;
-
-        if (is_numeric($search)) {
-            return (int)$search;
-        }
-
-        // build static lookup table
-        if (!$lookup) {
-            $lookup = [];
-            foreach (self::$httpCodes as $code => $text) {
-                $lookup[preg_replace('/[^a-z]+/', '', strtolower($text))] = $code;
-            }
-        }
-
-        $search = preg_replace('/[^a-z]+/', '', strtolower($search));
-        return $lookup[$search] ?? null;
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'header':
-                $type = self::wordShift($data);
-                if (empty($type)) {
-                    throw new Exception('Missing type for header');
-                }
-                $name = self::wordShift($data);
-                if (empty($name)) {
-                    throw new Exception('Missing name for header type \'' . $type . '\'');
-                }
-                $Header = new Header($this, $type, $data);
-                $this->Headers[$name] = $Header;
-                return $Header;
-
-            case 'example':
-                $name = self::wordShift($data);
-                if (empty($name)) {
-                    throw new Exception('Missing name for example');
-                }
-                if ($data === '') {
-                    throw new Exception('Missing content for example `' . $name . '`');
-                }
-                $json = preg_replace_callback('/([^{}:]+)/', static function ($match) {
-                    json_decode($match[1]);
-                    return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
-                }, trim($data));
-                $this->examples[$name] = json_decode($json, true);
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'description' => $this->description,
-            'schema' => $this->schema?->toArray(),
-            'headers' => self::objectsToArray($this->Headers),
-            'examples' => $this->examples,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
+	const OK = 200;
+	const CREATED = 201;
+	const ACCEPTED = 202;
+	const NON_AUTHORITATIVE_INFORMATION = 203;
+	const NO_CONTENT = 204;
+	const RESET_CONTENT = 205;
+	const PARTIAL_CONTENT = 206;
+	const BAD_REQUEST = 400;
+	const UNAUTHORIZED = 401;
+	const PAYMENT_REQUIRED = 402;
+	const FORBIDDEN = 403;
+	const NOT_FOUND = 404;
+	const METHOD_NOT_ALLOWED = 405;
+	const NOT_ACCEPTABLE = 406;
+	const PROXY_AUTHENTICATION_REQUIRED = 407;
+	const REQUEST_TIMEOUT = 408;
+	const CONFLICT = 409;
+	const GONE = 410;
+	const LENGTH_REQUIRED = 411;
+	const PRECONDITION_FAILED = 412;
+	const REQUEST_ENTITY_TOO_LARGE = 413;
+	const REQUEST_URI_TOO_LONG = 414;
+	const UNSUPPORTED_MEDIA_TYPE = 415;
+	const REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+	const EXPECTATION_FAILED = 417;
+	const UNPROCESSABLE_ENTITY = 422;
+	const TOO_MANY_REQUESTS = 429;
+	const INTERNAL_SERVER_ERROR = 500;
+	const NOT_IMPLEMENTED = 501; // When method is supported for none of the resources
+
+	protected static $httpCodes = array(
+		self::OK => 'OK',
+		self::CREATED => 'Created',
+		self::ACCEPTED => 'Accepted',
+		self::NON_AUTHORITATIVE_INFORMATION => 'Non-Authoritative Information',
+		self::NO_CONTENT => 'No Content',
+		self::RESET_CONTENT => 'Reset Content',
+		self::PARTIAL_CONTENT => 'Partial Content',
+		self::BAD_REQUEST => 'Bad Request',
+		self::UNAUTHORIZED => 'Unauthorized',
+		self::PAYMENT_REQUIRED => 'Payment Required',
+		self::FORBIDDEN => 'Forbidden',
+		self::NOT_FOUND => 'Not Found',
+		self::METHOD_NOT_ALLOWED => 'Method Not Allowed',
+		self::NOT_ACCEPTABLE => 'Not Acceptable',
+		self::PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+		self::REQUEST_TIMEOUT => 'Request Timeout',
+		self::CONFLICT => 'Conflict',
+		self::GONE => 'Gone',
+		self::LENGTH_REQUIRED => 'Length Required',
+		self::PRECONDITION_FAILED => 'Precondition Failed',
+		self::REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+		self::REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+		self::UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+		self::REQUESTED_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+		self::EXPECTATION_FAILED => 'Expectation Failed',
+		self::UNPROCESSABLE_ENTITY => 'Unprocessable Entity',
+		self::TOO_MANY_REQUESTS => 'Too Many Requests',
+		self::INTERNAL_SERVER_ERROR => 'Internal Server Error',
+		self::NOT_IMPLEMENTED => 'Not Implemented',
+	);
+	private $description = '';
+	private $schema;
+
+	/**
+	 * @var Header[]
+	 */
+	private $Headers = [];
+
+	/**
+	 * JSON examples
+	 * @var array
+	 */
+	private $examples = [];
+
+	/**
+	 * @throws Exception
+	 */
+	public function __construct(AbstractObject $parent, $code, $definition = null, $description = null)
+	{
+		parent::__construct($parent);
+
+		if ($definition) {
+			$this->schema = new Schema($this, $definition);
+		}
+
+		if (!empty($description)) {
+			$this->description = $description;
+		} elseif (isset(self::$httpCodes[$code])) {
+			$this->description = self::$httpCodes[$code];
+		}
+	}
+
+	public static function getCode($search)
+	{
+		static $lookup = null;
+
+		if (is_numeric($search)) {
+			return (int)$search;
+		}
+
+		// build static lookup table
+		if (!$lookup) {
+			$lookup = [];
+			foreach (self::$httpCodes as $code => $text) {
+				$lookup[preg_replace('/[^a-z]+/', '', strtolower($text))] = $code;
+			}
+		}
+
+		$search = preg_replace('/[^a-z]+/', '', strtolower($search));
+		return $lookup[$search] ?? null;
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'header':
+				$type = self::wordShift($data);
+				if (empty($type)) {
+					throw new Exception('Missing type for header');
+				}
+				$name = self::wordShift($data);
+				if (empty($name)) {
+					throw new Exception('Missing name for header type \'' . $type . '\'');
+				}
+				$Header = new Header($this, $type, $data);
+				$this->Headers[$name] = $Header;
+				return $Header;
+
+			case 'example':
+				$name = self::wordShift($data);
+				if (empty($name)) {
+					throw new Exception('Missing name for example');
+				}
+				if ($data === '') {
+					throw new Exception('Missing content for example `' . $name . '`');
+				}
+				$json = preg_replace_callback('/([^{}:]+)/', static function ($match) {
+					json_decode($match[1]);
+					return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
+				}, trim($data));
+				$this->examples[$name] = json_decode($json, true);
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'description' => $this->description,
+			'schema' => $this->schema?->toArray(),
+			'headers' => self::objectsToArray($this->Headers),
+			'examples' => $this->examples,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
 }