Factory: fix method bodies import [Closes #61] (#62)

Co-authored-by: Anton Zolotilin <[email protected]>

Author: 2 people

src/PhpGenerator/Factory.php

@@ -192,8 +192,7 @@ private function loadMethodBodies(\ReflectionClass $from): array
 		foreach ($nodeFinder->findInstanceOf($class, Node\Stmt\ClassMethod::class) as $method) {
 			/** @var Node\Stmt\ClassMethod $method */
 			if ($method->stmts) {
-				$start = $method->stmts[0]->getAttribute('startFilePos');
-				$body = substr($code, $start, end($method->stmts)->getAttribute('endFilePos') - $start + 1);
+				$body = $this->extractBody($nodeFinder, $code, $method->stmts);
 				$bodies[$method->name->toString()] = Helpers::indentPhp($body, -2);
 			}
 		}
@@ -208,17 +207,60 @@ private function loadFunctionBody(\ReflectionFunction $from): string
 		}
 
 		[$code, $stmts] = $this->parse($from);
+
+		$nodeFinder = new PhpParser\NodeFinder;
 		/** @var Node\Stmt\Function_ $function */
-		$function = (new PhpParser\NodeFinder)->findFirst($stmts, function (Node $node) use ($from) {
+		$function = $nodeFinder->findFirst($stmts, function (Node $node) use ($from) {
 			return $node instanceof Node\Stmt\Function_ && $node->namespacedName->toString() === $from->name;
 		});
 
-		$start = $function->stmts[0]->getAttribute('startFilePos');
-		$body = substr($code, $start, end($function->stmts)->getAttribute('endFilePos') - $start + 1);
+		$body = $this->extractBody($nodeFinder, $code, $function->stmts);
 		return Helpers::indentPhp($body, -1);
 	}
 
 
+	/**
+	 * @param  Node[]  $statements
+	 */
+	private function extractBody(PhpParser\NodeFinder $nodeFinder, string $originalCode, array $statements): string
+	{
+		$start = $statements[0]->getAttribute('startFilePos');
+		$body = substr($originalCode, $start, end($statements)->getAttribute('endFilePos') - $start + 1);
+
+		$replacements = [];
+		// name-nodes => resolved fully-qualified name
+		foreach ($nodeFinder->findInstanceOf($statements, Node\Name::class) as $node) {
+			if ($node->hasAttribute('resolvedName')
+				&& $node->getAttribute('resolvedName') instanceof Node\Name\FullyQualified
+			) {
+				$replacements[] = [
+					$node->getStartFilePos(),
+					$node->getEndFilePos(),
+					$node->getAttribute('resolvedName')->toCodeString(),
+				];
+			}
+		}
+
+		//sort collected resolved names by position in file
+		usort($replacements, function ($a, $b) {
+			return $a[0] <=> $b[0];
+		});
+		$correctiveOffset = -$start;
+		//replace changes body length so we need correct offset
+		foreach ($replacements as [$startPos, $endPos, $replacement]) {
+			$replacingStringLength = $endPos - $startPos + 1;
+			$body = substr_replace(
+				$body,
+				$replacement,
+				$correctiveOffset + $startPos,
+				$replacingStringLength
+			);
+			$correctiveOffset += strlen($replacement) - $replacingStringLength;
+		}
+		return $body;
+	}
+
+
 	private function parse($from): array
 	{
 		$file = $from->getFileName();
@@ -235,7 +277,7 @@ private function parse($from): array
 		$stmts = $parser->parse($code);
 
 		$traverser = new PhpParser\NodeTraverser;
-		$traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver);
+		$traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver(null, ['replaceNodes' => false]));
 		$stmts = $traverser->traverse($stmts);
 
 		return [$code, $stmts];

tests/PhpGenerator/GlobalFunction.phpt

@@ -11,7 +11,7 @@ require __DIR__ . '/../bootstrap.php';
 /** global */
 function func(stdClass $a, $b = null)
 {
-	echo 'hello';
+	echo sprintf('hello, %s', 'world');
 	return 1;
 }
 
@@ -28,13 +28,15 @@ function func(stdClass $a, $b = null)
 
 
 $function = GlobalFunction::withBodyFrom('func');
-same(
-'/**
+same(<<<'XX'
+/**
  * global
  */
 function func(stdClass $a, $b = null)
 {
-	echo \'hello\';
+	echo \sprintf('hello, %s', 'world');
 	return 1;
 }
-', (string) $function);
+
+XX
+, (string) $function);

tests/PhpGenerator/expected/ClassType.from.bodies.expect

@@ -27,13 +27,13 @@ abstract class Class7
 
 	public function long()
 	{
-		if ($member instanceof Method) {
+		if ($member instanceof \Abc\Method) {
 			$s = [1, 2, 3];
 		}
 		/*
 		$this->methods[$member->getName()] = $member;
 		*/
-		throw new Nette\InvalidArgumentException('Argument must be Method|Property|Constant.');
+		throw new \Nette\InvalidArgumentException('Argument must be Method|Property|Constant.');
 	}
 
 
@@ -56,8 +56,8 @@ abstract class Class7
 		/** multi
 		line
 		comment */
-
-		if ($member instanceof Method) {
+		// Alias Method will not be resolved in comment
+		if ($member instanceof \Abc\Method) {
 			$s1 = '
 a
 	b
@@ -87,6 +87,6 @@ a
 		c
 			<?php
 		}
-		throw new Nette\InvalidArgumentException();
+		throw new \Nette\InvalidArgumentException();
 	}
 }

tests/PhpGenerator/fixtures/class-body.phpf

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Abc;
 
+use Nette;
+
 abstract class Class7
 {
 	abstract function abstractFun();
@@ -51,7 +53,7 @@ abstract class Class7
 		/** multi
 		line
 		comment */
-
+		// Alias Method will not be resolved in comment
 		if ($member instanceof Method) {
 			$s1 = '
 a