Method, Parameter, Property: added and used constructors

Author: dg

src/PhpGenerator/ClassType.php

@@ -473,8 +473,7 @@ public function getProperty($name)
 	 */
 	public function addProperty($name, $value = NULL)
 	{
-		$property = new Property;
-		return $this->properties[$name] = $property->setName($name)->setValue($value);
+		return $this->properties[$name] = (new Property($name))->setValue($value);
 	}
 
 
@@ -521,13 +520,13 @@ public function getMethod($name)
 	 */
 	public function addMethod($name)
 	{
-		$method = new Method;
+		$method = new Method($name);
 		if ($this->type === 'interface') {
 			$method->setVisibility(NULL)->setBody(FALSE);
 		} else {
 			$method->setVisibility('public');
 		}
-		return $this->methods[$name] = $method->setName($name);
+		return $this->methods[$name] = $method;
 	}
 
 }

src/PhpGenerator/Method.php

@@ -68,8 +68,7 @@ public static function from($from)
 			$from = new \ReflectionFunction($from);
 		}
 
-		$method = new static;
-		$method->name = $from->isClosure() ? NULL : $from->getName();
+		$method = new static($from->isClosure() ? NULL : $from->getName());
 		foreach ($from->getParameters() as $param) {
 			$method->parameters[$param->getName()] = Parameter::from($param);
 		}
@@ -91,6 +90,15 @@ public static function from($from)
 	}
 
 
+	/**
+	 * @param  string|NULL
+	 */
+	public function __construct($name = NULL)
+	{
+		$this->setName($name);
+	}
+
+
 	/**
 	 * @return string  PHP code
 	 */
@@ -184,11 +192,11 @@ public function getParameters()
 	 */
 	public function addParameter($name, $defaultValue = NULL)
 	{
-		$param = new Parameter;
+		$param = new Parameter($name);
 		if (func_num_args() > 1) {
 			$param->setOptional(TRUE)->setDefaultValue($defaultValue);
 		}
-		return $this->parameters[$name] = $param->setName($name);
+		return $this->parameters[$name] = $param;
 	}
 
 
@@ -216,8 +224,7 @@ public function getUses()
 	 */
 	public function addUse($name)
 	{
-		$param = new Parameter;
-		return $this->uses[] = $param->setName($name);
+		return $this->uses[] = new Parameter($name);
 	}
 
 

src/PhpGenerator/Parameter.php

@@ -36,8 +36,7 @@ class Parameter extends Nette\Object
 	 */
 	public static function from(\ReflectionParameter $from)
 	{
-		$param = new static;
-		$param->name = $from->getName();
+		$param = new static($from->getName());
 		$param->reference = $from->isPassedByReference();
 		if (PHP_VERSION_ID >= 70000) {
 			$type = $from->getType();
@@ -67,6 +66,15 @@ public static function from(\ReflectionParameter $from)
 	}
 
 
+	/**
+	 * @param  string  without $
+	 */
+	public function __construct($name = '')
+	{
+		$this->setName($name);
+	}
+
+
 	/**
 	 * @param  string  without $
 	 * @return self

src/PhpGenerator/PhpFile.php

@@ -28,8 +28,6 @@ class PhpFile extends Object
 	private $namespaces = [];
 
 
-
-
 	/**
 	 * @param  string|NULL
 	 * @return self

src/PhpGenerator/Property.php

@@ -36,8 +36,7 @@ class Property extends Nette\Object
 	 */
 	public static function from(\ReflectionProperty $from)
 	{
-		$prop = new static;
-		$prop->name = $from->getName();
+		$prop = new static($from->getName());
 		$defaults = $from->getDeclaringClass()->getDefaultProperties();
 		$prop->value = isset($defaults[$prop->name]) ? $defaults[$prop->name] : NULL;
 		$prop->static = $from->isStatic();
@@ -47,6 +46,15 @@ public static function from(\ReflectionProperty $from)
 	}
 
 
+	/**
+	 * @param  string  without $
+	 */
+	public function __construct($name = '')
+	{
+		$this->setName($name);
+	}
+
+
 	/**
 	 * @param  string  without $
 	 * @return self