vanderlee / PHPSwaggerGen

SwaggerGen/Swagger/Type/ObjectType.php

Indentation +255 added lines, -255 removed lines

@@ -15,286 +15,286 @@
 class ObjectType extends AbstractType
 {
 
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    const REGEX_OBJECT_CONTENT = '(?:(\{)(.*)\})?';
-    const REGEX_PROP_START = '/^';
-    const REGEX_PROP_NAME = '([^?!:]+)';
-    /** @noinspection PhpRegExpUnsupportedModifierInspection */
-    const REGEX_PROP_REQUIRED = '([\?!])?';
-    const REGEX_PROP_ASSIGN = ':';
-    const REGEX_PROP_DEFINITION = '(.+)';
-    /** @noinspection PhpRegExpUnsupportedModifierInspection
-     * @noinspection PhpRegExpInvalidDelimiterInspection
-     */
-    const REGEX_PROP_ADDITIONAL = '\.\.\.(!|.+)?';
-    const REGEX_PROP_END = '$/';
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	const REGEX_OBJECT_CONTENT = '(?:(\{)(.*)\})?';
+	const REGEX_PROP_START = '/^';
+	const REGEX_PROP_NAME = '([^?!:]+)';
+	/** @noinspection PhpRegExpUnsupportedModifierInspection */
+	const REGEX_PROP_REQUIRED = '([\?!])?';
+	const REGEX_PROP_ASSIGN = ':';
+	const REGEX_PROP_DEFINITION = '(.+)';
+	/** @noinspection PhpRegExpUnsupportedModifierInspection
+	 * @noinspection PhpRegExpInvalidDelimiterInspection
+	 */
+	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 : (int)$match[4];
-            $this->maxProperties = $match[5] === '' ? null : (int)$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 : (int)$match[4];
+			$this->maxProperties = $match[5] === '' ? null : (int)$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 = (int)$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 = (int)$data;
-                return $this;
+			case 'min':
+				$this->minProperties = (int)$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 = (int)$data;
+				return $this;
 
-            case 'max':
-                $this->maxProperties = (int)$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 = (int)$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(): array
-    {
-        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(): array
+	{
+		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__;
+	}
 
 }

Spacing +5 added lines, -5 removed lines

@@ -143,8 +143,8 @@ 
             }
 
             $exclusiveMinimum = $match[3] == '<';
-            $this->minProperties = $match[4] === '' ? null : (int)$match[4];
-            $this->maxProperties = $match[5] === '' ? null : (int)$match[5];
+            $this->minProperties = $match[4] === '' ? null : (int) $match[4];
+            $this->maxProperties = $match[5] === '' ? null : (int) $match[5];
             $exclusiveMaximum = isset($match[6]) ? ($match[6] == '>') : null;
             if ($this->minProperties && $this->maxProperties && $this->minProperties > $this->maxProperties) {
                 self::swap($this->minProperties, $this->maxProperties);
@@ -250,18 +250,18 @@ 
                 return $this;
 
             case 'min':
-                $this->minProperties = (int)$data;
+                $this->minProperties = (int) $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 = (int)$data;
+                $this->minProperties = (int) $data;
                 return $this;
 
             case 'max':
-                $this->maxProperties = (int)$data;
+                $this->maxProperties = (int) $data;
                 if ($this->minProperties !== null && $this->minProperties > $this->maxProperties) {
                     throw new Exception("Maximum less than minimum: '{$data}'");
                 }

SwaggerGen/Swagger/Type/BooleanType.php

Indentation +48 added lines, -48 removed lines

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

SwaggerGen/Swagger/Type/AbstractType.php

Indentation +190 added lines, -190 removed lines

@@ -16,195 +16,195 @@
 abstract class AbstractType extends AbstractObject
 {
 
-    const REGEX_START = '/^';
-    const REGEX_FORMAT = '([a-z][a-z0-9]*)';
-    const REGEX_CONTENT = '(?:\((.*)\))?';
-    const REGEX_RANGE = '(?:([[<])(\\d*),(\\d*)([\\]>]))?';
-    const REGEX_DEFAULT = '(?:=(.+))?';
-    const REGEX_END = '$/i';
-
-    private static $classTypes = array(
-        'integer' => 'Integer',
-        'int' => 'Integer',
-        'int32' => 'Integer',
-        'int64' => 'Integer',
-        'long' => 'Integer',
-        'float' => 'Number',
-        'double' => 'Number',
-        'string' => 'String',
-        'uuid' => 'StringUuid',
-        'byte' => 'String',
-        'binary' => 'String',
-        'password' => 'String',
-        'enum' => 'String',
-        'boolean' => 'Boolean',
-        'bool' => 'Boolean',
-        'array' => 'Array',
-        'csv' => 'Array',
-        'ssv' => 'Array',
-        'tsv' => 'Array',
-        'pipes' => 'Array',
-        'date' => 'Date',
-        'datetime' => 'Date',
-        'date-time' => 'Date',
-        'object' => 'Object',
-        'refobject' => 'ReferenceObject',
-        'allof' => 'AllOf',
-    );
-
-    private $example = null;
-
-    /**
-     * Swap values of two variables.
-     * Used for sorting.
-     * @param mixed $a
-     * @param mixed $b
-     */
-    protected static function swap(&$a, &$b)
-    {
-        $tmp = $a;
-        $a = $b;
-        $b = $tmp;
-    }
-
-    /**
-     * @param string $list
-     * @return array
-     */
-    protected static function parseList($list)
-    {
-        $ret = array();
-        while ($item = self::parseListItem($list)) {
-            $ret[] = $item;
-        }
-        return $ret;
-    }
-
-    /**
-     * Extract an item from a comma-separated list of items.
-     *
-     * i.e. `a(x(x,x)),b(x)` returns `a(x(x,x))` and changes `$list` into `b(x)`.
-     * Note: brace nesting is not checked, e.g. `a{b(})` is a valid list item.
-     *
-     * @param string $list the list to parse
-     * @return string the extracted item
-     */
-    protected static function parseListItem(&$list)
-    {
-        $item = '';
-
-        $depth = 0;
-        $index = 0;
-        while ($index < strlen($list)) {
-            $c = $list[$index++];
-
-            if (str_contains('{([<', $c)) {
-                ++$depth;
-            } elseif (str_contains('})]>', $c)) {
-                --$depth;
-            } elseif ($c === ',' && $depth === 0) {
-                break;
-            }
-
-            $item .= $c;
-        }
-        $list = substr($list, $index);
-
-        return $item;
-    }
-
-    /**
-     * @param AbstractObject $parent
-     * @param $definition
-     * @constructor
-     */
-    public function __construct(AbstractObject $parent, $definition)
-    {
-        parent::__construct($parent);
-
-        $this->parseDefinition($definition);
-    }
-
-    abstract protected function parseDefinition($definition);
-
-    /**
-     * Overwrites default AbstractObject parser, since Types should not handle
-     * extensions themselves.
-     *
-     * @param string $command
-     * @param string $data
-     * @return AbstractType|boolean
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (strtolower($command) === 'example') {
-            if ($data === '') {
-                throw new Exception("Missing content for type example");
-            }
-            $json = preg_replace_callback('/([^{}:,]+)/', static function ($match) {
-                json_decode($match[1]);
-                return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
-            }, trim($data));
-            $this->example = json_decode($json, true);
-
-            // In case input contains special chars, the above preg_replace would fail
-            //   Input could be a well-formed json already though
-            if ($this->example === null) {
-                $this->example = json_decode($data, true);
-            }
-            // If all fails, use input as-is
-            if ($this->example === null) {
-                $this->example = $data;
-            }
-
-            return $this;
-        }
-
-        return false;
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'example' => $this->example,
-        ), parent::toArray()));
-    }
-
-    /**
-     * @param AbstractObject $parent
-     * @param string $definition
-     * @param string $error
-     * @return self
-     * @throws Exception
-     */
-    public static function typeFactory($parent, $definition, $error = "Unparseable schema type definition: '%s'")
-    {
-        // Parse regex
-        $match = array();
-        if (preg_match('/^([a-z]+)/i', $definition, $match) === 1) {
-            $format = strtolower($match[1]);
-        } elseif (preg_match('/^(\[)(?:.*?)\]$/', $definition, $match) === 1) {
-            $format = 'array';
-        } elseif (preg_match('/^(\{)(?:.*?)\}$/', $definition, $match) === 1) {
-            $format = 'object';
-        } else {
-            throw new Exception(sprintf($error, $definition));
-        }
-
-        // Internal type if type known and not overwritten by definition
-        if ($parent->getTypeRegistry()->has($format)) {
-            $class = $parent->getTypeRegistry()->get($format);
-            return new $class($parent, $definition);
-        }
-
-        if (isset(self::$classTypes[$format])) {
-            $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
-            return new $class($parent, $definition);
-        }
-
-        return new ReferenceObjectType($parent, $definition);
-    }
+	const REGEX_START = '/^';
+	const REGEX_FORMAT = '([a-z][a-z0-9]*)';
+	const REGEX_CONTENT = '(?:\((.*)\))?';
+	const REGEX_RANGE = '(?:([[<])(\\d*),(\\d*)([\\]>]))?';
+	const REGEX_DEFAULT = '(?:=(.+))?';
+	const REGEX_END = '$/i';
+
+	private static $classTypes = array(
+		'integer' => 'Integer',
+		'int' => 'Integer',
+		'int32' => 'Integer',
+		'int64' => 'Integer',
+		'long' => 'Integer',
+		'float' => 'Number',
+		'double' => 'Number',
+		'string' => 'String',
+		'uuid' => 'StringUuid',
+		'byte' => 'String',
+		'binary' => 'String',
+		'password' => 'String',
+		'enum' => 'String',
+		'boolean' => 'Boolean',
+		'bool' => 'Boolean',
+		'array' => 'Array',
+		'csv' => 'Array',
+		'ssv' => 'Array',
+		'tsv' => 'Array',
+		'pipes' => 'Array',
+		'date' => 'Date',
+		'datetime' => 'Date',
+		'date-time' => 'Date',
+		'object' => 'Object',
+		'refobject' => 'ReferenceObject',
+		'allof' => 'AllOf',
+	);
+
+	private $example = null;
+
+	/**
+	 * Swap values of two variables.
+	 * Used for sorting.
+	 * @param mixed $a
+	 * @param mixed $b
+	 */
+	protected static function swap(&$a, &$b)
+	{
+		$tmp = $a;
+		$a = $b;
+		$b = $tmp;
+	}
+
+	/**
+	 * @param string $list
+	 * @return array
+	 */
+	protected static function parseList($list)
+	{
+		$ret = array();
+		while ($item = self::parseListItem($list)) {
+			$ret[] = $item;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Extract an item from a comma-separated list of items.
+	 *
+	 * i.e. `a(x(x,x)),b(x)` returns `a(x(x,x))` and changes `$list` into `b(x)`.
+	 * Note: brace nesting is not checked, e.g. `a{b(})` is a valid list item.
+	 *
+	 * @param string $list the list to parse
+	 * @return string the extracted item
+	 */
+	protected static function parseListItem(&$list)
+	{
+		$item = '';
+
+		$depth = 0;
+		$index = 0;
+		while ($index < strlen($list)) {
+			$c = $list[$index++];
+
+			if (str_contains('{([<', $c)) {
+				++$depth;
+			} elseif (str_contains('})]>', $c)) {
+				--$depth;
+			} elseif ($c === ',' && $depth === 0) {
+				break;
+			}
+
+			$item .= $c;
+		}
+		$list = substr($list, $index);
+
+		return $item;
+	}
+
+	/**
+	 * @param AbstractObject $parent
+	 * @param $definition
+	 * @constructor
+	 */
+	public function __construct(AbstractObject $parent, $definition)
+	{
+		parent::__construct($parent);
+
+		$this->parseDefinition($definition);
+	}
+
+	abstract protected function parseDefinition($definition);
+
+	/**
+	 * Overwrites default AbstractObject parser, since Types should not handle
+	 * extensions themselves.
+	 *
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractType|boolean
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (strtolower($command) === 'example') {
+			if ($data === '') {
+				throw new Exception("Missing content for type example");
+			}
+			$json = preg_replace_callback('/([^{}:,]+)/', static function ($match) {
+				json_decode($match[1]);
+				return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
+			}, trim($data));
+			$this->example = json_decode($json, true);
+
+			// In case input contains special chars, the above preg_replace would fail
+			//   Input could be a well-formed json already though
+			if ($this->example === null) {
+				$this->example = json_decode($data, true);
+			}
+			// If all fails, use input as-is
+			if ($this->example === null) {
+				$this->example = $data;
+			}
+
+			return $this;
+		}
+
+		return false;
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'example' => $this->example,
+		), parent::toArray()));
+	}
+
+	/**
+	 * @param AbstractObject $parent
+	 * @param string $definition
+	 * @param string $error
+	 * @return self
+	 * @throws Exception
+	 */
+	public static function typeFactory($parent, $definition, $error = "Unparseable schema type definition: '%s'")
+	{
+		// Parse regex
+		$match = array();
+		if (preg_match('/^([a-z]+)/i', $definition, $match) === 1) {
+			$format = strtolower($match[1]);
+		} elseif (preg_match('/^(\[)(?:.*?)\]$/', $definition, $match) === 1) {
+			$format = 'array';
+		} elseif (preg_match('/^(\{)(?:.*?)\}$/', $definition, $match) === 1) {
+			$format = 'object';
+		} else {
+			throw new Exception(sprintf($error, $definition));
+		}
+
+		// Internal type if type known and not overwritten by definition
+		if ($parent->getTypeRegistry()->has($format)) {
+			$class = $parent->getTypeRegistry()->get($format);
+			return new $class($parent, $definition);
+		}
+
+		if (isset(self::$classTypes[$format])) {
+			$type = self::$classTypes[$format];
+			$class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+			return new $class($parent, $definition);
+		}
+
+		return new ReferenceObjectType($parent, $definition);
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
             if ($data === '') {
                 throw new Exception("Missing content for type example");
             }
-            $json = preg_replace_callback('/([^{}:,]+)/', static function ($match) {
+            $json = preg_replace_callback('/([^{}:,]+)/', static function($match) {
                 json_decode($match[1]);
                 return json_last_error() === JSON_ERROR_NONE ? $match[1] : json_encode($match[1]);
             }, trim($data));

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

@@ -200,7 +200,7 @@
 
         if (isset(self::$classTypes[$format])) {
             $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}type";
             return new $class($parent, $definition);
         }
 

SwaggerGen/Swagger/Type/NumberType.php

Indentation +152 added lines, -152 removed lines

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

Spacing +4 added lines, -4 removed lines

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

SwaggerGen/Swagger/Type/Property.php

Indentation +67 added lines, -67 removed lines

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

SwaggerGen/Swagger/Type/StringType.php

Indentation +194 added lines, -194 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -156,8 +156,8 @@
             'format' => empty($this->format) ? null : $this->format,
             'pattern' => $this->pattern,
             'default' => $this->default,
-            'minLength' => $this->minLength ? (int)$this->minLength : null,
-            'maxLength' => $this->maxLength ? (int)$this->maxLength : null,
+            'minLength' => $this->minLength ? (int) $this->minLength : null,
+            'maxLength' => $this->maxLength ? (int) $this->maxLength : null,
             'enum' => $this->enum,
         ), parent::toArray()));
     }

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

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

SwaggerGen/Swagger/Type/ReferenceObjectType.php

Indentation +43 added lines, -43 removed lines

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

SwaggerGen/Swagger/Tag.php

Indentation +42 added lines, -42 removed lines

@@ -13,47 +13,47 @@
 class Tag extends AbstractDocumentableObject
 {
 
-    private $name;
-    private $description;
-
-    public function __construct(AbstractObject $parent, $name, $description = null)
-    {
-        parent::__construct($parent);
-        $this->name = $name;
-        $this->description = $description;
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     */
-    public function handleCommand($command, $data = null)
-    {
-        if (strtolower($command) === 'description') {
-            $this->description = $data;
-            return $this;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'name' => $this->name,
-            'description' => empty($this->description) ? null : $this->description,
-        ), parent::toArray()));
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' ' . $this->name;
-    }
+	private $name;
+	private $description;
+
+	public function __construct(AbstractObject $parent, $name, $description = null)
+	{
+		parent::__construct($parent);
+		$this->name = $name;
+		$this->description = $description;
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		if (strtolower($command) === 'description') {
+			$this->description = $data;
+			return $this;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'name' => $this->name,
+			'description' => empty($this->description) ? null : $this->description,
+		), parent::toArray()));
+	}
+
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' ' . $this->name;
+	}
 
 }

SwaggerGen/Swagger/AbstractObject.php

Indentation +157 added lines, -157 removed lines

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

Spacing +2 added lines, -2 removed lines

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