Extractor: maintains exact visibility

Author: dg

src/PhpGenerator/Extractor.php

@@ -311,12 +311,7 @@ private function addPropertyToClass(ClassType $class, Node\Stmt\Property $node):
 		foreach ($node->props as $item) {
 			$prop = $class->addProperty($item->name->toString());
 			$prop->setStatic($node->isStatic());
-			if ($node->isPrivate()) {
-				$prop->setPrivate();
-			} elseif ($node->isProtected()) {
-				$prop->setProtected();
-			}
-
+			$prop->setVisibility($this->toVisibility($node->flags));
 			$prop->setType($node->type ? $this->toPhp($node->type) : null);
 			if ($item->default) {
 				$prop->setValue(new Literal($this->getReformattedContents([$item->default], 1)));
@@ -334,12 +329,7 @@ private function addMethodToClass(ClassType $class, Node\Stmt\ClassMethod $node)
 		$method->setAbstract($node->isAbstract());
 		$method->setFinal($node->isFinal());
 		$method->setStatic($node->isStatic());
-		if ($node->isPrivate()) {
-			$method->setPrivate();
-		} elseif ($node->isProtected()) {
-			$method->setProtected();
-		}
-
+		$method->setVisibility($this->toVisibility($node->flags));
 		$this->setupFunction($method, $node);
 	}
 
@@ -349,12 +339,7 @@ private function addConstantToClass(ClassType $class, Node\Stmt\ClassConst $node
 		foreach ($node->consts as $item) {
 			$value = $this->getReformattedContents([$item->value], 1);
 			$const = $class->addConstant($item->name->toString(), new Literal($value));
-			if ($node->isPrivate()) {
-				$const->setPrivate();
-			} elseif ($node->isProtected()) {
-				$const->setProtected();
-			}
-
+			$const->setVisibility($this->toVisibility($node->flags));
 			$const->setFinal(method_exists($node, 'isFinal') && $node->isFinal());
 			$this->addCommentAndAttributes($const, $node);
 		}
@@ -421,6 +406,19 @@ private function setupFunction($function, Node\FunctionLike $node): void
 	}
 
 
+	private function toVisibility(int $flags): ?string
+	{
+		if ($flags & Node\Stmt\Class_::MODIFIER_PUBLIC) {
+			return ClassType::VisibilityPublic;
+		} elseif ($flags & Node\Stmt\Class_::MODIFIER_PROTECTED) {
+			return ClassType::VisibilityProtected;
+		} elseif ($flags & Node\Stmt\Class_::MODIFIER_PRIVATE) {
+			return ClassType::VisibilityPrivate;
+		}
+		return null;
+	}
+
+
 	private function toPhp($value): string
 	{
 		return $this->printer->prettyPrint([$value]);

tests/PhpGenerator/ClassType.fromCode.phpt

@@ -17,7 +17,7 @@ Assert::match(<<<'XX'
  */
 interface Interface1
 {
-	function func1();
+	public function func1();
 }
 XX
 , (string) $class);

tests/PhpGenerator/Factory.fromClassCode.phpt

@@ -20,7 +20,7 @@ Assert::match(<<<'XX'
  */
 interface Interface1
 {
-	function func1();
+	public function func1();
 }
 XX
 , (string) $class);

tests/PhpGenerator/expected/Extractor.bodies.resolving.expect

@@ -5,32 +5,32 @@ use Abc\a\func;
 
 abstract class Class7
 {
-	abstract public function abstractFun();
+	abstract function abstractFun();
 
 
-	public function emptyFun()
+	function emptyFun()
 	{
 	}
 
 
-	public function emptyFun2()
+	function emptyFun2()
 	{
 	}
 
 
-	public function simple()
+	function simple()
 	{
 		return 1;
 	}
 
 
-	public function simple2()
+	function simple2()
 	{
 		return 1;
 	}
 
 
-	public function long()
+	function long()
 	{
 		if ($member instanceof \Abc\Method) {
 			$s = [1, 2, 3];
@@ -42,7 +42,7 @@ abstract class Class7
 	}
 
 
-	public function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)
+	function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)
 	{
 		echo FOO;
 		echo \FOO;
@@ -62,7 +62,7 @@ abstract class Class7
 	}
 
 
-	public function complex()
+	function complex()
 	{
 		echo 1;
 		// single line comment

tests/PhpGenerator/expected/Extractor.bodies.unresolving.expect

@@ -5,32 +5,32 @@ use Abc\a\func;
 
 abstract class Class7
 {
-	abstract public function abstractFun();
+	abstract function abstractFun();
 
 
-	public function emptyFun()
+	function emptyFun()
 	{
 	}
 
 
-	public function emptyFun2()
+	function emptyFun2()
 	{
 	}
 
 
-	public function simple()
+	function simple()
 	{
 		return 1;
 	}
 
 
-	public function simple2()
+	function simple2()
 	{
 		return 1;
 	}
 
 
-	public function long()
+	function long()
 	{
 		if ($member instanceof \Abc\Method) {
 			$s = [1, 2, 3];
@@ -42,7 +42,7 @@ abstract class Class7
 	}
 
 
-	public function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)
+	function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)
 	{
 		echo FOO;
 		echo \FOO;
@@ -62,7 +62,7 @@ abstract class Class7
 	}
 
 
-	public function complex()
+	function complex()
 	{
 		echo 1;
 		// single line comment

tests/PhpGenerator/expected/Extractor.classes.80.expect

@@ -21,7 +21,7 @@ class Class9
 	/** Commented */
 	#[ExampleAttribute]
 	#[WithArguments(true)]
-	public const FOO = 123;
+	const FOO = 123;
 
 	/** @var resource */
 	#[ExampleAttribute]
@@ -42,7 +42,7 @@ class Class10
 	public string|int $prop;
 
 
-	public function test(mixed $param): string|int
+	function test(mixed $param): string|int
 	{
 	}
 }

tests/PhpGenerator/expected/Extractor.classes.expect

@@ -14,7 +14,7 @@ namespace Abc;
  */
 interface Interface1
 {
-	function func1();
+	public function func1();
 }
 
 interface Interface2
@@ -82,7 +82,7 @@ class Class3
 
 class Class4
 {
-	public const THE_CONSTANT = 9;
+	const THE_CONSTANT = 9;
 }
 
 class Class5

tests/PhpGenerator/expected/Extractor.enum.expect

@@ -31,7 +31,7 @@ enum Enum2: string implements \Countable
 	case GET = 'get';
 	case POST = 'post';
 
-	public function count(): int
+	function count(): int
 	{
 	}
 }