vanderlee / PHPSwaggerGen

SwaggerGen/Swagger/Type/Custom/EmailType.php

Indentation +72 added lines, -72 removed lines

@@ -17,77 +17,77 @@
 class EmailType extends StringType implements ICustomType
 {
 
-    const PATTERN = '\A[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\z';
-
-    /**
-     * List of formats recognized by this class
-     * @var string[]
-     */
-    private static $formats = array('email');
-
-    /**
-     * 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);
-    }
-
-    /**
-     * Parse a type definition string, assuming it belongs to this type
-     *
-     * @param string $definition
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
-
-        $match = array();
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable email definition: '{$definition}'");
-        }
-
-        if (!in_array(strtolower($match[1]), self::$formats)) {
-            throw new Exception("Not an email: '{$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)
-    {
-        if (empty($value)) {
-            throw new Exception("Empty email default");
-        }
-
-        if (filter_var($value, FILTER_VALIDATE_EMAIL) === false) {
-            throw new Exception("Invalid email default value: '{$value}'");
-        }
-
-        return $value;
-    }
-
-    public static function getFormats()
-    {
-        return self::$formats;
-    }
-
-    public static function setFormats(array $formats)
-    {
-        self::$formats = $formats;
-    }
+	const PATTERN = '\A[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\z';
+
+	/**
+	 * List of formats recognized by this class
+	 * @var string[]
+	 */
+	private static $formats = array('email');
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * Parse a type definition string, assuming it belongs to this type
+	 *
+	 * @param string $definition
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
+
+		$match = array();
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable email definition: '{$definition}'");
+		}
+
+		if (!in_array(strtolower($match[1]), self::$formats)) {
+			throw new Exception("Not an email: '{$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)
+	{
+		if (empty($value)) {
+			throw new Exception("Empty email default");
+		}
+
+		if (filter_var($value, FILTER_VALIDATE_EMAIL) === false) {
+			throw new Exception("Invalid email default value: '{$value}'");
+		}
+
+		return $value;
+	}
+
+	public static function getFormats()
+	{
+		return self::$formats;
+	}
+
+	public static function setFormats(array $formats)
+	{
+		self::$formats = $formats;
+	}
 
 }

SwaggerGen/Swagger/Type/Custom/Ipv4Type.php

Indentation +72 added lines, -72 removed lines

@@ -17,77 +17,77 @@
 class Ipv4Type extends StringType implements ICustomType
 {
 
-    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);
-    }
-
-    /**
-     * Parse a type definition string, assuming it belongs to this type
-     *
-     * @param string $definition
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
-
-        $match = array();
-        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)
-    {
-        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 static function getFormats()
-    {
-        return self::$formats;
-    }
-
-    public static function setFormats(array $formats)
-    {
-        self::$formats = $formats;
-    }
+	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);
+	}
+
+	/**
+	 * Parse a type definition string, assuming it belongs to this type
+	 *
+	 * @param string $definition
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
+
+		$match = array();
+		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)
+	{
+		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 static function getFormats()
+	{
+		return self::$formats;
+	}
+
+	public static function setFormats(array $formats)
+	{
+		self::$formats = $formats;
+	}
 
 }

SwaggerGen/Swagger/Type/Custom/Ipv6Type.php

Indentation +72 added lines, -72 removed lines

@@ -17,77 +17,77 @@
 class Ipv6Type extends StringType implements ICustomType
 {
 
-    const PATTERN = '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))';
-
-    /**
-     * List of formats recognized by this class
-     * @var string[]
-     */
-    private static $formats = array('ipv6');
-
-    /**
-     * 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);
-    }
-
-    /**
-     * Parse a type definition string, assuming it belongs to this type
-     *
-     * @param string $definition
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
-
-        $match = array();
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable IPv6 definition: '{$definition}'");
-        }
-
-        if (!in_array(strtolower($match[1]), self::$formats)) {
-            throw new Exception("Not an IPv6: '{$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)
-    {
-        if (empty($value)) {
-            throw new Exception("Empty IPv6 default");
-        }
-
-        if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
-            throw new Exception("Invalid IPv6 default value: '{$value}'");
-        }
-
-        return $value;
-    }
-
-    public static function getFormats()
-    {
-        return self::$formats;
-    }
-
-    public static function setFormats(array $formats)
-    {
-        self::$formats = $formats;
-    }
+	const PATTERN = '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))';
+
+	/**
+	 * List of formats recognized by this class
+	 * @var string[]
+	 */
+	private static $formats = array('ipv6');
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * Parse a type definition string, assuming it belongs to this type
+	 *
+	 * @param string $definition
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
+
+		$match = array();
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable IPv6 definition: '{$definition}'");
+		}
+
+		if (!in_array(strtolower($match[1]), self::$formats)) {
+			throw new Exception("Not an IPv6: '{$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)
+	{
+		if (empty($value)) {
+			throw new Exception("Empty IPv6 default");
+		}
+
+		if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
+			throw new Exception("Invalid IPv6 default value: '{$value}'");
+		}
+
+		return $value;
+	}
+
+	public static function getFormats()
+	{
+		return self::$formats;
+	}
+
+	public static function setFormats(array $formats)
+	{
+		self::$formats = $formats;
+	}
 
 }

SwaggerGen/Swagger/Type/ArrayType.php

Indentation +176 added lines, -176 removed lines

@@ -16,181 +16,181 @@
 class ArrayType extends AbstractType
 {
 
-    const REGEX_ARRAY_CONTENT = '(?:(\[)(.*)\])?';
-
-    private static $collectionFormats = array(
-        'array' => 'csv',
-        'csv' => 'csv',
-        'ssv' => 'ssv',
-        'tsv' => 'tsv',
-        'pipes' => 'pipes',
-        'multi' => 'multi',
-    );
-
-    /**
-     * @var AbstractType
-     */
-    private $Items = null;
-    private $minItems = null;
-    private $maxItems = null;
-    private $collectionFormat = null;
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
-        $match = array();
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_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)
-    {
-        $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)
-    {
-        if (!empty($match[2])) {
-            $this->Items = $this->validateItems($match[2]);
-        }
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseRange($definition, $match)
-    {
-        if (!empty($match[3])) {
-            if ($match[4] === '' && $match[5] === '') {
-                throw new Exception("Empty array range: '{$definition}'");
-            }
-
-            $exclusiveMinimum = $match[3] == '<';
-            $this->minItems = $match[4] === '' ? null : intval($match[4]);
-            $this->maxItems = $match[5] === '' ? null : intval($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);
-        }
-    }
-
-    /**
-     * @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 = intval($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 = intval($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);
-    }
-
-    public function toArray()
-    {
-        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()));
-    }
-
-    /**
-     * @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 __toString()
-    {
-        return __CLASS__;
-    }
+	const REGEX_ARRAY_CONTENT = '(?:(\[)(.*)\])?';
+
+	private static $collectionFormats = array(
+		'array' => 'csv',
+		'csv' => 'csv',
+		'ssv' => 'ssv',
+		'tsv' => 'tsv',
+		'pipes' => 'pipes',
+		'multi' => 'multi',
+	);
+
+	/**
+	 * @var AbstractType
+	 */
+	private $Items = null;
+	private $minItems = null;
+	private $maxItems = null;
+	private $collectionFormat = null;
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
+		$match = array();
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_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)
+	{
+		$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)
+	{
+		if (!empty($match[2])) {
+			$this->Items = $this->validateItems($match[2]);
+		}
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseRange($definition, $match)
+	{
+		if (!empty($match[3])) {
+			if ($match[4] === '' && $match[5] === '') {
+				throw new Exception("Empty array range: '{$definition}'");
+			}
+
+			$exclusiveMinimum = $match[3] == '<';
+			$this->minItems = $match[4] === '' ? null : intval($match[4]);
+			$this->maxItems = $match[5] === '' ? null : intval($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);
+		}
+	}
+
+	/**
+	 * @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 = intval($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 = intval($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);
+	}
+
+	public function toArray()
+	{
+		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()));
+	}
+
+	/**
+	 * @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 __toString()
+	{
+		return __CLASS__;
+	}
 
 }

SwaggerGen/Swagger/Type/AbstractRegexType.php

Indentation +46 added lines, -46 removed lines

@@ -16,61 +16,61 @@
 class AbstractRegexType extends StringType
 {
 
-    const REGEX_DEFAULT_START = '(?:=(';
-    const REGEX_DEFAULT_END = '))?';
+	const REGEX_DEFAULT_START = '(?:=(';
+	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)
-    {
-        $definition = self::trim($definition);
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
 
-        $match = array();
-        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 = array();
+		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)
-    {
-        $value = parent::validateDefault($value);
+	protected function validateDefault($value)
+	{
+		$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/ObjectType.php

Indentation +250 added lines, -250 removed lines

@@ -15,281 +15,281 @@
 class ObjectType extends AbstractType
 {
 
-    const REGEX_OBJECT_CONTENT = '(?:(\{)(.*)\})?';
-    const REGEX_PROP_START = '/^';
-    const REGEX_PROP_NAME = '([^?!:]+)';
-    const REGEX_PROP_REQUIRED = '([\?!])?';
-    const REGEX_PROP_ASSIGN = ':';
-    const REGEX_PROP_DEFINITION = '(.+)';
-    const REGEX_PROP_ADDITIONAL = '\.\.\.(!|.+)?';
-    const REGEX_PROP_END = '$/';
+	const REGEX_OBJECT_CONTENT = '(?:(\{)(.*)\})?';
+	const REGEX_PROP_START = '/^';
+	const REGEX_PROP_NAME = '([^?!:]+)';
+	const REGEX_PROP_REQUIRED = '([\?!])?';
+	const REGEX_PROP_ASSIGN = ':';
+	const REGEX_PROP_DEFINITION = '(.+)';
+	const REGEX_PROP_ADDITIONAL = '\.\.\.(!|.+)?';
+	const REGEX_PROP_END = '$/';
 
-    private $minProperties = null;
-    private $maxProperties = null;
-    private $discriminator = null;
-    private $additionalProperties = null;
-    private $required = array();
+	private $minProperties = null;
+	private $maxProperties = null;
+	private $discriminator = null;
+	private $additionalProperties = null;
+	private $required = array();
 
-    /**
-     * @var Property[]
-     */
-    private $properties = array();
+	/**
+	 * @var Property[]
+	 */
+	private $properties = array();
 
-    /**
-     * @var Property
-     */
-    private $mostRecentProperty = null;
+	/**
+	 * @var Property
+	 */
+	private $mostRecentProperty = null;
 
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
 
-        $match = array();
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_END, $definition, $match) === 1) {
-            $match[1] = strtolower($match[1]);
-        } elseif (preg_match(self::REGEX_START . self::REGEX_OBJECT_CONTENT . self::REGEX_RANGE . self::REGEX_END, $definition, $match) === 1) {
-            $match[1] = 'object';
-        } else {
-            throw new Exception('Unparseable object definition: \'' . $definition . '\'');
-        }
+		$match = array();
+		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_OBJECT_CONTENT . self::REGEX_RANGE . self::REGEX_END, $definition, $match) === 1) {
+			$match[1] = 'object';
+		} else {
+			throw new Exception('Unparseable object definition: \'' . $definition . '\'');
+		}
 
-        $this->parseFormat($definition, $match);
-        $this->parseProperties($definition, $match);
-        $this->parseRange($definition, $match);
-    }
+		$this->parseFormat($definition, $match);
+		$this->parseProperties($definition, $match);
+		$this->parseRange($definition, $match);
+	}
 
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseFormat($definition, $match)
-    {
-        if (strtolower($match[1]) !== 'object') {
-            throw new Exception("Not an object: '{$definition}'");
-        }
-    }
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseFormat($definition, $match)
+	{
+		if (strtolower($match[1]) !== 'object') {
+			throw new Exception("Not an object: '{$definition}'");
+		}
+	}
 
-    /**
-     * @param AbstractType|bool $type
-     * @return void
-     * @throws Exception
-     */
-    private function setAdditionalProperties($type)
-    {
-        if ($this->additionalProperties !== null) {
-            throw new Exception('Additional properties may only be set once');
-        }
-        $this->additionalProperties = $type;
-    }
+	/**
+	 * @param AbstractType|bool $type
+	 * @return void
+	 * @throws Exception
+	 */
+	private function setAdditionalProperties($type)
+	{
+		if ($this->additionalProperties !== null) {
+			throw new Exception('Additional properties may only be set once');
+		}
+		$this->additionalProperties = $type;
+	}
 
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    private function parseProperties($definition, $match)
-    {
-        if (empty($match[2])) {
-            return;
-        }
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	private function parseProperties($definition, $match)
+	{
+		if (empty($match[2])) {
+			return;
+		}
 
-        while (($property = self::parseListItem($match[2])) !== '') {
-            $prop_match = array();
-            if (preg_match(self::REGEX_PROP_START . self::REGEX_PROP_ADDITIONAL . self::REGEX_PROP_END, $property, $prop_match) === 1) {
-                if (empty($prop_match[1])) {
-                    $this->setAdditionalProperties(true);
-                } else if ($prop_match[1] === '!') {
-                    $this->setAdditionalProperties(false);
-                } else {
-                    $this->setAdditionalProperties(self::typeFactory($this, $prop_match[1], "Unparseable additional properties definition: '...%s'"));
-                }
-                continue;
-            }
-            if (preg_match(self::REGEX_PROP_START . self::REGEX_PROP_NAME . self::REGEX_PROP_REQUIRED . self::REGEX_PROP_ASSIGN . self::REGEX_PROP_DEFINITION . self::REGEX_PROP_END, $property, $prop_match) !== 1) {
-                throw new Exception("Unparseable property definition: '{$property}'");
-            }
-            $this->properties[$prop_match[1]] = new Property($this, $prop_match[3]);
-            if ($prop_match[2] !== '!' && $prop_match[2] !== '?') {
-                $this->required[$prop_match[1]] = true;
-            }
-        }
+		while (($property = self::parseListItem($match[2])) !== '') {
+			$prop_match = array();
+			if (preg_match(self::REGEX_PROP_START . self::REGEX_PROP_ADDITIONAL . self::REGEX_PROP_END, $property, $prop_match) === 1) {
+				if (empty($prop_match[1])) {
+					$this->setAdditionalProperties(true);
+				} else if ($prop_match[1] === '!') {
+					$this->setAdditionalProperties(false);
+				} else {
+					$this->setAdditionalProperties(self::typeFactory($this, $prop_match[1], "Unparseable additional properties definition: '...%s'"));
+				}
+				continue;
+			}
+			if (preg_match(self::REGEX_PROP_START . self::REGEX_PROP_NAME . self::REGEX_PROP_REQUIRED . self::REGEX_PROP_ASSIGN . self::REGEX_PROP_DEFINITION . self::REGEX_PROP_END, $property, $prop_match) !== 1) {
+				throw new Exception("Unparseable property definition: '{$property}'");
+			}
+			$this->properties[$prop_match[1]] = new Property($this, $prop_match[3]);
+			if ($prop_match[2] !== '!' && $prop_match[2] !== '?') {
+				$this->required[$prop_match[1]] = true;
+			}
+		}
 
-    }
+	}
 
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseRange($definition, $match)
-    {
-        if (!empty($match[3])) {
-            if ($match[4] === '' && $match[5] === '') {
-                throw new Exception("Empty object range: '{$definition}'");
-            }
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseRange($definition, $match)
+	{
+		if (!empty($match[3])) {
+			if ($match[4] === '' && $match[5] === '') {
+				throw new Exception("Empty object range: '{$definition}'");
+			}
 
-            $exclusiveMinimum = $match[3] == '<';
-            $this->minProperties = $match[4] === '' ? null : intval($match[4]);
-            $this->maxProperties = $match[5] === '' ? null : intval($match[5]);
-            $exclusiveMaximum = isset($match[6]) ? ($match[6] == '>') : null;
-            if ($this->minProperties && $this->maxProperties && $this->minProperties > $this->maxProperties) {
-                self::swap($this->minProperties, $this->maxProperties);
-                self::swap($exclusiveMinimum, $exclusiveMaximum);
-            }
-            $this->minProperties = $this->minProperties === null ? null : max(0, $exclusiveMinimum ? $this->minProperties + 1 : $this->minProperties);
-            $this->maxProperties = $this->maxProperties === null ? null : max(0, $exclusiveMaximum ? $this->maxProperties - 1 : $this->maxProperties);
-        }
-    }
+			$exclusiveMinimum = $match[3] == '<';
+			$this->minProperties = $match[4] === '' ? null : intval($match[4]);
+			$this->maxProperties = $match[5] === '' ? null : intval($match[5]);
+			$exclusiveMaximum = isset($match[6]) ? ($match[6] == '>') : null;
+			if ($this->minProperties && $this->maxProperties && $this->minProperties > $this->maxProperties) {
+				self::swap($this->minProperties, $this->maxProperties);
+				self::swap($exclusiveMinimum, $exclusiveMaximum);
+			}
+			$this->minProperties = $this->minProperties === null ? null : max(0, $exclusiveMinimum ? $this->minProperties + 1 : $this->minProperties);
+			$this->maxProperties = $this->maxProperties === null ? null : max(0, $exclusiveMaximum ? $this->maxProperties - 1 : $this->maxProperties);
+		}
+	}
 
-    /**
-     * @param string|false $discriminator
-     * @throws Exception
-     * @throws Exception
-     */
-    private function setDiscriminator($discriminator)
-    {
-        if (!empty($this->discriminator)) {
-            throw new Exception("Discriminator may only be set once, "
-                . "trying to change it "
-                . "from '{$this->discriminator}' "
-                . "to '{$discriminator}'");
-        }
-        if (isset($this->properties[$discriminator]) && empty($this->required[$discriminator])) {
-            throw new Exception("Discriminator must be a required property, "
-                . "property '{$discriminator}' is not required");
-        }
-        $this->discriminator = $discriminator;
-    }
+	/**
+	 * @param string|false $discriminator
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	private function setDiscriminator($discriminator)
+	{
+		if (!empty($this->discriminator)) {
+			throw new Exception("Discriminator may only be set once, "
+				. "trying to change it "
+				. "from '{$this->discriminator}' "
+				. "to '{$discriminator}'");
+		}
+		if (isset($this->properties[$discriminator]) && empty($this->required[$discriminator])) {
+			throw new Exception("Discriminator must be a required property, "
+				. "property '{$discriminator}' is not required");
+		}
+		$this->discriminator = $discriminator;
+	}
 
-    /**
-     * @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
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            // type name description...
-            case 'additionalproperties':
-                $value = self::wordShift($data);
-                if (is_bool($value)) {
-                    $type = $value;
-                } else if ($value === 'false') {
-                    $type = false;
-                } else if ($value === 'true') {
-                    $type = true;
-                } else {
-                    $type = self::typeFactory($this, $value, "Unparseable additional properties definition: '%s'");
-                }
-                $this->setAdditionalProperties($type);
-                return $this;
-            case 'discriminator':
-                $discriminator = self::wordShift($data);
-                $this->setDiscriminator($discriminator);
-                return $this;
-            case 'property':
-            case 'property?':
-            case 'property!':
-                $definition = self::wordShift($data);
-                if (empty($definition)) {
-                    throw new Exception("Missing property definition");
-                }
+	/**
+	 * @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
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			// type name description...
+			case 'additionalproperties':
+				$value = self::wordShift($data);
+				if (is_bool($value)) {
+					$type = $value;
+				} else if ($value === 'false') {
+					$type = false;
+				} else if ($value === 'true') {
+					$type = true;
+				} else {
+					$type = self::typeFactory($this, $value, "Unparseable additional properties definition: '%s'");
+				}
+				$this->setAdditionalProperties($type);
+				return $this;
+			case 'discriminator':
+				$discriminator = self::wordShift($data);
+				$this->setDiscriminator($discriminator);
+				return $this;
+			case 'property':
+			case 'property?':
+			case 'property!':
+				$definition = self::wordShift($data);
+				if (empty($definition)) {
+					throw new Exception("Missing property definition");
+				}
 
-                $name = self::wordShift($data);
-                if (empty($name)) {
-                    throw new Exception("Missing property name: '{$definition}'");
-                }
+				$name = self::wordShift($data);
+				if (empty($name)) {
+					throw new Exception("Missing property name: '{$definition}'");
+				}
 
-                $readOnly = null;
-                $required = false;
-                $propertySuffix = substr($command, -1);
-                if ($propertySuffix === '!') {
-                    $readOnly = true;
-                } else if ($propertySuffix !== '?') {
-                    $required = true;
-                }
+				$readOnly = null;
+				$required = false;
+				$propertySuffix = substr($command, -1);
+				if ($propertySuffix === '!') {
+					$readOnly = true;
+				} else if ($propertySuffix !== '?') {
+					$required = true;
+				}
 
-                if (($name === $this->discriminator) && !$required) {
-                    throw new Exception("Discriminator must be a required property, "
-                        . "property '{$name}' is not required");
-                }
+				if (($name === $this->discriminator) && !$required) {
+					throw new Exception("Discriminator must be a required property, "
+						. "property '{$name}' is not required");
+				}
 
-                unset($this->required[$name]);
-                if ($required) {
-                    $this->required[$name] = true;
-                }
+				unset($this->required[$name]);
+				if ($required) {
+					$this->required[$name] = true;
+				}
 
-                $this->mostRecentProperty = new Property($this, $definition, $data, $readOnly);
-                $this->properties[$name] = $this->mostRecentProperty;
-                return $this;
+				$this->mostRecentProperty = new Property($this, $definition, $data, $readOnly);
+				$this->properties[$name] = $this->mostRecentProperty;
+				return $this;
 
-            case 'min':
-                $this->minProperties = intval($data);
-                if ($this->minProperties < 0) {
-                    throw new Exception("Minimum less than zero: '{$data}'");
-                }
-                if ($this->maxProperties !== null && $this->minProperties > $this->maxProperties) {
-                    throw new Exception("Minimum greater than maximum: '{$data}'");
-                }
-                $this->minProperties = intval($data);
-                return $this;
+			case 'min':
+				$this->minProperties = intval($data);
+				if ($this->minProperties < 0) {
+					throw new Exception("Minimum less than zero: '{$data}'");
+				}
+				if ($this->maxProperties !== null && $this->minProperties > $this->maxProperties) {
+					throw new Exception("Minimum greater than maximum: '{$data}'");
+				}
+				$this->minProperties = intval($data);
+				return $this;
 
-            case 'max':
-                $this->maxProperties = intval($data);
-                if ($this->minProperties !== null && $this->minProperties > $this->maxProperties) {
-                    throw new Exception("Maximum less than minimum: '{$data}'");
-                }
-                if ($this->maxProperties < 0) {
-                    throw new Exception("Maximum less than zero: '{$data}'");
-                }
-                return $this;
-        }
+			case 'max':
+				$this->maxProperties = intval($data);
+				if ($this->minProperties !== null && $this->minProperties > $this->maxProperties) {
+					throw new Exception("Maximum less than minimum: '{$data}'");
+				}
+				if ($this->maxProperties < 0) {
+					throw new Exception("Maximum less than zero: '{$data}'");
+				}
+				return $this;
+		}
 
-        // Pass through to most recent Property
-        if ($this->mostRecentProperty && $this->mostRecentProperty->handleCommand($command, $data)) {
-            return $this;
-        }
+		// Pass through to most recent Property
+		if ($this->mostRecentProperty && $this->mostRecentProperty->handleCommand($command, $data)) {
+			return $this;
+		}
 
-        return parent::handleCommand($command, $data);
-    }
+		return parent::handleCommand($command, $data);
+	}
 
-    public function toArray()
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'object',
-            'required' => array_keys($this->required),
-            'properties' => self::objectsToArray($this->properties),
-            'minProperties' => $this->minProperties,
-            'maxProperties' => $this->maxProperties,
-            'discriminator' => $this->discriminator,
-            'additionalProperties' => $this->additionalProperties instanceof AbstractType ? $this->additionalProperties->toArray() : $this->additionalProperties,
-        ), parent::toArray()));
-    }
+	public function toArray()
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'object',
+			'required' => array_keys($this->required),
+			'properties' => self::objectsToArray($this->properties),
+			'minProperties' => $this->minProperties,
+			'maxProperties' => $this->maxProperties,
+			'discriminator' => $this->discriminator,
+			'additionalProperties' => $this->additionalProperties instanceof AbstractType ? $this->additionalProperties->toArray() : $this->additionalProperties,
+		), parent::toArray()));
+	}
 
-    public function __toString()
-    {
-        return __CLASS__;
-    }
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
 }

SwaggerGen/Swagger/Type/BooleanType.php

Indentation +47 added lines, -47 removed lines

@@ -15,60 +15,60 @@
 class BooleanType extends AbstractType
 {
 
-    const REGEX_DEFAULT = '(?:=(true|false|1|0))?';
+	const REGEX_DEFAULT = '(?:=(true|false|1|0))?';
 
-    private $default = null;
+	private $default = null;
 
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $match = array();
-        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)
+	{
+		$match = array();
+		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');
+		}
+	}
 
-    /**
-     * @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'))) {
-                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'))) {
+				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()
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'boolean',
-            'default' => $this->default,
-        ), parent::toArray()));
-    }
+	public function toArray()
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'boolean',
+			'default' => $this->default,
+		), parent::toArray()));
+	}
 
-    public function __toString()
-    {
-        return __CLASS__;
-    }
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
 }

SwaggerGen/Swagger/Type/Property.php

Indentation +67 added lines, -67 removed lines

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

SwaggerGen/Swagger/Type/NumberType.php

Indentation +149 added lines, -149 removed lines

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