vanderlee / PHPSwaggerGen

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;
+	}
 
 }

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

SwaggerGen/Swagger/Info.php

Indentation +101 added lines, -101 removed lines

@@ -14,106 +14,106 @@
 class Info extends AbstractObject
 {
 
-    /**
-     * @var string
-     */
-    private $title = 'undefined';
-
-    /**
-     * @var string
-     */
-    private $description;
-
-    /**
-     * @var string
-     */
-    private $termsofservice;
-
-    /**
-     * @var Contact
-     */
-    private $contact;
-
-    /**
-     * @var License
-     */
-    private $license;
-
-    /**
-     * @var string|integer|float
-     */
-    private $version = 0;
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'title':
-            case 'description':
-            case 'termsofservice':
-            case 'version':
-                $this->$command = $data;
-                return $this;
-
-            case 'terms': // alias
-            case 'tos': // alias
-                $this->termsofservice = $data;
-                return $this;
-
-            case 'contact':
-                $name = [];
-                $url = null;
-                $email = null;
-                foreach (self::wordSplit($data) as $word) {
-                    if (filter_var($word, FILTER_VALIDATE_URL)) {
-                        $url = $word;
-                    } elseif (filter_var($word, FILTER_VALIDATE_EMAIL)) {
-                        $email = $word;
-                    } else {
-                        $name[] = $word;
-                    }
-                }
-                $name = implode(' ', array_filter($name));
-                $this->contact = new Contact($this, $name, $url, $email);
-                return $this->contact;
-
-            case 'license':
-                $name = [];
-                $url = null;
-                foreach (self::wordSplit($data) as $word) {
-                    if (filter_var($word, FILTER_VALIDATE_URL)) {
-                        $url = $word;
-                    } else {
-                        $name[] = $word;
-                    }
-                }
-                $name = implode(' ', array_filter($name));
-                $this->license = new License($this, $name, $url);
-                return $this->license;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'title' => $this->title,
-            'description' => $this->description,
-            'termsOfService' => $this->termsofservice,
-            'contact' => $this->contact?->toArray(),
-            'license' => $this->license?->toArray(),
-            'version' => (string)$this->version,
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' \'' . $this->title . '\'';
-    }
+	/**
+	 * @var string
+	 */
+	private $title = 'undefined';
+
+	/**
+	 * @var string
+	 */
+	private $description;
+
+	/**
+	 * @var string
+	 */
+	private $termsofservice;
+
+	/**
+	 * @var Contact
+	 */
+	private $contact;
+
+	/**
+	 * @var License
+	 */
+	private $license;
+
+	/**
+	 * @var string|integer|float
+	 */
+	private $version = 0;
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'title':
+			case 'description':
+			case 'termsofservice':
+			case 'version':
+				$this->$command = $data;
+				return $this;
+
+			case 'terms': // alias
+			case 'tos': // alias
+				$this->termsofservice = $data;
+				return $this;
+
+			case 'contact':
+				$name = [];
+				$url = null;
+				$email = null;
+				foreach (self::wordSplit($data) as $word) {
+					if (filter_var($word, FILTER_VALIDATE_URL)) {
+						$url = $word;
+					} elseif (filter_var($word, FILTER_VALIDATE_EMAIL)) {
+						$email = $word;
+					} else {
+						$name[] = $word;
+					}
+				}
+				$name = implode(' ', array_filter($name));
+				$this->contact = new Contact($this, $name, $url, $email);
+				return $this->contact;
+
+			case 'license':
+				$name = [];
+				$url = null;
+				foreach (self::wordSplit($data) as $word) {
+					if (filter_var($word, FILTER_VALIDATE_URL)) {
+						$url = $word;
+					} else {
+						$name[] = $word;
+					}
+				}
+				$name = implode(' ', array_filter($name));
+				$this->license = new License($this, $name, $url);
+				return $this->license;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'title' => $this->title,
+			'description' => $this->description,
+			'termsOfService' => $this->termsofservice,
+			'contact' => $this->contact?->toArray(),
+			'license' => $this->license?->toArray(),
+			'version' => (string)$this->version,
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' \'' . $this->title . '\'';
+	}
 
 }

SwaggerGen/Swagger/AbstractDocumentableObject.php

Indentation +30 added lines, -30 removed lines

@@ -14,38 +14,38 @@
 abstract class AbstractDocumentableObject extends AbstractObject
 {
 
-    /**
-     * External documentation
-     * @var ExternalDocumentation
-     */
-    private $externalDocs;
+	/**
+	 * External documentation
+	 * @var ExternalDocumentation
+	 */
+	private $externalDocs;
 
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'doc':
-            case 'docs':
-                $url = self::wordShift($data);
-                $this->externalDocs = new ExternalDocumentation($this, $url, $data);
-                return $this->externalDocs;
-        }
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'doc':
+			case 'docs':
+				$url = self::wordShift($data);
+				$this->externalDocs = new ExternalDocumentation($this, $url, $data);
+				return $this->externalDocs;
+		}
 
-        return parent::handleCommand($command, $data);
-    }
+		return parent::handleCommand($command, $data);
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'externalDocs' => $this->externalDocs?->toArray(),
-        ), parent::toArray()));
-    }
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'externalDocs' => $this->externalDocs?->toArray(),
+		), parent::toArray()));
+	}
 
 }

SwaggerGen/SwaggerGen.php

Indentation +202 added lines, -202 removed lines

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

SwaggerGen/TypeRegistry.php

Indentation +50 added lines, -50 removed lines

@@ -15,59 +15,59 @@
 class TypeRegistry

 {

 

-    /**

-     * Map of format-name => class-name

-     *

-     * @var array

-     */

-    private $formats = [];

+	/**

+	 * Map of format-name => class-name

+	 *

+	 * @var array

+	 */

+	private $formats = [];

 

-    /**

-     * Add a type name from classname

-     *

-     * @param string $classname

-     */

-    public function add(string $classname): void

-    {

-        if (is_subclass_of($classname, ICustomType::class)) {

-            foreach ($classname::getFormats() as $format) {

-                $this->formats[$format] = $classname;

-            }

-        }

-    }

+	/**

+	 * Add a type name from classname

+	 *

+	 * @param string $classname

+	 */

+	public function add(string $classname): void

+	{

+		if (is_subclass_of($classname, ICustomType::class)) {

+			foreach ($classname::getFormats() as $format) {

+				$this->formats[$format] = $classname;

+			}

+		}

+	}

 

-    /**

-     * Remove type format by explicitly nulling it (disables it)

-     *

-     * @param string $name

-     */

-    public function remove($name): void

-    {

-        $this->formats[$name] = null;

-    }

+	/**

+	 * Remove type format by explicitly nulling it (disables it)

+	 *

+	 * @param string $name

+	 */

+	public function remove($name): void

+	{

+		$this->formats[$name] = null;

+	}

 

-    /**

-     * Is a type format known?

-     *

-     * @param $name

-     * @return bool

-     */

-    public function has($name): bool

-    {

-        return !empty($this->formats[$name]);

-    }

+	/**

+	 * Is a type format known?

+	 *

+	 * @param $name

+	 * @return bool

+	 */

+	public function has($name): bool

+	{

+		return !empty($this->formats[$name]);

+	}

 

-    /**

-     * Get the format class name

-     *

-     * @param $name

-     * @return null|string

-     */

-    public function get($name): ?string

-    {

-        return !empty($this->formats[$name])

-            ? $this->formats[$name]

-            : null;

-    }

+	/**

+	 * Get the format class name

+	 *

+	 * @param $name

+	 * @return null|string

+	 */

+	public function get($name): ?string

+	{

+		return !empty($this->formats[$name])

+			? $this->formats[$name]

+			: null;

+	}

 

 }

SwaggerGen/Statement.php

Indentation +50 added lines, -50 removed lines

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