Method, Parameter: added support for build-in types callable, self, parent

Author: dg

src/PhpGenerator/Method.php

@@ -80,12 +80,13 @@ public static function from($from)
 	 */
 	public function __toString()
 	{
+		static $builtinTypes = array('array', 'self', 'parent', 'callable', '');
 		$parameters = array();
 		foreach ($this->parameters as $param) {
 			$variadic = $this->variadic && $param === end($this->parameters);
-			$hint = in_array($param->getTypeHint(), array('array', ''))
+			$hint = !$this->namespace || in_array($param->getTypeHint(), $builtinTypes, TRUE)
 				? $param->getTypeHint()
-				: ($this->namespace ? $this->namespace->unresolveName($param->getTypeHint()) : $param->getTypeHint());
+				: $this->namespace->unresolveName($param->getTypeHint());
 
 			$parameters[] = ($hint ? $hint . ' ' : '')
 				. ($param->isReference() ? '&' : '')

src/PhpGenerator/Parameter.php

@@ -39,13 +39,19 @@ public static function from(\ReflectionParameter $from)
 		$param = new static;
 		$param->name = $from->getName();
 		$param->reference = $from->isPassedByReference();
-		try {
-			$param->typeHint = $from->isArray() ? 'array' : ($from->getClass() ? '\\' . $from->getClass()->getName() : '');
-		} catch (\ReflectionException $e) {
-			if (preg_match('#Class (.+) does not exist#', $e->getMessage(), $m)) {
-				$param->typeHint = '\\' . $m[1];
-			} else {
-				throw $e;
+		if ($from->isArray()) {
+			$param->typeHint = 'array';
+		} elseif (PHP_VERSION_ID >= 50400 && $from->isCallable()) {
+			$param->typeHint = 'callable';
+		} else {
+			try {
+				$param->typeHint = $from->getClass() ? '\\' . $from->getClass()->getName() : '';
+			} catch (\ReflectionException $e) {
+				if (preg_match('#Class (.+) does not exist#', $e->getMessage(), $m)) {
+					$param->typeHint = '\\' . $m[1];
+				} else {
+					throw $e;
+				}
 			}
 		}
 		$param->optional = PHP_VERSION_ID < 50407 ? $from->isOptional() || ($param->typeHint && $from->allowsNull()) : $from->isDefaultValueAvailable();

tests/PhpGenerator/ClassType.from.expect

@@ -48,7 +48,7 @@ class Class2 extends Class1 implements Interface2
 	 * Func3
 	 * @return Class1
 	 */
-	private function & func3(array $a%a?%, Class2 $b = NULL, Unknown $c, \Xyz\Unknown $d, $e)
+	private function & func3(array $a%a?%, Class2 $b = NULL, Unknown $c, \Xyz\Unknown $d, callable $e, $f)
 	{
 	}
 

tests/PhpGenerator/ClassType.from.phpt

@@ -55,7 +55,7 @@ class Class2 extends Class1 implements Interface2
 	 * Func3
 	 * @return Class1
 	 */
-	private function & func3(array $a = array(), Class2 $b = NULL, \Abc\Unknown $c, \Xyz\Unknown $d, $e)
+	private function & func3(array $a = array(), Class2 $b = NULL, \Abc\Unknown $c, \Xyz\Unknown $d, callable $e, $f)
 	{}
 
 	final function func2()

tests/PhpGenerator/Method.variadics.phpt

@@ -69,7 +69,7 @@ $method = (new Method)
 	->setBody('return 42;');
 $method->addParameter('foo');
 $method->addParameter('bar');
-$method->addParameter('baz', []);
+$method->addParameter('baz', array());
 
 Assert::match(
 'function variadic($foo, $bar, ...$baz)

tests/PhpGenerator/PhpNamespace.expect

@@ -7,7 +7,7 @@ class A implements A, C
 	use \Bar\D;
 
 
-	public function test(C $test)
+	public function test(C $a, self $b, parent $c, array $d, callable $e)
 	{
 	}
 

tests/PhpGenerator/PhpNamespace.phpt

@@ -36,10 +36,13 @@ Assert::exception(function () use ($namespace) {
 $classA
 	->addImplement('Foo\\A')
 	->addImplement('Bar\\C')
-	->addTrait('Bar\\D')
-	->addMethod('test')
-		->addParameter('test')
-			->setTypeHint('Bar\C');
-
+	->addTrait('Bar\\D');
+
+$method = $classA->addMethod('test');
+$method->addParameter('a')->setTypeHint('Bar\C');
+$method->addParameter('b')->setTypeHint('self');
+$method->addParameter('c')->setTypeHint('parent');
+$method->addParameter('d')->setTypeHint('array');
+$method->addParameter('e')->setTypeHint('callable');
 
 Assert::matchFile(__DIR__ . '/PhpNamespace.expect', (string) $namespace);