Extractor: maintains exact visibility

dg · dg · commit e4e32ef41a05 · 2022-03-10T03:24:09.000+01:00
diff --git a/src/PhpGenerator/Extractor.php b/src/PhpGenerator/Extractor.php
@@ -311,12 +311,7 @@ private function addPropertyToClass(ClassLike $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(ClassLike $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(ClassLike $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);
 		}
@@ -423,6 +408,17 @@ private function setupFunction(GlobalFunction|Method $function, Node\FunctionLik
 	}
 
 
+	private function toVisibility(int $flags): ?string
+	{
+		return match (true) {
+			(bool) ($flags & Node\Stmt\Class_::MODIFIER_PUBLIC) => ClassType::VisibilityPublic,
+			(bool) ($flags & Node\Stmt\Class_::MODIFIER_PROTECTED) => ClassType::VisibilityProtected,
+			(bool) ($flags & Node\Stmt\Class_::MODIFIER_PRIVATE) => ClassType::VisibilityPrivate,
+			default => null,
+		};
+	}
+
+
 	private function toPhp(mixed $value): string
 	{
 		return $this->printer->prettyPrint([$value]);
diff --git a/tests/PhpGenerator/ClassType.fromCode.phpt b/tests/PhpGenerator/ClassType.fromCode.phpt
@@ -17,7 +17,7 @@ Assert::match(<<<'XX'
 	 */
 	interface Interface1
 	{
-		function func1();
+		public function func1();
 	}
 	XX, (string) $class);
 
diff --git a/tests/PhpGenerator/Factory.fromClassCode.phpt b/tests/PhpGenerator/Factory.fromClassCode.phpt
@@ -20,6 +20,6 @@ Assert::match(<<<'XX'
 	 */
 	interface Interface1
 	{
-		function func1();
+		public function func1();
 	}
 	XX, (string) $class);
diff --git a/tests/PhpGenerator/expected/Extractor.bodies.expect b/tests/PhpGenerator/expected/Extractor.bodies.expect
@@ -10,32 +10,32 @@ use const BAR;
 
 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 Method) {
 			$s = [1, 2, 3];
@@ -47,7 +47,7 @@ abstract class Class7
 	}
 
 
-	public function resolving($a = a\FOO, self $b = null, $c = self::FOO)
+	function resolving($a = a\FOO, self $b = null, $c = self::FOO)
 	{
 		echo FOO;
 		echo \FOO;
@@ -67,7 +67,7 @@ abstract class Class7
 	}
 
 
-	public function complex()
+	function complex()
 	{
 		echo 1;
 		// single line comment
diff --git a/tests/PhpGenerator/expected/Extractor.bodies.resolving.expect b/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
diff --git a/tests/PhpGenerator/expected/Extractor.bodies.unresolving.expect b/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
diff --git a/tests/PhpGenerator/expected/Extractor.classes.80.expect b/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
 	{
 	}
 }
diff --git a/tests/PhpGenerator/expected/Extractor.classes.expect b/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
diff --git a/tests/PhpGenerator/expected/Extractor.enum.expect b/tests/PhpGenerator/expected/Extractor.enum.expect
@@ -10,8 +10,8 @@ namespace Abc;
 #[\ExampleAttribute]
 enum Enum1
 {
-	public const FOO = 123;
-	public const BAR = self::Clubs;
+	const FOO = 123;
+	const BAR = self::Clubs;
 
 	/** Commented */
 	case Clubs;
@@ -31,14 +31,14 @@ enum Enum2: string implements \Countable
 	case GET = 'get';
 	case POST = 'post';
 
-	public function count(): int
+	function count(): int
 	{
 	}
 }
 
 enum Enum3: int
 {
-	public const FOO = 123;
+	const FOO = 123;
 
 	case A = self::FOO;
 	case B = 20 + 5;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Assert::match(<<<'XX'`
`17`	`17`	`*/`
`18`	`18`	`interface Interface1`
`19`	`19`	`{`
`20`		`- function func1();`
	`20`	`+ public function func1();`
`21`	`21`	`}`
`22`	`22`	`XX, (string) $class);`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ Assert::match(<<<'XX'`
`20`	`20`	`*/`
`21`	`21`	`interface Interface1`
`22`	`22`	`{`
`23`		`- function func1();`
	`23`	`+ public function func1();`
`24`	`24`	`}`
`25`	`25`	`XX, (string) $class);`
Original file line number	Diff line number	Diff line change
`@@ -10,32 +10,32 @@ use const BAR;`
`10`	`10`
`11`	`11`	`abstract class Class7`
`12`	`12`	`{`
`13`		`- abstract public function abstractFun();`
	`13`	`+ abstract function abstractFun();`
`14`	`14`
`15`	`15`
`16`		`- public function emptyFun()`
	`16`	`+ function emptyFun()`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`	`20`
`21`		`- public function emptyFun2()`
	`21`	`+ function emptyFun2()`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`
`25`	`25`
`26`		`- public function simple()`
	`26`	`+ function simple()`
`27`	`27`	`{`
`28`	`28`	`return 1;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`
`32`		`- public function simple2()`
	`32`	`+ function simple2()`
`33`	`33`	`{`
`34`	`34`	`return 1;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`
`38`		`- public function long()`
	`38`	`+ function long()`
`39`	`39`	`{`
`40`	`40`	`if ($member instanceof Method) {`
`41`	`41`	`$s = [1, 2, 3];`
`@@ -47,7 +47,7 @@ abstract class Class7`
`47`	`47`	`}`
`48`	`48`
`49`	`49`
`50`		`- public function resolving($a = a\FOO, self $b = null, $c = self::FOO)`
	`50`	`+ function resolving($a = a\FOO, self $b = null, $c = self::FOO)`
`51`	`51`	`{`
`52`	`52`	`echo FOO;`
`53`	`53`	`echo \FOO;`
`@@ -67,7 +67,7 @@ abstract class Class7`
`67`	`67`	`}`
`68`	`68`
`69`	`69`
`70`		`- public function complex()`
	`70`	`+ function complex()`
`71`	`71`	`{`
`72`	`72`	`echo 1;`
`73`	`73`	`// single line comment`
Original file line number	Diff line number	Diff line change
`@@ -5,32 +5,32 @@ use Abc\a\func;`
`5`	`5`
`6`	`6`	`abstract class Class7`
`7`	`7`	`{`
`8`		`- abstract public function abstractFun();`
	`8`	`+ abstract function abstractFun();`
`9`	`9`
`10`	`10`
`11`		`- public function emptyFun()`
	`11`	`+ function emptyFun()`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`	`15`
`16`		`- public function emptyFun2()`
	`16`	`+ function emptyFun2()`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`	`20`
`21`		`- public function simple()`
	`21`	`+ function simple()`
`22`	`22`	`{`
`23`	`23`	`return 1;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`
`27`		`- public function simple2()`
	`27`	`+ function simple2()`
`28`	`28`	`{`
`29`	`29`	`return 1;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
`33`		`- public function long()`
	`33`	`+ function long()`
`34`	`34`	`{`
`35`	`35`	`if ($member instanceof \Abc\Method) {`
`36`	`36`	`$s = [1, 2, 3];`
`@@ -42,7 +42,7 @@ abstract class Class7`
`42`	`42`	`}`
`43`	`43`
`44`	`44`
`45`		`- public function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)`
	`45`	`+ function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)`
`46`	`46`	`{`
`47`	`47`	`echo FOO;`
`48`	`48`	`echo \FOO;`
`@@ -62,7 +62,7 @@ abstract class Class7`
`62`	`62`	`}`
`63`	`63`
`64`	`64`
`65`		`- public function complex()`
	`65`	`+ function complex()`
`66`	`66`	`{`
`67`	`67`	`echo 1;`
`68`	`68`	`// single line comment`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Class9`
`21`	`21`	`/** Commented */`
`22`	`22`	`#[ExampleAttribute]`
`23`	`23`	`#[WithArguments(true)]`
`24`		`- public const FOO = 123;`
	`24`	`+ const FOO = 123;`
`25`	`25`
`26`	`26`	`/** @var resource */`
`27`	`27`	`#[ExampleAttribute]`
`@@ -42,7 +42,7 @@ class Class10`
`42`	`42`	`public string\|int $prop;`
`43`	`43`
`44`	`44`
`45`		`- public function test(mixed $param): string\|int`
	`45`	`+ function test(mixed $param): string\|int`
`46`	`46`	`{`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace Abc;`
`14`	`14`	`*/`
`15`	`15`	`interface Interface1`
`16`	`16`	`{`
`17`		`- function func1();`
	`17`	`+ public function func1();`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`interface Interface2`
`@@ -82,7 +82,7 @@ class Class3`
`82`	`82`
`83`	`83`	`class Class4`
`84`	`84`	`{`
`85`		`- public const THE_CONSTANT = 9;`
	`85`	`+ const THE_CONSTANT = 9;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`class Class5`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ namespace Abc;`
`10`	`10`	`#[\ExampleAttribute]`
`11`	`11`	`enum Enum1`
`12`	`12`	`{`
`13`		`- public const FOO = 123;`
`14`		`- public const BAR = self::Clubs;`
	`13`	`+ const FOO = 123;`
	`14`	`+ const BAR = self::Clubs;`
`15`	`15`
`16`	`16`	`/** Commented */`
`17`	`17`	`case Clubs;`
`@@ -31,14 +31,14 @@ enum Enum2: string implements \Countable`
`31`	`31`	`case GET = 'get';`
`32`	`32`	`case POST = 'post';`
`33`	`33`
`34`		`- public function count(): int`
	`34`	`+ function count(): int`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`enum Enum3: int`
`40`	`40`	`{`
`41`		`- public const FOO = 123;`
	`41`	`+ const FOO = 123;`
`42`	`42`
`43`	`43`	`case A = self::FOO;`
`44`	`44`	`case B = 20 + 5;`