Control: forcemerge -1 1039787
Control: tags -1 patch

Hi,

Le Sun, Jul 21, 2024 at 10:49:49AM +0200, Fab Stz a écrit :
[…]
> This would be fixed by updating to latest upstream, however we have to wait 
> until Debian migrates to a newer phpunit because changes for phpunit10/11 are 
> not backward compatible with phpunit 9.

On top of dropping the current 0001-Revert-to-phpunit-9.patch revert,
please find attached another needed change to make the build work with
PHPUnit 11 as currently available in Debian.

Please note that I also needed to call phpunit with --no-coverage to
make the system build without blocking error.

Cheers,

taffit
From 61fa93f28e46e1e9e415ed2480b425c272d3dd97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taf...@debian.org>
Date: Sun, 13 Oct 2024 14:25:55 +0100
Subject: [PATCH 1/2] Respect parameter name

Bug-Debian: https://bugs.debian.org/1070561
---
 src/InfoTest.php      | 6 +++---
 src/ResultSetTest.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/InfoTest.php b/src/InfoTest.php
index 8dd5b43..6b8eee7 100644
--- a/src/InfoTest.php
+++ b/src/InfoTest.php
@@ -104,10 +104,10 @@ EOF;
     }
 
     #[DataProvider('ByteSequenceMatchProvider')]
-    public function testByteSequenceMatch(string $str, string $expected, ?string $method_expected): void
+    public function testByteSequenceMatch(string $sequence, string $expected, ?string $method_expected): void
     {
-        self::assertSame($expected, Info::fetchBOMSequence($str) ?? '');
-        self::assertSame($method_expected, Info::fetchBOMSequence($str));
+        self::assertSame($expected, Info::fetchBOMSequence($sequence) ?? '');
+        self::assertSame($method_expected, Info::fetchBOMSequence($sequence));
     }
 
     public static function ByteSequenceMatchProvider(): array
diff --git a/src/ResultSetTest.php b/src/ResultSetTest.php
index f90affe..8f12d52 100644
--- a/src/ResultSetTest.php
+++ b/src/ResultSetTest.php
@@ -214,9 +214,9 @@ final class ResultSetTest extends TestCase
     }
 
     #[DataProvider('fetchPairsDataProvider')]
-    public function testFetchPairsIteratorMode(int|string $index, int|string $item, array $expected): void
+    public function testFetchPairsIteratorMode(int|string $key, int|string $value, array $expected): void
     {
-        $iterator = $this->stmt->process($this->csv)->fetchPairs($index, $item);
+        $iterator = $this->stmt->process($this->csv)->fetchPairs($key, $value);
         foreach ($iterator as $key => $value) {
             $res = current($expected);
             self::assertSame($value, $res[$key]);
-- 
2.45.2

Attachment: signature.asc
Description: PGP signature

Reply via email to