From 434ae90e852ed2b39432baf30d928e26b834c03e Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 22 Aug 2016 23:44:38 +0800
Subject: [PATCH] Fixed bug #72920 (Accessing a private constant using
 constant() creates an exception AND warning)

---
 NEWS                                              |  4 ++++
 ext/standard/basic_functions.c                    |  4 +++-
 .../tests/general_functions/bug72920.phpt         | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 ext/standard/tests/general_functions/bug72920.phpt

diff --git a/NEWS b/NEWS
index d3e6e9f12b..31eded8861 100644
--- a/NEWS
+++ b/NEWS
@@ -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"
-- 
2.40.0