Fix lineno for more inheritance errors

And also include explicit linenos in tests.

12 files changed, 12 insertions, 12 deletions

diff --git a/tests/classes/clone_005.phpt b/tests/classes/clone_005.phpt
index bfe4d66d6f..f759221480 100644
--- a/tests/classes/clone_005.phpt
+++ b/tests/classes/clone_005.phpt
@@ -16,4 +16,4 @@ class test extends base {
 
 ?>
 --EXPECTF--
-Fatal error: Cannot override final method base::__clone() in %sclone_005.php on line %d
+Fatal error: Cannot override final method base::__clone() in %sclone_005.php on line 11
diff --git a/tests/classes/final_ctor3.phpt b/tests/classes/final_ctor3.phpt
index b34996c979..b0156ef294 100644
--- a/tests/classes/final_ctor3.phpt
+++ b/tests/classes/final_ctor3.phpt
@@ -12,4 +12,4 @@ Ensure implicit final inherited old-style constructor cannot be overridden.
 --EXPECTF--
 Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; A has a deprecated constructor in %s on line %d
 
-Fatal error: Cannot override final method A::A() in %s on line %d
+Fatal error: Cannot override final method A::A() in %s on line 6
diff --git a/tests/classes/final_redeclare.phpt b/tests/classes/final_redeclare.phpt
index bdcbf3c86c..d3d53c5dc7 100644
--- a/tests/classes/final_redeclare.phpt
+++ b/tests/classes/final_redeclare.phpt
@@ -20,4 +20,4 @@ class fail extends pass {
 echo "Done\n"; // Shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Cannot override final method pass::show() in %s on line %d
+Fatal error: Cannot override final method pass::show() in %s on line 12
diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt
index 70740d2336..8dead36856 100644
--- a/tests/classes/static_mix_1.phpt
+++ b/tests/classes/static_mix_1.phpt
@@ -21,4 +21,4 @@ fail::show();
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d
+Fatal error: Cannot make static method pass::show() non static in class fail in %s on line 10
diff --git a/tests/classes/static_mix_2.phpt b/tests/classes/static_mix_2.phpt
index ec657c0d5e..bbf6f9c1dd 100644
--- a/tests/classes/static_mix_2.phpt
+++ b/tests/classes/static_mix_2.phpt
@@ -22,4 +22,4 @@ fail::show();
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Cannot make non static method pass::show() static in class fail in %s on line %d
+Fatal error: Cannot make non static method pass::show() static in class fail in %s on line 10
diff --git a/tests/classes/visibility_000a.phpt b/tests/classes/visibility_000a.phpt
index 0dd86aa182..00e918ad30 100644
--- a/tests/classes/visibility_000a.phpt
+++ b/tests/classes/visibility_000a.phpt
@@ -28,4 +28,4 @@ class fail extends same {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Access level to fail::f0() must be public (as in class same) in %s on line %d
+Fatal error: Access level to fail::f0() must be public (as in class same) in %s on line 22
diff --git a/tests/classes/visibility_000b.phpt b/tests/classes/visibility_000b.phpt
index f6ac466345..aeb3078b72 100644
--- a/tests/classes/visibility_000b.phpt
+++ b/tests/classes/visibility_000b.phpt
@@ -28,4 +28,4 @@ class fail extends same {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Access level to fail::f0() must be public (as in class same) in %s on line %d
+Fatal error: Access level to fail::f0() must be public (as in class same) in %s on line 22
diff --git a/tests/classes/visibility_001a.phpt b/tests/classes/visibility_001a.phpt
index d749b5266a..50baf64d67 100644
--- a/tests/classes/visibility_001a.phpt
+++ b/tests/classes/visibility_001a.phpt
@@ -28,4 +28,4 @@ class fail extends same {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Access level to fail::f1() must be public (as in class same) in %s on line %d
+Fatal error: Access level to fail::f1() must be public (as in class same) in %s on line 22
diff --git a/tests/classes/visibility_001b.phpt b/tests/classes/visibility_001b.phpt
index 27c39cf430..626b5303f8 100644
--- a/tests/classes/visibility_001b.phpt
+++ b/tests/classes/visibility_001b.phpt
@@ -28,4 +28,4 @@ class fail extends same {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Access level to fail::f1() must be public (as in class same) in %s on line %d
+Fatal error: Access level to fail::f1() must be public (as in class same) in %s on line 22
diff --git a/tests/classes/visibility_002a.phpt b/tests/classes/visibility_002a.phpt
index ea86412cea..2fd402070d 100644
--- a/tests/classes/visibility_002a.phpt
+++ b/tests/classes/visibility_002a.phpt
@@ -28,4 +28,4 @@ class fail extends same {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Access level to fail::f2() must be public (as in class same) in %s on line %d
+Fatal error: Access level to fail::f2() must be public (as in class same) in %s on line 22
diff --git a/tests/classes/visibility_002b.phpt b/tests/classes/visibility_002b.phpt
index 8116a3239b..a8b1c5e79e 100644
--- a/tests/classes/visibility_002b.phpt
+++ b/tests/classes/visibility_002b.phpt
@@ -28,4 +28,4 @@ class fail extends same {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Access level to fail::f2() must be public (as in class same) in %s on line %d
+Fatal error: Access level to fail::f2() must be public (as in class same) in %s on line 22
diff --git a/tests/classes/visibility_003b.phpt b/tests/classes/visibility_003b.phpt
index 9b45aa3487..474e0df235 100644
--- a/tests/classes/visibility_003b.phpt
+++ b/tests/classes/visibility_003b.phpt
@@ -28,4 +28,4 @@ class fail extends same {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Access level to fail::f3() must be protected (as in class same) or weaker in %s on line %d
+Fatal error: Access level to fail::f3() must be protected (as in class same) or weaker in %s on line 22