vanderlee / PHPSwaggerGen

SwaggerGen/Swagger/Type/Custom/Ipv4Type.php

Indentation +72 added lines, -72 removed lines

@@ -16,77 +16,77 @@
  */
 class Ipv4Type extends StringType implements ICustomType
 {
-    public const PATTERN = '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\\.|$)){4}$';
-
-    /**
-     * List of formats recognized by this class
-     * @var string[]
-     */
-    private static $formats = array('ipv4');
-
-    /**
-     * Construct and set up the regular expression for this type
-     *
-     * @param AbstractObject $parent
-     * @param string $definition
-     */
-    public function __construct(AbstractObject $parent, $definition)
-    {
-        $this->pattern = self::PATTERN;
-
-        parent::__construct($parent, $definition);
-    }
-
-    public static function getFormats(): array
-    {
-        return self::$formats;
-    }
-
-    public static function setFormats(array $formats): void
-    {
-        self::$formats = $formats;
-    }
-
-    /**
-     * Parse a type definition string, assuming it belongs to this type
-     *
-     * @param string $definition
-     * @throws Exception
-     */
-    protected function parseDefinition($definition): void
-    {
-        $definition = self::trim($definition);
-
-        $match = [];
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable IPv4 definition: '{$definition}'");
-        }
-
-        if (!in_array(strtolower($match[1]), self::$formats)) {
-            throw new Exception("Not an IPv4: '{$definition}'");
-        }
-
-        $this->default = isset($match[2]) && $match[2] !== '' ? $this->validateDefault($match[2]) : null;
-    }
-
-    /**
-     * Check (and optionally reformat) a default value
-     *
-     * @param string $value
-     * @return string
-     * @throws Exception
-     */
-    protected function validateDefault($value): string
-    {
-        if (empty($value)) {
-            throw new Exception("Empty IPv4 default");
-        }
-
-        if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false) {
-            throw new Exception("Invalid IPv4 default value: '{$value}'");
-        }
-
-        return $value;
-    }
+	public const PATTERN = '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\\.|$)){4}$';
+
+	/**
+	 * List of formats recognized by this class
+	 * @var string[]
+	 */
+	private static $formats = array('ipv4');
+
+	/**
+	 * Construct and set up the regular expression for this type
+	 *
+	 * @param AbstractObject $parent
+	 * @param string $definition
+	 */
+	public function __construct(AbstractObject $parent, $definition)
+	{
+		$this->pattern = self::PATTERN;
+
+		parent::__construct($parent, $definition);
+	}
+
+	public static function getFormats(): array
+	{
+		return self::$formats;
+	}
+
+	public static function setFormats(array $formats): void
+	{
+		self::$formats = $formats;
+	}
+
+	/**
+	 * Parse a type definition string, assuming it belongs to this type
+	 *
+	 * @param string $definition
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$definition = self::trim($definition);
+
+		$match = [];
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable IPv4 definition: '{$definition}'");
+		}
+
+		if (!in_array(strtolower($match[1]), self::$formats)) {
+			throw new Exception("Not an IPv4: '{$definition}'");
+		}
+
+		$this->default = isset($match[2]) && $match[2] !== '' ? $this->validateDefault($match[2]) : null;
+	}
+
+	/**
+	 * Check (and optionally reformat) a default value
+	 *
+	 * @param string $value
+	 * @return string
+	 * @throws Exception
+	 */
+	protected function validateDefault($value): string
+	{
+		if (empty($value)) {
+			throw new Exception("Empty IPv4 default");
+		}
+
+		if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false) {
+			throw new Exception("Invalid IPv4 default value: '{$value}'");
+		}
+
+		return $value;
+	}
 
 }

SwaggerGen/Swagger/Type/Custom/ICustomType.php

Indentation +10 added lines, -10 removed lines

@@ -13,16 +13,16 @@
 interface ICustomType
 {
 
-    /**
-     * Return a list of formats recognized by this type
-     * @return string[]
-     */
-    public static function getFormats(): array;
+	/**
+	 * Return a list of formats recognized by this type
+	 * @return string[]
+	 */
+	public static function getFormats(): array;
 
-    /**
-     * Overwrite format names recognized by this type
-     * @param string[] $formats
-     */
-    public static function setFormats(array $formats);
+	/**
+	 * Overwrite format names recognized by this type
+	 * @param string[] $formats
+	 */
+	public static function setFormats(array $formats);
 
 }

SwaggerGen/Swagger/Type/FileType.php

Indentation +40 added lines, -40 removed lines

@@ -17,45 +17,45 @@
 class FileType extends AbstractType
 {
 
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'file',
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition): void
-    {
-        $type = strtolower($definition);
-
-        if ($type !== 'file') {
-            throw new Exception("Not a file: '{$definition}'");
-        }
-
-        $parent = $this->getParent();
-        if (!($parent instanceof Parameter) || !$parent->isForm()) {
-            throw new Exception("File type '{$definition}' only allowed on form parameter");
-        }
-
-        /** @var Operation $parentOperation */
-        $parentOperation = $this->getParentClass(Operation::class);
-        $consumes = $parentOperation->getConsumes();
-        if (empty($consumes)) {
-            $consumes = $this->getSwagger()->getConsumes();
-        }
-
-        $valid_consumes = ((int)in_array('multipart/form-data', $consumes, true)) + ((int)in_array('application/x-www-form-urlencoded', $consumes, true));
-        if (empty($consumes) || $valid_consumes !== count($consumes)) {
-            throw new Exception("File type '{$definition}' without valid consume");
-        }
-    }
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'file',
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$type = strtolower($definition);
+
+		if ($type !== 'file') {
+			throw new Exception("Not a file: '{$definition}'");
+		}
+
+		$parent = $this->getParent();
+		if (!($parent instanceof Parameter) || !$parent->isForm()) {
+			throw new Exception("File type '{$definition}' only allowed on form parameter");
+		}
+
+		/** @var Operation $parentOperation */
+		$parentOperation = $this->getParentClass(Operation::class);
+		$consumes = $parentOperation->getConsumes();
+		if (empty($consumes)) {
+			$consumes = $this->getSwagger()->getConsumes();
+		}
+
+		$valid_consumes = ((int)in_array('multipart/form-data', $consumes, true)) + ((int)in_array('application/x-www-form-urlencoded', $consumes, true));
+		if (empty($consumes) || $valid_consumes !== count($consumes)) {
+			throw new Exception("File type '{$definition}' without valid consume");
+		}
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
             $consumes = $this->getSwagger()->getConsumes();
         }
 
-        $valid_consumes = ((int)in_array('multipart/form-data', $consumes, true)) + ((int)in_array('application/x-www-form-urlencoded', $consumes, true));
+        $valid_consumes = ((int) in_array('multipart/form-data', $consumes, true)) + ((int) in_array('application/x-www-form-urlencoded', $consumes, true));
         if (empty($consumes) || $valid_consumes !== count($consumes)) {
             throw new Exception("File type '{$definition}' without valid consume");
         }

SwaggerGen/Swagger/Type/BooleanType.php

Indentation +48 added lines, -48 removed lines

@@ -15,61 +15,61 @@
 class BooleanType extends AbstractType
 {
 
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    protected const REGEX_DEFAULT = '(?:=(true|false|1|0))?';
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	protected const REGEX_DEFAULT = '(?:=(true|false|1|0))?';
 
-    private $default;
+	private $default;
 
-    /**
-     * @param string $command The comment command
-     * @param string $data Any data added after the command
-     * @return AbstractType|boolean
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (strtolower($command) === 'default') {
-            if (!in_array($data, array('0', '1', 'true', 'false'), true)) {
-                throw new Exception("Invalid boolean default: '$data'");
-            }
-            $this->default = ($data == '1') || (strtolower($data) === 'true');
-            return $this;
-        }
+	/**
+	 * @param string $command The comment command
+	 * @param string $data Any data added after the command
+	 * @return AbstractType|boolean
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (strtolower($command) === 'default') {
+			if (!in_array($data, array('0', '1', 'true', 'false'), true)) {
+				throw new Exception("Invalid boolean default: '$data'");
+			}
+			$this->default = ($data == '1') || (strtolower($data) === 'true');
+			return $this;
+		}
 
-        return parent::handleCommand($command, $data);
-    }
+		return parent::handleCommand($command, $data);
+	}
 
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'boolean',
-            'default' => $this->default,
-        ), parent::toArray()));
-    }
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'boolean',
+			'default' => $this->default,
+		), parent::toArray()));
+	}
 
-    public function __toString()
-    {
-        return __CLASS__;
-    }
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition): void
-    {
-        $match = [];
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable boolean definition: '$definition'");
-        }
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$match = [];
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable boolean definition: '$definition'");
+		}
 
-        if (strtolower($match[1]) !== 'boolean') {
-            throw new Exception("Not a boolean: '$definition'");
-        }
+		if (strtolower($match[1]) !== 'boolean') {
+			throw new Exception("Not a boolean: '$definition'");
+		}
 
-        if (isset($match[2])) {
-            $this->default = ($match[2] === '1') || (strtolower($match[2]) === 'true');
-        }
-    }
+		if (isset($match[2])) {
+			$this->default = ($match[2] === '1') || (strtolower($match[2]) === 'true');
+		}
+	}
 
 }

SwaggerGen/Swagger/Type/DateType.php

Indentation +93 added lines, -93 removed lines

@@ -17,98 +17,98 @@
 class DateType extends AbstractType
 {
 
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    public const REGEX_DEFAULT = '(?:=(\S+))?';
-
-    /**
-     * Map of recognized format names to Swagger formats
-     * @var array
-     */
-    private static $formats = array(
-        'date' => 'date',
-        'date-time' => 'date-time',
-        'datetime' => 'date-time',
-    );
-    private static $datetime_formats = array(
-        'date' => 'Y-m-d',
-        'date-time' => DateTimeInterface::RFC3339,
-    );
-
-    /**
-     * @var String
-     */
-    private $format;
-
-    /**
-     * @var DateTime
-     */
-    private $default;
-
-    /**
-     * @param string $command The comment command
-     * @param string $data Any data added after the command
-     * @return AbstractType|boolean
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (strtolower($command) === 'default') {
-            $this->default = $this->validateDefault($data);
-            return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    /**
-     * @throws Exception
-     */
-    private function validateDefault($value)
-    {
-        if (empty($value)) {
-            throw new Exception("Empty date default");
-        }
-
-        if (($DateTime = date_create($value)) !== false) {
-            return $DateTime;
-        }
-
-        throw new Exception("Invalid '{$this->format}' default: '{$value}'");
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'string',
-            'format' => $this->format,
-            'default' => $this->default?->format(self::$datetime_formats[$this->format]),
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition): void
-    {
-        $match = [];
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable date definition: '{$definition}'");
-        }
-
-        $type = strtolower($match[1]);
-
-        if (!isset(self::$formats[$type])) {
-            throw new Exception("Not a date: '{$definition}'");
-        }
-        $this->format = self::$formats[$type];
-
-        $this->default = isset($match[2]) && $match[2] !== '' ? $this->validateDefault($match[2]) : null;
-    }
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	public const REGEX_DEFAULT = '(?:=(\S+))?';
+
+	/**
+	 * Map of recognized format names to Swagger formats
+	 * @var array
+	 */
+	private static $formats = array(
+		'date' => 'date',
+		'date-time' => 'date-time',
+		'datetime' => 'date-time',
+	);
+	private static $datetime_formats = array(
+		'date' => 'Y-m-d',
+		'date-time' => DateTimeInterface::RFC3339,
+	);
+
+	/**
+	 * @var String
+	 */
+	private $format;
+
+	/**
+	 * @var DateTime
+	 */
+	private $default;
+
+	/**
+	 * @param string $command The comment command
+	 * @param string $data Any data added after the command
+	 * @return AbstractType|boolean
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (strtolower($command) === 'default') {
+			$this->default = $this->validateDefault($data);
+			return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	private function validateDefault($value)
+	{
+		if (empty($value)) {
+			throw new Exception("Empty date default");
+		}
+
+		if (($DateTime = date_create($value)) !== false) {
+			return $DateTime;
+		}
+
+		throw new Exception("Invalid '{$this->format}' default: '{$value}'");
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'string',
+			'format' => $this->format,
+			'default' => $this->default?->format(self::$datetime_formats[$this->format]),
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$match = [];
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable date definition: '{$definition}'");
+		}
+
+		$type = strtolower($match[1]);
+
+		if (!isset(self::$formats[$type])) {
+			throw new Exception("Not a date: '{$definition}'");
+		}
+		$this->format = self::$formats[$type];
+
+		$this->default = isset($match[2]) && $match[2] !== '' ? $this->validateDefault($match[2]) : null;
+	}
 
 }

SwaggerGen/Swagger/Type/IntegerType.php

Indentation +161 added lines, -161 removed lines

@@ -15,166 +15,166 @@
 class IntegerType extends AbstractType
 {
 
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    const REGEX_RANGE = '(?:([[<])(-?\d*)?,(-?\d*)?([\\]>]))?';
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    const REGEX_DEFAULT = '(?:=(-?\d+))?';
-
-    private static $formats = array(
-        'int32' => 'int32',
-        'integer' => 'int32',
-        'int' => 'int32',
-        'int64' => 'int64',
-        'long' => 'int64',
-    );
-    private $format;
-    private $default;
-    private $maximum;
-    private $exclusiveMaximum;
-    private $minimum;
-    private $exclusiveMinimum;
-    private $enum = [];
-    private $multipleOf;
-
-    /**
-     * @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 = (int)$data) > 0) {
-                    $this->multipleOf = $step;
-                }
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    /**
-     * @throws Exception
-     */
-    private function validateDefault($value): int
-    {
-        if (preg_match('~^-?\d+$~', $value) !== 1) {
-            throw new Exception("Invalid integer default: '{$value}'");
-        }
-
-        if ($this->maximum) {
-            if (($value > $this->maximum) || ($this->exclusiveMaximum && $value == $this->maximum)) {
-                throw new Exception("Default integer beyond maximum: '{$value}'");
-            }
-        }
-        if ($this->minimum) {
-            if (($value < $this->minimum) || ($this->exclusiveMinimum && $value == $this->minimum)) {
-                throw new Exception("Default integer beyond minimum: '{$value}'");
-            }
-        }
-
-        return (int)$value;
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'integer',
-            '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
-     */
-    protected function parseDefinition($definition): void
-    {
-        $definition = self::trim($definition);
-
-        $match = [];
-        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 integer definition: '{$definition}'");
-        }
-
-        $this->parseFormat($definition, $match);
-        $this->parseRange($definition, $match);
-        $this->parseDefault($definition, $match);
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseFormat($definition, $match): void
-    {
-        $type = strtolower($match[1]);
-        if (!isset(self::$formats[$type])) {
-            throw new Exception("Not an integer: '{$definition}'");
-        }
-        $this->format = self::$formats[$type];
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseRange($definition, $match): void
-    {
-        if (!empty($match[2])) {
-            if ($match[3] === '' && $match[4] === '') {
-                throw new Exception("Empty integer range: '{$definition}'");
-            }
-
-            $this->exclusiveMinimum = $match[2] === '<';
-            $this->minimum = $match[3] === '' ? null : (int)$match[3];
-            $this->maximum = $match[4] === '' ? null : (int)$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 $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseDefault($definition, $match): void
-    {
-        $this->default = isset($match[6]) && $match[6] !== '' ? $this->validateDefault($match[6]) : null;
-    }
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	const REGEX_RANGE = '(?:([[<])(-?\d*)?,(-?\d*)?([\\]>]))?';
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	const REGEX_DEFAULT = '(?:=(-?\d+))?';
+
+	private static $formats = array(
+		'int32' => 'int32',
+		'integer' => 'int32',
+		'int' => 'int32',
+		'int64' => 'int64',
+		'long' => 'int64',
+	);
+	private $format;
+	private $default;
+	private $maximum;
+	private $exclusiveMaximum;
+	private $minimum;
+	private $exclusiveMinimum;
+	private $enum = [];
+	private $multipleOf;
+
+	/**
+	 * @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 = (int)$data) > 0) {
+					$this->multipleOf = $step;
+				}
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	private function validateDefault($value): int
+	{
+		if (preg_match('~^-?\d+$~', $value) !== 1) {
+			throw new Exception("Invalid integer default: '{$value}'");
+		}
+
+		if ($this->maximum) {
+			if (($value > $this->maximum) || ($this->exclusiveMaximum && $value == $this->maximum)) {
+				throw new Exception("Default integer beyond maximum: '{$value}'");
+			}
+		}
+		if ($this->minimum) {
+			if (($value < $this->minimum) || ($this->exclusiveMinimum && $value == $this->minimum)) {
+				throw new Exception("Default integer beyond minimum: '{$value}'");
+			}
+		}
+
+		return (int)$value;
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'integer',
+			'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
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$definition = self::trim($definition);
+
+		$match = [];
+		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 integer definition: '{$definition}'");
+		}
+
+		$this->parseFormat($definition, $match);
+		$this->parseRange($definition, $match);
+		$this->parseDefault($definition, $match);
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseFormat($definition, $match): void
+	{
+		$type = strtolower($match[1]);
+		if (!isset(self::$formats[$type])) {
+			throw new Exception("Not an integer: '{$definition}'");
+		}
+		$this->format = self::$formats[$type];
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseRange($definition, $match): void
+	{
+		if (!empty($match[2])) {
+			if ($match[3] === '' && $match[4] === '') {
+				throw new Exception("Empty integer range: '{$definition}'");
+			}
+
+			$this->exclusiveMinimum = $match[2] === '<';
+			$this->minimum = $match[3] === '' ? null : (int)$match[3];
+			$this->maximum = $match[4] === '' ? null : (int)$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 $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseDefault($definition, $match): void
+	{
+		$this->default = isset($match[6]) && $match[6] !== '' ? $this->validateDefault($match[6]) : null;
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
                 return $this;
 
             case 'step':
-                if (($step = (int)$data) > 0) {
+                if (($step = (int) $data) > 0) {
                     $this->multipleOf = $step;
                 }
                 return $this;
@@ -90,7 +90,7 @@ 
             }
         }
 
-        return (int)$value;
+        return (int) $value;
     }
 
     public function toArray(): array
@@ -157,8 +157,8 @@ 
             }
 
             $this->exclusiveMinimum = $match[2] === '<';
-            $this->minimum = $match[3] === '' ? null : (int)$match[3];
-            $this->maximum = $match[4] === '' ? null : (int)$match[4];
+            $this->minimum = $match[3] === '' ? null : (int) $match[3];
+            $this->maximum = $match[4] === '' ? null : (int) $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);

SwaggerGen/Swagger/Type/AbstractRegexType.php

Indentation +46 added lines, -46 removed lines

@@ -16,61 +16,61 @@
 class AbstractRegexType extends StringType
 {
 
-    public const REGEX_DEFAULT_START = '(?:=(';
-    public const REGEX_DEFAULT_END = '))?';
+	public const REGEX_DEFAULT_START = '(?:=(';
+	public const REGEX_DEFAULT_END = '))?';
 
-    /**
-     * The raw regular expression to use.
-     * Exclude start (`^`) and end (`$`) anchors.
-     * @var string
-     */
-    private $regex;
+	/**
+	 * The raw regular expression to use.
+	 * Exclude start (`^`) and end (`$`) anchors.
+	 * @var string
+	 */
+	private $regex;
 
-    /**
-     * Construct and set up the regular expression for this type
-     *
-     * @param AbstractObject $parent
-     * @param string $definition
-     * @param string $format Name of the string format
-     * @param string $regex Regular expression to use as the format and for default validation
-     */
-    public function __construct(AbstractObject $parent, $definition, $format, $regex)
-    {
-        $this->format = $format;
-        $this->regex = $regex;
+	/**
+	 * Construct and set up the regular expression for this type
+	 *
+	 * @param AbstractObject $parent
+	 * @param string $definition
+	 * @param string $format Name of the string format
+	 * @param string $regex Regular expression to use as the format and for default validation
+	 */
+	public function __construct(AbstractObject $parent, $definition, $format, $regex)
+	{
+		$this->format = $format;
+		$this->regex = $regex;
 
-        parent::__construct($parent, $definition);
-    }
+		parent::__construct($parent, $definition);
+	}
 
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition): void
-    {
-        $definition = self::trim($definition);
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$definition = self::trim($definition);
 
-        $match = [];
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT_START . $this->regex . self::REGEX_DEFAULT_END . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception('Unparseable ' . $this->format . ' definition: \'' . $definition . '\'');
-        }
+		$match = [];
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT_START . $this->regex . self::REGEX_DEFAULT_END . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception('Unparseable ' . $this->format . ' definition: \'' . $definition . '\'');
+		}
 
-        if (strtolower($match[1]) !== $this->format) {
-            throw new Exception('Not a ' . $this->format . ': \'' . $definition . '\'');
-        }
+		if (strtolower($match[1]) !== $this->format) {
+			throw new Exception('Not a ' . $this->format . ': \'' . $definition . '\'');
+		}
 
-        $this->pattern = '^' . $this->regex . '$';
-        $this->default = isset($match[2]) && $match[2] !== '' ? $this->validateDefault($match[2]) : null;
-    }
+		$this->pattern = '^' . $this->regex . '$';
+		$this->default = isset($match[2]) && $match[2] !== '' ? $this->validateDefault($match[2]) : null;
+	}
 
-    protected function validateDefault($value): string
-    {
-        $value = parent::validateDefault($value);
+	protected function validateDefault($value): string
+	{
+		$value = parent::validateDefault($value);
 
-        if (preg_match('/' . $this->pattern . '/', $value) !== 1) {
-            throw new Exception('Invalid ' . $this->format . ' default value');
-        }
+		if (preg_match('/' . $this->pattern . '/', $value) !== 1) {
+			throw new Exception('Invalid ' . $this->format . ' default value');
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
 }

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;
-    private $maximum;
-    private $exclusiveMaximum;
-    private $minimum;
-    private $exclusiveMinimum;
-    private $enum = [];
-    private $multipleOf;
-
-    /**
-     * @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);
-    }
-
-    /**
-     * @throws Exception
-     */
-    private function validateDefault($value): float
-    {
-        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;
-    }
-
-    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
-     */
-    protected function parseDefinition($definition): void
-    {
-        $match = [];
-        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): void
-    {
-        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): void
-    {
-        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): void
-    {
-        $this->default = isset($match[6]) && $match[6] !== '' ? $this->validateDefault($match[6]) : null;
-    }
+	/** @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;
+	private $maximum;
+	private $exclusiveMaximum;
+	private $minimum;
+	private $exclusiveMinimum;
+	private $enum = [];
+	private $multipleOf;
+
+	/**
+	 * @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);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	private function validateDefault($value): float
+	{
+		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;
+	}
+
+	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
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$match = [];
+		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): void
+	{
+		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): void
+	{
+		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): void
+	{
+		$this->default = isset($match[6]) && $match[6] !== '' ? $this->validateDefault($match[6]) : null;
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
                 return $this;
 
             case 'step':
-                if (($step = (float)$data) > 0) {
+                if (($step = (float) $data) > 0) {
                     $this->multipleOf = $step;
                 }
                 return $this;
@@ -87,7 +87,7 @@ 
             }
         }
 
-        return (float)$value;
+        return (float) $value;
     }
 
     public function toArray(): array
@@ -149,8 +149,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);

SwaggerGen/Swagger/Type/ArrayType.php

Indentation +177 added lines, -177 removed lines

@@ -16,182 +16,182 @@
 class ArrayType extends AbstractType
 {
 
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    private const REGEX_ARRAY_CONTENT = '(?:(\[)(.*)\])?';
-
-    private static $collectionFormats = array(
-        'array' => 'csv',
-        'csv' => 'csv',
-        'ssv' => 'ssv',
-        'tsv' => 'tsv',
-        'pipes' => 'pipes',
-        'multi' => 'multi',
-    );
-
-    /**
-     * @var AbstractType
-     */
-    private $Items;
-    private $minItems;
-    private $maxItems;
-    private $collectionFormat;
-
-    /**
-     * @param string $command The comment command
-     * @param string $data Any data added after the command
-     * @return AbstractType|boolean
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if ($this->Items) {
-            $return = $this->Items->handleCommand($command, $data);
-            if ($return) {
-                return $return;
-            }
-        }
-
-        switch (strtolower($command)) {
-            case 'min':
-                $this->minItems = (int)$data;
-                if ($this->minItems < 0) {
-                    throw new Exception("Minimum less than zero: '$data'");
-                }
-                if ($this->maxItems !== null && $this->minItems > $this->maxItems) {
-                    throw new Exception("Minimum greater than maximum: '$data'");
-                }
-                return $this;
-
-            case 'max':
-                $this->maxItems = (int)$data;
-                if ($this->minItems !== null && $this->minItems > $this->maxItems) {
-                    throw new Exception("Maximum less than minimum: '$data'");
-                }
-                if ($this->maxItems < 0) {
-                    throw new Exception("Maximum less than zero: '$data'");
-                }
-                return $this;
-
-            case 'items':
-                $this->Items = $this->validateItems($data);
-                return $this->Items;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    /**
-     * @throws Exception
-     */
-    private function validateItems($items)
-    {
-        if (empty($items)) {
-            throw new Exception("Empty items definition: '$items'");
-        }
-
-        return self::typeFactory($this, $items, "Unparseable items definition: '%s'");
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'array',
-            'items' => empty($this->Items) ? null : $this->Items->toArray(),
-            'collectionFormat' => $this->collectionFormat === 'csv' ? null : $this->collectionFormat,
-            'minItems' => $this->minItems,
-            'maxItems' => $this->maxItems,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition): void
-    {
-        $definition = self::trim($definition);
-        $match = [];
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_END, $definition, $match) === 1) {
-            $match[1] = strtolower($match[1]);
-        } elseif (preg_match(self::REGEX_START . self::REGEX_ARRAY_CONTENT . self::REGEX_RANGE . self::REGEX_END, $definition, $match) === 1) {
-            $match[1] = 'array';
-        } else {
-            throw new Exception('Unparseable array definition: \'' . $definition . '\'');
-        }
-
-        $this->parseFormat($definition, $match);
-        $this->parseItems($definition, $match);
-        $this->parseRange($definition, $match);
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     * @throws Exception
-     */
-    private function parseFormat($definition, $match): void
-    {
-        $type = strtolower($match[1]);
-        if (!isset(self::$collectionFormats[$type])) {
-            throw new Exception("Not an array: '$definition'");
-        }
-
-        if ($type === 'multi') {
-            $parent = $this->getParent();
-            if (!($parent instanceof Parameter) || !$parent->isMulti()) {
-                throw new Exception("Multi array only allowed on query or form parameter: '$definition'");
-            }
-        }
-
-        $this->collectionFormat = self::$collectionFormats[$type];
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseItems($definition, $match): void
-    {
-        if (!empty($match[2])) {
-            $this->Items = $this->validateItems($match[2]);
-        }
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseRange($definition, $match): void
-    {
-        if (!empty($match[3])) {
-            if ($match[4] === '' && $match[5] === '') {
-                throw new Exception("Empty array range: '$definition'");
-            }
-
-            $exclusiveMinimum = $match[3] === '<';
-            $this->minItems = $match[4] === '' ? null : (int)$match[4];
-            $this->maxItems = $match[5] === '' ? null : (int)$match[5];
-            $exclusiveMaximum = isset($match[6]) ? ($match[6] === '>') : null;
-            if ($this->minItems && $this->maxItems && $this->minItems > $this->maxItems) {
-                self::swap($this->minItems, $this->maxItems);
-                self::swap($exclusiveMinimum, $exclusiveMaximum);
-            }
-            $this->minItems = $this->minItems === null ? null : max(0, $exclusiveMinimum ? $this->minItems + 1 : $this->minItems);
-            $this->maxItems = $this->maxItems === null ? null : max(0, $exclusiveMaximum ? $this->maxItems - 1 : $this->maxItems);
-        }
-    }
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	private const REGEX_ARRAY_CONTENT = '(?:(\[)(.*)\])?';
+
+	private static $collectionFormats = array(
+		'array' => 'csv',
+		'csv' => 'csv',
+		'ssv' => 'ssv',
+		'tsv' => 'tsv',
+		'pipes' => 'pipes',
+		'multi' => 'multi',
+	);
+
+	/**
+	 * @var AbstractType
+	 */
+	private $Items;
+	private $minItems;
+	private $maxItems;
+	private $collectionFormat;
+
+	/**
+	 * @param string $command The comment command
+	 * @param string $data Any data added after the command
+	 * @return AbstractType|boolean
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if ($this->Items) {
+			$return = $this->Items->handleCommand($command, $data);
+			if ($return) {
+				return $return;
+			}
+		}
+
+		switch (strtolower($command)) {
+			case 'min':
+				$this->minItems = (int)$data;
+				if ($this->minItems < 0) {
+					throw new Exception("Minimum less than zero: '$data'");
+				}
+				if ($this->maxItems !== null && $this->minItems > $this->maxItems) {
+					throw new Exception("Minimum greater than maximum: '$data'");
+				}
+				return $this;
+
+			case 'max':
+				$this->maxItems = (int)$data;
+				if ($this->minItems !== null && $this->minItems > $this->maxItems) {
+					throw new Exception("Maximum less than minimum: '$data'");
+				}
+				if ($this->maxItems < 0) {
+					throw new Exception("Maximum less than zero: '$data'");
+				}
+				return $this;
+
+			case 'items':
+				$this->Items = $this->validateItems($data);
+				return $this->Items;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	private function validateItems($items)
+	{
+		if (empty($items)) {
+			throw new Exception("Empty items definition: '$items'");
+		}
+
+		return self::typeFactory($this, $items, "Unparseable items definition: '%s'");
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'array',
+			'items' => empty($this->Items) ? null : $this->Items->toArray(),
+			'collectionFormat' => $this->collectionFormat === 'csv' ? null : $this->collectionFormat,
+			'minItems' => $this->minItems,
+			'maxItems' => $this->maxItems,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition): void
+	{
+		$definition = self::trim($definition);
+		$match = [];
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_END, $definition, $match) === 1) {
+			$match[1] = strtolower($match[1]);
+		} elseif (preg_match(self::REGEX_START . self::REGEX_ARRAY_CONTENT . self::REGEX_RANGE . self::REGEX_END, $definition, $match) === 1) {
+			$match[1] = 'array';
+		} else {
+			throw new Exception('Unparseable array definition: \'' . $definition . '\'');
+		}
+
+		$this->parseFormat($definition, $match);
+		$this->parseItems($definition, $match);
+		$this->parseRange($definition, $match);
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	private function parseFormat($definition, $match): void
+	{
+		$type = strtolower($match[1]);
+		if (!isset(self::$collectionFormats[$type])) {
+			throw new Exception("Not an array: '$definition'");
+		}
+
+		if ($type === 'multi') {
+			$parent = $this->getParent();
+			if (!($parent instanceof Parameter) || !$parent->isMulti()) {
+				throw new Exception("Multi array only allowed on query or form parameter: '$definition'");
+			}
+		}
+
+		$this->collectionFormat = self::$collectionFormats[$type];
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseItems($definition, $match): void
+	{
+		if (!empty($match[2])) {
+			$this->Items = $this->validateItems($match[2]);
+		}
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseRange($definition, $match): void
+	{
+		if (!empty($match[3])) {
+			if ($match[4] === '' && $match[5] === '') {
+				throw new Exception("Empty array range: '$definition'");
+			}
+
+			$exclusiveMinimum = $match[3] === '<';
+			$this->minItems = $match[4] === '' ? null : (int)$match[4];
+			$this->maxItems = $match[5] === '' ? null : (int)$match[5];
+			$exclusiveMaximum = isset($match[6]) ? ($match[6] === '>') : null;
+			if ($this->minItems && $this->maxItems && $this->minItems > $this->maxItems) {
+				self::swap($this->minItems, $this->maxItems);
+				self::swap($exclusiveMinimum, $exclusiveMaximum);
+			}
+			$this->minItems = $this->minItems === null ? null : max(0, $exclusiveMinimum ? $this->minItems + 1 : $this->minItems);
+			$this->maxItems = $this->maxItems === null ? null : max(0, $exclusiveMaximum ? $this->maxItems - 1 : $this->maxItems);
+		}
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
 
         switch (strtolower($command)) {
             case 'min':
-                $this->minItems = (int)$data;
+                $this->minItems = (int) $data;
                 if ($this->minItems < 0) {
                     throw new Exception("Minimum less than zero: '$data'");
                 }
@@ -69,7 +69,7 @@ 
                 return $this;
 
             case 'max':
-                $this->maxItems = (int)$data;
+                $this->maxItems = (int) $data;
                 if ($this->minItems !== null && $this->minItems > $this->maxItems) {
                     throw new Exception("Maximum less than minimum: '$data'");
                 }
@@ -182,8 +182,8 @@ 
             }
 
             $exclusiveMinimum = $match[3] === '<';
-            $this->minItems = $match[4] === '' ? null : (int)$match[4];
-            $this->maxItems = $match[5] === '' ? null : (int)$match[5];
+            $this->minItems = $match[4] === '' ? null : (int) $match[4];
+            $this->maxItems = $match[5] === '' ? null : (int) $match[5];
             $exclusiveMaximum = isset($match[6]) ? ($match[6] === '>') : null;
             if ($this->minItems && $this->maxItems && $this->minItems > $this->maxItems) {
                 self::swap($this->minItems, $this->maxItems);