diff options
author | Levi Morrison <levim@php.net> | 2020-08-02 13:34:53 -0600 |
---|---|---|
committer | Levi Morrison <levim@php.net> | 2020-08-02 13:39:35 -0600 |
commit | 853eb8373fa6e29454efa27d6a9567a7e2fe0a27 (patch) | |
tree | 4070a73a64fa8cc8642f4f1fc51da8e8803c3294 /ext/standard | |
parent | 00743f3faed704754af34f482ca7540e560a54b7 (diff) | |
download | php-git-853eb8373fa6e29454efa27d6a9567a7e2fe0a27.tar.gz |
Default assert.exception to 1
Diffstat (limited to 'ext/standard')
-rw-r--r-- | ext/standard/assert.c | 2 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert03.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert04.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert_basic.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert_basic2.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert_basic3.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert_basic5.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert_closures.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert_error2.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/assert/assert_variation.phpt | 1 |
11 files changed, 11 insertions, 1 deletions
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() |