removed support for PHP 7

Author: dg

src/Utils/Html.php

@@ -763,15 +763,7 @@ final public function render(int $indent = null): string
 
 	final public function __toString(): string
 	{
-		try {
-			return $this->render();
-		} catch (\Throwable $e) {
-			if (PHP_VERSION_ID >= 70400) {
-				throw $e;
-			}
-			trigger_error('Exception in ' . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
-			return '';
-		}
+		return $this->render();
 	}
 
 

src/Utils/Image.php

@@ -591,15 +591,7 @@ public function toString(int $type = self::JPEG, int $quality = null): string
 	 */
 	public function __toString(): string
 	{
-		try {
-			return $this->toString();
-		} catch (\Throwable $e) {
-			if (func_num_args() || PHP_VERSION_ID >= 70400) {
-				throw $e;
-			}
-			trigger_error('Exception in ' . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
-			return '';
-		}
+		return $this->toString();
 	}
 
 

src/Utils/Reflection.php

@@ -98,7 +98,7 @@ public static function getParameterTypes(\ReflectionParameter $param): array
 	 */
 	public static function getPropertyType(\ReflectionProperty $prop): ?string
 	{
-		return self::getType($prop, PHP_VERSION_ID >= 70400 ? $prop->getType() : null);
+		return self::getType($prop, $prop->getType());
 	}
 
 
@@ -319,9 +319,7 @@ private static function parseUseStatements(string $code, string $forClass = null
 		$namespace = $class = $classLevel = $level = null;
 		$res = $uses = [];
 
-		$nameTokens = PHP_VERSION_ID < 80000
-			? [T_STRING, T_NS_SEPARATOR]
-			: [T_STRING, T_NS_SEPARATOR, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED];
+		$nameTokens = [T_STRING, T_NS_SEPARATOR, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED];
 
 		while ($token = current($tokens)) {
 			next($tokens);

src/Utils/Type.php

@@ -34,9 +34,7 @@ final class Type
 	 */
 	public static function fromReflection($reflection): ?self
 	{
-		if ($reflection instanceof \ReflectionProperty && PHP_VERSION_ID < 70400) {
-			return null;
-		} elseif ($reflection instanceof \ReflectionMethod) {
+		if ($reflection instanceof \ReflectionMethod) {
 			$type = $reflection->getReturnType() ?? (PHP_VERSION_ID >= 80100 ? $reflection->getTentativeReturnType() : null);
 		} else {
 			$type = $reflection instanceof \ReflectionFunctionAbstract

tests/Utils/Reflection.getParameterType.80.phpt

@@ -16,8 +16,18 @@ require __DIR__ . '/../bootstrap.php';
 
 class A
 {
-	public function method(Undeclared $undeclared, B $b, array $array, callable $callable, self $self, $none, ?B $nullable)
-	{
+	public function method(
+		Undeclared $undeclared,
+		B $b,
+		array $array,
+		callable $callable,
+		self $self,
+		$none,
+		?B $nullable,
+		mixed $mixed,
+		array|self $union,
+		array|self|null $nullableUnion,
+	) {
 	}
 }
 
@@ -38,6 +48,20 @@ Assert::same('callable', Reflection::getParameterType($params[3]));
 Assert::same('A', Reflection::getParameterType($params[4]));
 Assert::null(Reflection::getParameterType($params[5]));
 Assert::same('Test\B', Reflection::getParameterType($params[6]));
+Assert::same(['Test\B', 'null'], Reflection::getParameterTypes($params[6]));
+Assert::same('mixed', Reflection::getParameterType($params[7]));
+Assert::same(['mixed'], Reflection::getParameterTypes($params[7]));
+Assert::same(['A', 'array'], Reflection::getParameterTypes($params[8]));
+Assert::same(['A', 'array', 'null'], Reflection::getParameterTypes($params[9]));
+
+Assert::exception(function () use ($params) {
+	Reflection::getParameterType($params[8]);
+}, Nette\InvalidStateException::class, 'The $union in A::method() is not expected to have a union or intersection type.');
+
+Assert::exception(function () use ($params) {
+	Reflection::getParameterType($params[9]);
+}, Nette\InvalidStateException::class, 'The $nullableUnion in A::method() is not expected to have a union or intersection type.');
+
 
 $method = new ReflectionMethod('AExt', 'methodExt');
 $params = $method->getParameters();

tests/Utils/Reflection.getParameterType.phpt

@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\Utils\Reflection;
+use Test\B; // for testing purposes
 use Tester\Assert;
 
 
@@ -15,11 +16,46 @@ require __DIR__ . '/../bootstrap.php';
 
 class A
 {
+	public Undeclared $undeclared;
+	public B $b;
+	public array $array;
+	public self $self;
 	public $none;
+	public ?B $nullable;
+	public mixed $mixed;
+	public array|self $union;
+	public array|self|null $nullableUnion;
+}
+
+class AExt extends A
+{
+	public parent $parent;
 }
 
 $class = new ReflectionClass('A');
 $props = $class->getProperties();
 
-Assert::null(Reflection::getPropertyType($props[0]));
-Assert::same([], Reflection::getPropertyTypes($props[0]));
+Assert::same('Undeclared', Reflection::getPropertyType($props[0]));
+Assert::same('Test\B', Reflection::getPropertyType($props[1]));
+Assert::same('array', Reflection::getPropertyType($props[2]));
+Assert::same('A', Reflection::getPropertyType($props[3]));
+Assert::null(Reflection::getPropertyType($props[4]));
+Assert::same('Test\B', Reflection::getPropertyType($props[5]));
+Assert::same(['Test\B', 'null'], Reflection::getPropertyTypes($props[5]));
+Assert::same('mixed', Reflection::getPropertyType($props[6]));
+Assert::same(['mixed'], Reflection::getPropertyTypes($props[6]));
+Assert::same(['A', 'array'], Reflection::getPropertyTypes($props[7]));
+Assert::same(['A', 'array', 'null'], Reflection::getPropertyTypes($props[8]));
+
+Assert::exception(function () use ($props) {
+	Reflection::getPropertyType($props[7]);
+}, Nette\InvalidStateException::class, 'The A::$union is not expected to have a union or intersection type.');
+
+Assert::exception(function () use ($props) {
+	Reflection::getPropertyType($props[8]);
+}, Nette\InvalidStateException::class, 'The A::$nullableUnion is not expected to have a union or intersection type.');
+
+$class = new ReflectionClass('AExt');
+$props = $class->getProperties();
+
+Assert::same('A', Reflection::getPropertyType($props[0]));