Deprecate implicit nullable parameters

Majkl578 · Majkl578 · commit 7d5243992604 · 2019-05-07T16:34:51.000+02:00
diff --git a/Zend/tests/bug63635.phpt b/Zend/tests/bug63635.phpt
@@ -6,7 +6,7 @@ class Node {
 	public $parent = NULL;
 	public $children = array();
 
-	function __construct(Node $parent=NULL) {
+	function __construct(?Node $parent=NULL) {
 		if ($parent) {
 			$parent->children[] = $this;
 		}
diff --git a/Zend/tests/bug71428.1.phpt b/Zend/tests/bug71428.1.phpt
@@ -3,7 +3,7 @@ bug #71428.1: inheritance with null default values
 --FILE--
 <?php
 class A {
-    public function m(array $a = null) {}
+    public function m(?array $a = null) {}
 }
 class B extends A {
     public function m(array $a = []) {}
diff --git a/Zend/tests/bug71428.3.phpt b/Zend/tests/bug71428.3.phpt
@@ -3,7 +3,7 @@ bug #71428: Validation type inheritance with = NULL
 --FILE--
 <?php
 class A { }
-class B           {  public function m(A $a = NULL, $n) { echo "B.m";} };
+class B           {  public function m(?A $a = NULL, $n) { echo "B.m";} };
 class C extends B {  public function m(A $a       , $n) { echo "C.m";} };
 ?>
 --EXPECTF--
diff --git a/Zend/tests/bug72119.phpt b/Zend/tests/bug72119.phpt
@@ -15,4 +15,6 @@ class Hello implements Foo {
 echo "OK\n";
 ?>
 --EXPECTF--
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sbug72119.php on line %d
+
 Fatal error: Declaration of Hello::bar(array $baz = Array) must be compatible with Foo::bar(?array $baz = NULL) in %s on line %d
diff --git a/Zend/tests/ns_070.phpt b/Zend/tests/ns_070.phpt
@@ -6,7 +6,7 @@ Testing parameter type-hinted with default value inside namespace
 namespace foo;
 
 class bar {
-	public function __construct(\stdclass $x = NULL) {
+	public function __construct(?\stdclass $x = NULL) {
 		var_dump($x);
 	}
 }
diff --git a/Zend/tests/ns_071.phpt b/Zend/tests/ns_071.phpt
@@ -6,7 +6,7 @@ Testing parameter type-hinted (array) with default value inside namespace
 namespace foo;
 
 class bar {
-	public function __construct(array $x = NULL) {
+	public function __construct(?array $x = NULL) {
 		var_dump($x);
 	}
 }
diff --git a/Zend/tests/ns_072.phpt b/Zend/tests/ns_072.phpt
@@ -10,7 +10,7 @@ interface foo {
 }
 
 class bar {
-	public function __construct(foo $x = NULL) {
+	public function __construct(?foo $x = NULL) {
 		var_dump($x);
 	}
 }
diff --git a/Zend/tests/ns_073.phpt b/Zend/tests/ns_073.phpt
@@ -5,7 +5,7 @@ Testing type-hinted lambda parameter inside namespace
 
 namespace foo;
 
-$x = function (\stdclass $x = NULL) {
+$x = function (?\stdclass $x = NULL) {
 	var_dump($x);
 };
 
diff --git a/Zend/tests/ns_074.phpt b/Zend/tests/ns_074.phpt
@@ -5,7 +5,7 @@ Testing type-hinted lambda parameter inside namespace
 
 namespace foo;
 
-$x = function (\stdclass $x = NULL) {
+$x = function (?\stdclass $x = NULL) {
 	var_dump($x);
 };
 
diff --git a/Zend/tests/traits/bug60717.phpt b/Zend/tests/traits/bug60717.phpt
@@ -8,8 +8,8 @@ namespace HTML
 	interface Helper
 	{
 		function text($text);
-		function attributes(array $attributes = null);
-		function textArea(array $attributes = null, $value);
+		function attributes(?array $attributes = null);
+		function textArea(?array $attributes = null, $value);
 	}
 
 	trait TextUTF8
@@ -19,14 +19,14 @@ namespace HTML
 
 	trait TextArea
 	{
-		function textArea(array $attributes = null, $value) {}
-		abstract function attributes(array $attributes = null);
+		function textArea(?array $attributes = null, $value) {}
+		abstract function attributes(?array $attributes = null);
 		abstract function text($text);
 	}
 
 	trait HTMLAttributes
 	{
-		function attributes(array $attributes = null) {	}
+		function attributes(?array $attributes = null) {	}
 		abstract function text($text);
 	}
 
diff --git a/Zend/tests/type_declarations/callable_003.phpt b/Zend/tests/type_declarations/callable_003.phpt
@@ -6,7 +6,7 @@ callable type#003
 function foo(callable $a, $b, callable $c) {
 	var_dump($a, $b, $c);
 }
-function bar(callable $a = null) {
+function bar(?callable $a = null) {
 	var_dump($a);
 }
 
diff --git a/Zend/tests/type_declarations/iterable_002.phpt b/Zend/tests/type_declarations/iterable_002.phpt
@@ -3,7 +3,7 @@ iterable type#002 - Default values
 --FILE--
 <?php
 
-function foo(iterable $iterable = null) {
+function foo(?iterable $iterable = null) {
     // Null should be allowed as a default value
 }
 
diff --git a/Zend/tests/type_declarations/nullable_null.phpt b/Zend/tests/type_declarations/nullable_null.phpt
@@ -2,10 +2,10 @@
 nullable class
 --FILE--
 <?php
-function test(Foo $a = null) {
+function test(?Foo $a = null) {
 	echo "ok\n";
 }
 test(null);
 ?>
---EXPECT--
+--EXPECTF--
 ok
diff --git a/Zend/tests/type_declarations/scalar_none.phpt b/Zend/tests/type_declarations/scalar_none.phpt
@@ -24,6 +24,13 @@ foreach ($functions as $type => $function) {
 }
 echo PHP_EOL . "Done";
 --EXPECTF--
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_none.php on line %d
+
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_none.php on line %d
+
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_none.php on line %d
+
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_none.php on line %d
 Testing int:
 *** Caught Too few arguments to function {closure}(), 0 passed in %s on line %d and exactly 1 expected
 Testing float:
diff --git a/Zend/tests/type_declarations/scalar_null.phpt b/Zend/tests/type_declarations/scalar_null.phpt
@@ -26,6 +26,13 @@ foreach ($functions as $type => $function) {
 echo PHP_EOL . "Done";
 ?>
 --EXPECTF--
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_null.php on line %d
+
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_null.php on line %d
+
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_null.php on line %d
+
+Deprecated: Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign in %sscalar_null.php on line %d
 Testing int:
 *** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
 Testing float:
diff --git a/Zend/tests/variadic/adding_additional_optional_parameter.phpt b/Zend/tests/variadic/adding_additional_optional_parameter.phpt
@@ -8,7 +8,7 @@ interface DB {
 }
 
 class MySQL implements DB {
-    public function query($query, string $extraParam = null, string ...$params) { }
+    public function query($query, ?string $extraParam = null, string ...$params) { }
 }
 
 ?>
diff --git a/Zend/tests/variadic/adding_additional_optional_parameter_error.phpt b/Zend/tests/variadic/adding_additional_optional_parameter_error.phpt
@@ -8,7 +8,7 @@ interface DB {
 }
 
 class MySQL implements DB {
-    public function query($query, int $extraParam = null, string ...$params) { }
+    public function query($query, ?int $extraParam = null, string ...$params) { }
 }
 
 ?>
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5335,6 +5335,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 
 		if (type_ast) {
 			uint32_t default_type = default_ast ? Z_TYPE(default_node.u.constant) : IS_UNDEF;
+			zend_bool is_arg_explicitly_nullable = (type_ast->attr & ZEND_TYPE_NULLABLE) == ZEND_TYPE_NULLABLE;
 
 			uint32_t arg_type;
 			zend_bool is_class;
@@ -5349,6 +5350,10 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 				zend_error_noreturn(E_COMPILE_ERROR, "void cannot be used as a parameter type");
 			}
 
+			if (default_type == IS_NULL && !is_arg_explicitly_nullable) {
+				zend_error(E_DEPRECATED, "Implicit nullable types are deprecated, mark the type as explicitly nullable with the '?' sign");
+			}
+
 			if (default_type > IS_NULL && default_type != IS_CONSTANT_AST) {
 				if (is_class) {
 					zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters "
diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt
@@ -10,7 +10,7 @@ echo "*** Testing new DateTime() : with user space __construct magic method ***\
 
 class DateTimeExt extends DateTime
 {
-	public function __construct ($date = null, DateTimeZone  $dtz = null)
+	public function __construct ($date = null, ?DateTimeZone  $dtz = null)
     {
         if($dtz === null)
         {
diff --git a/ext/date/tests/bug55407.phpt b/ext/date/tests/bug55407.phpt
@@ -6,7 +6,7 @@ error_reporting=-1
 <?php namespace melt\core;
 
 class DateTime extends \DateTime {
-    public static function createFromFormat($format, $time, \DateTimeZone $timezone = null) {
+    public static function createFromFormat($format, $time, ?\DateTimeZone $timezone = null) {
         return new DateTime(parent::createFromFormat($format, $time, $timezone));
     }
 }
diff --git a/ext/opcache/tests/bug73746.phpt b/ext/opcache/tests/bug73746.phpt
@@ -9,7 +9,7 @@ class CountryMapping
 	const CZ = 'CZ';
 	const EN = 'EN';
 
-	public function get(string $countryIsoCode = null) : string // Works correctly if return type is removed
+	public function get(?string $countryIsoCode = null) : string // Works correctly if return type is removed
 	{
 		switch (strtoupper($countryIsoCode)) {
 		case 'CZ':
diff --git a/ext/opcache/tests/bug74442.phpt b/ext/opcache/tests/bug74442.phpt
@@ -5,14 +5,14 @@ Eric Norris <erictnorris@gmail.com>
 --FILE--
 <?php
 class Schema_Base {
-    public function addField($typeclass, array $params = null) {
+    public function addField($typeclass, ?array $params = null) {
         $field = new $typeclass($params);
         return $field;
     }
 }
 
 class Field_Base {
-    public function __construct(array $params = null) {
+    public function __construct(?array $params = null) {
         if (! is_array($params)) {
             $params = (array) $params;
         }
diff --git a/ext/opcache/tests/invalid_array_key_type.phpt b/ext/opcache/tests/invalid_array_key_type.phpt
@@ -3,7 +3,7 @@ Don't add array value type is key type is illegal
 --FILE--
 <?php
 
-function test(\SplObjectStorage $definitions = null) {
+function test(?\SplObjectStorage $definitions = null) {
     $argument = new stdClass;
     $definitions[$argument] = 1;
     $definitions[$argument] += 1;
diff --git a/ext/reflection/tests/ReflectionClass_export_basic1.phpt b/ext/reflection/tests/ReflectionClass_export_basic1.phpt
@@ -6,12 +6,12 @@ Class A {
 	public function privf(Exception $a) {}
 	public function pubf(A $a,
 						 $b,
-						 C $c = null,
+						 ?C $c = null,
 						 $d = K,
 						 $e = "15 chars long -",
 						 $f = null,
 						 $g = false,
-						 array $h = null) {}
+						 ?array $h = null) {}
 }
 
 Class C extends A { }
diff --git a/ext/reflection/tests/ReflectionType_001.phpt b/ext/reflection/tests/ReflectionType_001.phpt
@@ -2,7 +2,7 @@
 ReflectionParameter::get/hasType and ReflectionType tests
 --FILE--
 <?php
-function foo(stdClass $a, array $b, callable $c, stdClass $d = null, $e = null, string $f, bool $g, int $h, float $i, NotExisting $j) { }
+function foo(stdClass $a, array $b, callable $c, ?stdClass $d = null, $e = null, string $f, bool $g, int $h, float $i, NotExisting $j) { }
 
 function bar(): stdClass { return new stdClass; }
 
diff --git a/ext/reflection/tests/bug62715.phpt b/ext/reflection/tests/bug62715.phpt
@@ -3,7 +3,7 @@ Bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong result)
 --FILE--
 <?php
 
-function test(PDO $a = null, $b = 0, array $c) {}
+function test(?PDO $a = null, $b = 0, array $c) {}
 $r = new ReflectionFunction('test');
 
 foreach ($r->getParameters() as $p) {
diff --git a/ext/reflection/tests/parameters_002.phpt b/ext/reflection/tests/parameters_002.phpt
@@ -4,14 +4,14 @@ ReflectionParameter::getClass(), getDeclaringClass(), getDeclaringFunction()
 <?php
 
 function test($nix, Array $ar, &$ref, stdClass $std,
-    NonExistingClass $na, stdClass &$opt = NULL, $def = "FooBar")
+    NonExistingClass $na, ?stdClass &$opt = NULL, $def = "FooBar")
 {
 }
 
 class test
 {
 	function method($nix, Array $ar, &$ref, stdClass $std,
-        NonExistingClass $na, stdClass $opt = NULL, $def = "FooBar")
+        NonExistingClass $na, ?stdClass $opt = NULL, $def = "FooBar")
 	{
 	}
 }
diff --git a/ext/spl/tests/bug65328.phpt b/ext/spl/tests/bug65328.phpt
@@ -16,7 +16,7 @@ class Tree
     /**
      * @param Node $head
      */
-    public function __construct(Node $head = null)
+    public function __construct(?Node $head = null)
     {
         $this->head = $head ? : new Node('HEAD');
     }
@@ -115,7 +115,7 @@ class Node extends \RecursiveArrayIterator implements \Countable
      * @param Node $parent
      * @param bool $assureUnique
      */
-    public function __construct($data, $uid = null, Node $parent = null, $assureUnique = false)
+    public function __construct($data, $uid = null, ?Node $parent = null, $assureUnique = false)
     {
         if(null !== $parent) {
             $this->parent = $parent;
diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt
@@ -11,7 +11,7 @@ class Test
 		var_dump($ar);
 	}
 
-	static function f2(array $ar = NULL)
+	static function f2(?array $ar = NULL)
 	{
 		echo __METHOD__ . "()\n";
 		var_dump($ar);
diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt
@@ -8,7 +8,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
   function f1(A $a)  {
       echo "in f1;\n";
   }
-  function f2(A $a = null)  {
+  function f2(?A $a = null)  {
       echo "in f2;\n";
   }
   try {
@@ -51,7 +51,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
               echo "in C::f1 (static);\n";
           }
       }
-      static function f2(A $a = null) {
+      static function f2(?A $a = null) {
           if (isset($this)) {
               echo "in C::f2 (instance);\n";
           } else {
@@ -100,7 +100,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
               echo "in C::f1 (static);\n";
           }
       }
-      function f2(A $a = null) {
+      function f2(?A $a = null) {
           if (isset($this)) {
               echo "in C::f2 (instance);\n";
           } else {
diff --git a/tests/lang/type_hints_002.phpt b/tests/lang/type_hints_002.phpt
@@ -4,7 +4,7 @@ ZE2 type hinting
 <?php
 class P { }
 class T {
-	function f(P $p = NULL) {
+	function f(?P $p = NULL) {
 		var_dump($p);
 		echo "-\n";
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class Node {`
`6`	`6`	`public $parent = NULL;`
`7`	`7`	`public $children = array();`
`8`	`8`
`9`		`- function __construct(Node $parent=NULL) {`
	`9`	`+ function __construct(?Node $parent=NULL) {`
`10`	`10`	`if ($parent) {`
`11`	`11`	`$parent->children[] = $this;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ bug #71428.1: inheritance with null default values`
`3`	`3`	`--FILE--`
`4`	`4`	`<?php`
`5`	`5`	`class A {`
`6`		`- public function m(array $a = null) {}`
	`6`	`+ public function m(?array $a = null) {}`
`7`	`7`	`}`
`8`	`8`	`class B extends A {`
`9`	`9`	`public function m(array $a = []) {}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ Testing parameter type-hinted with default value inside namespace`
`6`	`6`	`namespace foo;`
`7`	`7`
`8`	`8`	`class bar {`
`9`		`- public function __construct(\stdclass $x = NULL) {`
	`9`	`+ public function __construct(?\stdclass $x = NULL) {`
`10`	`10`	`var_dump($x);`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ interface foo {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`class bar {`
`13`		`- public function __construct(foo $x = NULL) {`
	`13`	`+ public function __construct(?foo $x = NULL) {`
`14`	`14`	`var_dump($x);`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ namespace HTML`
`8`	`8`	`interface Helper`
`9`	`9`	`{`
`10`	`10`	`function text($text);`
`11`		`- function attributes(array $attributes = null);`
`12`		`- function textArea(array $attributes = null, $value);`
	`11`	`+ function attributes(?array $attributes = null);`
	`12`	`+ function textArea(?array $attributes = null, $value);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`trait TextUTF8`
`@@ -19,14 +19,14 @@ namespace HTML`
`19`	`19`
`20`	`20`	`trait TextArea`
`21`	`21`	`{`
`22`		`- function textArea(array $attributes = null, $value) {}`
`23`		`- abstract function attributes(array $attributes = null);`
	`22`	`+ function textArea(?array $attributes = null, $value) {}`
	`23`	`+ abstract function attributes(?array $attributes = null);`
`24`	`24`	`abstract function text($text);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`trait HTMLAttributes`
`28`	`28`	`{`
`29`		`- function attributes(array $attributes = null) { }`
	`29`	`+ function attributes(?array $attributes = null) { }`
`30`	`30`	`abstract function text($text);`
`31`	`31`	`}`
`32`	`32`