From b7c8096d0f9e7531d2aa44c372791e7882191077 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Thu, 8 Jan 2026 17:33:47 +0100 Subject: [PATCH 1/5] CI: add PHP 8.5 to test matrix (allowed to fail) --- .github/workflows/ci.yml | 3 ++- .github/workflows/test.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff7d42b4..a15ee630 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,8 @@ jobs: ubuntu: strategy: matrix: - version: ['8.1', '8.2', '8.3', '8.4'] + version: ['8.1', '8.2', '8.3', '8.4', '8.5'] + continue-on-error: ${{ matrix.version == '8.5' }} runs-on: ubuntu-latest steps: - name: Checkout PhD diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f04f7f0..c964cbb5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,8 @@ jobs: name: test strategy: matrix: - version: ['8.1', '8.2', '8.3', '8.4'] + version: ['8.1', '8.2', '8.3', '8.4', '8.5'] + continue-on-error: ${{ matrix.version == '8.5' }} runs-on: ubuntu-latest steps: - name: Checkout PhD From b0404b876541e44eb3d3726d06f89ee6827dc413 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Thu, 8 Jan 2026 17:42:06 +0100 Subject: [PATCH 2/5] Fix deprecated null array offset usage in Reader_Partial --- phpdotnet/phd/Reader/Partial.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpdotnet/phd/Reader/Partial.php b/phpdotnet/phd/Reader/Partial.php index 6ff1d631..84b341db 100644 --- a/phpdotnet/phd/Reader/Partial.php +++ b/phpdotnet/phd/Reader/Partial.php @@ -31,7 +31,7 @@ public function read(): bool { static $arraySkip = array(); while($ret = parent::read()) { - $id = $this->getAttributeNs("id", self::XMLNS_XML); + $id = $this->getAttributeNs("id", self::XMLNS_XML) ?? ''; $currentPartial = end($arrayPartial); $currentSkip = end($arraySkip); if (isset($this->partial[$id])) { From 512d7ebef32e028fd70318782af03972f8d5349d Mon Sep 17 00:00:00 2001 From: lacatoire Date: Thu, 8 Jan 2026 17:43:54 +0100 Subject: [PATCH 3/5] Replace deprecated SplObjectStorage::detach() with offsetUnset() --- phpdotnet/phd/TestRender.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpdotnet/phd/TestRender.php b/phpdotnet/phd/TestRender.php index a0f82f21..95cc79e9 100644 --- a/phpdotnet/phd/TestRender.php +++ b/phpdotnet/phd/TestRender.php @@ -17,7 +17,7 @@ public function run() { $this->attach($this->index); $this->reader->open($this->config->xmlFile); $this->execute($this->reader); - $this->detach($this->index); + $this->offsetUnset($this->index); } if ($this->format !== null) { From 7fa28dee0306a4e30c45d25618a588bd574c88ba Mon Sep 17 00:00:00 2001 From: lacatoire Date: Thu, 8 Jan 2026 17:46:28 +0100 Subject: [PATCH 4/5] Replace deprecated SplObjectStorage::detach() with offsetUnset() --- tests/bug_doc-en_GH-3353.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bug_doc-en_GH-3353.phpt b/tests/bug_doc-en_GH-3353.phpt index e2f0b0c3..b32584fb 100644 --- a/tests/bug_doc-en_GH-3353.phpt +++ b/tests/bug_doc-en_GH-3353.phpt @@ -26,7 +26,7 @@ $reader = new Reader($outputHandler); $reader->open($config->xmlFile, null, LIBXML_PARSEHUGE | LIBXML_XINCLUDE); $render->execute($reader); -$render->detach($index); +$render->offsetUnset($index); // Rendering From 66fb7fc0a98486ce9e5f8d78d1840921d9c21712 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 12 Jan 2026 09:29:48 +0100 Subject: [PATCH 5/5] removed the continue-on-error for PHP 8.5. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a15ee630..4025f1cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,6 @@ jobs: strategy: matrix: version: ['8.1', '8.2', '8.3', '8.4', '8.5'] - continue-on-error: ${{ matrix.version == '8.5' }} runs-on: ubuntu-latest steps: - name: Checkout PhD