Correct lineno of compile-time variance LSP error

Author: nikic

Zend/tests/bug62358.phpt

@@ -23,4 +23,4 @@ class B extends A {
 }
 ?>
 --EXPECTF--
-Fatal error: Declaration of B::foo($var) must be compatible with A::foo() in %sbug62358.php on line 17
+Fatal error: Declaration of B::foo($var) must be compatible with A::foo() in %sbug62358.php on line 18

Zend/tests/bug64988.phpt

@@ -26,5 +26,5 @@ $o = new Smooth1();
 echo "okey";
 ?>
 --EXPECTF--
-Warning: Declaration of Smooth1::insert(array $data) should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
+Warning: Declaration of Smooth1::insert(array $data) should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 17
 okey

Zend/tests/bug71428.1.phpt

@@ -9,4 +9,4 @@ class B extends A {
     public function m(array $a = []) {}
 }
 --EXPECTF--
-Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(?array $a = NULL) in %sbug71428.1.php on line 7
+Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(?array $a = NULL) in %sbug71428.1.php on line 6

Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt

@@ -11,4 +11,4 @@ class Two extends One {
     public function a() {}
 }
 --EXPECTF--
-Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 9
+Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 8

Zend/tests/return_types/031.phpt

@@ -11,4 +11,4 @@ class B extends A {
 ?>
 DONE
 --EXPECTF--
-Fatal error: Declaration of B::foo(): ?int must be compatible with A::foo(): int in %s031.php on line 7
+Fatal error: Declaration of B::foo(): ?int must be compatible with A::foo(): int in %s031.php on line 6

Zend/tests/return_types/rfc004.phpt

@@ -16,4 +16,4 @@ class UserGateway_MySql implements UserGateway {
     }
 }
 --EXPECTF--
-Fatal error: Declaration of UserGateway_MySql::find($id) must be compatible with UserGateway::find($id): User in %s on line 9
+Fatal error: Declaration of UserGateway_MySql::find($id) must be compatible with UserGateway::find($id): User in %s on line 11

Zend/tests/type_declarations/variance/parent_in_class.phpt

@@ -40,6 +40,6 @@ class B4 extends A4 {
 
 ?>
 --EXPECTF--
-Warning: Declaration of B4::method(A4 $x) should be compatible with A4::method(P4 $x) in %s on line 36
+Warning: Declaration of B4::method(A4 $x) should be compatible with A4::method(P4 $x) in %s on line 35
 
 Warning: Declaration of B::method(A $x) should be compatible with A::method(parent $x) in %s on line 8

Zend/zend_inheritance.c

@@ -717,7 +717,10 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
 					error_level = E_WARNING;
 					error_verb = "should";
 				}
-				zend_error(error_level, "Declaration of %s %s be compatible with %s", ZSTR_VAL(child_prototype), error_verb, ZSTR_VAL(method_prototype));
+				zend_error_at(error_level, NULL,
+					child->type == ZEND_USER_FUNCTION ? child->op_array.line_start : 0,
+					"Declaration of %s %s be compatible with %s",
+					ZSTR_VAL(child_prototype), error_verb, ZSTR_VAL(method_prototype));
 				zend_string_efree(child_prototype);
 				zend_string_efree(method_prototype);
 			}