used constants

Author: dg

src/PhpGenerator/ClassType.php

@@ -41,7 +41,7 @@ final class ClassType
 	private $name;
 
 	/** @var string  class|interface|trait */
-	private $type = 'class';
+	private $type = self::TYPE_CLASS;
 
 	/** @var bool */
 	private $final = false;
@@ -158,7 +158,7 @@ public function getName(): ?string
 	 */
 	public function setType(string $type): self
 	{
-		if (!in_array($type, ['class', 'interface', 'trait'], true)) {
+		if (!in_array($type, [self::TYPE_CLASS, self::TYPE_INTERFACE, self::TYPE_TRAIT], true)) {
 			throw new Nette\InvalidArgumentException('Argument must be class|interface|trait.');
 		}
 		$this->type = $type;
@@ -425,10 +425,10 @@ public function getMethod(string $name): Method
 	public function addMethod(string $name): Method
 	{
 		$method = (new Method($name))->setNamespace($this->namespace);
-		if ($this->type === 'interface') {
+		if ($this->type === self::TYPE_INTERFACE) {
 			$method->setBody(null);
 		} else {
-			$method->setVisibility('public');
+			$method->setVisibility(self::VISIBILITY_PUBLIC);
 		}
 		return $this->methods[$name] = $method;
 	}

src/PhpGenerator/Factory.php

@@ -24,9 +24,9 @@ public function fromClassReflection(\ReflectionClass $from): ClassType
 		$class = $from->isAnonymous()
 			? new ClassType
 			: new ClassType($from->getShortName(), new PhpNamespace($from->getNamespaceName()));
-		$class->setType($from->isInterface() ? 'interface' : ($from->isTrait() ? 'trait' : 'class'));
-		$class->setFinal($from->isFinal() && $class->getType() === 'class');
-		$class->setAbstract($from->isAbstract() && $class->getType() === 'class');
+		$class->setType($from->isInterface() ? $class::TYPE_INTERFACE : ($from->isTrait() ? $class::TYPE_TRAIT : $class::TYPE_CLASS));
+		$class->setFinal($from->isFinal() && $class->getType() === $class::TYPE_CLASS);
+		$class->setAbstract($from->isAbstract() && $class->getType() === $class::TYPE_CLASS);
 
 		$ifaces = $from->getInterfaceNames();
 		foreach ($ifaces as $iface) {
@@ -65,7 +65,10 @@ public function fromMethodReflection(\ReflectionMethod $from): Method
 		$method->setParameters(array_map([$this, 'fromParameterReflection'], $from->getParameters()));
 		$method->setStatic($from->isStatic());
 		$isInterface = $from->getDeclaringClass()->isInterface();
-		$method->setVisibility($from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : ($isInterface ? null : 'public')));
+		$method->setVisibility($from->isPrivate()
+			? ClassType::VISIBILITY_PRIVATE
+			: ($from->isProtected() ? ClassType::VISIBILITY_PROTECTED : ($isInterface ? null : ClassType::VISIBILITY_PUBLIC))
+		);
 		$method->setFinal($from->isFinal());
 		$method->setAbstract($from->isAbstract() && !$isInterface);
 		$method->setBody($from->isAbstract() ? null : '');
@@ -121,7 +124,10 @@ public function fromPropertyReflection(\ReflectionProperty $from): Property
 		$prop = new Property($from->getName());
 		$prop->setValue($from->getDeclaringClass()->getDefaultProperties()[$prop->getName()] ?? null);
 		$prop->setStatic($from->isStatic());
-		$prop->setVisibility($from->isPrivate() ? 'private' : ($from->isProtected() ? 'protected' : 'public'));
+		$prop->setVisibility($from->isPrivate()
+			? ClassType::VISIBILITY_PRIVATE
+			: ($from->isProtected() ? ClassType::VISIBILITY_PROTECTED : ClassType::VISIBILITY_PUBLIC)
+		);
 		$prop->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
 		return $prop;
 	}

src/PhpGenerator/Traits/VisibilityAware.php

@@ -10,6 +10,7 @@
 namespace Nette\PhpGenerator\Traits;
 
 use Nette;
+use Nette\PhpGenerator\ClassType;
 
 
 /**
@@ -27,7 +28,7 @@ trait VisibilityAware
 	 */
 	public function setVisibility(?string $val): self
 	{
-		if (!in_array($val, ['public', 'protected', 'private', null], true)) {
+		if (!in_array($val, [ClassType::VISIBILITY_PUBLIC, ClassType::VISIBILITY_PROTECTED, ClassType::VISIBILITY_PRIVATE, null], true)) {
 			throw new Nette\InvalidArgumentException('Argument must be public|protected|private.');
 		}
 		$this->visibility = $val;