vanderlee / PHPSwaggerGen

tests/Parser/Text/PreprocessorTest.php

Indentation +223 added lines, -223 removed lines

@@ -5,129 +5,129 @@ 
 class PreprocessorTest extends \SwaggerGen_TestCase
 {
 
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::__construct
-     */
-    public function testConstructor_Empty()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Ifdef_NotDefined()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $out = $object->preprocess('
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::__construct
+	 */
+	public function testConstructor_Empty()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Ifdef_NotDefined()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$out = $object->preprocess('
 			ifdef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Ifdef_Defined()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Ifdef_Defined()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test');
+		$out = $object->preprocess('
 			ifdef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 			whatever
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Ifndef_NotDefined()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Ifndef_NotDefined()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$out = $object->preprocess('
 			ifndef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 			whatever
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Ifndef_Defined()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Ifndef_Defined()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test');
+		$out = $object->preprocess('
 			ifndef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Define()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Define()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$out = $object->preprocess('
 			define test
 			ifndef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Undef()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Undef()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$out = $object->preprocess('
 			define test
 			undef test
 			ifdef test
@@ -135,133 +135,133 @@ 
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_If_NotDefined()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_If_NotDefined()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$out = $object->preprocess('
 			if test red
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_If_AnyValue()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test', 'green');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_If_AnyValue()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test', 'green');
+		$out = $object->preprocess('
 			if test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 			whatever
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_If_NoValue()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_If_NoValue()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test');
+		$out = $object->preprocess('
 			if test red
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_If_Mismatch()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test', 'green');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_If_Mismatch()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test', 'green');
+		$out = $object->preprocess('
 			if test red
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_If_Match()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test', 'red');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_If_Match()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test', 'red');
+		$out = $object->preprocess('
 			if test red
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 			whatever
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Else_Match()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test', 'blue');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Else_Match()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test', 'blue');
+		$out = $object->preprocess('
 			if test red
 			whatever
 			else
@@ -269,25 +269,25 @@ 
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 			otherwise
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Elif_Match()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test', 'blue');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Elif_Match()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test', 'blue');
+		$out = $object->preprocess('
 			if test red
 			whatever
 			elif test green
@@ -297,7 +297,7 @@ 
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
@@ -306,18 +306,18 @@ 
 			otherwise
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Elif_NoValue()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test', 'blue');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Elif_NoValue()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test', 'blue');
+		$out = $object->preprocess('
 			if test red
 			whatever
 			elif test green
@@ -327,7 +327,7 @@ 
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
@@ -336,76 +336,76 @@ 
 			otherwise
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::undefine
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_Undefine()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test');
-        $object->undefine('test');
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::undefine
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_Undefine()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test');
+		$object->undefine('test');
+		$out = $object->preprocess('
 			ifdef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::define
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::resetDefines
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_ResetDefines()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->define('test');
-        $object->resetDefines();
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::define
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::resetDefines
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_ResetDefines()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->define('test');
+		$object->resetDefines();
+		$out = $object->preprocess('
 			ifdef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 
 
 		', $out);
-    }
-
-    /**
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::addDefines
-     * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
-     */
-    public function testPreprocess_AddDefines()
-    {
-        $object = new \SwaggerGen\Parser\Text\Preprocessor();
-        $this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
-        $object->addDefines(['test' => true]);
-        $out = $object->preprocess('
+	}
+
+	/**
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::addDefines
+	 * @covers \SwaggerGen\Parser\Text\Preprocessor::preprocess
+	 */
+	public function testPreprocess_AddDefines()
+	{
+		$object = new \SwaggerGen\Parser\Text\Preprocessor();
+		$this->assertInstanceOf('\SwaggerGen\Parser\Text\Preprocessor', $object);
+		$object->addDefines(['test' => true]);
+		$out = $object->preprocess('
 			ifdef test
 			whatever
 			endif
 		');
 
-        $this->assertEquals('
+		$this->assertEquals('
 
 			whatever
 
 		', $out);
-    }
+	}
 
 }

SwaggerGen/Swagger/Parameter.php

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

@@ -115,7 +115,7 @@
             $this->Type = new $class($this, $definition);
         } elseif (isset(self::$classTypes[$format])) {
             $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}type";
             $this->Type = new $class($this, $definition);
         } else {
             throw new Exception("Type format not recognized: '{$format}'");

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
         $this->name = $name;
 
         $this->description = $data;
-        $this->required = (bool)$required;
+        $this->required = (bool) $required;
 
         // Parse regex
         $match = [];

Indentation +142 added lines, -142 removed lines

@@ -15,147 +15,147 @@
 class Parameter extends AbstractObject implements IParameter
 {
 
-    private static $classTypes = array(
-        'integer' => 'Integer',
-        'int' => 'Integer',
-        'int32' => 'Integer',
-        'int64' => 'Integer',
-        'long' => 'Integer',
-        'float' => 'Number',
-        'double' => 'Number',
-        'string' => 'String',
-        'byte' => 'String',
-        'binary' => 'String',
-        'password' => 'String',
-        'enum' => 'String',
-        'uuid' => 'StringUuid',
-        'boolean' => 'Boolean',
-        'bool' => 'Boolean',
-        'array' => 'Array',
-        'csv' => 'Array',
-        'ssv' => 'Array',
-        'tsv' => 'Array',
-        'pipes' => 'Array',
-        'multi' => 'Array',
-        'date' => 'Date',
-        'datetime' => 'Date',
-        'date-time' => 'Date',
-        'file' => 'File',
-    );
-    private $name;
-    private $in;
-    private $description;
-    private $required;
-
-    /**
-     * @var Type\AbstractType
-     */
-    private $Type;
-
-    /**
-     * @throws Exception
-     */
-    public function __construct(AbstractObject $parent, $in, $data, $required = false)
-    {
-        parent::__construct($parent);
-
-        if ($in !== 'path' && $in !== 'form' && $in !== 'query' && $in !== 'header') {
-            throw new Exception("Invalid in for parameter: '{$in}'");
-        }
-        $this->in = $in;
-
-        $definition = self::wordShift($data);
-        if (empty($definition)) {
-            throw new Exception('No type definition for parameter');
-        }
-
-        $name = self::wordShift($data);
-        if (empty($name)) {
-            throw new Exception('No name for parameter');
-        }
-
-        $this->name = $name;
-
-        $this->description = $data;
-        $this->required = (bool)$required;
-
-        // Parse regex
-        $match = [];
-        if (preg_match('/^([a-z][a-z0-9]*)/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('Unparseable parameter format definition: \'' . $definition . '\'');
-        }
-
-        if ($this->getTypeRegistry()->has($format)) {
-            $class = $this->getTypeRegistry()->get($format);
-            $this->Type = new $class($this, $definition);
-        } elseif (isset(self::$classTypes[$format])) {
-            $type = self::$classTypes[$format];
-            $class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
-            $this->Type = new $class($this, $definition);
-        } else {
-            throw new Exception("Type format not recognized: '{$format}'");
-        }
-    }
-
-    /**
-     * Returns true if the "multi" array collectionFormat is allowed for this
-     * parameter.
-     * @return bool
-     */
-    public function isMulti(): bool
-    {
-        return in_array($this->in, array('query', 'form'));
-    }
-
-    /**
-     * Return true if the parameter is of type 'formData'
-     * @return bool
-     */
-    public function isForm(): bool
-    {
-        return $this->in === 'form';
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|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);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'name' => $this->name,
-            'in' => $this->in === 'form' ? 'formData' : $this->in,
-            'description' => empty($this->description) ? null : $this->description,
-            'required' => $this->in === 'path' || $this->required ? true : null,
-        ), $this->Type->toArray(), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . " {$this->name} {$this->in}";
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
+	private static $classTypes = array(
+		'integer' => 'Integer',
+		'int' => 'Integer',
+		'int32' => 'Integer',
+		'int64' => 'Integer',
+		'long' => 'Integer',
+		'float' => 'Number',
+		'double' => 'Number',
+		'string' => 'String',
+		'byte' => 'String',
+		'binary' => 'String',
+		'password' => 'String',
+		'enum' => 'String',
+		'uuid' => 'StringUuid',
+		'boolean' => 'Boolean',
+		'bool' => 'Boolean',
+		'array' => 'Array',
+		'csv' => 'Array',
+		'ssv' => 'Array',
+		'tsv' => 'Array',
+		'pipes' => 'Array',
+		'multi' => 'Array',
+		'date' => 'Date',
+		'datetime' => 'Date',
+		'date-time' => 'Date',
+		'file' => 'File',
+	);
+	private $name;
+	private $in;
+	private $description;
+	private $required;
+
+	/**
+	 * @var Type\AbstractType
+	 */
+	private $Type;
+
+	/**
+	 * @throws Exception
+	 */
+	public function __construct(AbstractObject $parent, $in, $data, $required = false)
+	{
+		parent::__construct($parent);
+
+		if ($in !== 'path' && $in !== 'form' && $in !== 'query' && $in !== 'header') {
+			throw new Exception("Invalid in for parameter: '{$in}'");
+		}
+		$this->in = $in;
+
+		$definition = self::wordShift($data);
+		if (empty($definition)) {
+			throw new Exception('No type definition for parameter');
+		}
+
+		$name = self::wordShift($data);
+		if (empty($name)) {
+			throw new Exception('No name for parameter');
+		}
+
+		$this->name = $name;
+
+		$this->description = $data;
+		$this->required = (bool)$required;
+
+		// Parse regex
+		$match = [];
+		if (preg_match('/^([a-z][a-z0-9]*)/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('Unparseable parameter format definition: \'' . $definition . '\'');
+		}
+
+		if ($this->getTypeRegistry()->has($format)) {
+			$class = $this->getTypeRegistry()->get($format);
+			$this->Type = new $class($this, $definition);
+		} elseif (isset(self::$classTypes[$format])) {
+			$type = self::$classTypes[$format];
+			$class = "\\SwaggerGen\\Swagger\\Type\\{$type}Type";
+			$this->Type = new $class($this, $definition);
+		} else {
+			throw new Exception("Type format not recognized: '{$format}'");
+		}
+	}
+
+	/**
+	 * Returns true if the "multi" array collectionFormat is allowed for this
+	 * parameter.
+	 * @return bool
+	 */
+	public function isMulti(): bool
+	{
+		return in_array($this->in, array('query', 'form'));
+	}
+
+	/**
+	 * Return true if the parameter is of type 'formData'
+	 * @return bool
+	 */
+	public function isForm(): bool
+	{
+		return $this->in === 'form';
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|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);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'name' => $this->name,
+			'in' => $this->in === 'form' ? 'formData' : $this->in,
+			'description' => empty($this->description) ? null : $this->description,
+			'required' => $this->in === 'path' || $this->required ? true : null,
+		), $this->Type->toArray(), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . " {$this->name} {$this->in}";
+	}
+
+	public function getName()
+	{
+		return $this->name;
+	}
 
 }

SwaggerGen/Swagger/Error.php

Indentation +4 added lines, -4 removed lines

@@ -14,9 +14,9 @@
 class Error extends Response
 {
 
-    public function __construct(AbstractObject $parent, $code, $description = null)
-    {
-        parent::__construct($parent, $code, null, $description);
-    }
+	public function __construct(AbstractObject $parent, $code, $description = null)
+	{
+		parent::__construct($parent, $code, null, $description);
+	}
 
 }

SwaggerGen/Swagger/BodyParameter.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         }
 
         $this->description = $data;
-        $this->required = (bool)$required;
+        $this->required = (bool) $required;
 
         $this->schema = new Schema($this, $type);
     }

Indentation +72 added lines, -72 removed lines

@@ -15,77 +15,77 @@
 class BodyParameter extends AbstractObject implements IParameter
 {
 
-    /**
-     * @var string|boolean
-     */
-    private $name;
-    private $description;
-    private $required;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * @throws Exception
-     */
-    public function __construct(AbstractObject $parent, $data, $required = false)
-    {
-        parent::__construct($parent);
-
-        $type = self::wordShift($data);
-        if (empty($type)) {
-            throw new Exception('No type definition for body parameter');
-        }
-
-        $this->name = self::wordShift($data);
-        if (empty($this->name)) {
-            throw new Exception('No name for body parameter');
-        }
-
-        $this->description = $data;
-        $this->required = (bool)$required;
-
-        $this->schema = new Schema($this, $type);
-    }
-
-    /**
-     * @param string $command
-     * @param string $data
-     * @return AbstractObject|boolean
-     * @throws Exception
-     */
-    public function handleCommand($command, $data = null)
-    {
-        // Pass through to Type
-        $return = $this->schema->handleCommand($command, $data);
-        if ($return) {
-            return $return;
-        }
-
-        return parent::handleCommand($command, $data);
-    }
-
-    public function toArray(): array
-    {
-        return self::arrayFilterNull(array_merge(array(
-            'name' => $this->name,
-            'in' => 'body',
-            'description' => empty($this->description) ? null : $this->description,
-            'required' => $this->required ? true : null,
-            'schema' => $this->schema->toArray(),
-        ), parent::toArray()));
-    }
-
-    public function __toString()
-    {
-        return __CLASS__ . ' ' . $this->name;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
+	/**
+	 * @var string|boolean
+	 */
+	private $name;
+	private $description;
+	private $required;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * @throws Exception
+	 */
+	public function __construct(AbstractObject $parent, $data, $required = false)
+	{
+		parent::__construct($parent);
+
+		$type = self::wordShift($data);
+		if (empty($type)) {
+			throw new Exception('No type definition for body parameter');
+		}
+
+		$this->name = self::wordShift($data);
+		if (empty($this->name)) {
+			throw new Exception('No name for body parameter');
+		}
+
+		$this->description = $data;
+		$this->required = (bool)$required;
+
+		$this->schema = new Schema($this, $type);
+	}
+
+	/**
+	 * @param string $command
+	 * @param string $data
+	 * @return AbstractObject|boolean
+	 * @throws Exception
+	 */
+	public function handleCommand($command, $data = null)
+	{
+		// Pass through to Type
+		$return = $this->schema->handleCommand($command, $data);
+		if ($return) {
+			return $return;
+		}
+
+		return parent::handleCommand($command, $data);
+	}
+
+	public function toArray(): array
+	{
+		return self::arrayFilterNull(array_merge(array(
+			'name' => $this->name,
+			'in' => 'body',
+			'description' => empty($this->description) ? null : $this->description,
+			'required' => $this->required ? true : null,
+			'schema' => $this->schema->toArray(),
+		), parent::toArray()));
+	}
+
+	public function __toString()
+	{
+		return __CLASS__ . ' ' . $this->name;
+	}
+
+	public function getName()
+	{
+		return $this->name;
+	}
 
 }

SwaggerGen/Swagger/IParameter.php

Indentation +1 added lines, -1 removed lines

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

SwaggerGen/Swagger/Type/StringUuidType.php

Indentation +10 added lines, -10 removed lines

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

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-spl_autoload_register(function ($classname) {
+spl_autoload_register(function($classname) {
     $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
     if (is_file($file)) {
         require_once $file;

Indentation +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 spl_autoload_register(function ($classname) {
-    $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
-    if (is_file($file)) {
-        require_once $file;
-    }
+	$file = dirname(__DIR__) . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
+	if (is_file($file)) {
+		require_once $file;
+	}
 });

tests/output/uuid model overwrite/source.php

Indentation +8 added lines, -8 removed lines

@@ -13,14 +13,14 @@
 class Example
 {
 
-    /**
-     * @rest\endpoint /endpoint
-     * @rest\method GET Something
-     * @rest\response 200 uuid
-     */
-    public function Dummy()
-    {
+	/**
+	 * @rest\endpoint /endpoint
+	 * @rest\method GET Something
+	 * @rest\response 200 uuid
+	 */
+	public function Dummy()
+	{
 
-    }
+	}
 
 }

tests/output/global parameter/source.php

Indentation +9 added lines, -9 removed lines

@@ -11,15 +11,15 @@
 class Example
 {
 
-    /**
-     * @rest\endpoint /endpoint/{listid}
-     * @rest\method GET Something
-     * @rest\param listid
-     * @rest\response 200
-     */
-    public function Dummy()
-    {
+	/**
+	 * @rest\endpoint /endpoint/{listid}
+	 * @rest\method GET Something
+	 * @rest\param listid
+	 * @rest\response 200
+	 */
+	public function Dummy()
+	{
 
-    }
+	}
 
 }