fixed inconsistencies between 'nullable string' and 'string' properties

Author: dg

src/PhpGenerator/Method.php

@@ -15,7 +15,7 @@
  */
 class Method extends Nette\Object
 {
-	/** @var string */
+	/** @var string|NULL */
 	private $name;
 
 	/** @var array of name => Parameter */
@@ -25,7 +25,7 @@ class Method extends Nette\Object
 	private $uses = [];
 
 	/** @var string|FALSE */
-	private $body;
+	private $body = '';
 
 	/** @var bool */
 	private $static = FALSE;
@@ -45,13 +45,13 @@ class Method extends Nette\Object
 	/** @var bool */
 	private $variadic = FALSE;
 
-	/** @var array of string */
+	/** @var string[] */
 	private $documents = [];
 
 	/** @var PhpNamespace|NULL */
 	private $namespace;
 
-	/** @var string */
+	/** @var string|NULL */
 	private $returnType;
 
 
@@ -67,7 +67,7 @@ public static function from($from)
 			$method->parameters[$param->getName()] = Parameter::from($param);
 		}
 		$method->static = $from->isStatic();
-		$method->visibility = $from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : '');
+		$method->visibility = $from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : NULL);
 		$method->final = $from->isFinal();
 		$method->abstract = $from->isAbstract() && !$from->getDeclaringClass()->isInterface();
 		$method->body = $from->isAbstract() ? FALSE : '';
@@ -87,7 +87,7 @@ public static function from($from)
 	 */
 	public function __toString()
 	{
-		static $builtinTypes = ['array', 'self', 'parent', 'callable', 'string', 'bool', 'float', 'int', ''];
+		static $builtinTypes = ['array', 'self', 'parent', 'callable', 'string', 'bool', 'float', 'int', NULL];
 		$parameters = [];
 		foreach ($this->parameters as $param) {
 			$variadic = $this->variadic && $param === end($this->parameters);
@@ -105,7 +105,7 @@ public function __toString()
 		foreach ($this->uses as $param) {
 			$uses[] = ($param->isReference() ? '&' : '') . '$' . $param->getName();
 		}
-		$returnType = !$this->namespace || in_array($this->returnType, $builtinTypes)
+		$returnType = !$this->namespace || in_array($this->returnType, $builtinTypes, TRUE)
 			? $this->returnType
 			: $this->namespace->unresolveName($this->returnType);
 		return ($this->documents ? str_replace("\n", "\n * ", "/**\n" . implode("\n", $this->documents)) . "\n */\n" : '')
@@ -125,18 +125,18 @@ public function __toString()
 
 
 	/**
-	 * @param  string
+	 * @param  string|NULL
 	 * @return self
 	 */
 	public function setName($name)
 	{
-		$this->name = (string) $name;
+		$this->name = $name ? (string) $name : NULL;
 		return $this;
 	}
 
 
 	/**
-	 * @return string
+	 * @return string|NULL
 	 */
 	public function getName()
 	{
@@ -270,7 +270,7 @@ public function setVisibility($val)
 		if (!in_array($val, ['public', 'protected', 'private', NULL], TRUE)) {
 			throw new Nette\InvalidArgumentException('Argument must be public|protected|private|NULL.');
 		}
-		$this->visibility = (string) $val;
+		$this->visibility = $val ? (string) $val : NULL;
 		return $this;
 	}
 
@@ -405,18 +405,18 @@ public function setNamespace(PhpNamespace $val = NULL)
 	}
 
 	/**
-	 * @param  string
+	 * @param  string|NULL
 	 * @return self
 	 */
 	public function setReturnType($val)
 	{
-		$this->returnType = (string) $val;
+		$this->returnType = $val ? (string) $val : NULL;
 		return $this;
 	}
 
 
 	/**
-	 * @return string
+	 * @return string|NULL
 	 */
 	public function getReturnType()
 	{

src/PhpGenerator/Parameter.php

@@ -16,12 +16,12 @@
 class Parameter extends Nette\Object
 {
 	/** @var string */
-	private $name;
+	private $name = '';
 
 	/** @var bool */
 	private $reference = FALSE;
 
-	/** @var string */
+	/** @var string|NULL */
 	private $typeHint;
 
 	/** @var bool */
@@ -41,12 +41,12 @@ public static function from(\ReflectionParameter $from)
 		$param->reference = $from->isPassedByReference();
 		if (PHP_VERSION_ID >= 70000) {
 			$type = $from->getType();
-			$param->typeHint = !$type || $type->isBuiltin() ? (string) $type : '\\' . $type;
+			$param->typeHint = $type ? ($type->isBuiltin() ? '' : '\\') . $type : NULL;
 		} elseif ($from->isArray() || $from->isCallable()) {
 			$param->typeHint = $from->isArray() ? 'array' : 'callable';
 		} else {
 			try {
-				$param->typeHint = $from->getClass() ? '\\' . $from->getClass()->getName() : '';
+				$param->typeHint = $from->getClass() ? '\\' . $from->getClass()->getName() : NULL;
 			} catch (\ReflectionException $e) {
 				if (preg_match('#Class (.+) does not exist#', $e->getMessage(), $m)) {
 					$param->typeHint = '\\' . $m[1];
@@ -108,18 +108,18 @@ public function isReference()
 
 
 	/**
-	 * @param  string
+	 * @param  string|NULL
 	 * @return self
 	 */
 	public function setTypeHint($hint)
 	{
-		$this->typeHint = (string) $hint;
+		$this->typeHint = $hint ? (string) $hint : NULL;
 		return $this;
 	}
 
 
 	/**
-	 * @return string
+	 * @return string|NULL
 	 */
 	public function getTypeHint()
 	{

src/PhpGenerator/Property.php

@@ -16,7 +16,7 @@
 class Property extends Nette\Object
 {
 	/** @var string */
-	private $name;
+	private $name = '';
 
 	/** @var mixed */
 	public $value;
@@ -27,7 +27,7 @@ class Property extends Nette\Object
 	/** @var string  public|protected|private */
 	private $visibility = 'public';
 
-	/** @var array of string */
+	/** @var string[] */
 	private $documents = [];