diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-08-22 23:44:38 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-08-22 23:44:38 +0800 |
| commit | 434ae90e852ed2b39432baf30d928e26b834c03e (patch) | |
| tree | 5e554ff9bdfd263eeb68f2fe8c207c719f6c5d38 | |
| parent | caf890b29166c8a1c921b7f9d9fa4e6eec02c0dd (diff) | |
| download | php-git-434ae90e852ed2b39432baf30d928e26b834c03e.tar.gz | |
Fixed bug #72920 (Accessing a private constant using constant() creates an exception AND warning)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/bug72920.phpt | 15 |
3 files changed, 22 insertions, 1 deletions
@@ -21,6 +21,10 @@ PHP NEWS . Reverted prepending \ for class names and ? for nullable types returned from ReflectionType::__toString(). (Trowski) +- Standard: + . Fixed bug #72920 (Accessing a private constant using constant() creates + an exception AND warning). (Laruence) + - XML: . Fixed bug #72714 (_xml_startElementHandler() segmentation fault). (cmb) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 5463665a09..58f9b49151 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3887,7 +3887,9 @@ PHP_FUNCTION(constant) } } } else { - php_error_docref(NULL, E_WARNING, "Couldn't find constant %s", ZSTR_VAL(const_name)); + if (!EG(exception)) { + php_error_docref(NULL, E_WARNING, "Couldn't find constant %s", ZSTR_VAL(const_name)); + } RETURN_NULL(); } } diff --git a/ext/standard/tests/general_functions/bug72920.phpt b/ext/standard/tests/general_functions/bug72920.phpt new file mode 100644 index 0000000000..b5ca4760c3 --- /dev/null +++ b/ext/standard/tests/general_functions/bug72920.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #72920 (Accessing a private constant using constant() creates an exception AND warning) +--FILE-- +<?php +class Foo { + private const C1 = "a"; +} + +try { + var_dump(constant('Foo::C1')); +} catch (Error $e) { + var_dump($e->getMessage()); +} +--EXPECT-- +string(35) "Cannot access private const Foo::C1" |