From ee9a78a033696ff9546fb1dbfecd28f20477b511 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 28 Mar 2016 11:54:25 +0100
Subject: [PATCH] work on #71428

---
 Zend/tests/bug71428.1.phpt | 13 +++++++++++++
 Zend/zend_inheritance.c    |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 Zend/tests/bug71428.1.phpt

diff --git a/Zend/tests/bug71428.1.phpt b/Zend/tests/bug71428.1.phpt
new file mode 100644
index 0000000000..b754687560
--- /dev/null
+++ b/Zend/tests/bug71428.1.phpt
@@ -0,0 +1,13 @@
+--TEST--
+bug #71428.1: inheritance with null default values
+--FILE--
+<?php
+class A {
+    public function m(array $a = null) {}
+}
+class B extends A {
+    public function m(array $a = []) {}
+}
+--EXPECTF--
+Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(array $a = NULL) in %sbug71428.1.php on line 7
+
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 9eb7a0b9c9..d904a587a1 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -238,6 +238,11 @@ static int zend_do_perform_type_hint_check(const zend_function *fe, zend_arg_inf
 		zend_string_release(fe_class_name);
 	}
 
+	if (proto_arg_info->allow_null && !fe_arg_info->allow_null) {
+		/* incompatible nullability */
+		return 0;
+	}
+
 	if (fe_arg_info->type_hint != proto_arg_info->type_hint) {
 		/* Incompatible type */
 		return 0;
-- 
2.50.1