support for PHP 8.5

Author: dg

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.1', '8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4', '8.5']
 
             fail-fast: false
 

src/Application/UI/ComponentReflection.php

@@ -49,7 +49,7 @@ public function getParameters(): array
 				|| $prop->getAttributes(Attributes\Persistent::class)
 			) {
 				$params[$prop->getName()] = [
-					'def' => $prop->getDefaultValue(),
+					'def' => $prop->hasDefaultValue() ? $prop->getDefaultValue() : null,
 					'type' => ParameterConverter::getType($prop),
 					'since' => $isPresenter ? Reflection::getPropertyDeclaringClass($prop)->getName() : null,
 				];

src/Bridges/ApplicationLatte/SnippetRuntime.php

@@ -56,7 +56,7 @@ public function enter(string $name, string $type): void
 			($this->nestingLevel === 0 && $this->control->isControlInvalid($name))
 			|| ($type === self::TypeDynamic && ($previous = end($this->stack)) && $previous[1] === true)
 		) {
-			ob_start(fn() => null);
+			ob_start(fn() => '');
 			$this->nestingLevel = $type === self::TypeArea ? 0 : 1;
 			$obStarted = true;
 		} elseif ($this->nestingLevel > 0) {

src/Bridges/ApplicationLatte/Template.php

@@ -153,7 +153,7 @@ public function blueprint(?string $parentClass = null): void
 	/**
 	 * Prevents unserialization.
 	 */
-	final public function __wakeup()
+	final public function __unserialize($_)
 	{
 		throw new Nette\NotImplementedException('Object unserialization is not supported by class ' . static::class);
 	}

tests/Bridges.DI/RoutingExtension.cache.phpt

@@ -30,7 +30,7 @@ class MyRouter implements Nette\Routing\Router
 	}
 
 
-	public function __wakeup()
+	public function __unserialize($_)
 	{
 		$this->woken = true;
 	}

tests/Routers/Route.filter.global.phpt

@@ -16,7 +16,7 @@ require __DIR__ . '/Route.php';
 
 
 $route = new Route('<presenter>', [
-	null => [
+	'' => [
 		Route::FilterIn => function (array $arr) {
 			if (substr($arr['presenter'], 0, 3) !== 'Abc') {
 				return null;
@@ -50,7 +50,7 @@ Assert::null(testRouteOut($route, ['presenter' => 'Cde']));
 
 
 $route = new Route('<lang>/<presenter>/<action>', [
-	null => [
+	'' => [
 		Route::FilterIn => function (array $arr) {
 			if ($arr['presenter'] !== 'AbcCs') {
 				return null;

tests/UI/Presenter.link().persistent.phpt

@@ -14,6 +14,13 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
+function sortParams(array $params): array
+{
+	ksort($params);
+	return $params;
+}
+
+
 trait PersistentParam1
 {
 	/** @persistent */
@@ -62,9 +69,13 @@ class TestPresenter extends BasePresenter
 		$this->p2 = 2;
 		$this->t1 = 3;
 		$this->t2 = 4;
-		Assert::same('/index.php?p2=2&p1=1&t1=3&t2=4&action=default&presenter=Test', $this->link('this'));
+		Assert::same(PHP_VERSION_ID < 80500
+			? '/index.php?p2=2&p1=1&t1=3&t2=4&action=default&presenter=Test'
+			: '/index.php?p2=2&t2=4&p1=1&t1=3&action=default&presenter=Test', $this->link('this'));
 		Assert::same('/index.php?p1=1&t1=3&action=default&presenter=Second', $this->link('Second:'));
-		Assert::same('/index.php?p1=1&t1=3&t2=4&action=default&presenter=Third', $this->link('Third:'));
+		Assert::same(PHP_VERSION_ID < 80500
+			? '/index.php?p1=1&t1=3&t2=4&action=default&presenter=Third'
+			: '/index.php?t2=4&p1=1&t1=3&action=default&presenter=Third', $this->link('Third:'));
 
 		$this->p1 = 20;
 		Assert::same('/index.php?t1=3&action=default&presenter=Second', $this->link('Second:'));
@@ -105,32 +116,32 @@ class FourthPresenter extends BasePresenter
 Assert::same([
 	'p1' => ['def' => null, 'type' => 'scalar', 'since' => 'BasePresenter'],
 	't1' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam1'],
-], BasePresenter::getReflection()->getPersistentParams());
+], sortParams(BasePresenter::getReflection()->getPersistentParams()));
 
 Assert::same([
-	'p2' => ['def' => null, 'type' => 'scalar', 'since' => 'TestPresenter'],
 	'p1' => ['def' => null, 'type' => 'scalar', 'since' => 'BasePresenter'],
+	'p2' => ['def' => null, 'type' => 'scalar', 'since' => 'TestPresenter'],
 	't1' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam1'],
 	't2' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam2A'],
-], TestPresenter::getReflection()->getPersistentParams());
+], sortParams(TestPresenter::getReflection()->getPersistentParams()));
 
 Assert::same([
 	'p1' => ['def' => 20, 'type' => 'int', 'since' => 'BasePresenter'],
 	'p3' => ['def' => null, 'type' => 'scalar', 'since' => 'SecondPresenter'],
 	't1' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam1'],
 	't3' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam3'],
-], SecondPresenter::getReflection()->getPersistentParams());
+], sortParams(SecondPresenter::getReflection()->getPersistentParams()));
 
 Assert::same([
 	'p1' => ['def' => null, 'type' => 'scalar', 'since' => 'BasePresenter'],
 	't1' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam1'],
 	't2' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam2A'],
-], ThirdPresenter::getReflection()->getPersistentParams());
+], sortParams(ThirdPresenter::getReflection()->getPersistentParams()));
 
 Assert::same([
 	'p1' => ['def' => null, 'type' => 'scalar', 'since' => 'BasePresenter'],
 	't1' => ['def' => null, 'type' => 'scalar', 'since' => 'PersistentParam1'],
-], FourthPresenter::getReflection()->getPersistentParams());
+], sortParams(FourthPresenter::getReflection()->getPersistentParams()));
 
 $url = new Http\UrlScript('http://localhost/index.php', '/index.php');