Method::from() sets visibility 'public'

Author: dg

src/PhpGenerator/Method.php

@@ -80,10 +80,11 @@ public static function from($from)
 			$method->parameters[$param->getName()] = Parameter::from($param);
 		}
 		if ($from instanceof \ReflectionMethod) {
+			$isInterface = $from->getDeclaringClass()->isInterface();
 			$method->static = $from->isStatic();
-			$method->visibility = $from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : NULL);
+			$method->visibility = $from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : ($isInterface ? NULL : 'public'));
 			$method->final = $from->isFinal();
-			$method->abstract = $from->isAbstract() && !$from->getDeclaringClass()->isInterface();
+			$method->abstract = $from->isAbstract() && !$isInterface;
 			$method->body = $from->isAbstract() ? FALSE : '';
 		}
 		$method->returnReference = $from->returnsReference();

tests/PhpGenerator/ClassType.from.expect

@@ -19,7 +19,7 @@ abstract class Class1 implements Interface1
 	/**
 	 * @return Class1
 	 */
-	function func1()
+	public function func1()
 	{
 	}
 
@@ -53,7 +53,7 @@ class Class2 extends Class1 implements Interface2
 	}
 
 
-	final function func2()
+	final public function func2()
 	{
 	}
 

tests/PhpGenerator/ClassType.from.php7.expect

@@ -5,7 +5,7 @@ class anonymous
 	private $b;
 
 
-	function a()
+	public function a()
 	{
 	}
 
@@ -19,7 +19,7 @@ class anonymous
 class anonymous extends Class1
 {
 
-	function a()
+	public function a()
 	{
 	}
 

tests/PhpGenerator/ClassType.from.php71.expect

@@ -1,17 +1,17 @@
 class ClassA
 {
 
-	function func1(A $a, ?B $b, C $c = NULL, D $d = NULL, E $e, ?int $i = 1, ?array $arr = [])
+	public function func1(A $a, ?B $b, C $c = NULL, D $d = NULL, E $e, ?int $i = 1, ?array $arr = [])
 	{
 	}
 
 
-	function func2(): ?stdClass
+	public function func2(): ?stdClass
 	{
 	}
 
 
-	function func3(): void
+	public function func3(): void
 	{
 	}
 

tests/PhpGenerator/ClassType.from.trait.expect

@@ -4,7 +4,7 @@
 trait Trait1
 {
 
-	function func1()
+	public function func1()
 	{
 	}
 
@@ -22,7 +22,7 @@ trait Trait2
 abstract class Class1
 {
 
-	function func1()
+	public function func1()
 	{
 	}
 

tests/PhpGenerator/ClassType.inheritance.expect

@@ -7,7 +7,7 @@ class B extends A
 	private $f;
 
 
-	function bar()
+	public function bar()
 	{
 	}