Method: body is always string, even for interfaces (BC break)

Author: dg

src/PhpGenerator/ClassType.php

@@ -390,10 +390,6 @@ public function removeTrait(string $name): self
 	public function addMember($member): self
 	{
 		if ($member instanceof Method) {
-			if ($this->isInterface()) {
-				$member->setBody(null);
-			}
-
 			$this->methods[strtolower($member->getName())] = $member;
 
 		} elseif ($member instanceof Property) {
@@ -601,9 +597,7 @@ public function getMethod(string $name): Method
 	public function addMethod(string $name): Method
 	{
 		$method = new Method($name);
-		if ($this->isInterface()) {
-			$method->setBody(null);
-		} else {
+		if (!$this->isInterface()) {
 			$method->setPublic();
 		}
 

src/PhpGenerator/Factory.php

@@ -149,7 +149,6 @@ public function fromMethodReflection(\ReflectionMethod $from): Method
 		$method->setVisibility($isInterface ? null : $this->getVisibility($from));
 		$method->setFinal($from->isFinal());
 		$method->setAbstract($from->isAbstract() && !$isInterface);
-		$method->setBody($from->isAbstract() ? null : '');
 		$method->setReturnReference($from->returnsReference());
 		$method->setVariadic($from->isVariadic());
 		$method->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));

src/PhpGenerator/Method.php

@@ -26,9 +26,6 @@ final class Method
 	use Traits\CommentAware;
 	use Traits\AttributeAware;
 
-	/** @var string|null */
-	private $body = '';
-
 	/** @var bool */
 	private $static = false;
 
@@ -54,22 +51,6 @@ public function __toString(): string
 	}
 
 
-	/** @return static */
-	public function setBody(?string $code, ?array $args = null): self
-	{
-		$this->body = $args === null || $code === null
-			? $code
-			: (new Dumper)->format($code, ...$args);
-		return $this;
-	}
-
-
-	public function getBody(): ?string
-	{
-		return $this->body;
-	}
-
-
 	/** @return static */
 	public function setStatic(bool $state = true): self
 	{

src/PhpGenerator/Printer.php

@@ -112,11 +112,11 @@ public function printArrowFunction(Closure $closure, ?PhpNamespace $namespace =
 	}
 
 
-	public function printMethod(Method $method, ?PhpNamespace $namespace = null): string
+	public function printMethod(Method $method, ?PhpNamespace $namespace = null, bool $isInterface = false): string
 	{
 		$this->namespace = $this->resolveTypes ? $namespace : null;
 		$method->validate();
-		$line = ($method->isAbstract() ? 'abstract ' : '')
+		$line = ($method->isAbstract() && !$isInterface ? 'abstract ' : '')
 			. ($method->isFinal() ? 'final ' : '')
 			. ($method->getVisibility() ? $method->getVisibility() . ' ' : '')
 			. ($method->isStatic() ? 'static ' : '')
@@ -132,7 +132,7 @@ public function printMethod(Method $method, ?PhpNamespace $namespace = null): st
 			. $line
 			. $params
 			. $returnType
-			. ($method->isAbstract() || $method->getBody() === null
+			. ($method->isAbstract() || $isInterface
 				? ";\n"
 				: (strpos($params, "\n") === false ? "\n" : ' ')
 					. "{\n"
@@ -206,7 +206,7 @@ public function printClass(ClassType $class, ?PhpNamespace $namespace = null): s
 
 		$methods = [];
 		foreach ($class->getMethods() as $method) {
-			$methods[] = $this->printMethod($method, $namespace);
+			$methods[] = $this->printMethod($method, $namespace, $class->isInterface());
 		}
 
 		$members = array_filter([

tests/PhpGenerator/ClassType.addMember.phpt

@@ -32,5 +32,3 @@ Assert::same('', $method->getBody());
 $class = (new ClassType('Example'))
 	->setType('interface')
 	->addMember($method = new Nette\PhpGenerator\Method('getHandle'));
-
-Assert::null($method->getBody());