improved validation error messages

Author: dg

src/PhpGenerator/ClassType.php

@@ -600,14 +600,14 @@ public function hasMethod(string $name): bool
 	/** @throws Nette\InvalidStateException */
 	public function validate(): void
 	{
-		if ($this->abstract && $this->final) {
-			throw new Nette\InvalidStateException('Class cannot be abstract and final.');
-
-		} elseif ($this->isEnum() && ($this->abstract || $this->final || $this->extends || $this->properties)) {
-			throw new Nette\InvalidStateException('Enum cannot be abstract or final or extends class or have properties.');
+		if ($this->isEnum() && ($this->abstract || $this->final || $this->extends || $this->properties)) {
+			throw new Nette\InvalidStateException("Enum '$this->name' cannot be abstract or final or extends class or have properties.");
 
 		} elseif (!$this->name && ($this->abstract || $this->final)) {
 			throw new Nette\InvalidStateException('Anonymous class cannot be abstract or final.');
+
+		} elseif ($this->abstract && $this->final) {
+			throw new Nette\InvalidStateException("Class '$this->name' cannot be abstract and final at the same time.");
 		}
 	}
 

src/PhpGenerator/Method.php

@@ -137,7 +137,7 @@ public function addPromotedParameter(string $name, $defaultValue = null): Promot
 	public function validate(): void
 	{
 		if ($this->abstract && ($this->final || $this->visibility === ClassType::VISIBILITY_PRIVATE)) {
-			throw new Nette\InvalidStateException('Method cannot be abstract and final or private.');
+			throw new Nette\InvalidStateException("Method $this->name() cannot be abstract and final or private at the same time.");
 		}
 	}
 }

tests/PhpGenerator/ClassType.validate.phpt

@@ -13,13 +13,13 @@ Assert::exception(function () {
 	$class = new ClassType('A');
 	$class->setFinal(true)->setAbstract(true);
 	$class->validate();
-}, Nette\InvalidStateException::class, 'Class cannot be abstract and final.');
+}, Nette\InvalidStateException::class, "Class 'A' cannot be abstract and final at the same time.");
 
 Assert::exception(function () {
 	$class = new ClassType('A');
 	$class->setAbstract(true)->setFinal(true);
 	$class->validate();
-}, Nette\InvalidStateException::class, 'Class cannot be abstract and final.');
+}, Nette\InvalidStateException::class, "Class 'A' cannot be abstract and final at the same time.");
 
 Assert::exception(function () {
 	$class = new ClassType;

tests/PhpGenerator/Method.validate.phpt

@@ -13,16 +13,16 @@ Assert::exception(function () {
 	$method = new Method('foo');
 	$method->setFinal(true)->setAbstract(true);
 	$method->validate();
-}, Nette\InvalidStateException::class, 'Method cannot be abstract and final or private.');
+}, Nette\InvalidStateException::class, 'Method foo() cannot be abstract and final or private at the same time.');
 
 Assert::exception(function () {
 	$method = new Method('foo');
 	$method->setAbstract(true)->setFinal(true);
 	$method->validate();
-}, Nette\InvalidStateException::class, 'Method cannot be abstract and final or private.');
+}, Nette\InvalidStateException::class, 'Method foo() cannot be abstract and final or private at the same time.');
 
 Assert::exception(function () {
 	$method = new Method('foo');
 	$method->setAbstract(true)->setVisibility('private');
 	$method->validate();
-}, Nette\InvalidStateException::class, 'Method cannot be abstract and final or private.');
+}, Nette\InvalidStateException::class, 'Method foo() cannot be abstract and final or private at the same time.');

tests/PhpGenerator/Printer.phpt

@@ -87,4 +87,4 @@ Assert::exception(function () {
 	$class = new ClassType;
 	$class->setFinal(true)->setAbstract(true);
 	(new Printer)->printClass($class);
-}, Nette\InvalidStateException::class, 'Class cannot be abstract and final.');
+}, Nette\InvalidStateException::class, 'Anonymous class cannot be abstract or final.');