vanderlee / PHPSwaggerGen

SwaggerGen/StatementException.php

Indentation +23 added lines, -23 removed lines

@@ -15,28 +15,28 @@
 class StatementException extends \Exception
 {
 
-    /**
-     * @var Statement
-     */
-    private $statement;
-
-    /**
-     *
-     * @param string $message
-     * @param int $code
-     * @param Throwable $previous
-     * @param Statement $statement
-     */
-    public function __construct($message = "", $code = 0, $previous = null, $statement = null)
-    {
-        $this->statement = $statement;
-
-        parent::__construct($message, $code, $previous);
-    }
-
-    public function getStatement()
-    {
-        return $this->statement;
-    }
+	/**
+	 * @var Statement
+	 */
+	private $statement;
+
+	/**
+	 *
+	 * @param string $message
+	 * @param int $code
+	 * @param Throwable $previous
+	 * @param Statement $statement
+	 */
+	public function __construct($message = "", $code = 0, $previous = null, $statement = null)
+	{
+		$this->statement = $statement;
+
+		parent::__construct($message, $code, $previous);
+	}
+
+	public function getStatement()
+	{
+		return $this->statement;
+	}
 
 }

SwaggerGen/SwaggerGen.php

Indentation +212 added lines, -212 removed lines

@@ -38,217 +38,217 @@
 class SwaggerGen
 {
 
-    const FORMAT_ARRAY = '';
-    const FORMAT_JSON = 'json';
-    const FORMAT_JSON_PRETTY = 'json+';
-    const FORMAT_YAML = 'yaml';
-
-    private $host;
-    private $basePath;
-    private $dirs;
-    private $defines = [];
-
-    /**
-     * @var TypeRegistry
-     */
-    private $typeRegistry;
-
-    /**
-     * Create a new SwaggerGen instance
-     *
-     * @param string $host
-     * @param string $basePath
-     * @param string[] $dirs
-     * @param TypeRegistry $typeRegistry
-     */
-    public function __construct($host = '', $basePath = '', $dirs = [], $typeRegistry = null)
-    {
-        $this->host = $host;
-        $this->basePath = $basePath;
-        $this->dirs = $dirs;
-        $this->typeRegistry = $typeRegistry;
-    }
-
-    /**
-     * Set a new type registry
-     *
-     * @param TypeRegistry $typeRegistry
-     */
-    public function setTypeRegistry($typeRegistry = null)
-    {
-        $this->typeRegistry = $typeRegistry;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function define($name, $value = 1)
-    {
-        $this->defines[$name] = $value;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function undefine($name)
-    {
-        unset($this->defines[$name]);
-    }
-
-    /**
-     * @param string $file
-     * @param string[] $dirs
-     * @return Statement[]
-     * @throws Exception
-     */
-    private function parsePhpFile(string $file, array $dirs): array
-    {
-        $Parser = new Parser();
-        return $Parser->parse($file, $dirs, $this->defines);
-    }
-
-    /**
-     * @param string $file
-     * @param string[] $dirs
-     * @return Statement[]
-     */
-    private function parseTextFile($file, $dirs)
-    {
-        $Parser = new TextParser();
-        return $Parser->parse($file, $dirs, $this->defines);
-    }
-
-    /**
-     * @param string $text
-     * @param string[] $dirs
-     * @return Statement[]
-     */
-    private function parseText(string $text, array $dirs): array
-    {
-        $Parser = new TextParser();
-        return $Parser->parseText($text, $dirs, $this->defines);
-    }
-
-    /**
-     * Creates Swagger\Swagger object and populates it with statements
-     *
-     * This effectively converts the linear list of statements into parse-tree
-     * like structure, performing some checks (like rejecting unknown
-     * subcommands) during the process. Returned Swagger\Swagger object is
-     * ready for serialization with {@see Swagger\Swagger::toArray}
-     *
-     * @param string $host
-     * @param string $basePath
-     * @param Statement[] $statements
-     * @return Swagger
-     * @throws StatementException
-     */
-    public function parseStatements($host, $basePath, $statements)
-    {
-        $swagger = new Swagger($host, $basePath, $this->typeRegistry);
-
-        $stack = array($swagger);
-        /* @var AbstractObject[] $stack */
-        foreach ($statements as $statement) {
-            try {
-                $top = end($stack);
-
-                do {
-                    $result = $top->handleCommand($statement->getCommand(), $statement->getData());
-
-                    if ($result) {
-                        if ($result !== $top) {
-                            // Remove all similar classes from array first!
-                            $classname = get_class($result);
-                            $stack = array_filter($stack, function ($class) use ($classname) {
-                                return !(is_a($class, $classname));
-                            });
-
-                            $stack[] = $result;
-                        }
-                    } else {
-                        $top = prev($stack);
-                    }
-                } while (!$result && $top);
-            } catch (Exception $e) {
-                throw new StatementException($e->getMessage(), $e->getCode(), $e, $statement);
-            }
-
-            if (!$result && !$top) {
-                $messages = array("Unsupported or unknown command: {$statement->getCommand()} {$statement->getData()}");
-
-                $stacktrace = [];
-                foreach ($stack as $object) {
-                    $stacktrace[] = (string)$object;
-                }
-                $messages[] = join(', ' . PHP_EOL, $stacktrace);
-
-                throw new StatementException(join('. ', $messages), 0, null, $statement);
-            }
-        }
-
-        return $swagger;
-    }
-
-    /**
-     * Get Swagger 2.x output
-     *
-     * @param string[] $files
-     * @param string[] $dirs
-     * @param string $format
-     * @return array|false|string
-     * @throws Exception
-     * @throws StatementException
-     */
-    public function getSwagger(array $files, array $dirs = [], string $format = self::FORMAT_ARRAY)
-    {
-        $dirs = array_merge($this->dirs, $dirs);
-
-        $statements = [];
-        foreach ($files as $file) {
-            switch (pathinfo($file, PATHINFO_EXTENSION)) {
-                case 'php':
-                    $fileStatements = $this->parsePhpFile($file, $dirs);
-                    break;
-
-                case 'txt':
-                    $fileStatements = $this->parseTextFile($file, $dirs);
-                    break;
-
-                default:
-                    $fileStatements = $this->parseText($file, $dirs);
-                    break;
-            }
-
-            $statements = array_merge($statements, $fileStatements);
-        }
-
-        $output = $this->parseStatements($this->host, $this->basePath, $statements)->toArray();
-
-        switch ($format) {
-            case self::FORMAT_JSON:
-                $output = json_encode($output);
-                break;
-
-            case self::FORMAT_JSON_PRETTY:
-                $flags = (defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0); // Since PHP 5.4.0
-                $output = json_encode($output, $flags);
-                break;
-
-            case self::FORMAT_YAML:
-                if (!function_exists('yaml_emit')) {
-                    throw new Exception('YAML extension not installed.');
-                }
-                array_walk_recursive($output, function (&$value) {
-                    if (is_object($value)) {
-                        $value = (array)$value;
-                    }
-                });
-                $output = yaml_emit($output, YAML_UTF8_ENCODING, YAML_LN_BREAK);
-                break;
-        }
-
-        return $output;
-    }
+	const FORMAT_ARRAY = '';
+	const FORMAT_JSON = 'json';
+	const FORMAT_JSON_PRETTY = 'json+';
+	const FORMAT_YAML = 'yaml';
+
+	private $host;
+	private $basePath;
+	private $dirs;
+	private $defines = [];
+
+	/**
+	 * @var TypeRegistry
+	 */
+	private $typeRegistry;
+
+	/**
+	 * Create a new SwaggerGen instance
+	 *
+	 * @param string $host
+	 * @param string $basePath
+	 * @param string[] $dirs
+	 * @param TypeRegistry $typeRegistry
+	 */
+	public function __construct($host = '', $basePath = '', $dirs = [], $typeRegistry = null)
+	{
+		$this->host = $host;
+		$this->basePath = $basePath;
+		$this->dirs = $dirs;
+		$this->typeRegistry = $typeRegistry;
+	}
+
+	/**
+	 * Set a new type registry
+	 *
+	 * @param TypeRegistry $typeRegistry
+	 */
+	public function setTypeRegistry($typeRegistry = null)
+	{
+		$this->typeRegistry = $typeRegistry;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function define($name, $value = 1)
+	{
+		$this->defines[$name] = $value;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function undefine($name)
+	{
+		unset($this->defines[$name]);
+	}
+
+	/**
+	 * @param string $file
+	 * @param string[] $dirs
+	 * @return Statement[]
+	 * @throws Exception
+	 */
+	private function parsePhpFile(string $file, array $dirs): array
+	{
+		$Parser = new Parser();
+		return $Parser->parse($file, $dirs, $this->defines);
+	}
+
+	/**
+	 * @param string $file
+	 * @param string[] $dirs
+	 * @return Statement[]
+	 */
+	private function parseTextFile($file, $dirs)
+	{
+		$Parser = new TextParser();
+		return $Parser->parse($file, $dirs, $this->defines);
+	}
+
+	/**
+	 * @param string $text
+	 * @param string[] $dirs
+	 * @return Statement[]
+	 */
+	private function parseText(string $text, array $dirs): array
+	{
+		$Parser = new TextParser();
+		return $Parser->parseText($text, $dirs, $this->defines);
+	}
+
+	/**
+	 * Creates Swagger\Swagger object and populates it with statements
+	 *
+	 * This effectively converts the linear list of statements into parse-tree
+	 * like structure, performing some checks (like rejecting unknown
+	 * subcommands) during the process. Returned Swagger\Swagger object is
+	 * ready for serialization with {@see Swagger\Swagger::toArray}
+	 *
+	 * @param string $host
+	 * @param string $basePath
+	 * @param Statement[] $statements
+	 * @return Swagger
+	 * @throws StatementException
+	 */
+	public function parseStatements($host, $basePath, $statements)
+	{
+		$swagger = new Swagger($host, $basePath, $this->typeRegistry);
+
+		$stack = array($swagger);
+		/* @var AbstractObject[] $stack */
+		foreach ($statements as $statement) {
+			try {
+				$top = end($stack);
+
+				do {
+					$result = $top->handleCommand($statement->getCommand(), $statement->getData());
+
+					if ($result) {
+						if ($result !== $top) {
+							// Remove all similar classes from array first!
+							$classname = get_class($result);
+							$stack = array_filter($stack, function ($class) use ($classname) {
+								return !(is_a($class, $classname));
+							});
+
+							$stack[] = $result;
+						}
+					} else {
+						$top = prev($stack);
+					}
+				} while (!$result && $top);
+			} catch (Exception $e) {
+				throw new StatementException($e->getMessage(), $e->getCode(), $e, $statement);
+			}
+
+			if (!$result && !$top) {
+				$messages = array("Unsupported or unknown command: {$statement->getCommand()} {$statement->getData()}");
+
+				$stacktrace = [];
+				foreach ($stack as $object) {
+					$stacktrace[] = (string)$object;
+				}
+				$messages[] = join(', ' . PHP_EOL, $stacktrace);
+
+				throw new StatementException(join('. ', $messages), 0, null, $statement);
+			}
+		}
+
+		return $swagger;
+	}
+
+	/**
+	 * Get Swagger 2.x output
+	 *
+	 * @param string[] $files
+	 * @param string[] $dirs
+	 * @param string $format
+	 * @return array|false|string
+	 * @throws Exception
+	 * @throws StatementException
+	 */
+	public function getSwagger(array $files, array $dirs = [], string $format = self::FORMAT_ARRAY)
+	{
+		$dirs = array_merge($this->dirs, $dirs);
+
+		$statements = [];
+		foreach ($files as $file) {
+			switch (pathinfo($file, PATHINFO_EXTENSION)) {
+				case 'php':
+					$fileStatements = $this->parsePhpFile($file, $dirs);
+					break;
+
+				case 'txt':
+					$fileStatements = $this->parseTextFile($file, $dirs);
+					break;
+
+				default:
+					$fileStatements = $this->parseText($file, $dirs);
+					break;
+			}
+
+			$statements = array_merge($statements, $fileStatements);
+		}
+
+		$output = $this->parseStatements($this->host, $this->basePath, $statements)->toArray();
+
+		switch ($format) {
+			case self::FORMAT_JSON:
+				$output = json_encode($output);
+				break;
+
+			case self::FORMAT_JSON_PRETTY:
+				$flags = (defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0); // Since PHP 5.4.0
+				$output = json_encode($output, $flags);
+				break;
+
+			case self::FORMAT_YAML:
+				if (!function_exists('yaml_emit')) {
+					throw new Exception('YAML extension not installed.');
+				}
+				array_walk_recursive($output, function (&$value) {
+					if (is_object($value)) {
+						$value = (array)$value;
+					}
+				});
+				$output = yaml_emit($output, YAML_UTF8_ENCODING, YAML_LN_BREAK);
+				break;
+		}
+
+		return $output;
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -160,7 +160,7 @@ 
                         if ($result !== $top) {
                             // Remove all similar classes from array first!
                             $classname = get_class($result);
-                            $stack = array_filter($stack, function ($class) use ($classname) {
+                            $stack = array_filter($stack, function($class) use ($classname) {
                                 return !(is_a($class, $classname));
                             });
 
@@ -179,7 +179,7 @@ 
 
                 $stacktrace = [];
                 foreach ($stack as $object) {
-                    $stacktrace[] = (string)$object;
+                    $stacktrace[] = (string) $object;
                 }
                 $messages[] = join(', ' . PHP_EOL, $stacktrace);
 
@@ -239,9 +239,9 @@ 
                 if (!function_exists('yaml_emit')) {
                     throw new Exception('YAML extension not installed.');
                 }
-                array_walk_recursive($output, function (&$value) {
+                array_walk_recursive($output, function(&$value) {
                     if (is_object($value)) {
-                        $value = (array)$value;
+                        $value = (array) $value;
                     }
                 });
                 $output = yaml_emit($output, YAML_UTF8_ENCODING, YAML_LN_BREAK);

SwaggerGen/Statement.php

Indentation +50 added lines, -50 removed lines

@@ -14,61 +14,61 @@
 class Statement
 {
 
-    private $command;
-    private $data;
-    private $file;
-    private $line;
+	private $command;
+	private $data;
+	private $file;
+	private $line;
 
-    public function __construct($command, $data = null, $file = null, $line = null)
-    {
-        $this->command = $command;
-        $this->data = $data;
-        $this->file = $file;
-        $this->line = $line;
-    }
+	public function __construct($command, $data = null, $file = null, $line = null)
+	{
+		$this->command = $command;
+		$this->data = $data;
+		$this->file = $file;
+		$this->line = $line;
+	}
 
-    public function __toString()
-    {
-        $message = "Command '{$this->command}'";
-        $message .= $this->data ? " with data '{$this->data}'" : ' without data';
-        $message .= $this->file ? " from static text" : " in file '{$this->file}' on line {$this->line}";
-        return $message;
-    }
+	public function __toString()
+	{
+		$message = "Command '{$this->command}'";
+		$message .= $this->data ? " with data '{$this->data}'" : ' without data';
+		$message .= $this->file ? " from static text" : " in file '{$this->file}' on line {$this->line}";
+		return $message;
+	}
 
-    /**
-     * Get the command part of this statement
-     * @return string single word, without spaces
-     */
-    public function getCommand()
-    {
-        return $this->command;
-    }
+	/**
+	 * Get the command part of this statement
+	 * @return string single word, without spaces
+	 */
+	public function getCommand()
+	{
+		return $this->command;
+	}
 
-    /**
-     * Get the data of this statement
-     * @return string may contain spaces
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
+	/**
+	 * Get the data of this statement
+	 * @return string may contain spaces
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
 
-    /**
-     * Get the file (if available) where this statement was parsed from
-     * @return string|null the full filename or null of from static text
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
+	/**
+	 * Get the file (if available) where this statement was parsed from
+	 * @return string|null the full filename or null of from static text
+	 */
+	public function getFile()
+	{
+		return $this->file;
+	}
 
-    /**
-     * Get the line number where this statement was found
-     * @return int|null the line number
-     */
-    public function getLine()
-    {
-        return $this->line;
-    }
+	/**
+	 * Get the line number where this statement was found
+	 * @return int|null the line number
+	 */
+	public function getLine()
+	{
+		return $this->line;
+	}
 
 }

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()
-    {
-        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()
+	{
+		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/Parameter.php

Indentation +142 added lines, -142 removed lines

@@ -15,147 +15,147 @@
 class Parameter extends AbstractObject implements IParameter
 {
 
-    private static $classTypes = array(
-        'integer' => 'Integer',
-        'int' => 'Integer',
-        'int32' => 'Integer',
-        'int64' => 'Integer',
-        'long' => 'Integer',
-        'float' => 'Number',
-        'double' => 'Number',
-        'string' => 'String',
-        'byte' => 'String',
-        'binary' => 'String',
-        'password' => 'String',
-        'enum' => 'String',
-        'uuid' => 'StringUuid',
-        'boolean' => 'Boolean',
-        'bool' => 'Boolean',
-        'array' => 'Array',
-        'csv' => 'Array',
-        'ssv' => 'Array',
-        'tsv' => 'Array',
-        'pipes' => 'Array',
-        'multi' => 'Array',
-        'date' => 'Date',
-        'datetime' => 'Date',
-        'date-time' => 'Date',
-        'file' => 'File',
-    );
-    private $name = '';
-    private $in;
-    private $description;
-    private $required = false;
-
-    /**
-     * @var Type\AbstractType
-     */
-    private $Type;
-
-    /**
-     * Returns true if the "multi" array collectionFormat is allowed for this
-     * parameter.
-     * @return bool
-     */
-    public function isMulti(): bool
-    {
-        return in_array($this->in, array('query', 'form'));
-    }
-
-    /**
-     * Return true if the parameter is of type 'formData'
-     * @return bool
-     */
-    public function isForm(): bool
-    {
-        return $this->in === 'form';
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function __construct(AbstractObject $parent, $in, $data, $required = false)
-    {
-        parent::__construct($parent);
-
-        if ($in !== 'path' && $in !== 'form' && $in !== 'query' && $in !== 'header') {
-            throw new Exception("Invalid in for parameter: '{$in}'");
-        }
-        $this->in = $in;
-
-        $definition = self::wordShift($data);
-        if (empty($definition)) {
-            throw new Exception('No type definition for parameter');
-        }
-
-        $name = self::wordShift($data);
-        if (empty($name)) {
-            throw new Exception('No name for parameter');
-        } else {
-            $this->name = $name;
-        }
-
-        $this->description = $data;
-        $this->required = (bool)$required;
-
-        // Parse regex
-        $match = array();
-        if (preg_match('/^([a-z][a-z0-9]*)/i', $definition, $match) === 1) {
-            $format = strtolower($match[1]);
-        } elseif (preg_match('/^(\[)(?:.*?)\]$/i', $definition, $match) === 1) {
-            $format = 'array';
-        } elseif (preg_match('/^(\{)(?:.*?)\}$/i', $definition, $match) === 1) {
-            $format = 'object';
-        } else {
-            throw new Exception('Unparseable parameter format definition: \'' . $definition . '\'');
-        }
-
-        if ($this->getTypeRegistry()->has($format)) {
-            $class = $this->getTypeRegistry()->get($format);
-            $this->Type = new $class($this, $definition);
-        } elseif (isset(self::$classTypes[$format])) {
-            $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
-            $this->Type = new $class($this, $definition);
-        } else {
-            throw new Exception("Type format not recognized: '{$format}'");
-        }
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|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);
-    }
-
-    public function toArray()
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'name' => $this->name,
-            'in' => $this->in === 'form' ? 'formData' : $this->in,
-            'description' => empty($this->description) ? null : $this->description,
-            'required' => $this->in === 'path' || $this->required ? true : null,
-        ), $this->Type->toArray(), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . " {$this->name} {$this->in}";
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
+	private static $classTypes = array(
+		'integer' => 'Integer',
+		'int' => 'Integer',
+		'int32' => 'Integer',
+		'int64' => 'Integer',
+		'long' => 'Integer',
+		'float' => 'Number',
+		'double' => 'Number',
+		'string' => 'String',
+		'byte' => 'String',
+		'binary' => 'String',
+		'password' => 'String',
+		'enum' => 'String',
+		'uuid' => 'StringUuid',
+		'boolean' => 'Boolean',
+		'bool' => 'Boolean',
+		'array' => 'Array',
+		'csv' => 'Array',
+		'ssv' => 'Array',
+		'tsv' => 'Array',
+		'pipes' => 'Array',
+		'multi' => 'Array',
+		'date' => 'Date',
+		'datetime' => 'Date',
+		'date-time' => 'Date',
+		'file' => 'File',
+	);
+	private $name = '';
+	private $in;
+	private $description;
+	private $required = false;
+
+	/**
+	 * @var Type\AbstractType
+	 */
+	private $Type;
+
+	/**
+	 * Returns true if the "multi" array collectionFormat is allowed for this
+	 * parameter.
+	 * @return bool
+	 */
+	public function isMulti(): bool
+	{
+		return in_array($this->in, array('query', 'form'));
+	}
+
+	/**
+	 * Return true if the parameter is of type 'formData'
+	 * @return bool
+	 */
+	public function isForm(): bool
+	{
+		return $this->in === 'form';
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function __construct(AbstractObject $parent, $in, $data, $required = false)
+	{
+		parent::__construct($parent);
+
+		if ($in !== 'path' && $in !== 'form' && $in !== 'query' && $in !== 'header') {
+			throw new Exception("Invalid in for parameter: '{$in}'");
+		}
+		$this->in = $in;
+
+		$definition = self::wordShift($data);
+		if (empty($definition)) {
+			throw new Exception('No type definition for parameter');
+		}
+
+		$name = self::wordShift($data);
+		if (empty($name)) {
+			throw new Exception('No name for parameter');
+		} else {
+			$this->name = $name;
+		}
+
+		$this->description = $data;
+		$this->required = (bool)$required;
+
+		// Parse regex
+		$match = array();
+		if (preg_match('/^([a-z][a-z0-9]*)/i', $definition, $match) === 1) {
+			$format = strtolower($match[1]);
+		} elseif (preg_match('/^(\[)(?:.*?)\]$/i', $definition, $match) === 1) {
+			$format = 'array';
+		} elseif (preg_match('/^(\{)(?:.*?)\}$/i', $definition, $match) === 1) {
+			$format = 'object';
+		} else {
+			throw new Exception('Unparseable parameter format definition: \'' . $definition . '\'');
+		}
+
+		if ($this->getTypeRegistry()->has($format)) {
+			$class = $this->getTypeRegistry()->get($format);
+			$this->Type = new $class($this, $definition);
+		} elseif (isset(self::$classTypes[$format])) {
+			$type = self::$classTypes[$format];
+			$class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+			$this->Type = new $class($this, $definition);
+		} else {
+			throw new Exception("Type format not recognized: '{$format}'");
+		}
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|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);
+	}
+
+	public function toArray()
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'name' => $this->name,
+			'in' => $this->in === 'form' ? 'formData' : $this->in,
+			'description' => empty($this->description) ? null : $this->description,
+			'required' => $this->in === 'path' || $this->required ? true : null,
+		), $this->Type->toArray(), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . " {$this->name} {$this->in}";
+	}
+
+	public function getName()
+	{
+		return $this->name;
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         }
 
         $this->description = $data;
-        $this->required = (bool)$required;
+        $this->required = (bool) $required;
 
         // Parse regex
         $match = array();

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

@@ -115,7 +115,7 @@
             $this->Type = new $class($this, $definition);
         } elseif (isset(self::$classTypes[$format])) {
             $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}type";
             $this->Type = new $class($this, $definition);
         } else {
             throw new Exception("Type format not recognized: '{$format}'");

SwaggerGen/Swagger/Response.php

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 = array();
-
-    /**
-     * JSON examples
-     * @var array
-     */
-    private $examples = array();
-
-    public static function getCode($search)
-    {
-        static $lookup = null;
-
-        if (is_numeric($search)) {
-            return intval($search);
-        }
-
-        // build static lookup table
-        if (!$lookup) {
-            $lookup = array();
-            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;
-    }
-
-    /**
-     * @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];
-        }
-    }
-
-    /**
-     * @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('/([^{}:]+)/', 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()
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'description' => $this->description,
-            'schema' => $this->schema ? $this->schema->toArray() : null,
-            '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 = array();
+
+	/**
+	 * JSON examples
+	 * @var array
+	 */
+	private $examples = array();
+
+	public static function getCode($search)
+	{
+		static $lookup = null;
+
+		if (is_numeric($search)) {
+			return intval($search);
+		}
+
+		// build static lookup table
+		if (!$lookup) {
+			$lookup = array();
+			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;
+	}
+
+	/**
+	 * @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];
+		}
+	}
+
+	/**
+	 * @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('/([^{}:]+)/', 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()
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'description' => $this->description,
+			'schema' => $this->schema ? $this->schema->toArray() : null,
+			'headers' => self::objectsToArray($this->Headers),
+			'examples' => $this->examples,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
 }

Spacing +1 added lines, -1 removed lines

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

SwaggerGen/Swagger/SecurityScheme.php

Indentation +127 added lines, -127 removed lines

@@ -16,132 +16,132 @@
 class SecurityScheme extends AbstractObject
 {
 
-    /**
-     * 'basic', 'apikey' or 'oauth2'
-     * @var string
-     */
-    private $type;
-
-    /**
-     * @var string
-     */
-    private $description;
-    private $name;
-    private $in;
-    private $flow;
-    private $authorizationUrl;
-    private $tokenUrl;
-
-    /**
-     * Map of scope-name => description
-     * @var []
-     */
-    private $scopes = array();
-
-    /**
-     * Create a new SecurityScheme object
-     * @param AbstractObject $parent
-     * @param string $type
-     * @param string $data
-     * @throws Exception
-     */
-    public function __construct(AbstractObject $parent, $type, $data = null)
-    {
-        parent::__construct($parent);
-
-        if (!in_array(strtolower($type), array('basic', 'apikey', 'oauth2'))) {
-            throw new Exception("Security scheme type must be either 'basic', 'apiKey' or 'oauth2', not '{$type}'");
-        }
-        $this->type = strtolower($type);
-
-        switch ($this->type) {
-            case 'basic':
-                $this->description = $data;
-                break;
-
-            case 'apikey':
-                $this->name = self::wordShift($data);
-
-                $in = strtolower(self::wordShift($data));
-                if (!in_array($in, array('query', 'header'))) {
-                    throw new Exception("ApiKey in must be either 'query' or 'header', not '{$in}'");
-                }
-                $this->in = $in;
-
-                $this->description = $data;
-                break;
-
-            case 'oauth2':
-                $flow = strtolower(self::wordShift($data));
-                if (!in_array($flow, array('implicit', 'password', 'application', 'accesscode'))) {
-                    throw new Exception("OAuth2 flow must be either 'implicit', 'password', 'application' or 'accesscode', not '{$flow}'");
-                }
-                $this->flow = $flow;
-
-                if (in_array($flow, array('implicit', 'accesscode'))) {
-                    $authUrl = self::wordShift($data);
-                    if (!filter_var($authUrl, FILTER_VALIDATE_URL)) {
-                        throw new Exception("OAuth2 authorization URL invalid: '{$authUrl}'");
-                    }
-                    $this->authorizationUrl = $authUrl;
-                }
-
-                if (in_array($flow, array('password', 'application', 'accesscode'))) {
-                    $tokenUrl = self::wordShift($data);
-                    if (!filter_var($tokenUrl, FILTER_VALIDATE_URL)) {
-                        throw new Exception("OAuth2 token URL invalid: '{$tokenUrl}'");
-                    }
-                    $this->tokenUrl = $tokenUrl;
-                }
-
-                $this->description = $data;
-                break;
-        }
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'description':
-                $this->description = $data;
-                return $this;
-
-            case 'scope':
-                if ($this->type !== 'oauth2') {
-                    throw new Exception("Cannot set scope on type '{$this->type}'");
-                }
-
-                $name = self::wordShift($data);
-                $this->scopes[$name] = $data;
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray()
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => $this->type === 'apikey' ? 'apiKey' : $this->type,
-            'description' => empty($this->description) ? null : $this->description,
-            'name' => $this->name,
-            'in' => $this->in,
-            'flow' => $this->flow === 'accesscode' ? 'accessCode' : $this->flow,
-            'authorizationUrl' => $this->authorizationUrl,
-            'tokenUrl' => $this->tokenUrl,
-            'scopes' => $this->scopes,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' ' . $this->type;
-    }
+	/**
+	 * 'basic', 'apikey' or 'oauth2'
+	 * @var string
+	 */
+	private $type;
+
+	/**
+	 * @var string
+	 */
+	private $description;
+	private $name;
+	private $in;
+	private $flow;
+	private $authorizationUrl;
+	private $tokenUrl;
+
+	/**
+	 * Map of scope-name => description
+	 * @var []
+	 */
+	private $scopes = array();
+
+	/**
+	 * Create a new SecurityScheme object
+	 * @param AbstractObject $parent
+	 * @param string $type
+	 * @param string $data
+	 * @throws Exception
+	 */
+	public function __construct(AbstractObject $parent, $type, $data = null)
+	{
+		parent::__construct($parent);
+
+		if (!in_array(strtolower($type), array('basic', 'apikey', 'oauth2'))) {
+			throw new Exception("Security scheme type must be either 'basic', 'apiKey' or 'oauth2', not '{$type}'");
+		}
+		$this->type = strtolower($type);
+
+		switch ($this->type) {
+			case 'basic':
+				$this->description = $data;
+				break;
+
+			case 'apikey':
+				$this->name = self::wordShift($data);
+
+				$in = strtolower(self::wordShift($data));
+				if (!in_array($in, array('query', 'header'))) {
+					throw new Exception("ApiKey in must be either 'query' or 'header', not '{$in}'");
+				}
+				$this->in = $in;
+
+				$this->description = $data;
+				break;
+
+			case 'oauth2':
+				$flow = strtolower(self::wordShift($data));
+				if (!in_array($flow, array('implicit', 'password', 'application', 'accesscode'))) {
+					throw new Exception("OAuth2 flow must be either 'implicit', 'password', 'application' or 'accesscode', not '{$flow}'");
+				}
+				$this->flow = $flow;
+
+				if (in_array($flow, array('implicit', 'accesscode'))) {
+					$authUrl = self::wordShift($data);
+					if (!filter_var($authUrl, FILTER_VALIDATE_URL)) {
+						throw new Exception("OAuth2 authorization URL invalid: '{$authUrl}'");
+					}
+					$this->authorizationUrl = $authUrl;
+				}
+
+				if (in_array($flow, array('password', 'application', 'accesscode'))) {
+					$tokenUrl = self::wordShift($data);
+					if (!filter_var($tokenUrl, FILTER_VALIDATE_URL)) {
+						throw new Exception("OAuth2 token URL invalid: '{$tokenUrl}'");
+					}
+					$this->tokenUrl = $tokenUrl;
+				}
+
+				$this->description = $data;
+				break;
+		}
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'description':
+				$this->description = $data;
+				return $this;
+
+			case 'scope':
+				if ($this->type !== 'oauth2') {
+					throw new Exception("Cannot set scope on type '{$this->type}'");
+				}
+
+				$name = self::wordShift($data);
+				$this->scopes[$name] = $data;
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray()
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => $this->type === 'apikey' ? 'apiKey' : $this->type,
+			'description' => empty($this->description) ? null : $this->description,
+			'name' => $this->name,
+			'in' => $this->in,
+			'flow' => $this->flow === 'accesscode' ? 'accessCode' : $this->flow,
+			'authorizationUrl' => $this->authorizationUrl,
+			'tokenUrl' => $this->tokenUrl,
+			'scopes' => $this->scopes,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' ' . $this->type;
+	}
 
 }

SwaggerGen/Swagger/Operation.php

Indentation +225 added lines, -225 removed lines

@@ -16,230 +16,230 @@
 class Operation extends AbstractDocumentableObject
 {
 
-    private $tags = array();
-    private $summary;
-    private $description;
-    private $consumes = array();
-    private $produces = array();
-
-    /**
-     * @var IParameter[]
-     */
-    private $parameters = array();
-    private $responses = array();
-    private $schemes = array();
-    private $deprecated = false;
-    private $security = array();
-
-    /**
-     * @var string
-     */
-    private $operationId = null;
-
-    public function getConsumes(): array
-    {
-        return $this->consumes;
-    }
-
-    /**
-     * @param string $summary
-     */
-    public function __construct(AbstractObject $parent, $summary = null, Tag $tag = null)
-    {
-        parent::__construct($parent);
-        $this->summary = $summary;
-        if ($tag) {
-            $this->tags[] = $tag->getName();
-        }
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            // string
-            case 'summary':
-            case 'description':
-                $this->$command = $data;
-                return $this;
-
-            // string[]
-            case 'tags':
-            case 'schemes':
-                $this->$command = array_merge($this->$command, self::wordSplit($data));
-                return $this;
-
-            // MIME[]
-            case 'consumes':
-            case 'produces':
-                $this->$command = array_merge($this->$command, self::translateMimeTypes(self::wordSplit($data)));
-                return $this;
-
-            // boolean
-            case 'deprecated':
-                $this->deprecated = true;
-                return $this;
-
-            case 'error':
-                $code = self::wordShift($data);
-                $reasoncode = Response::getCode($code);
-                if ($reasoncode === null) {
-                    throw new Exception("Invalid error code: '$code'");
-                }
-                $description = $data;
-                $Error = new Error($this, $reasoncode, $description);
-                $this->responses[$reasoncode] = $Error;
-                return $Error;
-
-            case 'errors':
-                foreach (self::wordSplit($data) as $code) {
-                    $reasoncode = Response::getCode($code);
-                    if ($reasoncode === null) {
-                        throw new Exception("Invalid error code: '$code'");
-                    }
-                    $this->responses[$reasoncode] = new Error($this, $reasoncode);
-                }
-                return $this;
-
-            case 'path':
-            case 'query':
-            case 'query?':
-            case 'header':
-            case 'header?':
-            case 'form':
-            case 'form?':
-                $in = rtrim($command, '?');
-                $parameter = new Parameter($this, $in, $data, substr($command, -1) !== '?');
-                $this->parameters[$parameter->getName()] = $parameter;
-                return $parameter;
-
-            case 'body':
-            case 'body?':
-                $parameter = new BodyParameter($this, $data, substr($command, -1) !== '?');
-                $this->parameters[$parameter->getName()] = $parameter;
-                return $parameter;
-
-            case 'param':
-            case 'parameter':
-                $parameter = new ParameterReference($this, $data);
-                $this->parameters[$parameter->getName()] = $parameter;
-                return $this;
-
-            case 'response':
-                $code = self::wordShift($data);
-                $reasoncode = Response::getCode($code);
-                if ($reasoncode === null) {
-                    $reference = $code;
-                    $code = self::wordShift($data);
-                    $reasoncode = Response::getCode($code);
-                    if ($reasoncode === null) {
-                        throw new Exception("Invalid response code: '$reference'");
-                    }
-                    $this->responses[$reasoncode] = new ResponseReference($this, $reference);
-                    return $this;
-                } else {
-                    $definition = self::wordShift($data);
-                    $description = $data;
-                    $Response = new Response($this, $reasoncode, $definition, $description);
-                    $this->responses[$reasoncode] = $Response;
-                    return $Response;
-                }
-
-            case 'require':
-                $name = self::wordShift($data);
-                if (empty($name)) {
-                    throw new Exception('Empty security requirement name');
-                }
-                $scopes = self::wordSplit($data);
-                sort($scopes);
-                $this->security[] = array(
-                    $name => empty($scopes) ? array() : $scopes,
-                );
-                return $this;
-
-            case 'id':
-                $operationId = self::trim($data);
-                if ($this->getSwagger()->hasOperationId($operationId)) {
-                    throw new Exception("Duplicate operation id '{$operationId}'");
-                }
-                $this->operationId = $operationId;
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function toArray()
-    {
-        if (empty($this->responses)) {
-            throw new Exception('No response defined for operation');
-        }
-        ksort($this->responses);
-
-        $tags = array_unique($this->tags);
-        sort($tags);
-
-        $schemes = array_unique($this->schemes);
-        sort($schemes);
-
-        $consumes = array_unique($this->consumes);
-        sort($consumes);
-
-        $produces = array_unique($this->produces);
-        sort($produces);
-
-        foreach ($this->security as $security) {
-            foreach ($security as $name => $scope) {
-                if ($this->getSwagger()->getSecurity($name) === false) {
-                    throw new Exception("Required security scheme not defined: '{$name}'");
-                }
-            }
-        }
-
-        $parameters = $this->parameters ? array_values($this->parameters) : null;
-
-        return self::arrayFilterNull(array_merge(array(
-            'deprecated' => $this->deprecated ? true : null,
-            'tags' => $tags,
-            'summary' => empty($this->summary) ? null : $this->summary,
-            'description' => empty($this->description) ? null : $this->description,
-            'operationId' => $this->operationId,
-            'consumes' => $consumes,
-            'produces' => $produces,
-            'parameters' => $parameters ? self::objectsToArray($parameters) : null,
-            'schemes' => $schemes,
-            'responses' => $this->responses ? self::objectsToArray($this->responses) : null,
-            'security' => $this->security,
-        ), parent::toArray()));
-    }
-
-    /**
-     * Return the operation ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->operationId;
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' ' . $this->summary;
-    }
+	private $tags = array();
+	private $summary;
+	private $description;
+	private $consumes = array();
+	private $produces = array();
+
+	/**
+	 * @var IParameter[]
+	 */
+	private $parameters = array();
+	private $responses = array();
+	private $schemes = array();
+	private $deprecated = false;
+	private $security = array();
+
+	/**
+	 * @var string
+	 */
+	private $operationId = null;
+
+	public function getConsumes(): array
+	{
+		return $this->consumes;
+	}
+
+	/**
+	 * @param string $summary
+	 */
+	public function __construct(AbstractObject $parent, $summary = null, Tag $tag = null)
+	{
+		parent::__construct($parent);
+		$this->summary = $summary;
+		if ($tag) {
+			$this->tags[] = $tag->getName();
+		}
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			// string
+			case 'summary':
+			case 'description':
+				$this->$command = $data;
+				return $this;
+
+			// string[]
+			case 'tags':
+			case 'schemes':
+				$this->$command = array_merge($this->$command, self::wordSplit($data));
+				return $this;
+
+			// MIME[]
+			case 'consumes':
+			case 'produces':
+				$this->$command = array_merge($this->$command, self::translateMimeTypes(self::wordSplit($data)));
+				return $this;
+
+			// boolean
+			case 'deprecated':
+				$this->deprecated = true;
+				return $this;
+
+			case 'error':
+				$code = self::wordShift($data);
+				$reasoncode = Response::getCode($code);
+				if ($reasoncode === null) {
+					throw new Exception("Invalid error code: '$code'");
+				}
+				$description = $data;
+				$Error = new Error($this, $reasoncode, $description);
+				$this->responses[$reasoncode] = $Error;
+				return $Error;
+
+			case 'errors':
+				foreach (self::wordSplit($data) as $code) {
+					$reasoncode = Response::getCode($code);
+					if ($reasoncode === null) {
+						throw new Exception("Invalid error code: '$code'");
+					}
+					$this->responses[$reasoncode] = new Error($this, $reasoncode);
+				}
+				return $this;
+
+			case 'path':
+			case 'query':
+			case 'query?':
+			case 'header':
+			case 'header?':
+			case 'form':
+			case 'form?':
+				$in = rtrim($command, '?');
+				$parameter = new Parameter($this, $in, $data, substr($command, -1) !== '?');
+				$this->parameters[$parameter->getName()] = $parameter;
+				return $parameter;
+
+			case 'body':
+			case 'body?':
+				$parameter = new BodyParameter($this, $data, substr($command, -1) !== '?');
+				$this->parameters[$parameter->getName()] = $parameter;
+				return $parameter;
+
+			case 'param':
+			case 'parameter':
+				$parameter = new ParameterReference($this, $data);
+				$this->parameters[$parameter->getName()] = $parameter;
+				return $this;
+
+			case 'response':
+				$code = self::wordShift($data);
+				$reasoncode = Response::getCode($code);
+				if ($reasoncode === null) {
+					$reference = $code;
+					$code = self::wordShift($data);
+					$reasoncode = Response::getCode($code);
+					if ($reasoncode === null) {
+						throw new Exception("Invalid response code: '$reference'");
+					}
+					$this->responses[$reasoncode] = new ResponseReference($this, $reference);
+					return $this;
+				} else {
+					$definition = self::wordShift($data);
+					$description = $data;
+					$Response = new Response($this, $reasoncode, $definition, $description);
+					$this->responses[$reasoncode] = $Response;
+					return $Response;
+				}
+
+			case 'require':
+				$name = self::wordShift($data);
+				if (empty($name)) {
+					throw new Exception('Empty security requirement name');
+				}
+				$scopes = self::wordSplit($data);
+				sort($scopes);
+				$this->security[] = array(
+					$name => empty($scopes) ? array() : $scopes,
+				);
+				return $this;
+
+			case 'id':
+				$operationId = self::trim($data);
+				if ($this->getSwagger()->hasOperationId($operationId)) {
+					throw new Exception("Duplicate operation id '{$operationId}'");
+				}
+				$this->operationId = $operationId;
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function toArray()
+	{
+		if (empty($this->responses)) {
+			throw new Exception('No response defined for operation');
+		}
+		ksort($this->responses);
+
+		$tags = array_unique($this->tags);
+		sort($tags);
+
+		$schemes = array_unique($this->schemes);
+		sort($schemes);
+
+		$consumes = array_unique($this->consumes);
+		sort($consumes);
+
+		$produces = array_unique($this->produces);
+		sort($produces);
+
+		foreach ($this->security as $security) {
+			foreach ($security as $name => $scope) {
+				if ($this->getSwagger()->getSecurity($name) === false) {
+					throw new Exception("Required security scheme not defined: '{$name}'");
+				}
+			}
+		}
+
+		$parameters = $this->parameters ? array_values($this->parameters) : null;
+
+		return self::arrayFilterNull(array_merge(array(
+			'deprecated' => $this->deprecated ? true : null,
+			'tags' => $tags,
+			'summary' => empty($this->summary) ? null : $this->summary,
+			'description' => empty($this->description) ? null : $this->description,
+			'operationId' => $this->operationId,
+			'consumes' => $consumes,
+			'produces' => $produces,
+			'parameters' => $parameters ? self::objectsToArray($parameters) : null,
+			'schemes' => $schemes,
+			'responses' => $this->responses ? self::objectsToArray($this->responses) : null,
+			'security' => $this->security,
+		), parent::toArray()));
+	}
+
+	/**
+	 * Return the operation ID
+	 *
+	 * @return string
+	 */
+	public function getId()
+	{
+		return $this->operationId;
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' ' . $this->summary;
+	}
 
 }

SwaggerGen/Swagger/Path.php

Indentation +97 added lines, -97 removed lines

@@ -16,102 +16,102 @@
 class Path extends AbstractObject
 {
 
-    private static $methods = array(
-        'get',
-        'put',
-        'post',
-        'delete',
-        'options',
-        'head',
-        'patch',
-    );
-
-    /**
-     * @var Operation[] $operation
-     */
-    private $operations = array();
-
-    /**
-     * @var Tag|null $tag ;
-     */
-    private $tag;
-
-    public function __construct(AbstractObject $parent, Tag $Tag = null)
-    {
-        parent::__construct($parent);
-        $this->tag = $Tag;
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'method': // alias
-            case 'operation':
-                $method = strtolower(self::wordShift($data));
-
-                if (!in_array($method, self::$methods)) {
-                    throw new Exception('Unrecognized operation method \'' . $method . '\'');
-                }
-
-                if (isset($this->operations[$method])) {
-                    $Operation = $this->operations[$method];
-                } else {
-                    $summary = $data;
-                    $Operation = new Operation($this, $summary, $this->tag);
-                    $this->operations[$method] = $Operation;
-                }
-
-                return $Operation;
-
-            case 'description':
-                if ($this->tag) {
-                    return $this->tag->handleCommand($command, $data);
-                }
-                break;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray()
-    {
-        $methods = self::$methods;
-        uksort($this->operations, function ($a, $b) use ($methods) {
-            return array_search($a, $methods) - array_search($b, $methods);
-        });
-
-        return self::arrayFilterNull(array_merge(
-            self::objectsToArray($this->operations)
-            , parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        end($this->operations);
-        return __CLASS__ . ' ' . key($this->operations);
-    }
-
-    /**
-     * Check if an operation with the given id is registered to this Path.
-     *
-     * @param string $operationId
-     * @return boolean
-     */
-    public function hasOperationId($operationId)
-    {
-        foreach ($this->operations as $operation) {
-            if ($operation->getId() === $operationId) {
-                return true;
-            }
-        }
-
-        return false;
-    }
+	private static $methods = array(
+		'get',
+		'put',
+		'post',
+		'delete',
+		'options',
+		'head',
+		'patch',
+	);
+
+	/**
+	 * @var Operation[] $operation
+	 */
+	private $operations = array();
+
+	/**
+	 * @var Tag|null $tag ;
+	 */
+	private $tag;
+
+	public function __construct(AbstractObject $parent, Tag $Tag = null)
+	{
+		parent::__construct($parent);
+		$this->tag = $Tag;
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'method': // alias
+			case 'operation':
+				$method = strtolower(self::wordShift($data));
+
+				if (!in_array($method, self::$methods)) {
+					throw new Exception('Unrecognized operation method \'' . $method . '\'');
+				}
+
+				if (isset($this->operations[$method])) {
+					$Operation = $this->operations[$method];
+				} else {
+					$summary = $data;
+					$Operation = new Operation($this, $summary, $this->tag);
+					$this->operations[$method] = $Operation;
+				}
+
+				return $Operation;
+
+			case 'description':
+				if ($this->tag) {
+					return $this->tag->handleCommand($command, $data);
+				}
+				break;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray()
+	{
+		$methods = self::$methods;
+		uksort($this->operations, function ($a, $b) use ($methods) {
+			return array_search($a, $methods) - array_search($b, $methods);
+		});
+
+		return self::arrayFilterNull(array_merge(
+			self::objectsToArray($this->operations)
+			, parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		end($this->operations);
+		return __CLASS__ . ' ' . key($this->operations);
+	}
+
+	/**
+	 * Check if an operation with the given id is registered to this Path.
+	 *
+	 * @param string $operationId
+	 * @return boolean
+	 */
+	public function hasOperationId($operationId)
+	{
+		foreach ($this->operations as $operation) {
+			if ($operation->getId() === $operationId) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
     public function toArray()
     {
         $methods = self::$methods;
-        uksort($this->operations, function ($a, $b) use ($methods) {
+        uksort($this->operations, function($a, $b) use ($methods) {
             return array_search($a, $methods) - array_search($b, $methods);
         });