diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1189b342..ebeec0ac 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.0', '8.1', '8.2', '8.3']
+                php: ['8.0', '8.1', '8.2', '8.3', '8.4']
 
             fail-fast: false
 
diff --git a/composer.json b/composer.json
index b04fb925..c7026efc 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": "8.0 - 8.3",
+		"php": "8.0 - 8.4",
 		"nette/utils": "^3.2.9 || ^4.0"
 	},
 	"require-dev": {
diff --git a/readme.md b/readme.md
index 13d74d53..ba102dea 100644
--- a/readme.md
+++ b/readme.md
@@ -26,7 +26,7 @@ Download and install the library using the [Composer](https://doc.nette.org/en/b
 composer require nette/php-generator
 ```
 
-PhpGenerator 4.1 is compatible with PHP 8.0 to 8.3. Documentation can be found on the [library's website](https://doc.nette.org/php-generator).
+PhpGenerator 4.1 is compatible with PHP 8.0 to 8.4. Documentation can be found on the [library's website](https://doc.nette.org/php-generator).
 
  <!---->
 
diff --git a/tests/PhpGenerator/fixtures/bodies.php b/tests/PhpGenerator/fixtures/bodies.php
index 57133f2b..b13e695a 100644
--- a/tests/PhpGenerator/fixtures/bodies.php
+++ b/tests/PhpGenerator/fixtures/bodies.php
@@ -36,7 +36,7 @@ function long()
 		throw new Nette\InvalidArgumentException('Argument must be Method|Property|Constant.');
 	}
 
-	function resolving($a = a\FOO, self $b = null, $c = self::FOO)
+	function resolving($a = a\FOO, ?self $b = null, $c = self::FOO)
 	{
 		// constants
 		echo FOO;
diff --git a/tests/PhpGenerator/fixtures/classes.php b/tests/PhpGenerator/fixtures/classes.php
index 3a58dba7..e3d51960 100644
--- a/tests/PhpGenerator/fixtures/classes.php
+++ b/tests/PhpGenerator/fixtures/classes.php
@@ -72,7 +72,7 @@ private function &func3(/** foo */array $a, Class2 $b, \Abc\Unknown $c, \Xyz\Unk
 	}
 
 
-	private function func4(array $a = [], Class2 $b = null, $c = Unknown::ABC)
+	private function func4(array $a = [], ?Class2 $b = null, $c = Unknown::ABC)
 	{
 	}
 
@@ -97,7 +97,7 @@ class Class4
 /** */
 class Class5
 {
-	public function func1(\A $a, ?\B $b, ?\C $c = null, \D $d = null, ?int $i = 1, ?array $arr = [])
+	public function func1(\A $a, ?\B $b, ?\C $c = null, ?\D $d = null, ?int $i = 1, ?array $arr = [])
 	{
 	}