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 = array();
 
 	/** @var string|FALSE */
-	private $body;
+	private $body = '';
 
 	/** @var bool */
 	private $static = FALSE;
@@ -64,7 +64,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 : '';
@@ -80,7 +80,7 @@ public static function from($from)
 	 */
 	public function __toString()
 	{
-		static $builtinTypes = array('array', 'self', 'parent', 'callable', '');
+		static $builtinTypes = array('array', 'self', 'parent', 'callable', NULL);
 		$parameters = array();
 		foreach ($this->parameters as $param) {
 			$variadic = $this->variadic && $param === end($this->parameters);
@@ -114,18 +114,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()
 	{
@@ -259,7 +259,7 @@ public function setVisibility($val)
 		if (!in_array($val, array('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;
 	}
 

src/PhpGenerator/Parameter.php

@@ -21,7 +21,7 @@ class Parameter extends Nette\Object
 	/** @var bool */
 	private $reference = FALSE;
 
-	/** @var string */
+	/** @var string|NULL */
 	private $typeHint;
 
 	/** @var bool */
@@ -45,7 +45,7 @@ public static function from(\ReflectionParameter $from)
 			$param->typeHint = '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];
@@ -107,18 +107,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()
 	{