aports/testing/php85-pecl-runkit7/fix-estrict.patch
2025-12-30 21:14:13 +00:00

222 lines
8.3 KiB
Diff

diff --git a/tests/bug57658.phpt b/tests/bug57658.phpt
index 3e22898..560c969 100644
--- a/tests/bug57658.phpt
+++ b/tests/bug57658.phpt
@@ -4,7 +4,7 @@ Bug#57658 - runkit_class_adopt fails on method names with capitals
<?php if (!extension_loaded("runkit7") || !function_exists('runkit_class_adopt')) print "skip"; ?>
--FILE--
<?php
-error_reporting(E_ALL & ~E_STRICT);
+error_reporting(E_ALL);
class A { function aB() { print "a";} function aC() { echo "d"; } }
class B { function aB() { print "b";} }
diff --git a/tests/runkit_function_variadic.phpt b/tests/runkit_function_variadic.phpt
index 9b516d2..34a96db 100644
--- a/tests/runkit_function_variadic.phpt
+++ b/tests/runkit_function_variadic.phpt
@@ -43,7 +43,7 @@ function getter() {
}
function main() {
- ini_set('error_reporting', E_ALL | E_STRICT);
+ ini_set('error_reporting', E_ALL);
global $impl;
$impl = new FooImpl();
printf("Before mock: %s\n", var_export(bar('methodName', 0), true));
diff --git a/tests/runkit_function_variadic_strict.phpt b/tests/runkit_function_variadic_strict.phpt
index 819a52f..81ff006 100644
--- a/tests/runkit_function_variadic_strict.phpt
+++ b/tests/runkit_function_variadic_strict.phpt
@@ -39,7 +39,7 @@ function getter() {
}
function main() {
- ini_set('error_reporting', E_ALL | E_STRICT);
+ ini_set('error_reporting', E_ALL);
printf("Before mock: %s\n", var_export(bar('methodName', 0), true));
create_mock('bar', 'bar0000001123', 'string', true);
printf("After mock: %s\n", var_export(bar('methodName', 0), true));
diff --git a/tests/runkit_function_variadic_typed.phpt b/tests/runkit_function_variadic_typed.phpt
index 2c50568..a2d2a61 100644
--- a/tests/runkit_function_variadic_typed.phpt
+++ b/tests/runkit_function_variadic_typed.phpt
@@ -43,7 +43,7 @@ function getter() {
}
function main() {
- ini_set('error_reporting', E_ALL | E_STRICT);
+ ini_set('error_reporting', E_ALL);
global $impl;
$impl = new FooImpl();
printf("Before mock: %s\n", var_export(bar('methodName', 0), true));
diff --git a/tests/runkit_functions_returning_by_reference.phpt b/tests/runkit_functions_returning_by_reference.phpt
index d7930f3..17c6e41 100644
--- a/tests/runkit_functions_returning_by_reference.phpt
+++ b/tests/runkit_functions_returning_by_reference.phpt
@@ -4,7 +4,7 @@ runkit7_function_redefine() & runkit7_function_add() for functions returning a v
<?php if(!extension_loaded("runkit7") || !RUNKIT7_FEATURE_MANIPULATION) print "skip"; ?>
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT) & (~E_NOTICE));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_NOTICE));
$a = 0;
diff --git a/tests/runkit_method_add_alias.phpt b/tests/runkit_method_add_alias.phpt
index 6ec0901..4e11264 100644
--- a/tests/runkit_method_add_alias.phpt
+++ b/tests/runkit_method_add_alias.phpt
@@ -10,7 +10,7 @@ display_errors=on
error_reporting=E_ALL
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
class runkit_class {
}
diff --git a/tests/runkit_method_add_and_doc_comment.phpt b/tests/runkit_method_add_and_doc_comment.phpt
index da30065..6cbb725 100644
--- a/tests/runkit_method_add_and_doc_comment.phpt
+++ b/tests/runkit_method_add_and_doc_comment.phpt
@@ -6,7 +6,7 @@ runkit7_method_add() function and doc_comment
display_errors=on
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
class runkit_class {
}
diff --git a/tests/runkit_method_copy.phpt b/tests/runkit_method_copy.phpt
index f282b8b..de828b8 100644
--- a/tests/runkit_method_copy.phpt
+++ b/tests/runkit_method_copy.phpt
@@ -6,7 +6,7 @@ runkit7_method_copy() function
display_errors=on
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
class runkit_one {
public static function runkit_method($n) {
diff --git a/tests/runkit_method_copy_and_doc_comment.phpt b/tests/runkit_method_copy_and_doc_comment.phpt
index 1f11f5b..9861670 100644
--- a/tests/runkit_method_copy_and_doc_comment.phpt
+++ b/tests/runkit_method_copy_and_doc_comment.phpt
@@ -6,7 +6,7 @@ runkit7_method_copy() function and doc_comment
display_errors=on
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
class runkit_class {
/**
diff --git a/tests/runkit_method_redefine_and_doc_comment.phpt b/tests/runkit_method_redefine_and_doc_comment.phpt
index 85f80d5..f611b89 100644
--- a/tests/runkit_method_redefine_and_doc_comment.phpt
+++ b/tests/runkit_method_redefine_and_doc_comment.phpt
@@ -6,7 +6,7 @@ runkit7_method_redefine() function and doc_comment
display_errors=on
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
class runkit_class {
/**
diff --git a/tests/runkit_method_remove.phpt b/tests/runkit_method_remove.phpt
index 4458874..07e9b83 100644
--- a/tests/runkit_method_remove.phpt
+++ b/tests/runkit_method_remove.phpt
@@ -9,7 +9,7 @@ if (PHP_VERSION_ID >= 80000) { print "skip\n"; }
display_errors=on
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
class runkit_class {
function runkit_method() {
diff --git a/tests/runkit_method_rename.phpt b/tests/runkit_method_rename.phpt
index 36a7410..051b236 100644
--- a/tests/runkit_method_rename.phpt
+++ b/tests/runkit_method_rename.phpt
@@ -9,7 +9,7 @@ if (PHP_VERSION_ID >= 80000) print "skip php >= 8.0";
display_errors=on
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
class runkit_class {
function runkit_original($a) {
diff --git a/tests/runkit_method_variadic.phpt b/tests/runkit_method_variadic.phpt
index 3bd596b..d73370f 100644
--- a/tests/runkit_method_variadic.phpt
+++ b/tests/runkit_method_variadic.phpt
@@ -47,7 +47,7 @@ class foo {
}
function main() {
- ini_set('error_reporting', E_ALL | E_STRICT);
+ ini_set('error_reporting', E_ALL);
global $impl;
$impl = new FooImpl();
printf("Before mock: %s\n", var_export(foo::bar('methodName', 0), true));
diff --git a/tests/runkit_method_variadic_strict.phpt b/tests/runkit_method_variadic_strict.phpt
index 8cdad1c..3e3d50c 100644
--- a/tests/runkit_method_variadic_strict.phpt
+++ b/tests/runkit_method_variadic_strict.phpt
@@ -48,7 +48,7 @@ class foo {
}
function main() {
- ini_set('error_reporting', E_ALL | E_STRICT);
+ ini_set('error_reporting', E_ALL);
global $impl;
$impl = new FooImpl();
printf("Before mock: %s\n", var_export(foo::bar('methodName', 0), true));
diff --git a/tests/runkit_method_variadic_typed.phpt b/tests/runkit_method_variadic_typed.phpt
index d955d02..aa05c6e 100644
--- a/tests/runkit_method_variadic_typed.phpt
+++ b/tests/runkit_method_variadic_typed.phpt
@@ -48,7 +48,7 @@ class foo {
}
function main() {
- ini_set('error_reporting', E_ALL | E_STRICT);
+ ini_set('error_reporting', E_ALL);
global $impl;
$impl = new FooImpl();
printf("Before mock: %s\n", var_export(foo::bar('methodName', 0), true));
diff --git a/tests/runkit_methods_returning_by_reference.phpt b/tests/runkit_methods_returning_by_reference.phpt
index 03dc12e..71b78ef 100644
--- a/tests/runkit_methods_returning_by_reference.phpt
+++ b/tests/runkit_methods_returning_by_reference.phpt
@@ -4,7 +4,7 @@ runkit7_method_redefine() & runkit7_method_add() for methods returning a value b
<?php if(!extension_loaded("runkit7") || !RUNKIT7_FEATURE_MANIPULATION) print "skip"; ?>
--FILE--
<?php
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT) & (~E_NOTICE));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_NOTICE));
class RunkitClass {
var $a = 0;
diff --git a/tests/runkit_superglobals.phpt b/tests/runkit_superglobals.phpt
index b378e68..a39b923 100644
--- a/tests/runkit_superglobals.phpt
+++ b/tests/runkit_superglobals.phpt
@@ -13,7 +13,7 @@ function testme() {
echo "Baz is $baz\n";
}
-ini_set('error_reporting', E_ALL & (~E_DEPRECATED) & (~E_STRICT));
+ini_set('error_reporting', E_ALL & (~E_DEPRECATED));
$foo = 1;
$bar = 2;