From: Hannes Magnusson <bjori@php.net>
Date: Sun, 11 Jun 2006 23:46:53 +0000 (+0000)
Subject: Only display visibility for methods
X-Git-Tag: RELEASE_1_0_0RC1~2742
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6486b8116ce65b98adf1b7b9fc23ba31a9f84ab;p=php

Only display visibility for methods
---

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index b9bf53c1bb..220b47e247 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -717,23 +717,27 @@ static void _function_string(string *str, zend_function *fptr, zend_class_entry
 		string_printf(str, "static ");
 	}
 
-	/* These are mutually exclusive */
-	switch (fptr->common.fn_flags & ZEND_ACC_PPP_MASK) {
-		case ZEND_ACC_PUBLIC:
-			string_printf(str, "public ");
-			break;
-		case ZEND_ACC_PRIVATE:
-			string_printf(str, "private ");
-			break;
-		case ZEND_ACC_PROTECTED:
-			string_printf(str, "protected ");
-			break;
-		default:
-		    string_printf(str, "<visibility error> ");
-		    break;
+	if (fptr->common.scope) {
+		/* These are mutually exclusive */
+		switch (fptr->common.fn_flags & ZEND_ACC_PPP_MASK) {
+			case ZEND_ACC_PUBLIC:
+				string_printf(str, "public ");
+				break;
+			case ZEND_ACC_PRIVATE:
+				string_printf(str, "private ");
+				break;
+			case ZEND_ACC_PROTECTED:
+				string_printf(str, "protected ");
+				break;
+			default:
+			    string_printf(str, "<visibility error> ");
+			    break;
+		}
+		string_printf(str, "method ");
+	} else {
+		string_printf(str, "function ");
 	}
 
-	string_printf(str, fptr->common.scope ? "method " : "function ");
 	if (fptr->op_array.return_reference) {
 		string_printf(str, "&");
 	}