Merge branch 'PHP-7.4'

nikic · nikic · commit 9b7a78b1c222 · 2019-03-27T12:43:23.000+01:00
diff --git a/Zend/tests/bug62358.phpt b/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
diff --git a/Zend/tests/bug64988.phpt b/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
diff --git a/Zend/tests/bug71428.1.phpt b/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
diff --git a/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt b/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
diff --git a/Zend/tests/return_types/008.phpt b/Zend/tests/return_types/008.phpt
@@ -16,4 +16,4 @@ class qux implements foo {
 $qux = new qux();
 var_dump($qux->bar());
 --EXPECTF--
-Fatal error: Declaration of qux::bar(): qux must be compatible with foo::bar(): foo in %s008.php on line 7
+Fatal error: Declaration of qux::bar(): qux must be compatible with foo::bar(): foo in %s008.php on line 8
diff --git a/Zend/tests/return_types/031.phpt b/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
diff --git a/Zend/tests/return_types/generators003.phpt b/Zend/tests/return_types/generators003.phpt
@@ -17,4 +17,4 @@ class SomeCollection implements Collection {
 $some = new SomeCollection();
 var_dump($some->getIterator());
 --EXPECTF--
-Fatal error: Declaration of SomeCollection::getIterator(): Generator must be compatible with Collection::getIterator(): Iterator in %sgenerators003.php on line 6
+Fatal error: Declaration of SomeCollection::getIterator(): Generator must be compatible with Collection::getIterator(): Iterator in %sgenerators003.php on line 7
diff --git a/Zend/tests/return_types/inheritance005.phpt b/Zend/tests/return_types/inheritance005.phpt
@@ -14,4 +14,4 @@ class Bar extends Foo {
     }
 }
 --EXPECTF--
-Fatal error: Declaration of Bar::test(): Bar must be compatible with Foo::test(): Foo in %sinheritance005.php on line 12
+Fatal error: Declaration of Bar::test(): Bar must be compatible with Foo::test(): Foo in %sinheritance005.php on line 9
diff --git a/Zend/tests/return_types/inheritance006.phpt b/Zend/tests/return_types/inheritance006.phpt
@@ -18,4 +18,4 @@ class Bar extends Foo {
     }
 }
 --EXPECTF--
-Fatal error: Declaration of Bar::test(): B must be compatible with Foo::test(): A in %sinheritance006.php on line 14
+Fatal error: Declaration of Bar::test(): B must be compatible with Foo::test(): A in %sinheritance006.php on line 11
diff --git a/Zend/tests/return_types/inheritance007.phpt b/Zend/tests/return_types/inheritance007.phpt
@@ -16,4 +16,4 @@ class Bar extends Foo {
     }
 }
 --EXPECTF--
-Fatal error: Declaration of Bar::test(): ArrayObject must be compatible with Foo::test(): Traversable in %sinheritance007.php on line 12
+Fatal error: Declaration of Bar::test(): ArrayObject must be compatible with Foo::test(): Traversable in %sinheritance007.php on line 9
diff --git a/Zend/tests/return_types/rfc004.phpt b/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
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -639,7 +639,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->common.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);
 			}
diff --git a/ext/opcache/tests/preload_006.phpt b/ext/opcache/tests/preload_006.phpt
@@ -12,4 +12,4 @@ opcache.preload={PWD}/preload_inheritance_error_ind.inc
 echo "Foobar\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of B::foo($bar) must be compatible with A::foo() in %spreload_inheritance_error.inc on line 7
+Fatal error: Declaration of B::foo($bar) must be compatible with A::foo() in %spreload_inheritance_error.inc on line 8

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ class B extends A {`
`23`	`23`	`}`
`24`	`24`	`?>`
`25`	`25`	`--EXPECTF--`
`26`		`-Fatal error: Declaration of B::foo($var) must be compatible with A::foo() in %sbug62358.php on line 17`
	`26`	`+Fatal error: Declaration of B::foo($var) must be compatible with A::foo() in %sbug62358.php on line 18`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@ class B extends A {`
`9`	`9`	`public function m(array $a = []) {}`
`10`	`10`	`}`
`11`	`11`	`--EXPECTF--`
`12`		`-Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(?array $a = NULL) in %sbug71428.1.php on line 7`
	`12`	`+Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(?array $a = NULL) in %sbug71428.1.php on line 6`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ class Two extends One {`
`11`	`11`	`public function a() {}`
`12`	`12`	`}`
`13`	`13`	`--EXPECTF--`
`14`		`-Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 9`
	`14`	`+Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 8`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ class Bar extends Foo {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`--EXPECTF--`
`17`		`-Fatal error: Declaration of Bar::test(): Bar must be compatible with Foo::test(): Foo in %sinheritance005.php on line 12`
	`17`	`+Fatal error: Declaration of Bar::test(): Bar must be compatible with Foo::test(): Foo in %sinheritance005.php on line 9`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@ class Bar extends Foo {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`--EXPECTF--`
`21`		`-Fatal error: Declaration of Bar::test(): B must be compatible with Foo::test(): A in %sinheritance006.php on line 14`
	`21`	`+Fatal error: Declaration of Bar::test(): B must be compatible with Foo::test(): A in %sinheritance006.php on line 11`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ class Bar extends Foo {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`--EXPECTF--`
`19`		`-Fatal error: Declaration of Bar::test(): ArrayObject must be compatible with Foo::test(): Traversable in %sinheritance007.php on line 12`
	`19`	`+Fatal error: Declaration of Bar::test(): ArrayObject must be compatible with Foo::test(): Traversable in %sinheritance007.php on line 9`