com php-src: Revert "Added tests demonstrating the same effect with abstracts": Zend/tests/bug73987.phpt Zend/tests/bug7398 7_1.phpt
Zend/tests/bug73987_2.phpt Zend/tests/bug73987_3.phpt
| From: | Joe Watkins | Date: | Wed, 01 Feb 2017 18:33:47 +0000 |
| Subject: | com php-src: Revert "Added tests demonstrating the same effect with abstracts": Zend/tests/bug73987.phpt Zend/tests/bug7398 7_1.phpt Zend/tests/bug73987_2.phpt Zend/tests/bug73987_3.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96954@lists.php.net to get a copy of this message | ||
Commit: 648238da5c45bdf2c65d856b533f9a2534864ba2
Author: Joe Watkins <krakjoe@php.net> Wed, 1 Feb 2017 18:33:47 +0000
Parents: ddf41b505c179792476b4165cb3d06e9b9b1d377
Branches: PHP-7.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=648238da5c45bdf2c65d856b533f9a2534864ba2
Log:
Revert "Added tests demonstrating the same effect with abstracts"
This reverts commit c11b2b809d349399c8f4b54c6bf24078dece455e.
Changed paths:
M Zend/tests/bug73987.phpt
M Zend/tests/bug73987_1.phpt
D Zend/tests/bug73987_2.phpt
D Zend/tests/bug73987_3.phpt
Diff:
diff --git a/Zend/tests/bug73987.phpt b/Zend/tests/bug73987.phpt
index 610b594..5515656 100644
--- a/Zend/tests/bug73987.phpt
+++ b/Zend/tests/bug73987.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #73987 (Method compatibility check looks to original definition and not parent - nullability
interface)
+Bug #73987 (Method compatibility check looks to original definition and not parent)
--FILE--
<?php
diff --git a/Zend/tests/bug73987_1.phpt b/Zend/tests/bug73987_1.phpt
index 010987e..6a0a157 100644
--- a/Zend/tests/bug73987_1.phpt
+++ b/Zend/tests/bug73987_1.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #73987 (Method compatibility check looks to original definition and not parent - return types
interface)
+Bug #73987 (Method compatibility check looks to original definition and not parent)
--FILE--
<?php
diff --git a/Zend/tests/bug73987_2.phpt b/Zend/tests/bug73987_2.phpt
deleted file mode 100644
index a70f145..0000000
--- a/Zend/tests/bug73987_2.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Bug #73987 (Method compatibility check looks to original definition and not parent - nullabilty
abstract)
---FILE--
-<?php
-
-abstract class A {
- abstract function example($a, $b, $c);
-}
-
-class B extends A {
- function example($a, $b = null, $c = null) { }
-}
-
-class C extends B {
- function example($a, $b, $c = null) { }
-}
-
-?>
---EXPECTF--
-Fatal error: Declaration of C::example($a, $b, $c = NULL) must be compatible with B::example($a, $b
= NULL, $c = NULL) in %s
diff --git a/Zend/tests/bug73987_3.phpt b/Zend/tests/bug73987_3.phpt
deleted file mode 100644
index 89e4686..0000000
--- a/Zend/tests/bug73987_3.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Bug #73987 (Method compatibility check looks to original definition and not parent - return types
abstract)
---FILE--
-<?php
-
-abstract class A {
- abstract function example();
-}
-
-class B extends A {
- function example(): int { }
-}
-
-class C extends B {
- function example(): string { }
-}
-
-?>
---EXPECTF--
-Fatal error: Declaration of C::example(): string must be compatible with B::example(): int in %s