Method::from() added support for closures & global functions

Author: dg

src/PhpGenerator/Method.php

@@ -11,7 +11,7 @@
 
 
 /**
- * Class method description.
+ * Method or function description.
  */
 class Method extends Nette\Object
 {
@@ -60,17 +60,26 @@ class Method extends Nette\Object
 	 */
 	public static function from($from)
 	{
-		$from = $from instanceof \ReflectionMethod ? $from : new \ReflectionMethod($from);
+		if (is_string($from) && strpos($from, '::')) {
+			$from = new \ReflectionMethod($from);
+		} elseif (is_array($from)) {
+			$from = new \ReflectionMethod($from[0], $from[1]);
+		} elseif (!$from instanceof \ReflectionFunctionAbstract) {
+			$from = new \ReflectionFunction($from);
+		}
+
 		$method = new static;
-		$method->name = $from->getName();
+		$method->name = $from->isClosure() ? NULL : $from->getName();
 		foreach ($from->getParameters() as $param) {
 			$method->parameters[$param->getName()] = Parameter::from($param);
 		}
-		$method->static = $from->isStatic();
-		$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 : '';
+		if ($from instanceof \ReflectionMethod) {
+			$method->static = $from->isStatic();
+			$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 : '';
+		}
 		$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"))] : [];
@@ -108,14 +117,15 @@ public function __toString()
 		$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" : '')
 			. ($this->abstract ? 'abstract ' : '')
 			. ($this->final ? 'final ' : '')
 			. ($this->visibility ? $this->visibility . ' ' : '')
 			. ($this->static ? 'static ' : '')
 			. 'function'
 			. ($this->returnReference ? ' &' : '')
-			. ($this->name ? ' ' . $this->name : '')
+			. ' ' . $this->name
 			. '(' . implode(', ', $parameters) . ')'
 			. ($this->uses ? ' use (' . implode(', ', $uses) . ')' : '')
 			. ($returnType ? ': ' . $returnType : '')

src/PhpGenerator/Parameter.php

@@ -58,7 +58,7 @@ public static function from(\ReflectionParameter $from)
 		$param->optional = PHP_VERSION_ID < 50407 ? $from->isOptional() || ($param->typeHint && $from->allowsNull()) : $from->isDefaultValueAvailable();
 		$param->defaultValue = $from->isDefaultValueAvailable() ? $from->getDefaultValue() : NULL;
 
-		$namespace = $from->getDeclaringClass()->getNamespaceName();
+		$namespace = $from->getDeclaringClass() ? $from->getDeclaringClass()->getNamespaceName() : NULL;
 		$namespace = $namespace ? "\\$namespace\\" : '\\';
 		if (Nette\Utils\Strings::startsWith($param->typeHint, $namespace)) {
 			$param->typeHint = substr($param->typeHint, strlen($namespace));

tests/PhpGenerator/Method.closure.expect

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Test: Nette\PhpGenerator & function.
+ */
+
+use Nette\PhpGenerator\Method;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$function = new Method;
+$function
+	->setReturnReference(TRUE)
+	->setBody('return $a + $b;');
+
+$function->addParameter('a');
+$function->addParameter('b');
+$function->addUse('this');
+$function->addUse('vars')
+	->setReference(TRUE);
+
+Assert::match(
+'function & ($a, $b) use ($this, &$vars) {
+	return $a + $b;
+}', (string) $function);
+
+
+/** closure */
+$closure = function (stdClass $a, $b = NULL) {};
+$function = Method::from($closure);
+Assert::match(
+'/**
+ * closure
+ */
+function (stdClass $a, $b = NULL) {
+}', (string) $function);
+
+
+/** global */
+function func(stdClass $a, $b = NULL) {
+};
+
+$function = Method::from('func');
+Assert::match(
+'/**
+ * global
+ */
+function func(stdClass $a, $b = NULL)
+{
+}', (string) $function);