From 853eb8373fa6e29454efa27d6a9567a7e2fe0a27 Mon Sep 17 00:00:00 2001
From: Levi Morrison <levim@php.net>
Date: Sun, 2 Aug 2020 13:34:53 -0600
Subject: [PATCH] Default assert.exception to 1

---
 UPGRADING                                       | 2 ++
 Zend/tests/arrow_functions/007.phpt             | 3 +++
 Zend/tests/ast/zend-pow-assign.phpt             | 1 +
 Zend/tests/ast_serialize_backtick_literal.phpt  | 1 +
 Zend/tests/attributes/012_ast_export.phpt       | 4 ++++
 Zend/tests/match/009.phpt                       | 2 ++
 ext/standard/assert.c                           | 2 +-
 ext/standard/tests/assert/assert.phpt           | 1 +
 ext/standard/tests/assert/assert03.phpt         | 1 +
 ext/standard/tests/assert/assert04.phpt         | 1 +
 ext/standard/tests/assert/assert_basic.phpt     | 1 +
 ext/standard/tests/assert/assert_basic2.phpt    | 1 +
 ext/standard/tests/assert/assert_basic3.phpt    | 1 +
 ext/standard/tests/assert/assert_basic5.phpt    | 1 +
 ext/standard/tests/assert/assert_closures.phpt  | 1 +
 ext/standard/tests/assert/assert_error2.phpt    | 1 +
 ext/standard/tests/assert/assert_variation.phpt | 1 +
 17 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/UPGRADING b/UPGRADING
index d4ddcede72..b1c722c4a4 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -21,6 +21,8 @@ PHP 8.0 UPGRADE NOTES
 ========================================
 
 - Core:
+  . Assertion failures now throw by default. If the old behavior is desired,
+    then set `assert.exception=0` in INI settings.
   . Methods with the same name as the class are no longer interpreted as
     constructors. The __construct() method should be used instead.
   . Removed ability to call non-static methods statically.
diff --git a/Zend/tests/arrow_functions/007.phpt b/Zend/tests/arrow_functions/007.phpt
index 0fcc4930d1..92b525ffbb 100644
--- a/Zend/tests/arrow_functions/007.phpt
+++ b/Zend/tests/arrow_functions/007.phpt
@@ -1,5 +1,8 @@
 --TEST--
 Pretty printing for arrow functions
+--INI--
+zend.assertions=1
+assert.exception=0
 --FILE--
 <?php
 
diff --git a/Zend/tests/ast/zend-pow-assign.phpt b/Zend/tests/ast/zend-pow-assign.phpt
index d978e77ce6..cae9420539 100644
--- a/Zend/tests/ast/zend-pow-assign.phpt
+++ b/Zend/tests/ast/zend-pow-assign.phpt
@@ -2,6 +2,7 @@
 ZEND_POW_ASSIGN
 --INI--
 zend.assertions=1
+assert.exception=0
 --FILE--
 <?php
 
diff --git a/Zend/tests/ast_serialize_backtick_literal.phpt b/Zend/tests/ast_serialize_backtick_literal.phpt
index 4dd65963c5..a757a1db2e 100644
--- a/Zend/tests/ast_serialize_backtick_literal.phpt
+++ b/Zend/tests/ast_serialize_backtick_literal.phpt
@@ -2,6 +2,7 @@
 Serialization of backtick literal is incorrect
 --INI--
 zend.assertions=1
+assert.exception=0
 --FILE--
 <?php
 
diff --git a/Zend/tests/attributes/012_ast_export.phpt b/Zend/tests/attributes/012_ast_export.phpt
index c811327d0c..9412acc605 100644
--- a/Zend/tests/attributes/012_ast_export.phpt
+++ b/Zend/tests/attributes/012_ast_export.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Attributes AST can be exported.
+--INI--
+zend.assertions=1
+assert.exception=0
+assert.warning=1
 --FILE--
 <?php
 
diff --git a/Zend/tests/match/009.phpt b/Zend/tests/match/009.phpt
index 32153e7453..4d5b4a540f 100644
--- a/Zend/tests/match/009.phpt
+++ b/Zend/tests/match/009.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Pretty printing for match expression
+--INI--
+assert.exception=0
 --FILE--
 <?php
 
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 45648fbc49..3203a4e041 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -77,7 +77,7 @@ PHP_INI_BEGIN()
 	 STD_PHP_INI_BOOLEAN("assert.bail",		"0",	PHP_INI_ALL,	OnUpdateBool,		bail,	 			zend_assert_globals,		assert_globals)
 	 STD_PHP_INI_BOOLEAN("assert.warning",	"1",	PHP_INI_ALL,	OnUpdateBool,		warning, 			zend_assert_globals,		assert_globals)
 	 PHP_INI_ENTRY("assert.callback",		NULL,	PHP_INI_ALL,	OnChangeCallback)
-	 STD_PHP_INI_BOOLEAN("assert.exception",	"0",	PHP_INI_ALL,	OnUpdateBool,		exception, 			zend_assert_globals,		assert_globals)
+	 STD_PHP_INI_BOOLEAN("assert.exception",	"1",	PHP_INI_ALL,	OnUpdateBool,		exception, 			zend_assert_globals,		assert_globals)
 PHP_INI_END()
 
 static void php_assert_init_globals(zend_assert_globals *assert_globals_p) /* {{{ */
diff --git a/ext/standard/tests/assert/assert.phpt b/ext/standard/tests/assert/assert.phpt
index 7935b7c8fd..54924365b0 100644
--- a/ext/standard/tests/assert/assert.phpt
+++ b/ext/standard/tests/assert/assert.phpt
@@ -5,6 +5,7 @@ assert.active = 0
 assert.warning = 1
 assert.callback =
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 function a($file, $line, $unused, $desc)
diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt
index 4428790fa2..5224537f44 100644
--- a/ext/standard/tests/assert/assert03.phpt
+++ b/ext/standard/tests/assert/assert03.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 0
 assert.callback =
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 function a($file, $line, $unused, $desc)
diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
index 35f7668ce1..0584e65cb6 100644
--- a/ext/standard/tests/assert/assert04.phpt
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 1
 assert.callback =
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 /* Assert not active */
diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt
index dbf15c1998..dee0f46f72 100644
--- a/ext/standard/tests/assert/assert_basic.phpt
+++ b/ext/standard/tests/assert/assert_basic.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 0
 assert.callback = f1
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 function f1()
diff --git a/ext/standard/tests/assert/assert_basic2.phpt b/ext/standard/tests/assert/assert_basic2.phpt
index 9d768e0d36..bd2f23005d 100644
--- a/ext/standard/tests/assert/assert_basic2.phpt
+++ b/ext/standard/tests/assert/assert_basic2.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 1
 assert.callback=f1
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 function f2()
diff --git a/ext/standard/tests/assert/assert_basic3.phpt b/ext/standard/tests/assert/assert_basic3.phpt
index 8374eff951..ca896f9f14 100644
--- a/ext/standard/tests/assert/assert_basic3.phpt
+++ b/ext/standard/tests/assert/assert_basic3.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 1
 assert.callback = f1
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 function f1()
diff --git a/ext/standard/tests/assert/assert_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt
index 98053c7313..cfdc3028ee 100644
--- a/ext/standard/tests/assert/assert_basic5.phpt
+++ b/ext/standard/tests/assert/assert_basic5.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 0
 assert.callback = f1
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 function f1()
diff --git a/ext/standard/tests/assert/assert_closures.phpt b/ext/standard/tests/assert/assert_closures.phpt
index 13a7e5415e..df497a3828 100644
--- a/ext/standard/tests/assert/assert_closures.phpt
+++ b/ext/standard/tests/assert/assert_closures.phpt
@@ -4,6 +4,7 @@ assert() - basic - accept closures as callback.
 assert.active = 1
 assert.warning = 1
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 assert_options(ASSERT_CALLBACK, function () { echo "Hello World!\n"; });
diff --git a/ext/standard/tests/assert/assert_error2.phpt b/ext/standard/tests/assert/assert_error2.phpt
index 027bd03067..bc138c3346 100644
--- a/ext/standard/tests/assert/assert_error2.phpt
+++ b/ext/standard/tests/assert/assert_error2.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 1
 assert.callback = f1
 assert.bail = 0
+assert.exception=0
 error_reporting = -1
 display_errors = 1
 --FILE--
diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index 7b550b36d1..d6ea8a15e6 100644
--- a/ext/standard/tests/assert/assert_variation.phpt
+++ b/ext/standard/tests/assert/assert_variation.phpt
@@ -5,6 +5,7 @@ assert.active = 1
 assert.warning = 0
 assert.callback = f1
 assert.bail = 0
+assert.exception=0
 --FILE--
 <?php
 function f1()
-- 
2.50.1