From 48e36085ea07d3be0a2c31edf27a41a0b8c6b1cc Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 22 Oct 2025 21:55:02 +0200
Subject: [PATCH 1/2] [ci skip] Add myself to tidy extension maintainers

I've been looking after this de-facto, and can review PRs.
This doesn't add much extra workload anyway.
---
 .github/CODEOWNERS | 1 +
 EXTENSIONS         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8f8273e0ef5a..456770878fa2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -52,6 +52,7 @@
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
+/ext/tidy @nielsdos
 /ext/xml @nielsdos
 /ext/xmlreader @nielsdos
 /ext/xmlwriter @nielsdos
diff --git a/EXTENSIONS b/EXTENSIONS
index 7f23894e17e8..e13d0708292a 100644
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@ -510,6 +510,7 @@ EXTENSION:           tidy
 PRIMARY MAINTAINER:  John Coggeshall <john@php.net> (2003 - 2006)
                      Ilia Alshanetsky <iliaa@php.net> (2003 - 2009)
                      Nuno Lopes <nlopess@php.net> (2006 - 2012)
+                     Niels Dossche <nielsdos@php.net> (2025 - 2025)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------

From f8d804b9ee7b7cd3853baf63dd0b91e8e88ac29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Tue, 30 Sep 2025 22:17:55 +0200
Subject: [PATCH 2/2] Add Tim as a maintainer of ext/uri

[skip-ci]

Backported to 8.5 from master (cd9eec79a87b92486c2c594ea07b4c31bf05eb87)
as this needs to be in sync (see file header).
---
 .github/CODEOWNERS | 2 +-
 EXTENSIONS         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6e3c60b16afa..5cb8a4ac7bd4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -53,7 +53,7 @@
 /ext/spl @Girgias
 /ext/standard @bukka
 /ext/tidy @nielsdos
-/ext/uri @kocsismate
+/ext/uri @kocsismate @TimWolla
 /ext/xml @nielsdos
 /ext/xmlreader @nielsdos
 /ext/xmlwriter @nielsdos
diff --git a/EXTENSIONS b/EXTENSIONS
index 512498a27fff..f040afcced6e 100644
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@ -507,6 +507,7 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           uri
 PRIMARY MAINTAINER   Máté Kocsis <kocsismate@php.net> (2025 - 2025)
+                     Tim Düsterhus <timwolla@php.net> (2025 - 2025)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               8.5.0