removed PHP 8.0 stuff

Author: dg

src/PhpGenerator/Dumper.php

@@ -11,7 +11,7 @@
 
 use Nette;
 use function addcslashes, array_keys, array_shift, count, dechex, implode, in_array, is_array, is_int, is_object, is_resource, is_string, ltrim, method_exists, ord, preg_match, preg_replace, preg_replace_callback, preg_split, range, serialize, str_contains, str_pad, str_repeat, str_replace, strlen, strrpos, strtoupper, substr, trim, unserialize, var_export;
-use const PHP_VERSION_ID, PREG_SPLIT_DELIM_CAPTURE, STR_PAD_LEFT;
+use const PREG_SPLIT_DELIM_CAPTURE, STR_PAD_LEFT;
 
 
 /**
@@ -160,9 +160,7 @@ private function dumpObject(object $var, array $parents, int $level, int $column
 		} elseif ($var instanceof \Closure) {
 			$inner = Nette\Utils\Callback::unwrap($var);
 			if (Nette\Utils\Callback::isStatic($inner)) {
-				return PHP_VERSION_ID < 80100
-					? '\Closure::fromCallable(' . $this->dump($inner) . ')'
-					: implode('::', (array) $inner) . '(...)';
+				return implode('::', (array) $inner) . '(...)';
 			}
 
 			throw new Nette\InvalidStateException('Cannot dump object of type Closure.');

src/PhpGenerator/Factory.php

@@ -38,7 +38,7 @@ public function fromClassReflection(
 		}
 
 		$enumIface = null;
-		if (PHP_VERSION_ID >= 80100 && $from->isEnum()) {
+		if ($from->isEnum()) {
 			$class = new EnumType($from->getShortName(), new PhpNamespace($from->getNamespaceName()));
 			$from = new \ReflectionEnum($from->getName());
 			$enumIface = $from->isBacked() ? \BackedEnum::class : \UnitEnum::class;
@@ -214,7 +214,7 @@ public function fromParameterReflection(\ReflectionParameter $from): Parameter
 			$property = $from->getDeclaringClass()->getProperty($from->name);
 			$param = (new PromotedParameter($from->name))
 				->setVisibility($this->getVisibility($property))
-				->setReadOnly(PHP_VERSION_ID >= 80100 && $property->isReadonly())
+				->setReadOnly($property->isReadonly())
 				->setFinal(PHP_VERSION_ID >= 80500 && $property->isFinal() && !$property->isPrivateSet());
 			$this->addHooks($property, $param);
 		} else {
@@ -248,7 +248,7 @@ public function fromConstantReflection(\ReflectionClassConstant $from): Constant
 		$const = new Constant($from->name);
 		$const->setValue($from->getValue());
 		$const->setVisibility($this->getVisibility($from));
-		$const->setFinal(PHP_VERSION_ID >= 80100 && $from->isFinal());
+		$const->setFinal($from->isFinal());
 		$const->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
 		$const->setAttributes($this->getAttributes($from));
 		return $const;
@@ -274,7 +274,7 @@ public function fromPropertyReflection(\ReflectionProperty $from): Property
 		$prop->setVisibility($this->getVisibility($from));
 		$prop->setType((string) $from->getType());
 		$prop->setInitialized($from->hasType() && array_key_exists($prop->getName(), $defaults));
-		$prop->setReadOnly(PHP_VERSION_ID >= 80100 && $from->isReadOnly());
+		$prop->setReadOnly($from->isReadOnly());
 		$prop->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
 		$prop->setAttributes($this->getAttributes($from));
 

tests/PhpGenerator/ClassType.from.81.phpt

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @phpVersion 8.1
- */
-
 declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;

tests/PhpGenerator/Dumper.dump().enum.phpt

@@ -2,7 +2,6 @@
 
 /**
  * Test: Nette\PhpGenerator\Dumper::dump() enum
- * @phpVersion 8.1
  */
 
 declare(strict_types=1);

tests/PhpGenerator/Dumper.dump().phpt

@@ -116,9 +116,7 @@ class Test2 extends Test
 }
 
 Assert::same(
-	PHP_VERSION_ID < 80100
-		? "\\Nette\\PhpGenerator\\Dumper::createObject(\\Test2::class, [\n\t\"\\x00Test2\\x00c\" => 4,\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n])"
-		: "\\Nette\\PhpGenerator\\Dumper::createObject(\\Test2::class, [\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n\t\"\\x00Test2\\x00c\" => 4,\n])",
+	"\\Nette\\PhpGenerator\\Dumper::createObject(\\Test2::class, [\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n\t\"\\x00Test2\\x00c\" => 4,\n])",
 	$dumper->dump(new Test2),
 );
 Assert::equal(new Test2, eval('return ' . $dumper->dump(new Test2) . ';'));
@@ -134,16 +132,12 @@ Assert::exception(function () {
 
 // closures
 Assert::same(
-	PHP_VERSION_ID < 80100
-		? "\\Closure::fromCallable('strlen')"
-		: 'strlen(...)',
+	'strlen(...)',
 	$dumper->dump(Closure::fromCallable('strlen')),
 );
 
 Assert::same(
-	PHP_VERSION_ID < 80100
-		? "\\Closure::fromCallable(['Nette\\PhpGenerator\\ClassLike', 'from'])"
-		: 'Nette\PhpGenerator\ClassLike::from(...)',
+	'Nette\PhpGenerator\ClassLike::from(...)',
 	$dumper->dump(Closure::fromCallable([Nette\PhpGenerator\ClassLike::class, 'from'])),
 );
 

tests/PhpGenerator/EnumType.from.phpt

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @phpVersion 8.1
- */
-
 declare(strict_types=1);
 
 use Nette\PhpGenerator\EnumType;

tests/PhpGenerator/GlobalFunction.from.81.phpt

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @phpVersion 8.1
- */
-
 declare(strict_types=1);
 
 use Nette\PhpGenerator\GlobalFunction;

tests/PhpGenerator/Method.from.81.phpt

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @phpVersion 8.1
- */
-
 declare(strict_types=1);
 
 use Nette\PhpGenerator\Method;