Merge pull request #11 from pavelkouril/php7-features

Support for PHP7 return types and scalar type hints

Author: dg

src/PhpGenerator/Method.php

@@ -51,6 +51,9 @@ class Method extends Nette\Object
 	/** @var PhpNamespace|NULL */
 	private $namespace;
 
+	/** @var string */
+	private $returnType;
+
 
 	/**
 	 * @return self
@@ -71,6 +74,10 @@ public static function from($from)
 		$method->returnReference = $from->returnsReference();
 		$method->variadic = PHP_VERSION_ID >= 50600 && $from->isVariadic();
 		$method->documents = $from->getDocComment() ? [preg_replace('#^\s*\* ?#m', '', trim($from->getDocComment(), "/* \r\n\t"))] : [];
+		if (PHP_VERSION_ID >= 70000 && $from->hasReturnType()) {
+			$returnType = $from->getReturnType();
+			$method->returnType = $returnType->isBuiltin() ? (string) $returnType : '\\' . $returnType;
+		}
 		return $method;
 	}
 
@@ -80,7 +87,7 @@ public static function from($from)
 	 */
 	public function __toString()
 	{
-		static $builtinTypes = ['array', 'self', 'parent', 'callable', ''];
+		static $builtinTypes = ['array', 'self', 'parent', 'callable', 'string', 'bool', 'float', 'int', ''];
 		$parameters = [];
 		foreach ($this->parameters as $param) {
 			$variadic = $this->variadic && $param === end($this->parameters);
@@ -98,6 +105,9 @@ public function __toString()
 		foreach ($this->uses as $param) {
 			$uses[] = ($param->isReference() ? '&' : '') . '$' . $param->getName();
 		}
+		$returnType = !$this->namespace || in_array($this->returnType, $builtinTypes)
+			? $this->returnType
+			: $this->namespace->unresolveName($this->returnType);
 		return ($this->documents ? str_replace("\n", "\n * ", "/**\n" . implode("\n", $this->documents)) . "\n */\n" : '')
 			. ($this->abstract ? 'abstract ' : '')
 			. ($this->final ? 'final ' : '')
@@ -108,6 +118,7 @@ public function __toString()
 			. ($this->name ? ' ' . $this->name : '')
 			. '(' . implode(', ', $parameters) . ')'
 			. ($this->uses ? ' use (' . implode(', ', $uses) . ')' : '')
+			. ($returnType ? ': ' . $returnType : '')
 			. ($this->abstract || $this->body === FALSE ? ';'
 				: ($this->name ? "\n" : ' ') . "{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}');
 	}
@@ -393,4 +404,23 @@ public function setNamespace(PhpNamespace $val = NULL)
 		return $this;
 	}
 
+	/**
+	 * @param  string
+	 * @return self
+	 */
+	public function setReturnType($val)
+	{
+		$this->returnType = (string) $val;
+		return $this;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getReturnType()
+	{
+		return $this->returnType;
+	}
+
 }

src/PhpGenerator/Parameter.php

@@ -39,7 +39,10 @@ public static function from(\ReflectionParameter $from)
 		$param = new static;
 		$param->name = $from->getName();
 		$param->reference = $from->isPassedByReference();
-		if ($from->isArray() || $from->isCallable()) {
+		if (PHP_VERSION_ID >= 70000) {
+			$type = $from->getType();
+			$param->typeHint = !$type || $type->isBuiltin() ? (string) $type : '\\' . $type;
+		} elseif ($from->isArray() || $from->isCallable()) {
 			$param->typeHint = $from->isArray() ? 'array' : 'callable';
 		} else {
 			try {

tests/PhpGenerator/Method.returnTypes.phpt

@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Test: Nette\PhpGenerator - PHP7 return type declarations
+ * @phpversion 7.0
+ */
+
+namespace A
+{
+	class Foo {}
+}
+
+namespace
+{
+	use Nette\PhpGenerator\Method;
+	use Tester\Assert;
+
+
+	require __DIR__ . '/../bootstrap.php';
+
+	// test from
+
+	interface A
+	{
+		function testClass() : \A\Foo;
+		function testScalar() : string;
+	}
+
+	$method = Method::from(A::class .'::testClass');
+	Assert::same('\A\Foo', $method->getReturnType());
+
+	$method = Method::from(A::class .'::testScalar');
+	Assert::same('string', $method->getReturnType());
+
+	// generating methods with return type declarations
+
+	$method = (new Method)
+		->setName('create')
+		->setReturnType('Foo')
+		->setBody('return new Foo();');
+
+	Assert::match(
+		'function create(): Foo
+{
+	return new Foo();
+}
+', (string) $method);
+
+}

tests/PhpGenerator/Method.scalarParameters.phpt

@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Test: Nette\PhpGenerator - PHP7 scalar type hints
+ * @phpversion 7.0
+ */
+
+
+use Nette\PhpGenerator\Method;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+// test from
+
+
+interface Foo
+{
+	function scalars(string $a, bool $b, int $c, float $d);
+}
+
+$method = Method::from(Foo::class . '::scalars');
+Assert::same('string', $method->getParameters()['a']->getTypeHint());
+
+$method = Method::from(Foo::class . '::scalars');
+Assert::same('bool', $method->getParameters()['b']->getTypeHint());
+
+$method = Method::from(Foo::class . '::scalars');
+Assert::same('int', $method->getParameters()['c']->getTypeHint());
+
+$method = Method::from(Foo::class . '::scalars');
+Assert::same('float', $method->getParameters()['d']->getTypeHint());
+
+
+// generating methods with scalar type hints
+
+$method = (new Method)
+	->setName('create')
+	->setBody('return null;');
+$method->addParameter('a')->setTypeHint('string');
+$method->addParameter('b')->setTypeHint('bool');
+
+Assert::match(
+'function create(string $a, bool $b)
+{
+	return null;
+}
+', (string) $method);