vanderlee / PHPSwaggerGen

SwaggerGen/Swagger/Type/Property.php

Indentation +67 added lines, -67 removed lines

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

SwaggerGen/Swagger/Type/NumberType.php

Indentation +149 added lines, -149 removed lines

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

SwaggerGen/Swagger/Info.php

Indentation +101 added lines, -101 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             'termsOfService' => $this->termsofservice,
             'contact' => $this->contact ? $this->contact->toArray() : null,
             'license' => $this->license ? $this->license->toArray() : null,
-            'version' => (string)$this->version,
+            'version' => (string) $this->version,
         ), parent::toArray()));
     }
 

SwaggerGen/Parser/AbstractPreprocessor.php

Indentation +119 added lines, -119 removed lines

@@ -13,123 +13,123 @@
 abstract class AbstractPreprocessor
 {
 
-    private $defines = array();
-    private $stack = array();
-
-    public function __construct()
-    {
-        $this->resetDefines();
-    }
-
-    public function resetDefines()
-    {
-        $this->defines = array();
-    }
-
-    public function addDefines(array $defines)
-    {
-        $this->defines = array_merge($this->defines, $defines);
-    }
-
-    public function define($name, $value = 1)
-    {
-        $this->defines[$name] = $value;
-    }
-
-    public function undefine($name)
-    {
-        unset($this->defines[$name]);
-    }
-
-    protected function getState()
-    {
-        return empty($this->stack) || end($this->stack);
-    }
-
-    /**
-     * Get the first word from a string and remove it from the string.
-     *
-     * @param string $data
-     * @return boolean|string
-     */
-    private static function wordShift(&$data)
-    {
-        if (preg_match('~^(\S+)\s*(.*)$~', $data, $matches) === 1) {
-            $data = $matches[2];
-            return $matches[1];
-        }
-        return false;
-    }
-
-    protected function handle($command, $expression)
-    {
-        switch (strtolower($command)) {
-            case 'if':
-                $name = self::wordShift($expression);
-                $state = $this->getState();
-                if (empty($expression)) {
-                    $this->stack[] = $state && !empty($this->defines[$name]);
-                } else {
-                    $this->stack[] = $state && isset($this->defines[$name]) && $this->defines[$name] == $expression;
-                }
-                break;
-
-            case 'ifdef':
-                $this->stack[] = $this->getState() && isset($this->defines[$expression]);
-                break;
-
-            case 'ifndef':
-                $this->stack[] = $this->getState() && !isset($this->defines[$expression]);
-                break;
-
-            case 'else':
-                $state = $this->getState();
-                array_pop($this->stack);
-                $this->stack[] = !$state;
-                break;
-
-            case 'elif':
-                $name = self::wordShift($expression);
-                $state = $this->getState();
-                array_pop($this->stack);
-                if (empty($expression)) {
-                    $this->stack[] = !$state && !empty($this->defines[$name]);
-                } else {
-                    $this->stack[] = !$state && isset($this->defines[$name]) && $this->defines[$name] == $expression;
-                }
-                break;
-
-            case 'define':
-                $name = self::wordShift($expression);
-                $this->defines[$name] = $expression;
-                break;
-
-            case 'undef':
-                unset($this->defines[$expression]);
-                break;
-
-            case 'endif':
-                array_pop($this->stack);
-                break;
-
-            default:
-                return false;
-        }
-
-        return true;
-    }
-
-    public function preprocess($content)
-    {
-        $this->stack = array();
-
-        return $this->parseContent($content);
-    }
-
-    public function preprocessFile($filename)
-    {
-        return $this->preprocess(file_get_contents($filename));
-    }
-
-    abstract protected function parseContent($content);
+	private $defines = array();
+	private $stack = array();
+
+	public function __construct()
+	{
+		$this->resetDefines();
+	}
+
+	public function resetDefines()
+	{
+		$this->defines = array();
+	}
+
+	public function addDefines(array $defines)
+	{
+		$this->defines = array_merge($this->defines, $defines);
+	}
+
+	public function define($name, $value = 1)
+	{
+		$this->defines[$name] = $value;
+	}
+
+	public function undefine($name)
+	{
+		unset($this->defines[$name]);
+	}
+
+	protected function getState()
+	{
+		return empty($this->stack) || end($this->stack);
+	}
+
+	/**
+	 * Get the first word from a string and remove it from the string.
+	 *
+	 * @param string $data
+	 * @return boolean|string
+	 */
+	private static function wordShift(&$data)
+	{
+		if (preg_match('~^(\S+)\s*(.*)$~', $data, $matches) === 1) {
+			$data = $matches[2];
+			return $matches[1];
+		}
+		return false;
+	}
+
+	protected function handle($command, $expression)
+	{
+		switch (strtolower($command)) {
+			case 'if':
+				$name = self::wordShift($expression);
+				$state = $this->getState();
+				if (empty($expression)) {
+					$this->stack[] = $state && !empty($this->defines[$name]);
+				} else {
+					$this->stack[] = $state && isset($this->defines[$name]) && $this->defines[$name] == $expression;
+				}
+				break;
+
+			case 'ifdef':
+				$this->stack[] = $this->getState() && isset($this->defines[$expression]);
+				break;
+
+			case 'ifndef':
+				$this->stack[] = $this->getState() && !isset($this->defines[$expression]);
+				break;
+
+			case 'else':
+				$state = $this->getState();
+				array_pop($this->stack);
+				$this->stack[] = !$state;
+				break;
+
+			case 'elif':
+				$name = self::wordShift($expression);
+				$state = $this->getState();
+				array_pop($this->stack);
+				if (empty($expression)) {
+					$this->stack[] = !$state && !empty($this->defines[$name]);
+				} else {
+					$this->stack[] = !$state && isset($this->defines[$name]) && $this->defines[$name] == $expression;
+				}
+				break;
+
+			case 'define':
+				$name = self::wordShift($expression);
+				$this->defines[$name] = $expression;
+				break;
+
+			case 'undef':
+				unset($this->defines[$expression]);
+				break;
+
+			case 'endif':
+				array_pop($this->stack);
+				break;
+
+			default:
+				return false;
+		}
+
+		return true;
+	}
+
+	public function preprocess($content)
+	{
+		$this->stack = array();
+
+		return $this->parseContent($content);
+	}
+
+	public function preprocessFile($filename)
+	{
+		return $this->preprocess(file_get_contents($filename));
+	}
+
+	abstract protected function parseContent($content);
 }

SwaggerGen/Parser/Php/Preprocessor.php

Indentation +57 added lines, -57 removed lines

@@ -18,72 +18,72 @@
 class Preprocessor extends AbstractPreprocessor
 {
 
-    private $prefix = 'rest';
+	private $prefix = 'rest';
 
-    public function __construct($prefix = null)
-    {
-        parent::__construct();
-        if (!empty($prefix)) {
-            $this->prefix = $prefix;
-        }
-    }
+	public function __construct($prefix = null)
+	{
+		parent::__construct();
+		if (!empty($prefix)) {
+			$this->prefix = $prefix;
+		}
+	}
 
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
+	public function getPrefix()
+	{
+		return $this->prefix;
+	}
 
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-    }
+	public function setPrefix($prefix)
+	{
+		$this->prefix = $prefix;
+	}
 
-    protected function parseContent($content)
-    {
-        $pattern = '/@' . preg_quote($this->getPrefix()) . '\\\\([a-z]+)\\s*(.*)$/';
+	protected function parseContent($content)
+	{
+		$pattern = '/@' . preg_quote($this->getPrefix()) . '\\\\([a-z]+)\\s*(.*)$/';
 
-        $output_file = '';
+		$output_file = '';
 
-        foreach (token_get_all($content) as $token) {
-            $output = '';
+		foreach (token_get_all($content) as $token) {
+			$output = '';
 
-            if (is_array($token)) {
-                switch ($token[0]) {
-                    case T_DOC_COMMENT:
-                    case T_COMMENT:
-                        foreach (preg_split('/(\\R)/m', $token[1], -1, PREG_SPLIT_DELIM_CAPTURE) as $index => $line) {
-                            if ($index % 2) {
-                                $output .= $line;
-                            } else {
-                                $match = array();
-                                if (preg_match($pattern, $line, $match) === 1) {
-                                    if (!$this->handle($match[1], $match[2]) && $this->getState()) {
-                                        $output .= $line;
-                                    } else {
-                                        $output .= str_replace('@' . $this->getPrefix() . '\\', '@!' . $this->getPrefix() . '\\', $line);
-                                    }
-                                } else {
-                                    $output .= $line;
-                                }
-                            }
-                        }
-                        break;
+			if (is_array($token)) {
+				switch ($token[0]) {
+					case T_DOC_COMMENT:
+					case T_COMMENT:
+						foreach (preg_split('/(\\R)/m', $token[1], -1, PREG_SPLIT_DELIM_CAPTURE) as $index => $line) {
+							if ($index % 2) {
+								$output .= $line;
+							} else {
+								$match = array();
+								if (preg_match($pattern, $line, $match) === 1) {
+									if (!$this->handle($match[1], $match[2]) && $this->getState()) {
+										$output .= $line;
+									} else {
+										$output .= str_replace('@' . $this->getPrefix() . '\\', '@!' . $this->getPrefix() . '\\', $line);
+									}
+								} else {
+									$output .= $line;
+								}
+							}
+						}
+						break;
 
-                    default:
-                        $output .= $token[1];
-                }
-            } else {
-                $output .= $token;
-            }
+					default:
+						$output .= $token[1];
+				}
+			} else {
+				$output .= $token;
+			}
 
-            if ($this->getState()) {
-                $output_file .= $output;
-            } else {
-                $output_file .= '/* ' . $output . ' */';
-            }
-        }
+			if ($this->getState()) {
+				$output_file .= $output;
+			} else {
+				$output_file .= '/* ' . $output . ' */';
+			}
+		}
 
-        return $output_file;
-    }
+		return $output_file;
+	}
 
 }

SwaggerGen/Parser/Php/Parser.php

Indentation +366 added lines, -366 removed lines

@@ -20,376 +20,376 @@
 class Parser extends Entity\AbstractEntity implements IParser
 {
 
-    const COMMENT_TAG = 'rest';
+	const COMMENT_TAG = 'rest';
 
 // transient
 
-    private $current_file = null;
-    private $files_queued = [];
-    private $files_done = [];
-    private $dirs = [];
+	private $current_file = null;
+	private $files_queued = [];
+	private $files_done = [];
+	private $dirs = [];
 // States
 
-    /** @var Statement[] */
-    public $statements = [];
-
-    /**
-     * @var Statement[]|null
-     */
-    private $lastStatements = [];
-
-    /**
-     * @var Entity\ParserClass[]
-     */
-    public $Classes = [];
-
-    /**
-     * @var Entity\ParserFunction[]
-     */
-    public $Functions = [];
-
-    /**
-     * @var AbstractPreprocessor
-     */
-    private $Preprocessor;
-
-    /**
-     * Directories available to all parse calls
-     *
-     * @var string[]
-     */
-    protected $common_dirs = [];
-
-    public function __construct(array $dirs = [])
-    {
-        foreach ($dirs as $dir) {
-            $this->common_dirs[] = realpath($dir);
-        }
-
-        $this->Preprocessor = new Preprocessor(self::COMMENT_TAG);
-    }
-
-    public function addDirs(array $dirs)
-    {
-        foreach ($dirs as $dir) {
-            $this->common_dirs[] = realpath($dir);
-        }
-    }
-
-    private function extractStatements()
-    {
-        // Core comments
-        $Statements = $this->statements;
-
-        // Functions
-        foreach ($this->Functions as $Function) {
-            if ($Function->hasCommand('method')) {
-                $Statements = array_merge($Statements, $Function->Statements);
-            }
-        }
-
-        // Classes
-        foreach ($this->Classes as $Class) {
-            $Statements = array_merge($Statements, $Class->Statements);
-            foreach ($Class->Methods as $Method) {
-                if ($Method->hasCommand('method')) {
-                    $Statements = array_merge($Statements, $Method->Statements);
-                }
-            }
-        }
-
-        return $Statements;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function parse($file, array $dirs = [], array $defines = [])
-    {
-        $this->dirs = $this->common_dirs;
-        foreach ($dirs as $dir) {
-            $this->dirs[] = realpath($dir);
-        }
-
-        $this->parseFiles(array($file), $defines);
-
-        // Inherit classes
-        foreach ($this->Classes as $Class) {
-            $this->inherit($Class);
-        }
-
-        // Expand functions with used and seen functions/methods.
-        foreach ($this->Classes as $Class) {
-            foreach ($Class->Methods as $Method) {
-                $Method->Statements = $this->expand($Method->Statements, $Class);
-            }
-        }
-
-        return $this->extractStatements();
-    }
-
-    /**
-     * Convert a T_*_COMMENT string to an array of Statements
-     * @param array $token
-     * @return Statement[]
-     */
-    public function tokenToStatements($token)
-    {
-        $comment = $token[1];
-        $commentLineNumber = $token[2];
-        $commentLines = [];
-
-        $match = [];
-        if (preg_match('~^/\*\*?\s*(.*)\s*\*\/$~sm', $comment, $match) === 1) {
-            $lines = preg_split('~\n~', $match[0]);
-            foreach ($lines as $line) {
-                if (preg_match('~^\s*\*?\s*(.*?)\s*$~', $line, $match) === 1) {
-                    if (!empty($match[1])) {
-                        $commentLines[] = trim($match[1]);
-                    }
-                }
-            }
-        } elseif (preg_match('~^//\s*(.*)$~', $comment, $match) === 1) {
-            $commentLines[] = trim($match[1]);
-        }
-        // to commands
-        $match = [];
-        $command = null;
-        $data = '';
-        $commandLineNumber = 0;
-        $statements = [];
-        foreach ($commentLines as $lineNumber => $line) {
-            // If new @-command, store any old and start new
-            if ($command !== null && chr(ord($line)) === '@') {
-                $statements[] = new Statement($command, $data, $this->current_file, $commentLineNumber + $commandLineNumber);
-                $command = null;
-                $data = '';
-            }
-
-            if (preg_match('~^@' . preg_quote(self::COMMENT_TAG) . '\\\\([a-z][-a-z]*[?!]?)\\s*(.*)$~', $line, $match) === 1) {
-                $command = $match[1];
-                $data = $match[2];
-                $commandLineNumber = $lineNumber;
-            } elseif ($command !== null) {
-                if ($lineNumber < count($commentLines) - 1) {
-                    $data .= ' ' . $line;
-                } else {
-                    $data .= preg_replace('~\s*\**\/\s*$~', '', $line);
-                }
-            }
-        }
-
-        if ($command !== null) {
-            $statements[] = new Statement($command, $data, $this->current_file, $commentLineNumber + $commandLineNumber);
-        }
-
-        return $statements;
-    }
-
-    public function queueClass($classname)
-    {
-        foreach ($this->dirs as $dir) {
-            $paths = array(
-                $dir . DIRECTORY_SEPARATOR . $classname . '.php',
-                $dir . DIRECTORY_SEPARATOR . $classname . '.class.php',
-            );
-
-            foreach ($paths as $path) {
-                $realpath = realpath($path);
-                if (in_array($realpath, $this->files_done)) {
-                    return;
-                } elseif (is_file($realpath)) {
-                    $this->files_queued[] = $realpath;
-                    return;
-                }
-            }
-        }
-
-        // assume it's a class;
-    }
-
-    /**
-     * Add to the queue any classes based on the commands.
-     * @param Statement[] $Statements
-     */
-    public function queueClassesFromComments(array $Statements)
-    {
-        foreach ($Statements as $Statement) {
-            if (in_array($Statement->getCommand(), array('uses', 'see'))) {
-                $match = [];
-                if (preg_match('~^(\w+)(::|->)?(\w+)?(?:\(\))?$~', $Statement->getData(), $match) === 1) {
-                    if (!in_array($match[1], array('self', '$this'))) {
-                        $this->queueClass($match[1]);
-                    }
-                }
-            }
-        }
-    }
-
-    private function parseTokens($source)
-    {
-        $mode = null;
-        $namespace = '';
-
-        $tokens = token_get_all($source);
-        $token = reset($tokens);
-        while ($token) {
-            switch ($token[0]) {
-                case T_NAMESPACE:
-                    $mode = T_NAMESPACE;
-                    break;
-
-                case T_NS_SEPARATOR:
-                case T_STRING:
-                    if ($mode === T_NAMESPACE) {
-                        $namespace .= $token[1];
-                    }
-                    break;
-
-                case ';':
-                    $mode = null;
-                    break;
-
-                case T_CLASS:
-                case T_INTERFACE:
-                    $Class = new Entity\ParserClass($this, $tokens, $this->lastStatements);
-                    $this->Classes[strtolower($Class->name)] = $Class;
-                    $this->lastStatements = null;
-                    break;
-
-                case T_FUNCTION:
-                    $Function = new Entity\ParserFunction($this, $tokens, $this->lastStatements);
-                    $this->Functions[strtolower($Function->name)] = $Function;
-                    $this->lastStatements = null;
-                    break;
-
-                case T_COMMENT:
-                    if ($this->lastStatements !== null) {
-                        $this->statements = array_merge($this->statements, $this->lastStatements);
-                        $this->lastStatements = null;
-                    }
-                    $Statements = $this->tokenToStatements($token);
-                    $this->queueClassesFromComments($Statements);
-                    $this->statements = array_merge($this->statements, $Statements);
-                    break;
-
-                case T_DOC_COMMENT:
-                    if ($this->lastStatements !== null) {
-                        $this->statements = array_merge($this->statements, $this->lastStatements);
-                    }
-                    $Statements = $this->tokenToStatements($token);
-                    $this->queueClassesFromComments($Statements);
-                    $this->lastStatements = $Statements;
-                    break;
-            }
-
-            $token = next($tokens);
-        }
-    }
-
-    private function parseFiles(array $files, array $defines = [])
-    {
-        $this->files_queued = $files;
-
-        $index = 0;
-        while (($file = array_shift($this->files_queued)) !== null) {
-            $file = realpath($file);
-
-            // @todo Test if this works
-            if (in_array($file, $this->files_done)) {
-                continue;
-            }
-
-            $this->current_file = $file;
-            $this->files_done[] = $file;
-            ++$index;
-
-            $this->Preprocessor->resetDefines();
-            $this->Preprocessor->addDefines($defines);
-            $source = $this->Preprocessor->preprocessFile($file);
-
-            $this->parseTokens($source);
-
-            if ($this->lastStatements !== null) {
-                $this->statements = array_merge($this->statements, $this->lastStatements);
-                $this->lastStatements = null;
-            }
-        }
-
-        $this->current_file = null;
-    }
-
-    /**
-     * Inherit the statements
-     * @param ParserClass $Class
-     */
-    private function inherit(Entity\ParserClass $Class)
-    {
-        $inherits = array_merge(array($Class->extends), $Class->implements);
-        while (($inherit = array_shift($inherits)) !== null) {
-            if (isset($this->Classes[strtolower($inherit)])) {
-                $inheritedClass = $this->Classes[strtolower($inherit)];
-                $this->inherit($inheritedClass);
-
-                foreach ($inheritedClass->Methods as $name => $Method) {
-                    if (!isset($Class->Methods[$name])) {
-                        $Class->Methods[$name] = $Method;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Expands a set of comments with comments of methods referred to by rest\uses statements.
-     *
-     * @param Statement[] $Statements
-     * @return Statement[]
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    private function expand(array $Statements, ParserClass $Self = null)
-    {
-        $output = [];
-
-        $match = [];
-        foreach ($Statements as $Statement) {
-            if (in_array($Statement->getCommand(), array('uses', 'see'))) {
-                if (preg_match('/^((?:\\w+)|\$this)(?:(::|->)(\\w+))?(?:\\(\\))?$/', strtolower($Statement->getData()), $match) === 1) {
-                    if (count($match) >= 3) {
-                        $Class = null;
-                        if (in_array($match[1], array('$this', 'self', 'static'))) {
-                            $Class = $Self;
-                        } elseif (isset($this->Classes[$match[1]])) {
-                            $Class = $this->Classes[$match[1]];
-                        }
-
-                        if ($Class) {
-                            if (isset($Class->Methods[$match[3]])) {
-                                $Method = $Class->Methods[$match[3]];
-                                $Method->Statements = $this->expand($Method->Statements, $Class);
-                                $output = array_merge($output, $Method->Statements);
-                            } else {
-                                throw new Exception("Method '{$match[3]}' for class '{$match[1]}' not found");
-                            }
-                        } else {
-                            throw new Exception("Class '{$match[1]}' not found");
-                        }
-                    } elseif (isset($this->Functions[$match[1]])) {
-                        $Function = $this->Functions[$match[1]];
-                        $Function->Statements = $this->expand($Function->Statements);
-                        $output = array_merge($output, $Function->Statements);
-                    } else {
-                        throw new Exception("Function '{$match[1]}' not found");
-                    }
-                }
-            } else {
-                $output[] = $Statement;
-            }
-        }
-
-        return $output;
-    }
+	/** @var Statement[] */
+	public $statements = [];
+
+	/**
+	 * @var Statement[]|null
+	 */
+	private $lastStatements = [];
+
+	/**
+	 * @var Entity\ParserClass[]
+	 */
+	public $Classes = [];
+
+	/**
+	 * @var Entity\ParserFunction[]
+	 */
+	public $Functions = [];
+
+	/**
+	 * @var AbstractPreprocessor
+	 */
+	private $Preprocessor;
+
+	/**
+	 * Directories available to all parse calls
+	 *
+	 * @var string[]
+	 */
+	protected $common_dirs = [];
+
+	public function __construct(array $dirs = [])
+	{
+		foreach ($dirs as $dir) {
+			$this->common_dirs[] = realpath($dir);
+		}
+
+		$this->Preprocessor = new Preprocessor(self::COMMENT_TAG);
+	}
+
+	public function addDirs(array $dirs)
+	{
+		foreach ($dirs as $dir) {
+			$this->common_dirs[] = realpath($dir);
+		}
+	}
+
+	private function extractStatements()
+	{
+		// Core comments
+		$Statements = $this->statements;
+
+		// Functions
+		foreach ($this->Functions as $Function) {
+			if ($Function->hasCommand('method')) {
+				$Statements = array_merge($Statements, $Function->Statements);
+			}
+		}
+
+		// Classes
+		foreach ($this->Classes as $Class) {
+			$Statements = array_merge($Statements, $Class->Statements);
+			foreach ($Class->Methods as $Method) {
+				if ($Method->hasCommand('method')) {
+					$Statements = array_merge($Statements, $Method->Statements);
+				}
+			}
+		}
+
+		return $Statements;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function parse($file, array $dirs = [], array $defines = [])
+	{
+		$this->dirs = $this->common_dirs;
+		foreach ($dirs as $dir) {
+			$this->dirs[] = realpath($dir);
+		}
+
+		$this->parseFiles(array($file), $defines);
+
+		// Inherit classes
+		foreach ($this->Classes as $Class) {
+			$this->inherit($Class);
+		}
+
+		// Expand functions with used and seen functions/methods.
+		foreach ($this->Classes as $Class) {
+			foreach ($Class->Methods as $Method) {
+				$Method->Statements = $this->expand($Method->Statements, $Class);
+			}
+		}
+
+		return $this->extractStatements();
+	}
+
+	/**
+	 * Convert a T_*_COMMENT string to an array of Statements
+	 * @param array $token
+	 * @return Statement[]
+	 */
+	public function tokenToStatements($token)
+	{
+		$comment = $token[1];
+		$commentLineNumber = $token[2];
+		$commentLines = [];
+
+		$match = [];
+		if (preg_match('~^/\*\*?\s*(.*)\s*\*\/$~sm', $comment, $match) === 1) {
+			$lines = preg_split('~\n~', $match[0]);
+			foreach ($lines as $line) {
+				if (preg_match('~^\s*\*?\s*(.*?)\s*$~', $line, $match) === 1) {
+					if (!empty($match[1])) {
+						$commentLines[] = trim($match[1]);
+					}
+				}
+			}
+		} elseif (preg_match('~^//\s*(.*)$~', $comment, $match) === 1) {
+			$commentLines[] = trim($match[1]);
+		}
+		// to commands
+		$match = [];
+		$command = null;
+		$data = '';
+		$commandLineNumber = 0;
+		$statements = [];
+		foreach ($commentLines as $lineNumber => $line) {
+			// If new @-command, store any old and start new
+			if ($command !== null && chr(ord($line)) === '@') {
+				$statements[] = new Statement($command, $data, $this->current_file, $commentLineNumber + $commandLineNumber);
+				$command = null;
+				$data = '';
+			}
+
+			if (preg_match('~^@' . preg_quote(self::COMMENT_TAG) . '\\\\([a-z][-a-z]*[?!]?)\\s*(.*)$~', $line, $match) === 1) {
+				$command = $match[1];
+				$data = $match[2];
+				$commandLineNumber = $lineNumber;
+			} elseif ($command !== null) {
+				if ($lineNumber < count($commentLines) - 1) {
+					$data .= ' ' . $line;
+				} else {
+					$data .= preg_replace('~\s*\**\/\s*$~', '', $line);
+				}
+			}
+		}
+
+		if ($command !== null) {
+			$statements[] = new Statement($command, $data, $this->current_file, $commentLineNumber + $commandLineNumber);
+		}
+
+		return $statements;
+	}
+
+	public function queueClass($classname)
+	{
+		foreach ($this->dirs as $dir) {
+			$paths = array(
+				$dir . DIRECTORY_SEPARATOR . $classname . '.php',
+				$dir . DIRECTORY_SEPARATOR . $classname . '.class.php',
+			);
+
+			foreach ($paths as $path) {
+				$realpath = realpath($path);
+				if (in_array($realpath, $this->files_done)) {
+					return;
+				} elseif (is_file($realpath)) {
+					$this->files_queued[] = $realpath;
+					return;
+				}
+			}
+		}
+
+		// assume it's a class;
+	}
+
+	/**
+	 * Add to the queue any classes based on the commands.
+	 * @param Statement[] $Statements
+	 */
+	public function queueClassesFromComments(array $Statements)
+	{
+		foreach ($Statements as $Statement) {
+			if (in_array($Statement->getCommand(), array('uses', 'see'))) {
+				$match = [];
+				if (preg_match('~^(\w+)(::|->)?(\w+)?(?:\(\))?$~', $Statement->getData(), $match) === 1) {
+					if (!in_array($match[1], array('self', '$this'))) {
+						$this->queueClass($match[1]);
+					}
+				}
+			}
+		}
+	}
+
+	private function parseTokens($source)
+	{
+		$mode = null;
+		$namespace = '';
+
+		$tokens = token_get_all($source);
+		$token = reset($tokens);
+		while ($token) {
+			switch ($token[0]) {
+				case T_NAMESPACE:
+					$mode = T_NAMESPACE;
+					break;
+
+				case T_NS_SEPARATOR:
+				case T_STRING:
+					if ($mode === T_NAMESPACE) {
+						$namespace .= $token[1];
+					}
+					break;
+
+				case ';':
+					$mode = null;
+					break;
+
+				case T_CLASS:
+				case T_INTERFACE:
+					$Class = new Entity\ParserClass($this, $tokens, $this->lastStatements);
+					$this->Classes[strtolower($Class->name)] = $Class;
+					$this->lastStatements = null;
+					break;
+
+				case T_FUNCTION:
+					$Function = new Entity\ParserFunction($this, $tokens, $this->lastStatements);
+					$this->Functions[strtolower($Function->name)] = $Function;
+					$this->lastStatements = null;
+					break;
+
+				case T_COMMENT:
+					if ($this->lastStatements !== null) {
+						$this->statements = array_merge($this->statements, $this->lastStatements);
+						$this->lastStatements = null;
+					}
+					$Statements = $this->tokenToStatements($token);
+					$this->queueClassesFromComments($Statements);
+					$this->statements = array_merge($this->statements, $Statements);
+					break;
+
+				case T_DOC_COMMENT:
+					if ($this->lastStatements !== null) {
+						$this->statements = array_merge($this->statements, $this->lastStatements);
+					}
+					$Statements = $this->tokenToStatements($token);
+					$this->queueClassesFromComments($Statements);
+					$this->lastStatements = $Statements;
+					break;
+			}
+
+			$token = next($tokens);
+		}
+	}
+
+	private function parseFiles(array $files, array $defines = [])
+	{
+		$this->files_queued = $files;
+
+		$index = 0;
+		while (($file = array_shift($this->files_queued)) !== null) {
+			$file = realpath($file);
+
+			// @todo Test if this works
+			if (in_array($file, $this->files_done)) {
+				continue;
+			}
+
+			$this->current_file = $file;
+			$this->files_done[] = $file;
+			++$index;
+
+			$this->Preprocessor->resetDefines();
+			$this->Preprocessor->addDefines($defines);
+			$source = $this->Preprocessor->preprocessFile($file);
+
+			$this->parseTokens($source);
+
+			if ($this->lastStatements !== null) {
+				$this->statements = array_merge($this->statements, $this->lastStatements);
+				$this->lastStatements = null;
+			}
+		}
+
+		$this->current_file = null;
+	}
+
+	/**
+	 * Inherit the statements
+	 * @param ParserClass $Class
+	 */
+	private function inherit(Entity\ParserClass $Class)
+	{
+		$inherits = array_merge(array($Class->extends), $Class->implements);
+		while (($inherit = array_shift($inherits)) !== null) {
+			if (isset($this->Classes[strtolower($inherit)])) {
+				$inheritedClass = $this->Classes[strtolower($inherit)];
+				$this->inherit($inheritedClass);
+
+				foreach ($inheritedClass->Methods as $name => $Method) {
+					if (!isset($Class->Methods[$name])) {
+						$Class->Methods[$name] = $Method;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Expands a set of comments with comments of methods referred to by rest\uses statements.
+	 *
+	 * @param Statement[] $Statements
+	 * @return Statement[]
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	private function expand(array $Statements, ParserClass $Self = null)
+	{
+		$output = [];
+
+		$match = [];
+		foreach ($Statements as $Statement) {
+			if (in_array($Statement->getCommand(), array('uses', 'see'))) {
+				if (preg_match('/^((?:\\w+)|\$this)(?:(::|->)(\\w+))?(?:\\(\\))?$/', strtolower($Statement->getData()), $match) === 1) {
+					if (count($match) >= 3) {
+						$Class = null;
+						if (in_array($match[1], array('$this', 'self', 'static'))) {
+							$Class = $Self;
+						} elseif (isset($this->Classes[$match[1]])) {
+							$Class = $this->Classes[$match[1]];
+						}
+
+						if ($Class) {
+							if (isset($Class->Methods[$match[3]])) {
+								$Method = $Class->Methods[$match[3]];
+								$Method->Statements = $this->expand($Method->Statements, $Class);
+								$output = array_merge($output, $Method->Statements);
+							} else {
+								throw new Exception("Method '{$match[3]}' for class '{$match[1]}' not found");
+							}
+						} else {
+							throw new Exception("Class '{$match[1]}' not found");
+						}
+					} elseif (isset($this->Functions[$match[1]])) {
+						$Function = $this->Functions[$match[1]];
+						$Function->Statements = $this->expand($Function->Statements);
+						$output = array_merge($output, $Function->Statements);
+					} else {
+						throw new Exception("Function '{$match[1]}' not found");
+					}
+				}
+			} else {
+				$output[] = $Statement;
+			}
+		}
+
+		return $output;
+	}
 
 }

SwaggerGen/Parser/Php/Entity/ParserClass.php

Indentation +115 added lines, -115 removed lines

@@ -15,120 +15,120 @@
 class ParserClass extends AbstractEntity
 {
 
-    /**
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * @var ParserFunction[]
-     */
-    public $Methods = array();
-
-    /**
-     * @var string
-     */
-    public $extends = null;
-
-    /**
-     * @var string[]
-     */
-    public $implements = array();
-    private $lastStatements = null;
-
-    public function __construct(Parser $Parser, &$tokens, $Statements)
-    {
-        if ($Statements) {
-            $this->Statements = array_merge($this->Statements, $Statements);
-        }
-
-        $depth = 0;
-
-        $mode = T_CLASS;
-
-        $token = current($tokens);
-        while ($token) {
-            switch ($token[0]) {
-                case T_STRING:
-                    switch ($mode) {
-                        case T_CLASS:
-                            $this->name = $token[1];
-                            $mode = null;
-                            break;
-
-                        case T_EXTENDS:
-                            $Parser->queueClass($token[1]);
-                            $this->extends = $token[1];
-                            $mode = null;
-                            break;
-
-                        case T_IMPLEMENTS:
-                            $Parser->queueClass($token[1]);
-                            $this->implements[] = $token[1];
-                            break;
-                    }
-                    break;
-
-                case '{':
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case T_STRING_VARNAME:
-                    $mode = null;
-                    ++$depth;
-                    break;
-
-                case '}':
-                    --$depth;
-                    if ($depth == 0) {
-                        if ($this->lastStatements) {
-                            $this->Statements = array_merge($this->Statements, $this->lastStatements);
-                            $this->lastStatements = null;
-                        }
-                        return;
-                    }
-                    break;
-
-                case T_FUNCTION:
-                    $Method = new ParserFunction($Parser, $tokens, $this->lastStatements);
-                    $this->Methods[strtolower($Method->name)] = $Method;
-                    $this->lastStatements = null;
-                    break;
-
-                case T_EXTENDS:
-                    $mode = T_EXTENDS;
-                    break;
-
-                case T_IMPLEMENTS:
-                    $mode = T_IMPLEMENTS;
-                    break;
-
-                case T_COMMENT:
-                    if ($this->lastStatements) {
-                        $this->Statements = array_merge($this->Statements, $this->lastStatements);
-                        $this->lastStatements = null;
-                    }
-                    $Statements = $Parser->tokenToStatements($token);
-                    $Parser->queueClassesFromComments($Statements);
-                    $this->Statements = array_merge($this->Statements, $Statements);
-                    break;
-
-                case T_DOC_COMMENT:
-                    if ($this->lastStatements) {
-                        $this->Statements = array_merge($this->Statements, $this->lastStatements);
-                    }
-                    $Statements = $Parser->tokenToStatements($token);
-                    $Parser->queueClassesFromComments($Statements);
-                    $this->lastStatements = $Statements;
-                    break;
-            }
-
-            $token = next($tokens);
-        }
-
-        if ($this->lastStatements) {
-            $this->Statements = array_merge($this->Statements, $this->lastStatements);
-            $this->lastStatements = null;
-        }
-    }
+	/**
+	 * @var string
+	 */
+	public $name = null;
+
+	/**
+	 * @var ParserFunction[]
+	 */
+	public $Methods = array();
+
+	/**
+	 * @var string
+	 */
+	public $extends = null;
+
+	/**
+	 * @var string[]
+	 */
+	public $implements = array();
+	private $lastStatements = null;
+
+	public function __construct(Parser $Parser, &$tokens, $Statements)
+	{
+		if ($Statements) {
+			$this->Statements = array_merge($this->Statements, $Statements);
+		}
+
+		$depth = 0;
+
+		$mode = T_CLASS;
+
+		$token = current($tokens);
+		while ($token) {
+			switch ($token[0]) {
+				case T_STRING:
+					switch ($mode) {
+						case T_CLASS:
+							$this->name = $token[1];
+							$mode = null;
+							break;
+
+						case T_EXTENDS:
+							$Parser->queueClass($token[1]);
+							$this->extends = $token[1];
+							$mode = null;
+							break;
+
+						case T_IMPLEMENTS:
+							$Parser->queueClass($token[1]);
+							$this->implements[] = $token[1];
+							break;
+					}
+					break;
+
+				case '{':
+				case T_CURLY_OPEN:
+				case T_DOLLAR_OPEN_CURLY_BRACES:
+				case T_STRING_VARNAME:
+					$mode = null;
+					++$depth;
+					break;
+
+				case '}':
+					--$depth;
+					if ($depth == 0) {
+						if ($this->lastStatements) {
+							$this->Statements = array_merge($this->Statements, $this->lastStatements);
+							$this->lastStatements = null;
+						}
+						return;
+					}
+					break;
+
+				case T_FUNCTION:
+					$Method = new ParserFunction($Parser, $tokens, $this->lastStatements);
+					$this->Methods[strtolower($Method->name)] = $Method;
+					$this->lastStatements = null;
+					break;
+
+				case T_EXTENDS:
+					$mode = T_EXTENDS;
+					break;
+
+				case T_IMPLEMENTS:
+					$mode = T_IMPLEMENTS;
+					break;
+
+				case T_COMMENT:
+					if ($this->lastStatements) {
+						$this->Statements = array_merge($this->Statements, $this->lastStatements);
+						$this->lastStatements = null;
+					}
+					$Statements = $Parser->tokenToStatements($token);
+					$Parser->queueClassesFromComments($Statements);
+					$this->Statements = array_merge($this->Statements, $Statements);
+					break;
+
+				case T_DOC_COMMENT:
+					if ($this->lastStatements) {
+						$this->Statements = array_merge($this->Statements, $this->lastStatements);
+					}
+					$Statements = $Parser->tokenToStatements($token);
+					$Parser->queueClassesFromComments($Statements);
+					$this->lastStatements = $Statements;
+					break;
+			}
+
+			$token = next($tokens);
+		}
+
+		if ($this->lastStatements) {
+			$this->Statements = array_merge($this->Statements, $this->lastStatements);
+			$this->lastStatements = null;
+		}
+	}
 
 }

SwaggerGen/Parser/Php/Entity/AbstractEntity.php

Indentation +25 added lines, -25 removed lines

@@ -15,30 +15,30 @@
 class AbstractEntity
 {
 
-    /**
-     * @var Statement[]
-     */
-    public $Statements = array();
-
-    /**
-     * Returns true if a statement with the specified command exists.
-     * @param string $command
-     * @return boolean
-     */
-    public function hasCommand($command)
-    {
-        foreach ($this->Statements as $Statement) {
-            if ($Statement->getCommand() === $command) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function getStatements()
-    {
-        return $this->Statements;
-    }
+	/**
+	 * @var Statement[]
+	 */
+	public $Statements = array();
+
+	/**
+	 * Returns true if a statement with the specified command exists.
+	 * @param string $command
+	 * @return boolean
+	 */
+	public function hasCommand($command)
+	{
+		foreach ($this->Statements as $Statement) {
+			if ($Statement->getCommand() === $command) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public function getStatements()
+	{
+		return $this->Statements;
+	}
 
 }

SwaggerGen/Parser/Php/Entity/ParserFunction.php

Indentation +62 added lines, -62 removed lines

@@ -16,77 +16,77 @@
 class ParserFunction extends AbstractEntity
 {
 
-    public $name = null;
-    private $lastStatements = null;
+	public $name = null;
+	private $lastStatements = null;
 
-    public function __construct(Parser $Parser, &$tokens, $Statements)
-    {
-        if ($Statements) {
-            $this->Statements = array_merge($this->Statements, $Statements);
-        }
+	public function __construct(Parser $Parser, &$tokens, $Statements)
+	{
+		if ($Statements) {
+			$this->Statements = array_merge($this->Statements, $Statements);
+		}
 
-        $depth = 0;
+		$depth = 0;
 
-        $token = current($tokens);
-        while ($token) {
-            switch ($token[0]) {
-                case T_STRING:
-                    if (empty($this->name)) {
-                        $this->name = $token[1];
-                    }
-                    break;
+		$token = current($tokens);
+		while ($token) {
+			switch ($token[0]) {
+				case T_STRING:
+					if (empty($this->name)) {
+						$this->name = $token[1];
+					}
+					break;
 
-                case '{':
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case T_STRING_VARNAME:
-                    ++$depth;
-                    break;
+				case '{':
+				case T_CURLY_OPEN:
+				case T_DOLLAR_OPEN_CURLY_BRACES:
+				case T_STRING_VARNAME:
+					++$depth;
+					break;
 
-                case '}':
-                    --$depth;
-                    if ($depth == 0) {
-                        if ($this->lastStatements) {
-                            $this->Statements = array_merge($this->Statements, $this->lastStatements);
-                            $this->lastStatements = null;
-                        }
-                        return;
-                    }
-                    break;
+				case '}':
+					--$depth;
+					if ($depth == 0) {
+						if ($this->lastStatements) {
+							$this->Statements = array_merge($this->Statements, $this->lastStatements);
+							$this->lastStatements = null;
+						}
+						return;
+					}
+					break;
 
-                case T_COMMENT:
-                    if ($this->lastStatements) {
-                        $this->Statements = array_merge($this->Statements, $this->lastStatements);
-                        $this->lastStatements = null;
-                    }
-                    $Statements = $Parser->tokenToStatements($token);
-                    $Parser->queueClassesFromComments($Statements);
-                    $this->Statements = array_merge($this->Statements, $Statements);
-                    break;
+				case T_COMMENT:
+					if ($this->lastStatements) {
+						$this->Statements = array_merge($this->Statements, $this->lastStatements);
+						$this->lastStatements = null;
+					}
+					$Statements = $Parser->tokenToStatements($token);
+					$Parser->queueClassesFromComments($Statements);
+					$this->Statements = array_merge($this->Statements, $Statements);
+					break;
 
-                case T_DOC_COMMENT:
-                    if ($this->lastStatements) {
-                        $this->Statements = array_merge($this->Statements, $this->lastStatements);
-                    }
-                    $Statements = $Parser->tokenToStatements($token);
-                    $Parser->queueClassesFromComments($Statements);
-                    $this->lastStatements = $Statements;
-                    break;
-            }
+				case T_DOC_COMMENT:
+					if ($this->lastStatements) {
+						$this->Statements = array_merge($this->Statements, $this->lastStatements);
+					}
+					$Statements = $Parser->tokenToStatements($token);
+					$Parser->queueClassesFromComments($Statements);
+					$this->lastStatements = $Statements;
+					break;
+			}
 
-            $token = next($tokens);
-        }
+			$token = next($tokens);
+		}
 
-        if ($this->lastStatements) {
-            $this->Statements = array_merge($this->Statements, $this->lastStatements);
-            $this->lastStatements = null;
-        }
-    }
+		if ($this->lastStatements) {
+			$this->Statements = array_merge($this->Statements, $this->lastStatements);
+			$this->lastStatements = null;
+		}
+	}
 
-    public function getStatements()
-    {
-        // inherit
-        return $this->Statements;
-    }
+	public function getStatements()
+	{
+		// inherit
+		return $this->Statements;
+	}
 
 }