ClassLike::from() & fromCode() returns 'static'

Author: dg

src/PhpGenerator/ClassLike.php

@@ -37,27 +37,27 @@ abstract class ClassLike
 	private ?string $name;
 
 
-	public static function from(string|object $class, bool $withBodies = false): self
+	public static function from(string|object $class, bool $withBodies = false): static
 	{
 		$instance = (new Factory)
 			->fromClassReflection(new \ReflectionClass($class), $withBodies);
 
 		if (!$instance instanceof static) {
 			$class = is_object($class) ? $class::class : $class;
-			trigger_error("$class cannot be represented with " . static::class . '. Call ' . $instance::class . '::' . __FUNCTION__ . '() or ' . __METHOD__ . '() instead.', E_USER_WARNING);
+			throw new Nette\InvalidArgumentException("$class cannot be represented with " . static::class . '. Call ' . $instance::class . '::' . __FUNCTION__ . '() or ' . __METHOD__ . '() instead.');
 		}
 
 		return $instance;
 	}
 
 
-	public static function fromCode(string $code): self
+	public static function fromCode(string $code): static
 	{
 		$instance = (new Factory)
 			->fromClassCode($code);
 
 		if (!$instance instanceof static) {
-			trigger_error('Provided code cannot be represented with ' . static::class . '. Call ' . $instance::class . '::' . __FUNCTION__ . '() or ' . __METHOD__ . '() instead.', E_USER_WARNING);
+			throw new Nette\InvalidArgumentException('Provided code cannot be represented with ' . static::class . '. Call ' . $instance::class . '::' . __FUNCTION__ . '() or ' . __METHOD__ . '() instead.');
 		}
 
 		return $instance;

tests/PhpGenerator/ClassLike.typecheck.phpt

@@ -11,26 +11,26 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/fixtures/classes.php';
 
 
-Assert::error(
+Assert::exception(
 	fn() => ClassType::from(Abc\Interface1::class),
-	E_USER_WARNING,
+	Nette\InvalidArgumentException::class,
 	'Abc\Interface1 cannot be represented with Nette\PhpGenerator\ClassType. Call Nette\PhpGenerator\InterfaceType::from() or Nette\PhpGenerator\ClassLike::from() instead.',
 );
 
-Assert::error(
+Assert::exception(
 	fn() => TraitType::from(Abc\Class1::class),
-	E_USER_WARNING,
+	Nette\InvalidArgumentException::class,
 	'Abc\Class1 cannot be represented with Nette\PhpGenerator\TraitType. Call Nette\PhpGenerator\ClassType::from() or Nette\PhpGenerator\ClassLike::from() instead.',
 );
 
-Assert::error(
+Assert::exception(
 	fn() => ClassType::fromCode('<?php interface I {}'),
-	E_USER_WARNING,
+	Nette\InvalidArgumentException::class,
 	'Provided code cannot be represented with Nette\PhpGenerator\ClassType. Call Nette\PhpGenerator\InterfaceType::fromCode() or Nette\PhpGenerator\ClassLike::fromCode() instead.',
 );
 
-Assert::error(
+Assert::exception(
 	fn() => InterfaceType::fromCode('<?php trait T {}'),
-	E_USER_WARNING,
+	Nette\InvalidArgumentException::class,
 	'Provided code cannot be represented with Nette\PhpGenerator\InterfaceType. Call Nette\PhpGenerator\TraitType::fromCode() or Nette\PhpGenerator\ClassLike::fromCode() instead.',
 );