Covariant Returns and Contravariant Parameters

Zend/tests/bug75573.phpt

@@ -6,10 +6,6 @@ Bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
 class A
 {
 	var $_stdObject;
-	function initialize($properties = FALSE) {
-		$this->_stdObject = $properties ? (object) $properties : new stdClass();
-		parent::initialize();
-	}
 	function &__get($property)
 	{
 		if (isset($this->_stdObject->{$property})) {
@@ -31,10 +27,6 @@ class A
 
 class B extends A
 {
-	function initialize($properties = array())
-	{
-		parent::initialize($properties);
-	}
 	function &__get($property)
 	{
 		if (isset($this->settings) && isset($this->settings[$property])) {

Zend/tests/bug76451.inc

@@ -0,0 +1,4 @@
+<?php
+
+class Foo {}
+class_alias('Foo', 'Bar');

Zend/tests/bug76451.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Aliases during inheritance type checks affected by opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+--SKIPIF--
+<?php if (!extension_loaded('Zend OPcache') || php_sapi_name() != "cli") die("skip CLI only"); ?>
+--FILE--
+<?php
+require __DIR__ . "/bug76451.inc";
+
+class A {
+  public function test(Foo $foo) {}
+}
+class B extends A {
+  public function test(Bar $foo) {}
+}
+?>
+--EXPECT--

Zend/tests/class_name_as_scalar.phpt

@@ -8,8 +8,11 @@ namespace Foo\Bar {
         // compile time constants
         const A = self::class;
         const B = Two::class;
+
     }
     class Two extends One {
+        const A = parent::class;
+
         public static function run() {
             var_dump(self::class); // self compile time lookup
             var_dump(static::class); // runtime lookup
@@ -18,6 +21,8 @@ namespace Foo\Bar {
         }
     }
     class Three extends Two {
+        const B = parent::class;
+
         // compile time static lookups
         public static function checkCompileTime(
             $one = self::class,

Zend/tests/class_name_as_scalar_error_002.phpt

@@ -10,4 +10,6 @@ namespace Foo\Bar {
 }
 ?>
 --EXPECTF--
-Fatal error: parent::class cannot be used for compile-time class name resolution in %s on line %d
+Deprecated: Cannot use "parent" without a parent class in %s on line %d
+
+Fatal error: Cannot use "parent" without a parent class in %s on line %d

Zend/tests/class_name_as_scalar_error_004.phpt

@@ -10,4 +10,6 @@ namespace Foo\Bar {
 }
 ?>
 --EXPECTF--
-Fatal error: parent::class cannot be used for compile-time class name resolution in %s on line %d
+Deprecated: Cannot use "parent" without a parent class in %s on line %d
+
+Fatal error: Cannot use "parent" without a parent class in %s on line %d

Zend/tests/compile_time_parent_error_01.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Using "parent" in class without parent results in compile-time error
+--FILE--
+<?php
+class InvalidClass {
+  function method(parent $p) {}
+}
+
+?>
+--EXPECTF--
+Deprecated: Cannot use "parent" without a parent class in %s on line %d

Zend/tests/compile_time_parent_error_02.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Using "parent" in class without parent results in compile-time error
+--FILE--
+<?php
+class InvalidClass {
+  function method(): parent {}
+}
+
+?>
+--EXPECTF--
+Deprecated: Cannot use "parent" without a parent class in %s on line %d

Zend/tests/compile_time_parent_error_03.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Using "parent" in class without parent results in compile-time error
+--FILE--
+<?php
+class InvalidClass {
+  function method() {
+    echo parent::class;
+  }
+}
+
+?>
+--EXPECTF--
+Deprecated: Cannot use "parent" without a parent class in %s on line %d

Zend/tests/compile_time_parent_error_04.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Using "parent" in class without parent results in compile-time error
+--FILE--
+<?php
+$obj = new class() {
+  function method() {
+    echo parent::class;
+  }
+}
+
+?>
+--EXPECTF--
+Deprecated: Cannot use "parent" without a parent class in %s on line %d

Zend/tests/compile_time_parent_error_05.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Using "parent" in class without parent results in compile-time error
+--FILE--
+<?php
+class InvalidClass {
+  function method() {
+    $obj = new class() {
+      function method() {
+        echo parent::class;
+      }
+    };
+  }
+}
+
+?>
+--EXPECTF--
+Deprecated: Cannot use "parent" without a parent class in %s on line %d

Zend/tests/object_types/object_variance.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Testing object's variance in inheritance
+--FILE--
+<?php
+
+interface I1 {
+  function method1(I1 $o): object;
+}
+interface I2 extends I1 {
+  function method1(object $o): I1;
+}
+final class C1 implements I2 {
+  function method1($o = null): self {
+    return $this;
+  }
+}
+
+$o = new C1();
+echo get_class($o->method1());
+?>
+--EXPECT--
+C1

Zend/tests/return_types/008.phpt

@@ -14,6 +14,7 @@ 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
+echo get_class($qux->bar());
+
+--EXPECT--
+qux

Zend/tests/return_types/generators003.phpt

@@ -15,6 +15,7 @@ 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
+echo get_class($some->getIterator());
+
+--EXPECT--
+Generator

Zend/tests/return_types/inheritance005.phpt

@@ -13,5 +13,8 @@ class Bar extends Foo {
         return new Bar;
     }
 }
---EXPECTF--
-Fatal error: Declaration of Bar::test(): Bar must be compatible with Foo::test(): Foo in %sinheritance005.php on line 12
+
+echo get_class(Bar::test());
+
+--EXPECT--
+Bar

Zend/tests/return_types/inheritance006.phpt

@@ -17,5 +17,8 @@ class Bar extends Foo {
         return new B;
     }
 }
---EXPECTF--
-Fatal error: Declaration of Bar::test(): B must be compatible with Foo::test(): A in %sinheritance006.php on line 14
+
+echo get_class(Bar::test());
+
+--EXPECT--
+B

Zend/tests/return_types/inheritance007.phpt

@@ -15,5 +15,8 @@ class Bar extends Foo {
         return new ArrayObject([1, 2]);
     }
 }
---EXPECTF--
-Fatal error: Declaration of Bar::test(): ArrayObject must be compatible with Foo::test(): Traversable in %sinheritance007.php on line 12
+
+echo get_class(Bar::test());
+
+--EXPECT--
+ArrayObject

Zend/tests/traits/parent_001.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Using parent does not create compile-time warnings
+--FILE--
+<?php
+
+trait P {
+	public function m(parent $arg): parent {
+		return $arg;
+	}
+}
+
+class A {}
+
+class B extends A {
+	use P;
+}
+
+$b = new B();
+$a = $b->m(new A());
+
+print "OK\n";
+
+?>
+--EXPECT--
+OK
+

Zend/zend.c

@@ -627,6 +627,8 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{
 	zend_hash_init_ex(compiler_globals->class_table, 64, NULL, ZEND_CLASS_DTOR, 1, 0);
 	zend_hash_copy(compiler_globals->class_table, global_class_table, zend_class_add_ref);
 
+	compiler_globals->unverified_types = NULL;
+
 	zend_set_default_compile_time_values();
 
 	compiler_globals->auto_globals = (HashTable *) malloc(sizeof(HashTable));