From: Johannes Schlüter <johannes@php.net>
Date: Sat, 9 Jun 2007 08:36:52 +0000 (+0000)
Subject: Fix #41640 (get_class_vars produces error on class constants)
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~483
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eae4b3109ed45e55aeed13d4b27a2f88c39d0f35;p=php

Fix #41640 (get_class_vars produces error on class constants)
---

diff --git a/Zend/tests/bug41640.phpt b/Zend/tests/bug41640.phpt
new file mode 100644
index 0000000000..c859d90850
--- /dev/null
+++ b/Zend/tests/bug41640.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #41640 (get_class_vars produces error on class constants)
+--FILE--
+<?php
+class foo {
+        const FOO = 1;
+        public $x = self::FOO;
+}
+
+var_dump(get_class_vars("foo"));
+--EXPECT--
+array(1) {
+  ["x"]=>
+  int(1)
+}
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 97fedfa18e..63a96f8588 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -815,8 +815,8 @@ ZEND_FUNCTION(get_class_vars)
 		RETURN_FALSE;
 	} else {
 		array_init(return_value);
-		add_class_vars(*pce, &(*pce)->default_properties, return_value TSRMLS_CC);
 		zend_update_class_constants(*pce TSRMLS_CC);
+		add_class_vars(*pce, &(*pce)->default_properties, return_value TSRMLS_CC);
 		add_class_vars(*pce, CE_STATIC_MEMBERS(*pce), return_value TSRMLS_CC);
 	}
 }