Reclassify E_STRICT notices

Per RFC https://wiki.php.net/rfc/reclassify_e_strict

While reviewing this, found that there are still three E_STRICTs
left in libraries - need to discuss those.

11 files changed, 21 insertions, 16 deletions

diff --git a/tests/classes/abstract_static.phpt b/tests/classes/abstract_static.phpt
index bcebec599f..9b9205af3e 100644
--- a/tests/classes/abstract_static.phpt
+++ b/tests/classes/abstract_static.phpt
@@ -31,6 +31,4 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call to function show()
 
-Strict Standards: Static function fail::func() should not be abstract in %sabstract_static.php(%d) : eval()'d code on line %d
-
 Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::func) in %sabstract_static.php(%d) : eval()'d code on line %d
diff --git a/tests/classes/clone_006.phpt b/tests/classes/clone_006.phpt
index 15f0a5ec52..713670aba8 100644
--- a/tests/classes/clone_006.phpt
+++ b/tests/classes/clone_006.phpt
@@ -34,8 +34,15 @@ echo $clone->name . "\n";
 echo $clone->address . "\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Notice: Accessing static property MyCloneable::$id as non static in %s on line %d
+
+Notice: Accessing static property MyCloneable::$id as non static in %s on line %d
 0
+
+Notice: Accessing static property MyCloneable::$id as non static in %s on line %d
+
+Notice: Accessing static property MyCloneable::$id as non static in %s on line %d
 1
 Hello
 New York
diff --git a/tests/classes/inheritance_003.phpt b/tests/classes/inheritance_003.phpt
index 1f4eafa537..919e03126f 100644
--- a/tests/classes/inheritance_003.phpt
+++ b/tests/classes/inheritance_003.phpt
@@ -17,5 +17,5 @@ class B extends A
 ===DONE===
 --EXPECTF--
 
-Strict Standards: Declaration of B::f() should be compatible with A::f($x) in %sinheritance_003.php on line %d
+Warning: Declaration of B::f() should be compatible with A::f($x) in %sinheritance_003.php on line %d
 ===DONE===
diff --git a/tests/classes/inheritance_004.phpt b/tests/classes/inheritance_004.phpt
index d1f5faf5da..d783f7437a 100644
--- a/tests/classes/inheritance_004.phpt
+++ b/tests/classes/inheritance_004.phpt
@@ -17,5 +17,5 @@ class B extends A
 ===DONE===
 --EXPECTF--
 
-Strict Standards: Declaration of B::f() should be compatible with A::f() in %sinheritance_004.php on line %d
+Warning: Declaration of B::f() should be compatible with A::f() in %sinheritance_004.php on line %d
 ===DONE===
diff --git a/tests/classes/method_override_optional_arg_001.phpt b/tests/classes/method_override_optional_arg_001.phpt
index 333c29d128..bea95756c6 100644
--- a/tests/classes/method_override_optional_arg_001.phpt
+++ b/tests/classes/method_override_optional_arg_001.phpt
@@ -28,6 +28,6 @@ $b->foo(1);
 
 ?>
 --EXPECTF--
-Strict Standards: Declaration of C::foo() should be compatible with A::foo($arg1 = 1) in %s on line %d
+Warning: Declaration of C::foo() should be compatible with A::foo($arg1 = 1) in %s on line %d
 int(1)
 int(3)
diff --git a/tests/classes/method_override_optional_arg_002.phpt b/tests/classes/method_override_optional_arg_002.phpt
index 669a8ca836..c62e3a562e 100644
--- a/tests/classes/method_override_optional_arg_002.phpt
+++ b/tests/classes/method_override_optional_arg_002.phpt
@@ -18,5 +18,5 @@ $b->foo();
 
 ?>
 --EXPECTF--
-Strict Standards: Declaration of B::foo() should be compatible with A::foo($arg = 1) in %s on line %d
+Warning: Declaration of B::foo() should be compatible with A::foo($arg = 1) in %s on line %d
 foo
diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt
index 3303d7c1fd..61c9857b58 100644
--- a/tests/classes/static_properties_003.phpt
+++ b/tests/classes/static_properties_003.phpt
@@ -30,17 +30,17 @@ var_dump(isset($c->y));
 --> Access visible static prop like instance prop:
 bool(false)
 
-Strict Standards: Accessing static property C::$x as non static in %s on line 11
+Notice: Accessing static property C::$x as non static in %s on line 11
 
-Strict Standards: Accessing static property C::$x as non static in %s on line 12
+Notice: Accessing static property C::$x as non static in %s on line 12
 
 Notice: Undefined property: C::$x in %s on line 12
 
-Strict Standards: Accessing static property C::$x as non static in %s on line 13
+Notice: Accessing static property C::$x as non static in %s on line 13
 
-Strict Standards: Accessing static property C::$x as non static in %s on line 15
+Notice: Accessing static property C::$x as non static in %s on line 15
 
-Strict Standards: Accessing static property C::$x as non static in %s on line 16
+Notice: Accessing static property C::$x as non static in %s on line 16
 %unicode|string%(3) "ref"
 %unicode|string%(5) "C::$x"
 
diff --git a/tests/classes/type_hinting_005a.phpt b/tests/classes/type_hinting_005a.phpt
index 5e4c43b8af..5fe1097a5d 100644
--- a/tests/classes/type_hinting_005a.phpt
+++ b/tests/classes/type_hinting_005a.phpt
@@ -12,7 +12,7 @@ Class D2 extends C { function f(SomeClass $a) {} }
 ?>
 ==DONE==
 --EXPECTF--
-Strict Standards: Declaration of D2::f() should be compatible with C::f(array $a) in %s on line 8
+Warning: Declaration of D2::f() should be compatible with C::f(array $a) in %s on line 8
 Compatible hint.
 Class hint, should be array.
 ==DONE==
diff --git a/tests/classes/type_hinting_005b.phpt b/tests/classes/type_hinting_005b.phpt
index f13ab957bb..8a7b4466f7 100644
--- a/tests/classes/type_hinting_005b.phpt
+++ b/tests/classes/type_hinting_005b.phpt
@@ -9,6 +9,6 @@ Class D extends C { function f($a) {} }
 ?>
 ==DONE==
 --EXPECTF--
-Strict Standards: Declaration of D::f() should be compatible with C::f(array $a) in %s on line 5
+Warning: Declaration of D::f() should be compatible with C::f(array $a) in %s on line 5
 No hint, should be array.
 ==DONE==
diff --git a/tests/classes/type_hinting_005c.phpt b/tests/classes/type_hinting_005c.phpt
index 30a114e2a4..3378dcb398 100644
--- a/tests/classes/type_hinting_005c.phpt
+++ b/tests/classes/type_hinting_005c.phpt
@@ -9,6 +9,6 @@ Class D extends C { function f(array $a) {} }
 ?>
 ==DONE==
 --EXPECTF--
-Strict Standards: Declaration of D::f() should be compatible with C::f(SomeClass $a) in %s on line 5
+Warning: Declaration of D::f() should be compatible with C::f(SomeClass $a) in %s on line 5
 Array hint, should be class.
 ==DONE==
diff --git a/tests/classes/type_hinting_005d.phpt b/tests/classes/type_hinting_005d.phpt
index 830054d03d..ab86c68eea 100644
--- a/tests/classes/type_hinting_005d.phpt
+++ b/tests/classes/type_hinting_005d.phpt
@@ -9,6 +9,6 @@ Class D extends C { function f(array $a) {} }
 ?>
 ==DONE==
 --EXPECTF--
-Strict Standards: Declaration of D::f() should be compatible with C::f($a) in %s on line 5
+Warning: Declaration of D::f() should be compatible with C::f($a) in %s on line 5
 Array hint, should be nothing.
 ==DONE==