From 2c3c897ecfe1c4a6657446bbc48bffcbcb580aff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Sep 2023 10:06:56 +0200 Subject: build out of sources tree add patch for test suite with PHP 8.3 from https://github.com/TysonAndre/pecl-teds/pull/204 --- teds-php83.patch | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 teds-php83.patch (limited to 'teds-php83.patch') diff --git a/teds-php83.patch b/teds-php83.patch new file mode 100644 index 0000000..41d2662 --- /dev/null +++ b/teds-php83.patch @@ -0,0 +1,112 @@ +From 590af3d5af3a26b9a0159eac95f19028cfe4c45e Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 4 Sep 2023 09:59:13 +0200 +Subject: [PATCH] relax test expectations for 8.3 + +--- + tests/Map/toArray.phpt | 8 ++++---- + tests/iterable/all_array.phpt | 6 +++--- + tests/iterable/any_array.phpt | 6 +++--- + tests/iterable/none_array.phpt | 4 ++-- + 4 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tests/Map/toArray.phpt b/tests/Map/toArray.phpt +index 11bce83..f0e43f1 100644 +--- a/tests/Map/toArray.phpt ++++ b/tests/Map/toArray.phpt +@@ -26,7 +26,7 @@ foreach ([ + test_to_array($class); + } + ?> +---EXPECT-- ++--EXPECTF-- + Test Teds\StrictSortedVectorMap + array(2) { + ["def"]=> +@@ -35,7 +35,7 @@ array(2) { + ["v_abc"]=> + string(3) "v_x" + } +-Caught: Illegal offset type ++Caught: %s offset %s + Test Teds\StrictTreeMap + array(2) { + ["def"]=> +@@ -44,7 +44,7 @@ array(2) { + ["v_abc"]=> + string(3) "v_x" + } +-Caught: Illegal offset type ++Caught: %s offset %s + Test Teds\StrictHashMap + array(2) { + ["v_abc"]=> +@@ -53,4 +53,4 @@ array(2) { + object(stdClass)#2 (0) { + } + } +-Caught: Illegal offset type +\ No newline at end of file ++Caught: %s offset %s +diff --git a/tests/iterable/all_array.phpt b/tests/iterable/all_array.phpt +index 3ef30e1..8d3df7b 100644 +--- a/tests/iterable/all_array.phpt ++++ b/tests/iterable/all_array.phpt +@@ -51,9 +51,9 @@ echo "\nDone"; + --EXPECTF-- + *** Testing not enough or wrong arguments *** + Caught ArgumentCountError: Teds\all() expects at least 1 argument, 0 given +-Caught TypeError: Teds\all(): Argument #1 ($iterable) must be of type %s, bool given ++Caught TypeError: Teds\all(): Argument #1 ($iterable) must be of type %s, %s given + bool(true) +-Caught TypeError: Teds\all(): Argument #1 ($iterable) must be of type %s, bool given ++Caught TypeError: Teds\all(): Argument #1 ($iterable) must be of type %s, %s given + Caught TypeError: Teds\all(): Argument #2 ($callback) must be a valid callback%S, no array or string given + + *** Testing basic functionality *** +@@ -65,4 +65,4 @@ int(1) + *** Testing edge cases *** + bool(true) + +-Done +\ No newline at end of file ++Done +diff --git a/tests/iterable/any_array.phpt b/tests/iterable/any_array.phpt +index 892c50c..09e28aa 100644 +--- a/tests/iterable/any_array.phpt ++++ b/tests/iterable/any_array.phpt +@@ -60,9 +60,9 @@ echo "\nDone"; + --EXPECTF-- + *** Testing not enough or wrong arguments *** + Caught ArgumentCountError: Teds\any() expects at least 1 argument, 0 given +-Caught TypeError: Teds\any(): Argument #1 ($iterable) must be of type %s, bool given ++Caught TypeError: Teds\any(): Argument #1 ($iterable) must be of type %s, %s given + bool(false) +-Caught TypeError: Teds\any(): Argument #1 ($iterable) must be of type %s, bool given ++Caught TypeError: Teds\any(): Argument #1 ($iterable) must be of type %s, %s given + Caught TypeError: Teds\any(): Argument #2 ($callback) must be a valid callback%S, no array or string given + + *** Testing basic functionality *** +@@ -78,4 +78,4 @@ Caught ArgumentCountError: Too few arguments to function {closure}(), 1 passed a + bool(false) + bool(true) + +-Done +\ No newline at end of file ++Done +diff --git a/tests/iterable/none_array.phpt b/tests/iterable/none_array.phpt +index a9f779d..5e69706 100644 +--- a/tests/iterable/none_array.phpt ++++ b/tests/iterable/none_array.phpt +@@ -60,9 +60,9 @@ echo "\nDone"; + --EXPECTF-- + *** Testing not enough or wrong arguments *** + Caught ArgumentCountError: Teds\none() expects at least 1 argument, 0 given +-Caught TypeError: Teds\none(): Argument #1 ($iterable) must be of type %s, bool given ++Caught TypeError: Teds\none(): Argument #1 ($iterable) must be of type %s, %s given + bool(true) +-Caught TypeError: Teds\none(): Argument #1 ($iterable) must be of type %s, bool given ++Caught TypeError: Teds\none(): Argument #1 ($iterable) must be of type %s, %s given + Caught TypeError: Teds\none(): Argument #2 ($callback) must be a valid callback%S, no array or string given + + *** Testing basic functionality *** -- cgit