php
diff --git a/‎Zend/tests/type_declarations/intersection_types/typed_reference.phpt
Copy file name to clipboard
+30Lines changed: 30 additions & 0 deletions b/‎Zend/tests/type_declarations/intersection_types/typed_reference.phpt
Copy file name to clipboard
+30Lines changed: 30 additions & 0 deletions
diff --git a/‎Zend/tests/type_declarations/intersection_types/variance/valid1.phpt
Copy file name to clipboardExpand all lines: Zend/tests/type_declarations/intersection_types/variance/valid1.phpt
+1-1Lines changed: 1 addition & 1 deletion b/‎Zend/tests/type_declarations/intersection_types/variance/valid1.phpt
Copy file name to clipboardExpand all lines: Zend/tests/type_declarations/intersection_types/variance/valid1.phpt
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Zend/tests/type_declarations/intersection_types/variance/valid2.phpt
Copy file name to clipboard
+9-27Lines changed: 9 additions & 27 deletions b/‎Zend/tests/type_declarations/intersection_types/variance/valid2.phpt
Copy file name to clipboard
+9-27Lines changed: 9 additions & 27 deletions
diff --git a/‎Zend/tests/type_declarations/intersection_types/variance/valid4.phpt
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions b/‎Zend/tests/type_declarations/intersection_types/variance/valid4.phpt
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
@@ -0,0 +1,30 @@
+--TEST--
+Intersection types and typed reference
+--FILE--
+<?php
+
+interface X {}
+interface Y {}
+interface Z {}
+
+class A implements X, Y, Z {}
+class B implements X, Y {}
+
+class Test {
+    public X&Y $y;
+    public X&Z $z;
+}
+$test = new Test;
+$r = new A;
+$test->y =& $r;
+$test->z =& $r;
+
+try {
+    $r = new B;
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+
+?>
+--EXPECT--
+Cannot assign B to reference held by property Test::$z of type X&Z
@@ -1,5 +1,5 @@
 --TEST--
-Basic tests for intersection types
+Valid inheritence - co-variance
 --FILE--
 <?php
 
 
@@ -1,40 +1,22 @@
 --TEST--
-Intersection with a child type is valid
+Commutative intersection types
 --FILE--
 <?php
 
 interface A {}
-interface B extends A{}
-interface C {}
-
-class Test implements A, B {}
+interface B {}
 
 class Foo {
-    public function foo(): A&B {
-        return new Test();
-    }
+    public A&B $prop;
+    public function foo(A&B $v): A&B {}
 }
 
 class FooChild extends Foo {
-    public function foo(): A&B {
-        return new Test();
-    }
-}
-
-class FooChildAgain extends Foo {
-    public function foo(): B&A {
-        return new Test();
-    }
+    public B&A $prop;
+    public function foo(B&A $v): B&A {}
 }
 
-$o = new FooChild();
-var_dump($o->foo());
-$o = new FooChildAgain();
-var_dump($o->foo());
-
 ?>
---EXPECTF--
-object(Test)#%d (0) {
-}
-object(Test)#%d (0) {
-}
+===DONE===
+--EXPECT--
+===DONE===
@@ -0,0 +1,19 @@
+--TEST--
+Intersection type reduction invariant type check
+--FILE--
+<?php
+
+class A {}
+class B extends A {}
+
+class Test {
+    public A&B $prop;
+}
+class Test2 extends Test {
+    public B $prop;
+}
+
+?>
+===DONE===
+--EXPECT--
+===DONE===