From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 29 Jan 2019 10:04:20 +0000 (+0100)
Subject: Remove support for custom assert() function
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55dbb573226cf98d77e23becfd5148f0ea93d640;p=php

Remove support for custom assert() function

Deprecated in PHP 7.3 as part of
https://wiki.php.net/rfc/deprecations_php_7_3.
---

diff --git a/Zend/tests/custom_assert_deprecation.phpt b/Zend/tests/custom_assert_forbidden.phpt
similarity index 53%
rename from Zend/tests/custom_assert_deprecation.phpt
rename to Zend/tests/custom_assert_forbidden.phpt
index b4e22843dd..492a656f39 100644
--- a/Zend/tests/custom_assert_deprecation.phpt
+++ b/Zend/tests/custom_assert_forbidden.phpt
@@ -9,4 +9,4 @@ function assert() {}
 
 ?>
 --EXPECTF--
-Deprecated: Defining a custom assert() function is deprecated, as the function has special semantics in %s on line %d
+Fatal error: Defining a custom assert() function is not allowed, as the function has special semantics in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e6b6d9fc09..cfe03e71f9 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5740,8 +5740,8 @@ static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_as
 	}
 
 	if (zend_string_equals_literal_ci(unqualified_name, "assert")) {
-		zend_error(E_DEPRECATED,
-			"Defining a custom assert() function is deprecated, "
+		zend_error(E_COMPILE_ERROR,
+			"Defining a custom assert() function is not allowed, "
 			"as the function has special semantics");
 	}