Bugfix for alias in use statements

Author: gossi

composer.json

@@ -17,8 +17,8 @@
 	"require" : {
 		"php" : ">=5.4.0",
 		"gossi/docblock" : "~1",
-		"doctrine/annotations" : "~1",
-		"symfony/options-resolver" : "~2"
+		"symfony/options-resolver" : "~2",
+		"gossi/tokenizer" : "~0"
 	},
 	"autoload" : {
 		"psr-4" : {

composer.lock

@@ -20,7 +20,6 @@
 use gossi\codegen\model\parts\QualifiedNameTrait;
 use gossi\codegen\model\parts\DocblockTrait;
 use gossi\codegen\model\parts\LongDescriptionTrait;
-use Doctrine\Common\Annotations\PhpParser;
 
 /**
  * Represents an abstract php struct.
@@ -64,13 +63,6 @@ protected static function createMethod(\ReflectionMethod $method) {
 	protected static function createProperty(\ReflectionProperty $property) {
 		return PhpProperty::fromReflection($property);
 	}
-	
-	protected static function getUseStatementsFromReflection(\ReflectionClass $ref) {
-		if (null === self::$phpParser) {
-			self::$phpParser = new PhpParser();
-		}
-		return self::$phpParser->parseClass($ref);
-	}
 
 	public function __construct($name = null) {
 		$this->setQualifiedName($name);
@@ -94,7 +86,10 @@ public function addRequiredFile($file) {
 	}
 
 	public function setUseStatements(array $useStatements) {
-		$this->useStatements = $useStatements;
+		$this->useStatements = [];
+		foreach ($useStatements as $alias => $useStatement) {
+			$this->addUseStatement($useStatement, $alias);
+		}
 
 		return $this;
 	}
@@ -106,7 +101,7 @@ public function setUseStatements(array $useStatements) {
 	 * @return $this
 	 */
 	public function addUseStatement($qualifiedName, $alias = null) {
-		if (null === $alias) {
+		if (!is_string($alias)) {
 			if (false === strpos($qualifiedName, '\\')) {
 				$alias = $qualifiedName;
 			} else {
@@ -130,29 +125,6 @@ public function hasUseStatement($qualifiedName) {
 		return isset($flipped[$qualifiedName]);
 	}
 
-// 	public function declareUses()
-// 	{
-// 		foreach (func_get_args() as $name) {
-// 			$this->declareUse($name);
-// 		}
-// 	}
-
-// 	/**
-// 	 * @param string      $fullClassName
-// 	 * @param null|string $alias
-// 	 *
-// 	 * @return string
-// 	 */
-// 	public function declareUse($fullClassName, $alias = null)
-// 	{
-// 		$fullClassName = trim($fullClassName, '\\');
-// 		if (!$this->hasUseStatement($fullClassName)) {
-// 			$this->addUseStatement($fullClassName, $alias);
-// 		}
-
-// 		return $this->getUseAlias($fullClassName);
-// 	}
-
 	/**
 	 * @param string $qualifiedName
 	 * @return string
@@ -253,7 +225,5 @@ public function generateDocblock() {
 		foreach ($this->methods as $method) {
 			$method->generateDocblock();
 		}
-		
-// 		$this->setDocblock($docblock);
 	}
 }

src/model/AbstractPhpStruct.php

@@ -9,6 +9,7 @@
 use gossi\codegen\model\parts\ConstantsTrait;
 use gossi\codegen\model\parts\PropertiesTrait;
 use gossi\codegen\model\parts\TraitsTrait;
+use gossi\codegen\utils\ReflectionUtils;
 
 class PhpClass extends AbstractPhpStruct implements GenerateableInterface, TraitsInterface, ConstantsInterface {
 
@@ -27,7 +28,7 @@ public static function fromReflection(\ReflectionClass $ref) {
 			->setAbstract($ref->isAbstract())
 			->setFinal($ref->isFinal())
 			->setConstants($ref->getConstants())
-			->setUseStatements(static::getUseStatementsFromReflection($ref));
+			->setUseStatements(ReflectionUtils::getUseStatements($ref));
 
 		if ($ref->getDocComment()) {
 			$docblock = new Docblock($ref);

src/model/PhpClass.php

@@ -4,6 +4,7 @@
 use gossi\docblock\Docblock;
 use gossi\codegen\model\parts\InterfacesTrait;
 use gossi\codegen\model\parts\ConstantsTrait;
+use gossi\codegen\utils\ReflectionUtils;
 
 class PhpInterface extends AbstractPhpStruct implements GenerateableInterface, ConstantsInterface {
 
@@ -14,7 +15,7 @@ public static function fromReflection(\ReflectionClass $ref) {
 		$interface = new static();
 		$interface->setQualifiedName($ref->name)
 			->setConstants($ref->getConstants())
-			->setUseStatements(static::getUseStatementsFromReflection($ref));
+			->setUseStatements(ReflectionUtils::getUseStatements($ref));
 
 		$docblock = new Docblock($ref);
 		$interface->setDocblock($docblock);

src/model/PhpInterface.php

@@ -4,7 +4,7 @@
 use gossi\docblock\Docblock;
 use gossi\codegen\model\parts\PropertiesTrait;
 use gossi\codegen\model\parts\TraitsTrait;
-use Doctrine\Common\Annotations\PhpParser;
+use gossi\codegen\utils\ReflectionUtils;
 
 class PhpTrait extends AbstractPhpStruct implements GenerateableInterface, TraitsInterface {
 
@@ -14,7 +14,7 @@ class PhpTrait extends AbstractPhpStruct implements GenerateableInterface, Trait
 	public static function fromReflection(\ReflectionClass $ref) {
 		$trait = new static();
 		$trait->setQualifiedName($ref->name);
-		$trait->setUseStatements(static::getUseStatementsFromReflection($ref));
+		$trait->setUseStatements(ReflectionUtils::getUseStatements($ref));
 
 		$docblock = new Docblock($ref);
 		$trait->setDocblock($docblock);