Merge pull request #2 from marcj/master

Fixed trait use in classes, added 'resource' to noHintTypes and

Author: gossi

src/model/parts/ParametersTrait.php

@@ -43,6 +43,28 @@ public function addSimpleParameter($name, $type = null, $defaultValue = null)
 return $this;
 }
 
+/**
+ * @param string $name
+ * @param null|string $type
+ * @param null|string $typeDescription
+ * @param mixed $defaultValue omit the argument to define now default value
+ *
+ * @return $this
+ */
+public function addSimpleDescParameter($name, $type = null, $typeDescription = null, $defaultValue = null)
+{
+$parameter = new PhpParameter($name);
+$parameter->setType($type);
+$parameter->setTypeDescription($typeDescription);
+
+if (3 < func_num_args()) {
+$parameter->setDefaultValue($defaultValue);
+}
+
+$this->addParameter($parameter);
+return $this;
+}
+
 /**
  *
  * @param string|integer $nameOrIndex

src/visitor/DefaultVisitor.php

@@ -48,7 +48,8 @@ class DefaultVisitor implements GeneratorVisitorInterface {
 'float',
 'double',
 'object',
-'mixed'
+'mixed',
+'resource'
 ];
 
 public function __construct() {
@@ -121,8 +122,8 @@ private function visitDocblock(DocblockInterface $model) {
 
 private function visitTraits(TraitsInterface $struct) {
 foreach ($struct->getTraits() as $trait) {
-$this->writer->write('uses ');
-$this->writer->writeln($trait);
+$this->writer->write('use ');
+$this->writer->writeln($trait . ';');
 }
 }
 
@@ -322,7 +323,7 @@ private function writeParameters(array $parameters) {
 }
 $first = false;
 
-if (($type = $parameter->getType()) && !in_array($type, self::$noTypeHints)) {
+if (false === strpos($parameter->getType(), '|') && ($type = $parameter->getType()) && !in_array($type, self::$noTypeHints)) {
 $this->writer->write($type . ' ');
 }