Use X&Y|null instead of ?X&Y

Author: nicolas-grekas

Zend/tests/type_declarations/intersection_types/assigning_intersection_types.phpt

@@ -20,7 +20,7 @@ class A {
     public function method2(X $a): X&Y {
         return new TestParent();
     }
-    public function method3(?X&Y $a): ?X&Y {
+    public function method3(X&Y|null $a): X&Y|null {
         return $a;
     }
 }

Zend/tests/type_declarations/intersection_types/bug81268.phpt

@@ -9,4 +9,4 @@ class Test {
 
 ?>
 --EXPECTF--
-Fatal error: Default value for property of type X&Y may not be null. Use the nullable type ?X&Y to allow null default value in %s on line %d
+Fatal error: Default value for property of type X&Y may not be null. Use the nullable type X&Y|null to allow null default value in %s on line %d

Zend/tests/type_declarations/intersection_types/parameter.phpt

@@ -9,7 +9,7 @@ interface B {}
 class Foo implements A, B {}
 class Bar implements A {}
 
-function foo(?A&B $bar) {
+function foo(A&B|null $bar) {
     var_dump($bar);
 }
 
@@ -27,4 +27,4 @@ try {
 NULL
 object(Foo)#1 (0) {
 }
-foo(): Argument #1 ($bar) must be of type ?A&B, Bar given, called in %s on line %d
+foo(): Argument #1 ($bar) must be of type A&B|null, Bar given, called in %s on line %d

Zend/tests/type_declarations/intersection_types/typed_reference2.phpt

@@ -11,7 +11,7 @@ class A implements X, Y, Z {}
 class B implements X, Y {}
 
 class Test {
-    public ?X&Y $y;
+    public X&Y|null $y;
     public X&Z $z;
 }
 $test = new Test;

Zend/tests/type_declarations/intersection_types/typed_reference3.phpt

@@ -11,8 +11,8 @@ class A implements X, Y, Z {}
 class B implements X, Y {}
 
 class Test {
-    public ?X&Y $y;
-    public ?X&Z $z;
+    public X&Y|null $y;
+    public X&Z|null $z;
 }
 $test = new Test;
 $r = new A;

Zend/tests/type_declarations/intersection_types/variance/invalid7.phpt

@@ -22,11 +22,11 @@ class FooChild extends Foo {
 }
 
 class FooSecondChild extends FooChild {
-    public function foo(): ?A&B {
+    public function foo(): A&B|null {
         return new Test();
     }
 }
 
 ?>
 --EXPECTF--
-Fatal error: Declaration of FooSecondChild::foo(): ?A&B must be compatible with FooChild::foo(): A&B in %s on line %d
+Fatal error: Declaration of FooSecondChild::foo(): A&B|null must be compatible with FooChild::foo(): A&B in %s on line %d

Zend/tests/type_declarations/intersection_types/variance/invalid8.phpt

@@ -7,12 +7,12 @@ class A {}
 class B extends A {}
 
 class Test {
-    public ?A&B $prop;
+    public A&B|null $prop;
 }
 class Test2 extends Test {
     public A&B $prop;
 }
 
 ?>
 --EXPECTF--
-Fatal error: Type of Test2::$prop must be ?A&B (as in class Test) in %s on line %d
+Fatal error: Type of Test2::$prop must be A&B|null (as in class Test) in %s on line %d

Zend/tests/type_declarations/intersection_types/variance/invalid9.phpt

@@ -7,7 +7,7 @@ interface A {}
 interface B {}
 
 class Foo {
-    public function foo(?A&B $foo) {
+    public function foo(A&B|null $foo) {
     }
 }
 
@@ -18,4 +18,4 @@ class FooChild extends Foo {
 
 ?>
 --EXPECTF--
-Fatal error: Declaration of FooChild::foo(A&B $foo) must be compatible with Foo::foo(?A&B $foo) in %s on line %d
+Fatal error: Declaration of FooChild::foo(A&B $foo) must be compatible with Foo::foo(A&B|null $foo) in %s on line %d

Zend/tests/type_declarations/intersection_types/variance/valid10.phpt

@@ -11,15 +11,15 @@ class TestParent implements X, Y, Z {}
 class TestChild implements Z {}
 
 class A {
-    public ?X&Y $prop;
+    public X&Y|null $prop;
 
-    public function method1(X&Y&Z $a): ?X&Y {}
+    public function method1(X&Y&Z $a): X&Y|null{}
     public function method2(X&Y $a): ?X {}
 }
 class B extends A {
-    public ?X&Y $prop;
+    public X&Y|null $prop;
 
-    public function method1(?X&Y $a): X&Y&Z {}
+    public function method1(X&Y|null $a): X&Y&Z {}
     public function method2(?X $a): X&Y {}
 }
 

Zend/tests/type_declarations/intersection_types/variance/valid9.phpt

@@ -10,7 +10,7 @@ interface C {}
 class Test implements A, B, C {}
 
 class Foo {
-    public function foo(): ?A&B {
+    public function foo(): A&B|null {
         return null;
     }
 }