Bugfix, only write return types when allowed

Author: gossi

src/generator/builder/parts/RoutineBuilderPart.php

@@ -41,7 +41,7 @@ protected function writeParameters(RoutineInterface $model) {
 
 	protected function writeFunctionReturnType(RoutineInterface $model) {
 		$type = $this->getType($model, $this->config->getGenerateReturnTypeHints());
-		if ($type !== null) {
+		if ($type !== null && $this->config->getGenerateReturnTypeHints()) {
 			$this->writer->write(': ')->write($type);
 		}
 	}

src/generator/builder/parts/TypeBuilderPart.php

@@ -32,9 +32,8 @@ trait TypeBuilderPart {
 	private function getType(AbstractModel $model, $allowed) {
 		$type = $model->getType();
 		if (!empty($type) && strpos($type, '|') === false
-				&& (!in_array($type, self::$noTypeHints) || (
-						$allowed && in_array($type, self::$php7typeHints))
-					)
+				&& (!in_array($type, self::$noTypeHints) 
+					|| ($allowed && in_array($type, self::$php7typeHints)))
 				) {
 			if (isset(self::$typeHintMap[$type])) {
 				return self::$typeHintMap[$type];