diff --git a/composer.json b/composer.json
index d31bac1381..e5f77ae753 100644
--- a/composer.json
+++ b/composer.json
@@ -82,14 +82,23 @@
 			"composer/ca-bundle": [
 				"patches/cloudflare-ca.patch"
 			],
+			"hoa/exception": [
+				"patches/Idle.patch"
+			],
+			"hoa/file": [
+				"patches/File.patch",
+				"patches/Read.patch"
+			],
 			"hoa/iterator": [
 				"patches/Buffer.patch",
 				"patches/Lookahead.patch"
 			],
 			"hoa/compiler": [
 				"patches/HoaException.patch",
+				"patches/Invocation.patch",
 				"patches/Rule.patch",
-				"patches/Lexer.patch"
+				"patches/Lexer.patch",
+				"patches/TreeNode.patch"
 			],
 			"hoa/consistency": [
 				"patches/Consistency.patch"
diff --git a/composer.lock b/composer.lock
index 31c6ca2800..b50891bf2c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bd2a93888cc6505be9390abef749c447",
+    "content-hash": "758196456ce51136032914c3ba937aff",
     "packages": [
         {
             "name": "clue/ndjson-react",
diff --git a/patches/File.patch b/patches/File.patch
new file mode 100644
index 0000000000..0732eb0e55
--- /dev/null
+++ b/patches/File.patch
@@ -0,0 +1,11 @@
+--- File.php	2017-07-11 09:42:15
++++ File.php	2024-08-26 23:13:27
+@@ -192,7 +192,7 @@
+      * @throws  \Hoa\File\Exception\FileDoesNotExist
+      * @throws  \Hoa\File\Exception
+      */
+-    protected function &_open($streamName, Stream\Context $context = null)
++    protected function &_open($streamName, ?Stream\Context $context = null)
+     {
+         if (substr($streamName, 0, 4) == 'file' &&
+             false === is_dir(dirname($streamName))) {
diff --git a/patches/Idle.patch b/patches/Idle.patch
new file mode 100644
index 0000000000..6f6f0dbe29
--- /dev/null
+++ b/patches/Idle.patch
@@ -0,0 +1,11 @@
+--- Idle.php	2017-01-16 08:53:27
++++ Idle.php	2024-08-26 23:18:04
+@@ -100,7 +100,7 @@
+         $message,
+         $code = 0,
+         $arguments = [],
+-        \Exception $previous = null
++        ?\Exception $previous = null
+     ) {
+         $this->_tmpArguments = $arguments;
+         parent::__construct($message, $code, $previous);
diff --git a/patches/Invocation.patch b/patches/Invocation.patch
new file mode 100644
index 0000000000..a3e9e10965
--- /dev/null
+++ b/patches/Invocation.patch
@@ -0,0 +1,11 @@
+--- Llk/Rule/Invocation.php	2017-08-08 09:44:07
++++ Llk/Rule/Invocation.php	2024-08-26 23:11:25
+@@ -95,7 +95,7 @@
+     public function __construct(
+         $rule,
+         $data,
+-        array $todo = null,
++        ?array $todo = null,
+         $depth      = -1
+     ) {
+         $this->_rule         = $rule;
diff --git a/patches/Read.patch b/patches/Read.patch
new file mode 100644
index 0000000000..ad9b64c445
--- /dev/null
+++ b/patches/Read.patch
@@ -0,0 +1,11 @@
+--- Read.php	2017-07-11 09:42:15
++++ Read.php	2024-08-26 23:09:54
+@@ -77,7 +77,7 @@
+      * @throws  \Hoa\File\Exception\FileDoesNotExist
+      * @throws  \Hoa\File\Exception
+      */
+-    protected function &_open($streamName, Stream\Context $context = null)
++    protected function &_open($streamName, ?Stream\Context $context = null)
+     {
+         static $createModes = [
+             parent::MODE_READ
diff --git a/patches/Stream.patch b/patches/Stream.patch
index daf6990e1b..8dbb2e108e 100644
--- a/patches/Stream.patch
+++ b/patches/Stream.patch
@@ -1,5 +1,5 @@
---- Stream.php	2017-02-21 17:01:06.000000000 +0100
-+++ Stream.php	2021-04-19 17:10:20.000000000 +0200
+--- Stream.php	2024-08-26 23:05:49
++++ Stream.php	2024-08-26 23:01:08
 @@ -192,7 +192,7 @@
       * @return  array
       * @throws  \Hoa\Stream\Exception
@@ -9,6 +9,15 @@
          $streamName,
          Stream $handler,
          $context = null
+@@ -250,7 +250,7 @@
+      * @return  resource
+      * @throws  \Hoa\Exception\Exception
+      */
+-    abstract protected function &_open($streamName, Context $context = null);
++    abstract protected function &_open($streamName, ?Context $context = null);
+
+     /**
+      * Close the current stream.
 @@ -687,11 +687,6 @@
  Consistency::flexEntity('Hoa\Stream\Stream');
 
diff --git a/patches/TreeNode.patch b/patches/TreeNode.patch
new file mode 100644
index 0000000000..39e7917def
--- /dev/null
+++ b/patches/TreeNode.patch
@@ -0,0 +1,14 @@
+--- Llk/TreeNode.php	2017-08-08 09:44:07
++++ Llk/TreeNode.php	2024-08-26 23:07:29
+@@ -95,9 +95,9 @@
+      */
+     public function __construct(
+         $id,
+-        array $value    = null,
++        ?array $value    = null,
+         array $children = [],
+-        self  $parent   = null
++        ?self  $parent   = null
+     ) {
+         $this->setId($id);
+