From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 29 Jan 2019 09:46:21 +0000 (+0100)
Subject: Remove (unset) cast
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d74d3922ce6f9ea07c1226b0cb2a94fc333f7a02;p=php

Remove (unset) cast

Deprecated in PHP 7.2 as part of
https://wiki.php.net/rfc/deprecations_php_7_2.
---

diff --git a/UPGRADING b/UPGRADING
index d338af2928..ea6d6bbce9 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -21,6 +21,7 @@ PHP 8.0 UPGRADE NOTES
 ========================================
 
 - Core:
+  . Removed (unset) cast.
   . Removed track_errors ini directive. This means that $php_errormsg is no
     longer available. The error_get_last() function may be used instead.
   . Removed create_function(). Anonymous functions may be used instead.
diff --git a/Zend/tests/unset_cast_deprecated.phpt b/Zend/tests/unset_cast_deprecated.phpt
deleted file mode 100644
index 6744c85f02..0000000000
--- a/Zend/tests/unset_cast_deprecated.phpt
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-The (unset) cast is deprecated
---FILE--
-<?php
-
-$x = 1;
-var_dump((unset) $x);
-var_dump($x);
-
-?>
---EXPECTF--
-Deprecated: The (unset) cast is deprecated in %s on line %d
-NULL
-int(1)
diff --git a/Zend/tests/unset_cast_removed.phpt b/Zend/tests/unset_cast_removed.phpt
new file mode 100644
index 0000000000..9f2f798ed0
--- /dev/null
+++ b/Zend/tests/unset_cast_removed.phpt
@@ -0,0 +1,12 @@
+--TEST--
+The (unset) cast is removed
+--FILE--
+<?php
+
+$x = 1;
+var_dump((unset) $x);
+var_dump($x);
+
+?>
+--EXPECTF--
+Fatal error: The (unset) cast is no longer supported in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index bf2a096810..e6b6d9fc09 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -7184,7 +7184,7 @@ void zend_compile_cast(znode *result, zend_ast *ast) /* {{{ */
 	opline->extended_value = ast->attr;
 
 	if (ast->attr == IS_NULL) {
-		zend_error(E_DEPRECATED, "The (unset) cast is deprecated");
+		zend_error(E_COMPILE_ERROR, "The (unset) cast is no longer supported");
 	}
 }
 /* }}} */