added Factory::fromMethodReflection()

Author: dg

src/PhpGenerator/Factory.php

@@ -45,7 +45,7 @@ public function fromClassReflection(\ReflectionClass $from)
 		$class->setProperties($props);
 		foreach ($from->getMethods() as $method) {
 			if ($method->getDeclaringClass()->getName() === $from->getName()) {
-				$methods[] = $this->fromFunctionReflection($method)->setNamespace($class->getNamespace());
+				$methods[] = $this->fromMethodReflection($method)->setNamespace($class->getNamespace());
 			}
 		}
 		$class->setMethods($methods);
@@ -56,25 +56,19 @@ public function fromClassReflection(\ReflectionClass $from)
 	/**
 	 * @return Method
 	 */
-	public function fromFunctionReflection(\ReflectionFunctionAbstract $from)
+	public function fromMethodReflection(\ReflectionMethod $from)
 	{
-		$method = $from instanceof \ReflectionMethod 
-			? new Method($from->getName()) 
-			: ($from->isClosure() ? new Closure : new GlobalFunction($from->getName()));
+		$method = new Method($from->getName());
 		$method->setParameters(array_map([$this, 'fromParameterReflection'], $from->getParameters()));
-		if ($from instanceof \ReflectionMethod) {
-			$isInterface = $from->getDeclaringClass()->isInterface();
-			$method->setStatic($from->isStatic());
-			$method->setVisibility($from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : ($isInterface ? NULL : 'public')));
-			$method->setFinal($from->isFinal());
-			$method->setAbstract($from->isAbstract() && !$isInterface);
-			$method->setBody($from->isAbstract() ? FALSE : '');
-		}
+		$method->setStatic($from->isStatic());
+		$isInterface = $from->getDeclaringClass()->isInterface();
+		$method->setVisibility($from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : ($isInterface ? NULL : 'public')));
+		$method->setFinal($from->isFinal());
+		$method->setAbstract($from->isAbstract() && !$isInterface);
+		$method->setBody($from->isAbstract() ? FALSE : '');
 		$method->setReturnReference($from->returnsReference());
 		$method->setVariadic($from->isVariadic());
-		if (!$from->isClosure()) {
-			$method->setComment(Helpers::unformatDocComment($from->getDocComment()));
-		}
+		$method->setComment(Helpers::unformatDocComment($from->getDocComment()));
 		if (PHP_VERSION_ID >= 70000 && $from->hasReturnType()) {
 			$method->setReturnType((string) $from->getReturnType());
 			$method->setReturnNullable($from->getReturnType()->allowsNull());
@@ -83,6 +77,26 @@ public function fromFunctionReflection(\ReflectionFunctionAbstract $from)
 	}
 
 
+	/**
+	 * @return GlobalFunction|Closure
+	 */
+	public function fromFunctionReflection(\ReflectionFunction $from)
+	{
+		$function = $from->isClosure() ? new Closure : new GlobalFunction($from->getName());
+		$function->setParameters(array_map([$this, 'fromParameterReflection'], $from->getParameters()));
+		$function->setReturnReference($from->returnsReference());
+		$function->setVariadic($from->isVariadic());
+		if (!$from->isClosure()) {
+			$function->setComment(Helpers::unformatDocComment($from->getDocComment()));
+		}
+		if (PHP_VERSION_ID >= 70000 && $from->hasReturnType()) {
+			$function->setReturnType((string) $from->getReturnType());
+			$function->setReturnNullable($from->getReturnType()->allowsNull());
+		}
+		return $function;
+	}
+
+
 	/**
 	 * @return Parameter
 	 */

src/PhpGenerator/Method.php

@@ -39,9 +39,12 @@ class Method
 	 */
 	public static function from($method)
 	{
-		return (new Factory)->fromFunctionReflection(
-			$method instanceof \ReflectionFunctionAbstract ? $method : Nette\Utils\Callback::toReflection($method)
-		);
+		$method = $method instanceof \ReflectionFunctionAbstract ? $method : Nette\Utils\Callback::toReflection($method);
+		if ($method instanceof \ReflectionFunction) {
+			trigger_error('For global functions or closures use Nette\PhpGenerator\GlobalFunction or Nette\PhpGenerator\Closure.', E_USER_DEPRECATED);
+			return (new Factory)->fromFunctionReflection($method);
+		}
+		return (new Factory)->fromMethodReflection($method);
 	}
 
 
@@ -51,7 +54,7 @@ public static function from($method)
 	public function __construct($name = NULL)
 	{
 		if ($name === NULL) {
-			throw new Nette\DeprecatedException('For closures use Nette\PhpGenerator\GlobalFunction instead of Nette\PhpGenerator\Method.');
+			throw new Nette\DeprecatedException('For closures use Nette\PhpGenerator\Closure instead of Nette\PhpGenerator\Method.');
 		}
 		$this->setName($name);
 	}

tests/PhpGenerator/Factory.phpt

@@ -18,7 +18,7 @@ Assert::type(Nette\PhpGenerator\ClassType::class, $res);
 Assert::same('stdClass', $res->getName());
 
 
-$res = $factory->fromFunctionReflection(new \ReflectionMethod(ReflectionClass::class, 'getName'));
+$res = $factory->fromMethodReflection(new \ReflectionMethod(ReflectionClass::class, 'getName'));
 Assert::type(Nette\PhpGenerator\Method::class, $res);
 Assert::same('getName', $res->getName());