vanderlee / PHPSwaggerGen

SwaggerGen/Swagger/License.php

Indentation +81 added lines, -81 removed lines

@@ -14,94 +14,94 @@
 class License extends AbstractObject
 {
 
-    // @todo make this a separate resource file? (licenseUrls.json)
-    private static $licenses = array(
-        'artistic-1.0' => 'http://opensource.org/licenses/artistic-license-1.0',
-        'artistic-1' => 'http://opensource.org/licenses/artistic-license-1.0',
-        'artistic-2.0' => 'http://opensource.org/licenses/artistic-license-2.0',
-        'artistic-2' => 'http://opensource.org/licenses/artistic-license-2.0',
-        'artistic' => 'http://opensource.org/licenses/artistic-license-2.0',
-        'bsd-new' => 'https://opensource.org/licenses/BSD-3-Clause',
-        'bsd-3' => 'https://opensource.org/licenses/BSD-3-Clause',
-        'bsd-2' => 'https://opensource.org/licenses/BSD-2-Clause',
-        'bsd' => 'https://opensource.org/licenses/BSD-2-Clause',
-        'epl-1.0' => 'http://www.eclipse.org/legal/epl-v10.html',
-        'epl-1' => 'http://www.eclipse.org/legal/epl-v10.html',
-        'epl' => 'http://www.eclipse.org/legal/epl-v10.html',
-        'apache-2.0' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
-        'apache-2' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
-        'apache' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
-        'gpl-1.0' => 'https://www.gnu.org/licenses/gpl-1.0.html',
-        'gpl-1' => 'https://www.gnu.org/licenses/gpl-1.0.html',
-        'gpl-2.0' => 'https://www.gnu.org/licenses/gpl-2.0.html',
-        'gpl-2' => 'https://www.gnu.org/licenses/gpl-2.0.html',
-        'gpl-3.0' => 'http://www.gnu.org/licenses/gpl-3.0.html',
-        'gpl-3' => 'http://www.gnu.org/licenses/gpl-3.0.html',
-        'gpl' => 'http://www.gnu.org/licenses/gpl-3.0.html',
-        'lgpl-2.0' => 'http://www.gnu.org/licenses/lgpl-2.0.html',
-        'lgpl-2.1' => 'http://www.gnu.org/licenses/lgpl-2.1.html',
-        'lgpl-2' => 'http://www.gnu.org/licenses/lgpl-2.1.html',
-        'lgpl-3.0' => 'http://www.gnu.org/licenses/lgpl-3.0.html',
-        'lgpl-3' => 'http://www.gnu.org/licenses/lgpl-3.0.html',
-        'lgpl' => 'http://www.gnu.org/licenses/lgpl-3.0.html',
-        'mit' => 'http://opensource.org/licenses/MIT',
-        'mpl-1.1' => 'https://www.mozilla.org/en-US/MPL/1.1/',
-        'mpl-1' => 'https://www.mozilla.org/en-US/MPL/1.1/',
-        'mpl-2.0' => 'https://www.mozilla.org/en-US/MPL/',
-        'mpl-2' => 'https://www.mozilla.org/en-US/MPL/',
-        'mpl' => 'https://www.mozilla.org/en-US/MPL/',
-        'mspl' => 'https://msdn.microsoft.com/en-us/library/ff648068.aspx',
-    );
-    private $name;
-    private $url;
+	// @todo make this a separate resource file? (licenseUrls.json)
+	private static $licenses = array(
+		'artistic-1.0' => 'http://opensource.org/licenses/artistic-license-1.0',
+		'artistic-1' => 'http://opensource.org/licenses/artistic-license-1.0',
+		'artistic-2.0' => 'http://opensource.org/licenses/artistic-license-2.0',
+		'artistic-2' => 'http://opensource.org/licenses/artistic-license-2.0',
+		'artistic' => 'http://opensource.org/licenses/artistic-license-2.0',
+		'bsd-new' => 'https://opensource.org/licenses/BSD-3-Clause',
+		'bsd-3' => 'https://opensource.org/licenses/BSD-3-Clause',
+		'bsd-2' => 'https://opensource.org/licenses/BSD-2-Clause',
+		'bsd' => 'https://opensource.org/licenses/BSD-2-Clause',
+		'epl-1.0' => 'http://www.eclipse.org/legal/epl-v10.html',
+		'epl-1' => 'http://www.eclipse.org/legal/epl-v10.html',
+		'epl' => 'http://www.eclipse.org/legal/epl-v10.html',
+		'apache-2.0' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
+		'apache-2' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
+		'apache' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
+		'gpl-1.0' => 'https://www.gnu.org/licenses/gpl-1.0.html',
+		'gpl-1' => 'https://www.gnu.org/licenses/gpl-1.0.html',
+		'gpl-2.0' => 'https://www.gnu.org/licenses/gpl-2.0.html',
+		'gpl-2' => 'https://www.gnu.org/licenses/gpl-2.0.html',
+		'gpl-3.0' => 'http://www.gnu.org/licenses/gpl-3.0.html',
+		'gpl-3' => 'http://www.gnu.org/licenses/gpl-3.0.html',
+		'gpl' => 'http://www.gnu.org/licenses/gpl-3.0.html',
+		'lgpl-2.0' => 'http://www.gnu.org/licenses/lgpl-2.0.html',
+		'lgpl-2.1' => 'http://www.gnu.org/licenses/lgpl-2.1.html',
+		'lgpl-2' => 'http://www.gnu.org/licenses/lgpl-2.1.html',
+		'lgpl-3.0' => 'http://www.gnu.org/licenses/lgpl-3.0.html',
+		'lgpl-3' => 'http://www.gnu.org/licenses/lgpl-3.0.html',
+		'lgpl' => 'http://www.gnu.org/licenses/lgpl-3.0.html',
+		'mit' => 'http://opensource.org/licenses/MIT',
+		'mpl-1.1' => 'https://www.mozilla.org/en-US/MPL/1.1/',
+		'mpl-1' => 'https://www.mozilla.org/en-US/MPL/1.1/',
+		'mpl-2.0' => 'https://www.mozilla.org/en-US/MPL/',
+		'mpl-2' => 'https://www.mozilla.org/en-US/MPL/',
+		'mpl' => 'https://www.mozilla.org/en-US/MPL/',
+		'mspl' => 'https://msdn.microsoft.com/en-us/library/ff648068.aspx',
+	);
+	private $name;
+	private $url;
 
-    public function __construct(AbstractObject $parent, $name, $url = null)
-    {
-        parent::__construct($parent);
+	public function __construct(AbstractObject $parent, $name, $url = null)
+	{
+		parent::__construct($parent);
 
-        $this->name = empty($name) ? null : $name;
+		$this->name = empty($name) ? null : $name;
 
-        if (!empty($url)) {
-            $this->url = $url;
-        } elseif (!empty(self::$licenses[strtolower($name)])) {
-            $this->url = self::$licenses[strtolower($name)];
-        }
-    }
+		if (!empty($url)) {
+			$this->url = $url;
+		} elseif (!empty(self::$licenses[strtolower($name)])) {
+			$this->url = self::$licenses[strtolower($name)];
+		}
+	}
 
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'name':
-                $this->name = $data;
-                if (empty($this->url) && !empty(self::$licenses[strtolower($data)])) {
-                    $this->url = self::$licenses[strtolower($data)];
-                }
-                return $this;
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'name':
+				$this->name = $data;
+				if (empty($this->url) && !empty(self::$licenses[strtolower($data)])) {
+					$this->url = self::$licenses[strtolower($data)];
+				}
+				return $this;
 
-            case 'url':
-                $this->url = $data;
-                return $this;
-        }
+			case 'url':
+				$this->url = $data;
+				return $this;
+		}
 
-        return parent::handleCommand($command, $data);
-    }
+		return parent::handleCommand($command, $data);
+	}
 
-    public function toArray()
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'name' => $this->name,
-            'url' => $this->url,
-        ), parent::toArray()));
-    }
+	public function toArray()
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'name' => $this->name,
+			'url' => $this->url,
+		), parent::toArray()));
+	}
 
-    public function __toString()
-    {
-        return __CLASS__ . " {$this->name}, {$this->url}";
-    }
+	public function __toString()
+	{
+		return __CLASS__ . " {$this->name}, {$this->url}";
+	}
 
 }

SwaggerGen/Swagger/IParameter.php

Indentation +1 added lines, -1 removed lines

@@ -13,5 +13,5 @@
 interface IParameter
 {
 
-    public function getName();
+	public function getName();
 }

SwaggerGen/Swagger/Type/ReferenceObjectType.php

Indentation +43 added lines, -43 removed lines

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

SwaggerGen/Swagger/Type/AllOfType.php

Indentation +47 added lines, -47 removed lines

@@ -14,54 +14,54 @@
  */
 class AllOfType extends AbstractType
 {
-    private $allOfItems = array();
-    private $mostRecentItem;
+	private $allOfItems = array();
+	private $mostRecentItem;
 
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $pattern = self::REGEX_START . 'allof' . self::REGEX_CONTENT . self::REGEX_END;
-        $inlineDef = '';
-        if (preg_match($pattern, $definition, $matches)) {
-            if (isset($matches[1])) {
-                $inlineDef = $matches[1];
-            }
-        }
-        if ($inlineDef) {
-            foreach ($this->parseList($inlineDef) as $item) {
-                $this->handleCommand('item', $item);
-            }
-        }
-    }
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$pattern = self::REGEX_START . 'allof' . self::REGEX_CONTENT . self::REGEX_END;
+		$inlineDef = '';
+		if (preg_match($pattern, $definition, $matches)) {
+			if (isset($matches[1])) {
+				$inlineDef = $matches[1];
+			}
+		}
+		if ($inlineDef) {
+			foreach ($this->parseList($inlineDef) as $item) {
+				$this->handleCommand('item', $item);
+			}
+		}
+	}
 
-    /**
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (strtolower($command) === 'item') {
-            $this->mostRecentItem = self::typeFactory($this, $data);
-            $this->allOfItems[] = $this->mostRecentItem;
-            return $this;
-        }
-        if (isset($this->mostRecentItem)) {
-            if ($this->mostRecentItem->handleCommand($command, $data)) {
-                return $this;
-            }
-        }
-        return parent::handleCommand($command, $data);
-    }
+	/**
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (strtolower($command) === 'item') {
+			$this->mostRecentItem = self::typeFactory($this, $data);
+			$this->allOfItems[] = $this->mostRecentItem;
+			return $this;
+		}
+		if (isset($this->mostRecentItem)) {
+			if ($this->mostRecentItem->handleCommand($command, $data)) {
+				return $this;
+			}
+		}
+		return parent::handleCommand($command, $data);
+	}
 
-    public function toArray()
-    {
-        $allOf = array();
-        foreach ($this->allOfItems as $item) {
-            $allOf[] = $item->toArray();
-        }
-        return self::arrayFilterNull(array_merge(array(
-            'allOf' => $allOf,
-        ), parent::toArray()));
-    }
+	public function toArray()
+	{
+		$allOf = array();
+		foreach ($this->allOfItems as $item) {
+			$allOf[] = $item->toArray();
+		}
+		return self::arrayFilterNull(array_merge(array(
+			'allOf' => $allOf,
+		), parent::toArray()));
+	}
 }

SwaggerGen/Swagger/Type/FileType.php

Indentation +40 added lines, -40 removed lines

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

Spacing +1 added lines, -1 removed lines

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

SwaggerGen/Swagger/Type/DateType.php

Indentation +92 added lines, -92 removed lines

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

SwaggerGen/Swagger/Type/StringUuidType.php

Indentation +10 added lines, -10 removed lines

@@ -15,15 +15,15 @@
 class StringUuidType extends AbstractRegexType
 {
 
-    /**
-     * Construct and set up the regular expression for this type
-     *
-     * @param AbstractObject $parent
-     * @param string $definition
-     */
-    public function __construct(AbstractObject $parent, $definition)
-    {
-        parent::__construct($parent, $definition, 'uuid', '[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[1-5][a-fA-F0-9]{3}-[89abAB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}');
-    }
+	/**
+	 * Construct and set up the regular expression for this type
+	 *
+	 * @param AbstractObject $parent
+	 * @param string $definition
+	 */
+	public function __construct(AbstractObject $parent, $definition)
+	{
+		parent::__construct($parent, $definition, 'uuid', '[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[1-5][a-fA-F0-9]{3}-[89abAB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}');
+	}
 
 }

SwaggerGen/Swagger/Type/StringType.php

Indentation +182 added lines, -182 removed lines

@@ -15,187 +15,187 @@
 class StringType extends AbstractType
 {
 
-    private static $formats = array(
-        'string' => '',
-        'byte' => 'byte',
-        'binary' => 'binary',
-        'password' => 'password',
-        'enum' => '',
-    );
-
-    /**
-     * Name of the type
-     * @var string
-     */
-    protected $format = '';
-    protected $pattern = null;
-    protected $default = null;
-    protected $maxLength = null;
-    protected $minLength = null;
-    protected $enum = array();
-
-    /**
-     * @throws Exception
-     */
-    protected function parseDefinition($definition)
-    {
-        $definition = self::trim($definition);
-
-        $match = array();
-        if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
-            throw new Exception("Unparseable string definition: '{$definition}'");
-        }
-
-        $this->parseFormat($definition, $match);
-        $this->parseContent($definition, $match);
-        $this->parseRange($definition, $match);
-        $this->parseDefault($definition, $match);
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseFormat($definition, $match)
-    {
-        $type = strtolower($match[1]);
-        if (!isset(self::$formats[$type])) {
-            throw new Exception("Not a string: '{$definition}'");
-        }
-        $this->format = self::$formats[$type];
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     */
-    private function parseContent($definition, $match)
-    {
-        if (strtolower($match[1]) === 'enum') {
-            $this->enum = explode(',', $match[2]);
-        } else {
-            $this->pattern = empty($match[2]) ? null : $match[2];
-        }
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     * @throws Exception
-     */
-    private function parseRange($definition, $match)
-    {
-
-        if (!empty($match[3])) {
-            if ($match[1] === 'enum') {
-                throw new Exception("Range not allowed in enumeration definition: '{$definition}'");
-            }
-            if ($match[4] === '' && $match[5] === '') {
-                throw new Exception("Empty string range: '{$definition}'");
-            }
-            $exclusiveMinimum = $match[3] == '<';
-            $this->minLength = $match[4] === '' ? null : $match[4];
-            $this->maxLength = $match[5] === '' ? null : $match[5];
-            $exclusiveMaximum = isset($match[6]) ? ($match[6] == '>') : null;
-            if ($this->minLength !== null && $this->maxLength !== null && $this->minLength > $this->maxLength) {
-                self::swap($this->minLength, $this->maxLength);
-                self::swap($exclusiveMinimum, $exclusiveMaximum);
-            }
-            $this->minLength = $this->minLength === null ? null : max(0, $exclusiveMinimum ? $this->minLength + 1 : $this->minLength);
-            $this->maxLength = $this->maxLength === null ? null : max(0, $exclusiveMaximum ? $this->maxLength - 1 : $this->maxLength);
-        }
-    }
-
-    /**
-     * @param string $definition
-     * @param string[] $match
-     * @throws Exception
-     */
-    private function parseDefault($definition, $match)
-    {
-        $this->default = isset($match[7]) && $match[7] !== '' ? $this->validateDefault($match[7]) : null;
-    }
-
-    /**
-     * @param string $command The comment command
-     * @param string $data Any data added after the command
-     * @return AbstractType|boolean
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        switch (strtolower($command)) {
-            case 'default':
-                $this->default = $this->validateDefault($data);
-                return $this;
-
-            case 'pattern':
-                $this->pattern = $data;
-                return $this;
-
-            case 'enum':
-                if ($this->minLength !== null || $this->maxLength !== null) {
-                    throw new Exception("Enumeration not allowed in ranged string: '{$data}'");
-                }
-                $words = self::wordSplit($data);
-                $this->enum = is_array($this->enum) ? array_merge($this->enum, $words) : $words;
-                return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray()
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'type' => 'string',
-            'format' => empty($this->format) ? null : $this->format,
-            'pattern' => $this->pattern,
-            'default' => $this->default,
-            'minLength' => $this->minLength ? intval($this->minLength) : null,
-            'maxLength' => $this->maxLength ? intval($this->maxLength) : null,
-            'enum' => $this->enum,
-        ), parent::toArray()));
-    }
-
-    /**
-     * Validate a default string value, depending on subtype
-     *
-     * @param string $value the value to validate
-     * @return string the value after validation (might become trimmed)
-     * @throws Exception
-     */
-    protected function validateDefault($value)
-    {
-        if (empty($value)) {
-            $type = $this->format ?: ($this->enum ? 'enum' : 'string');
-            throw new Exception("Empty {$type} default");
-        }
-
-        if (!empty($this->enum) && !in_array($value, $this->enum)) {
-            throw new Exception("Invalid enum default: '{$value}'");
-        }
-
-        if ($this->maxLength !== null && mb_strlen($value) > $this->maxLength) {
-            $type = $this->format ?: ($this->enum ? 'enum' : 'string');
-            throw new Exception("Default {$type} length beyond maximum: '{$value}'");
-        }
-
-        if ($this->minLength !== null && mb_strlen($value) < $this->minLength) {
-            $type = $this->format ?: ($this->enum ? 'enum' : 'string');
-            throw new Exception("Default {$type} length beyond minimum: '{$value}'");
-        }
-
-        return $value;
-    }
-
-    public function __toString()
-    {
-        return __CLASS__;
-    }
+	private static $formats = array(
+		'string' => '',
+		'byte' => 'byte',
+		'binary' => 'binary',
+		'password' => 'password',
+		'enum' => '',
+	);
+
+	/**
+	 * Name of the type
+	 * @var string
+	 */
+	protected $format = '';
+	protected $pattern = null;
+	protected $default = null;
+	protected $maxLength = null;
+	protected $minLength = null;
+	protected $enum = array();
+
+	/**
+	 * @throws Exception
+	 */
+	protected function parseDefinition($definition)
+	{
+		$definition = self::trim($definition);
+
+		$match = array();
+		if (preg_match(self::REGEX_START . self::REGEX_FORMAT . self::REGEX_CONTENT . self::REGEX_RANGE . self::REGEX_DEFAULT . self::REGEX_END, $definition, $match) !== 1) {
+			throw new Exception("Unparseable string definition: '{$definition}'");
+		}
+
+		$this->parseFormat($definition, $match);
+		$this->parseContent($definition, $match);
+		$this->parseRange($definition, $match);
+		$this->parseDefault($definition, $match);
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseFormat($definition, $match)
+	{
+		$type = strtolower($match[1]);
+		if (!isset(self::$formats[$type])) {
+			throw new Exception("Not a string: '{$definition}'");
+		}
+		$this->format = self::$formats[$type];
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 */
+	private function parseContent($definition, $match)
+	{
+		if (strtolower($match[1]) === 'enum') {
+			$this->enum = explode(',', $match[2]);
+		} else {
+			$this->pattern = empty($match[2]) ? null : $match[2];
+		}
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	private function parseRange($definition, $match)
+	{
+
+		if (!empty($match[3])) {
+			if ($match[1] === 'enum') {
+				throw new Exception("Range not allowed in enumeration definition: '{$definition}'");
+			}
+			if ($match[4] === '' && $match[5] === '') {
+				throw new Exception("Empty string range: '{$definition}'");
+			}
+			$exclusiveMinimum = $match[3] == '<';
+			$this->minLength = $match[4] === '' ? null : $match[4];
+			$this->maxLength = $match[5] === '' ? null : $match[5];
+			$exclusiveMaximum = isset($match[6]) ? ($match[6] == '>') : null;
+			if ($this->minLength !== null && $this->maxLength !== null && $this->minLength > $this->maxLength) {
+				self::swap($this->minLength, $this->maxLength);
+				self::swap($exclusiveMinimum, $exclusiveMaximum);
+			}
+			$this->minLength = $this->minLength === null ? null : max(0, $exclusiveMinimum ? $this->minLength + 1 : $this->minLength);
+			$this->maxLength = $this->maxLength === null ? null : max(0, $exclusiveMaximum ? $this->maxLength - 1 : $this->maxLength);
+		}
+	}
+
+	/**
+	 * @param string $definition
+	 * @param string[] $match
+	 * @throws Exception
+	 */
+	private function parseDefault($definition, $match)
+	{
+		$this->default = isset($match[7]) && $match[7] !== '' ? $this->validateDefault($match[7]) : null;
+	}
+
+	/**
+	 * @param string $command The comment command
+	 * @param string $data Any data added after the command
+	 * @return AbstractType|boolean
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		switch (strtolower($command)) {
+			case 'default':
+				$this->default = $this->validateDefault($data);
+				return $this;
+
+			case 'pattern':
+				$this->pattern = $data;
+				return $this;
+
+			case 'enum':
+				if ($this->minLength !== null || $this->maxLength !== null) {
+					throw new Exception("Enumeration not allowed in ranged string: '{$data}'");
+				}
+				$words = self::wordSplit($data);
+				$this->enum = is_array($this->enum) ? array_merge($this->enum, $words) : $words;
+				return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray()
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'type' => 'string',
+			'format' => empty($this->format) ? null : $this->format,
+			'pattern' => $this->pattern,
+			'default' => $this->default,
+			'minLength' => $this->minLength ? intval($this->minLength) : null,
+			'maxLength' => $this->maxLength ? intval($this->maxLength) : null,
+			'enum' => $this->enum,
+		), parent::toArray()));
+	}
+
+	/**
+	 * Validate a default string value, depending on subtype
+	 *
+	 * @param string $value the value to validate
+	 * @return string the value after validation (might become trimmed)
+	 * @throws Exception
+	 */
+	protected function validateDefault($value)
+	{
+		if (empty($value)) {
+			$type = $this->format ?: ($this->enum ? 'enum' : 'string');
+			throw new Exception("Empty {$type} default");
+		}
+
+		if (!empty($this->enum) && !in_array($value, $this->enum)) {
+			throw new Exception("Invalid enum default: '{$value}'");
+		}
+
+		if ($this->maxLength !== null && mb_strlen($value) > $this->maxLength) {
+			$type = $this->format ?: ($this->enum ? 'enum' : 'string');
+			throw new Exception("Default {$type} length beyond maximum: '{$value}'");
+		}
+
+		if ($this->minLength !== null && mb_strlen($value) < $this->minLength) {
+			$type = $this->format ?: ($this->enum ? 'enum' : 'string');
+			throw new Exception("Default {$type} length beyond minimum: '{$value}'");
+		}
+
+		return $value;
+	}
+
+	public function __toString()
+	{
+		return __CLASS__;
+	}
 
 }

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

@@ -173,7 +173,7 @@ 
     {
         if (empty($value)) {
             $type = $this->format ?: ($this->enum ? 'enum' : 'string');
-            throw new Exception("Empty {$type} default");
+            throw new Exception("empty {$type} default");
         }
 
         if (!empty($this->enum) && !in_array($value, $this->enum)) {
@@ -182,12 +182,12 @@ 
 
         if ($this->maxLength !== null && mb_strlen($value) > $this->maxLength) {
             $type = $this->format ?: ($this->enum ? 'enum' : 'string');
-            throw new Exception("Default {$type} length beyond maximum: '{$value}'");
+            throw new Exception("default {$type} length beyond maximum: '{$value}'");
         }
 
         if ($this->minLength !== null && mb_strlen($value) < $this->minLength) {
             $type = $this->format ?: ($this->enum ? 'enum' : 'string');
-            throw new Exception("Default {$type} length beyond minimum: '{$value}'");
+            throw new Exception("default {$type} length beyond minimum: '{$value}'");
         }
 
         return $value;

SwaggerGen/Swagger/Type/IntegerType.php

Indentation +158 added lines, -158 removed lines

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