vanderlee / PHPSwaggerGen

SwaggerGen/Swagger/Type/NumberType.php

Indentation +152 added lines, -152 removed lines

@@ -15,157 +15,157 @@
 class NumberType extends AbstractType
 {
 
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    const REGEX_RANGE = '(?:([[<])(-?(?:\\d*\\.?\\d+|\\d+\\.\\d*))?,(-?(?:\\d*\\.?\\d+|\\d+\\.\\d*))?([\\]>]))?';
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    const REGEX_DEFAULT = '(?:=(-?(?:\\d*\\.?\\d+|\\d+\\.\\d*)))?';
-
-    private static $formats = array(
-        'float' => 'float',
-        'double' => 'double',
-    );
-    private $format;
-    private $default = null;
-    private $maximum = null;
-    private $exclusiveMaximum = null;
-    private $minimum = null;
-    private $exclusiveMinimum = null;
-    private $enum = array();
-    private $multipleOf = null;
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $match = array();
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_RANGE . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable number definition: '{$definition}'");
-        }
-
-        $this->parseFormat($definition, $match);
-        $this->parseRange($definition, $match);
-        $this->parseDefault($definition, $match);
-    }
-
-    /**
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseFormat($definition, $match)
-    {
-        if (!isset(self::$formats[strtolower($match[1])])) {
-            throw new Exception("Not a number: '{$definition}'");
-        }
-        $this->format = self::$formats[strtolower($match[1])];
-    }
-
-    /**
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseRange($definition, $match)
-    {
-        if (!empty($match[2])) {
-            if ($match[3] === '' && $match[4] === '') {
-                throw new Exception("Empty number range: '{$definition}'");
-            }
-
-            $this->exclusiveMinimum = $match[2] == '<';
-            $this->minimum = $match[3] === '' ? null : (float)$match[3];
-            $this->maximum = $match[4] === '' ? null : (float)$match[4];
-            $this->exclusiveMaximum = isset($match[5]) ? ($match[5] == '>') : null;
-            if ($this->minimum && $this->maximum && $this->minimum > $this->maximum) {
-                self::swap($this->minimum, $this->maximum);
-                self::swap($this->exclusiveMinimum, $this->exclusiveMaximum);
-            }
-        }
-    }
-
-    /**
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseDefault($definition, $match)
-    {
-        $this->default = isset($match[6]) && $match[6] !== '' ? $this->validateDefault($match[6]) : null;
-    }
-
-    /**
-     * @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 'enum':
-                $words = self::wordSplit($data);
-                foreach ($words as &$word) {
-                    $word = $this->validateDefault($word);
-                }
-                unset($word);
-                $this->enum = array_merge($this->enum, $words);
-                return $this;
-
-            case 'step':
-                if (($step = (float)$data) > 0) {
-                    $this->multipleOf = $step;
-                }
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'number',
-            'format' => $this->format,
-            'default' => $this->default,
-            'minimum' => $this->minimum,
-            'exclusiveMinimum' => ($this->exclusiveMinimum && !is_null($this->minimum)) ? true : null,
-            'maximum' => $this->maximum,
-            'exclusiveMaximum' => ($this->exclusiveMaximum && !is_null($this->maximum)) ? true : null,
-            'enum' => $this->enum,
-            'multipleOf' => $this->multipleOf,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
-
-    /**
-     * @throws Exception
-     */
-    private function validateDefault($value)
-    {
-        if (preg_match('~^-?(?:\\d*\\.?\\d+|\\d+\\.\\d*)$~', $value) !== 1) {
-            throw new Exception("Invalid number default: '{$value}'");
-        }
-
-        if ($this->maximum) {
-            if (($value > $this->maximum) || ($this->exclusiveMaximum && $value == $this->maximum)) {
-                throw new Exception("Default number beyond maximum: '{$value}'");
-            }
-        }
-        if ($this->minimum) {
-            if (($value < $this->minimum) || ($this->exclusiveMinimum && $value == $this->minimum)) {
-                throw new Exception("Default number beyond minimum: '{$value}'");
-            }
-        }
-
-        return (float)$value;
-    }
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	const REGEX_RANGE = '(?:([[<])(-?(?:\\d*\\.?\\d+|\\d+\\.\\d*))?,(-?(?:\\d*\\.?\\d+|\\d+\\.\\d*))?([\\]>]))?';
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	const REGEX_DEFAULT = '(?:=(-?(?:\\d*\\.?\\d+|\\d+\\.\\d*)))?';
+
+	private static $formats = array(
+		'float' => 'float',
+		'double' => 'double',
+	);
+	private $format;
+	private $default = null;
+	private $maximum = null;
+	private $exclusiveMaximum = null;
+	private $minimum = null;
+	private $exclusiveMinimum = null;
+	private $enum = array();
+	private $multipleOf = null;
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$match = array();
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_RANGE . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable number definition: '{$definition}'");
+		}
+
+		$this->parseFormat($definition, $match);
+		$this->parseRange($definition, $match);
+		$this->parseDefault($definition, $match);
+	}
+
+	/**
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseFormat($definition, $match)
+	{
+		if (!isset(self::$formats[strtolower($match[1])])) {
+			throw new Exception("Not a number: '{$definition}'");
+		}
+		$this->format = self::$formats[strtolower($match[1])];
+	}
+
+	/**
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseRange($definition, $match)
+	{
+		if (!empty($match[2])) {
+			if ($match[3] === '' && $match[4] === '') {
+				throw new Exception("Empty number range: '{$definition}'");
+			}
+
+			$this->exclusiveMinimum = $match[2] == '<';
+			$this->minimum = $match[3] === '' ? null : (float)$match[3];
+			$this->maximum = $match[4] === '' ? null : (float)$match[4];
+			$this->exclusiveMaximum = isset($match[5]) ? ($match[5] == '>') : null;
+			if ($this->minimum && $this->maximum && $this->minimum > $this->maximum) {
+				self::swap($this->minimum, $this->maximum);
+				self::swap($this->exclusiveMinimum, $this->exclusiveMaximum);
+			}
+		}
+	}
+
+	/**
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseDefault($definition, $match)
+	{
+		$this->default = isset($match[6]) && $match[6] !== '' ? $this->validateDefault($match[6]) : null;
+	}
+
+	/**
+	 * @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 'enum':
+				$words = self::wordSplit($data);
+				foreach ($words as &$word) {
+					$word = $this->validateDefault($word);
+				}
+				unset($word);
+				$this->enum = array_merge($this->enum, $words);
+				return $this;
+
+			case 'step':
+				if (($step = (float)$data) > 0) {
+					$this->multipleOf = $step;
+				}
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'number',
+			'format' => $this->format,
+			'default' => $this->default,
+			'minimum' => $this->minimum,
+			'exclusiveMinimum' => ($this->exclusiveMinimum && !is_null($this->minimum)) ? true : null,
+			'maximum' => $this->maximum,
+			'exclusiveMaximum' => ($this->exclusiveMaximum && !is_null($this->maximum)) ? true : null,
+			'enum' => $this->enum,
+			'multipleOf' => $this->multipleOf,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	private function validateDefault($value)
+	{
+		if (preg_match('~^-?(?:\\d*\\.?\\d+|\\d+\\.\\d*)$~', $value) !== 1) {
+			throw new Exception("Invalid number default: '{$value}'");
+		}
+
+		if ($this->maximum) {
+			if (($value > $this->maximum) || ($this->exclusiveMaximum && $value == $this->maximum)) {
+				throw new Exception("Default number beyond maximum: '{$value}'");
+			}
+		}
+		if ($this->minimum) {
+			if (($value < $this->minimum) || ($this->exclusiveMinimum && $value == $this->minimum)) {
+				throw new Exception("Default number beyond minimum: '{$value}'");
+			}
+		}
+
+		return (float)$value;
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -72,8 +72,8 @@ 
             }
 
             $this->exclusiveMinimum = $match[2] == '<';
-            $this->minimum = $match[3] === '' ? null : (float)$match[3];
-            $this->maximum = $match[4] === '' ? null : (float)$match[4];
+            $this->minimum = $match[3] === '' ? null : (float) $match[3];
+            $this->maximum = $match[4] === '' ? null : (float) $match[4];
             $this->exclusiveMaximum = isset($match[5]) ? ($match[5] == '>') : null;
             if ($this->minimum && $this->maximum && $this->minimum > $this->maximum) {
                 self::swap($this->minimum, $this->maximum);
@@ -116,7 +116,7 @@ 
                 return $this;
 
             case 'step':
-                if (($step = (float)$data) > 0) {
+                if (($step = (float) $data) > 0) {
                     $this->multipleOf = $step;
                 }
                 return $this;
@@ -165,7 +165,7 @@ 
             }
         }
 
-        return (float)$value;
+        return (float) $value;
     }
 
 }

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

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 = null;
-    protected $default = null;
-    protected $maxLength = null;
-    protected $minLength = null;
-    protected $enum = array();
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
-
-        $match = array();
-        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)
-    {
-        $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)
-    {
-        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)
-    {
-
-        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)
-    {
-        $this->default = isset($match[7]) && $match[7] !== '' ? $this->validateDefault($match[7]) : null;
-    }
-
-    /**
-     * @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);
-    }
-
-    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()));
-    }
-
-    /**
-     * 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)
-    {
-        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)) {
-            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 __toString()
-    {
-        return __CLASS__;
-    }
+	private static $formats = array(
+		'string' => '',
+		'byte' => 'byte',
+		'binary' => 'binary',
+		'password' => 'password',
+		'enum' => '',
+	);
+
+	/**
+	 * Name of the type
+	 * @var string
+	 */
+	protected $format = '';
+	protected $pattern = null;
+	protected $default = null;
+	protected $maxLength = null;
+	protected $minLength = null;
+	protected $enum = array();
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
+
+		$match = array();
+		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)
+	{
+		$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)
+	{
+		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)
+	{
+
+		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)
+	{
+		$this->default = isset($match[7]) && $match[7] !== '' ? $this->validateDefault($match[7]) : null;
+	}
+
+	/**
+	 * @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);
+	}
+
+	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()));
+	}
+
+	/**
+	 * 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)
+	{
+		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)) {
+			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 __toString()
+	{
+		return __CLASS__;
+	}
 
 }

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()));
     }

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

@@ -177,7 +177,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)) {
@@ -190,7 +190,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) {
@@ -199,7 +199,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/Type/ReferenceObjectType.php

Indentation +43 added lines, -43 removed lines

@@ -15,48 +15,48 @@
 class ReferenceObjectType extends AbstractType
 {
 
-    private $reference = null;
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
-
-        $match = array();
-        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 . '\'');
-        }
-
-        $type = strtolower($match[1]);
-
-        $reference = null;
-        if ($type === 'refobject') {
-            if (isset($match[2])) {
-                $reference = $match[2];
-            }
-        } else {
-            $reference = $match[1];
-        }
-
-        if (empty($reference)) {
-            throw new Exception('Referenced object name missing: \'' . $definition . '\'');
-        }
-
-        $this->reference = $reference;
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            '$ref' => '#/definitions/' . $this->reference,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' ' . $this->reference;
-    }
+	private $reference = null;
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
+
+		$match = array();
+		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 . '\'');
+		}
+
+		$type = strtolower($match[1]);
+
+		$reference = null;
+		if ($type === 'refobject') {
+			if (isset($match[2])) {
+				$reference = $match[2];
+			}
+		} else {
+			$reference = $match[1];
+		}
+
+		if (empty($reference)) {
+			throw new Exception('Referenced object name missing: \'' . $definition . '\'');
+		}
+
+		$this->reference = $reference;
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'$ref' => '#/definitions/' . $this->reference,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' ' . $this->reference;
+	}
 
 }

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/AbstractObject.php

Indentation +157 added lines, -157 removed lines

@@ -16,162 +16,162 @@
 abstract class AbstractObject
 {
 
-    private static $mime_types = array(
-        'fileform' => 'multipart/form-data',
-        'form' => 'application/x-www-form-urlencoded',
-        'json' => 'application/json',
-        'text' => 'text/plain',
-        'utf8' => 'text/plain; charset=utf-8',
-        'yml' => 'application/x-yaml',
-        'yaml' => 'application/x-yaml',
-        'php' => 'text/x-php',
-        'xml' => 'text/xml',
-    );
-
-    /**
-     * @var AbstractObject
-     */
-    private $parent;
-
-    /**
-     * Map of extensions and their (trimmed) values
-     * @var string[]
-     */
-    private $extensions = array();
-
-    public function __construct(AbstractObject $parent = null)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * @return AbstractObject|null
-     */
-    protected function getParent(): ?AbstractObject
-    {
-        return $this->parent;
-    }
-
-    protected function getParentClass($classname): AbstractObject
-    {
-        if (is_a($this, $classname)) {
-            return $this;
-        }
-        return $this->parent->getParentClass($classname);
-    }
-
-    /**
-     * @return Swagger
-     */
-    protected function getSwagger(): Swagger
-    {
-        return $this->parent->getSwagger();
-    }
-
-    /**
-     * @return TypeRegistry
-     */
-    protected function getTypeRegistry(): TypeRegistry
-    {
-        return $this->parent->getTypeRegistry();
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (stripos($command, 'x-') === 0) {
-            $this->extensions[$command] = empty($data) ? $data : trim($data);
-            return $this;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Translate consumes from shortcuts
-     * @param String[] $mimeTypes
-     * @return String[]
-     */
-    protected static function translateMimeTypes($mimeTypes): array
-    {
-        foreach ($mimeTypes as &$mimeType) {
-            if (isset(self::$mime_types[strtolower($mimeType)])) {
-                $mimeType = self::$mime_types[strtolower($mimeType)];
-            }
-        }
-
-        return $mimeTypes;
-    }
-
-    /**
-     * Trim whitespace from a multibyte string
-     * @param string $string
-     * @return string
-     */
-    public static function trim($string): string
-    {
-        return mb_ereg_replace('^\s*([\s\S]*?)\s*$', '\1', $string);
-    }
-
-    /**
-     * Filter all items from an array where the value is either null or an
-     * empty array.
-     * @param array $array
-     * @return array
-     */
-    public static function arrayFilterNull($array): array
-    {
-        return array_filter($array, static function ($value) {
-            return $value !== null && $value !== array();
-        });
-    }
-
-    /**
-     * Recursively call toArray() on all objects to return an array
-     * @param array $array
-     * @return array
-     */
-    public static function objectsToArray($array): array
-    {
-        return array_map(static function (AbstractObject $item) {
-            return $item->toArray();
-        }, $array);
-    }
-
-    /**
-     * Shifts the first word off a text line and returns it
-     * @param string $data
-     * @return string|bool Either the first word or false if no more words available
-     */
-    public static function wordShift(&$data)
-    {
-        if (preg_match('~^\s*(\S+)\s*(.*)$~s', $data, $matches) === 1) {
-            $data = $matches[2];
-            return $matches[1];
-        }
-        return false;
-    }
-
-    /**
-     * Splits a text line in all it's words
-     * @param string $data
-     * @return string[]
-     */
-    public static function wordSplit($data): array
-    {
-        return array_values(preg_grep('~\S~', preg_split('~\s+~', $data)));
-    }
+	private static $mime_types = array(
+		'fileform' => 'multipart/form-data',
+		'form' => 'application/x-www-form-urlencoded',
+		'json' => 'application/json',
+		'text' => 'text/plain',
+		'utf8' => 'text/plain; charset=utf-8',
+		'yml' => 'application/x-yaml',
+		'yaml' => 'application/x-yaml',
+		'php' => 'text/x-php',
+		'xml' => 'text/xml',
+	);
+
+	/**
+	 * @var AbstractObject
+	 */
+	private $parent;
+
+	/**
+	 * Map of extensions and their (trimmed) values
+	 * @var string[]
+	 */
+	private $extensions = array();
+
+	public function __construct(AbstractObject $parent = null)
+	{
+		$this->parent = $parent;
+	}
+
+	/**
+	 * @return AbstractObject|null
+	 */
+	protected function getParent(): ?AbstractObject
+	{
+		return $this->parent;
+	}
+
+	protected function getParentClass($classname): AbstractObject
+	{
+		if (is_a($this, $classname)) {
+			return $this;
+		}
+		return $this->parent->getParentClass($classname);
+	}
+
+	/**
+	 * @return Swagger
+	 */
+	protected function getSwagger(): Swagger
+	{
+		return $this->parent->getSwagger();
+	}
+
+	/**
+	 * @return TypeRegistry
+	 */
+	protected function getTypeRegistry(): TypeRegistry
+	{
+		return $this->parent->getTypeRegistry();
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (stripos($command, 'x-') === 0) {
+			$this->extensions[$command] = empty($data) ? $data : trim($data);
+			return $this;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return $this->extensions;
+	}
+
+	/**
+	 * Translate consumes from shortcuts
+	 * @param String[] $mimeTypes
+	 * @return String[]
+	 */
+	protected static function translateMimeTypes($mimeTypes): array
+	{
+		foreach ($mimeTypes as &$mimeType) {
+			if (isset(self::$mime_types[strtolower($mimeType)])) {
+				$mimeType = self::$mime_types[strtolower($mimeType)];
+			}
+		}
+
+		return $mimeTypes;
+	}
+
+	/**
+	 * Trim whitespace from a multibyte string
+	 * @param string $string
+	 * @return string
+	 */
+	public static function trim($string): string
+	{
+		return mb_ereg_replace('^\s*([\s\S]*?)\s*$', '\1', $string);
+	}
+
+	/**
+	 * Filter all items from an array where the value is either null or an
+	 * empty array.
+	 * @param array $array
+	 * @return array
+	 */
+	public static function arrayFilterNull($array): array
+	{
+		return array_filter($array, static function ($value) {
+			return $value !== null && $value !== array();
+		});
+	}
+
+	/**
+	 * Recursively call toArray() on all objects to return an array
+	 * @param array $array
+	 * @return array
+	 */
+	public static function objectsToArray($array): array
+	{
+		return array_map(static function (AbstractObject $item) {
+			return $item->toArray();
+		}, $array);
+	}
+
+	/**
+	 * Shifts the first word off a text line and returns it
+	 * @param string $data
+	 * @return string|bool Either the first word or false if no more words available
+	 */
+	public static function wordShift(&$data)
+	{
+		if (preg_match('~^\s*(\S+)\s*(.*)$~s', $data, $matches) === 1) {
+			$data = $matches[2];
+			return $matches[1];
+		}
+		return false;
+	}
+
+	/**
+	 * Splits a text line in all it's words
+	 * @param string $data
+	 * @return string[]
+	 */
+	public static function wordSplit($data): array
+	{
+		return array_values(preg_grep('~\S~', preg_split('~\s+~', $data)));
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
      */
     public static function arrayFilterNull($array): array
     {
-        return array_filter($array, static function ($value) {
+        return array_filter($array, static function($value) {
             return $value !== null && $value !== array();
         });
     }
@@ -145,7 +145,7 @@ 
      */
     public static function objectsToArray($array): array
     {
-        return array_map(static function (AbstractObject $item) {
+        return array_map(static function(AbstractObject $item) {
             return $item->toArray();
         }, $array);
     }

SwaggerGen/Swagger/Schema.php

Indentation +83 added lines, -83 removed lines

@@ -17,88 +17,88 @@
 class Schema extends AbstractDocumentableObject implements IDefinition
 {
 
-    /**
-     * @var string
-     */
-    private $description;
-
-    /**
-     * @var string
-     */
-    private $title = null;
-
-    /**
-     * @var bool
-     */
-    private $readOnly = null;
-
-    /**
-     * @var AbstractType
-     */
-    private $type;
-
-    /**
-     * @param string $description
-     * @throws Exception
-     */
-    public function __construct(AbstractObject $parent, $definition = 'object', $description = null)
-    {
-        parent::__construct($parent);
-
-        // Check if definition set
-        if ($this->getSwagger()->hasDefinition($definition)) {
-            $this->type = new Type\ReferenceObjectType($this, $definition);
-        } else {
-            $this->type = Type\AbstractType::typeFactory($this, $definition);
-        }
-
-        $this->description = $description;
-    }
-
-    /**
-     * @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;
-        }
-
-        // handle all the rest manually
-        switch (strtolower($command)) {
-            case 'description':
-                $this->description = $data;
-                return $this;
-
-            case 'title':
-                $this->title = $data;
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge($this->type->toArray(), array(
-            'title' => empty($this->title) ? null : $this->title,
-            'description' => empty($this->description) ? null : $this->description,
-            'readOnly' => $this->readOnly
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
-
-    public function setReadOnly()
-    {
-        $this->readOnly = true;
-    }
+	/**
+	 * @var string
+	 */
+	private $description;
+
+	/**
+	 * @var string
+	 */
+	private $title = null;
+
+	/**
+	 * @var bool
+	 */
+	private $readOnly = null;
+
+	/**
+	 * @var AbstractType
+	 */
+	private $type;
+
+	/**
+	 * @param string $description
+	 * @throws Exception
+	 */
+	public function __construct(AbstractObject $parent, $definition = 'object', $description = null)
+	{
+		parent::__construct($parent);
+
+		// Check if definition set
+		if ($this->getSwagger()->hasDefinition($definition)) {
+			$this->type = new Type\ReferenceObjectType($this, $definition);
+		} else {
+			$this->type = Type\AbstractType::typeFactory($this, $definition);
+		}
+
+		$this->description = $description;
+	}
+
+	/**
+	 * @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;
+		}
+
+		// handle all the rest manually
+		switch (strtolower($command)) {
+			case 'description':
+				$this->description = $data;
+				return $this;
+
+			case 'title':
+				$this->title = $data;
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge($this->type->toArray(), array(
+			'title' => empty($this->title) ? null : $this->title,
+			'description' => empty($this->description) ? null : $this->description,
+			'readOnly' => $this->readOnly
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
+
+	public function setReadOnly()
+	{
+		$this->readOnly = true;
+	}
 
 }

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(): array
-    {
-        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(): array
+	{
+		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/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 (int)$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('/([^{}:]+)/', 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 ? $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 (int)$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('/([^{}:]+)/', 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 ? $this->schema->toArray() : null,
+			'headers' => self::objectsToArray($this->Headers),
+			'examples' => $this->examples,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
 }

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));