From 331e331aca1980e9b84dcd303013381ba9c5a71f Mon Sep 17 00:00:00 2001
From: Andrei Nicholson <andre@neo-anime.org>
Date: Fri, 19 Aug 2011 18:17:01 -0600
Subject: [PATCH] Distinguish between const keyword used inside class
definition and not (#50)
PHP 5.3.0 introduced behavior of using const keyword in place of define() for
global constants. token_get_all() still treats it as a class constant however.
---
classes/phpDoctor.php | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/classes/phpDoctor.php b/classes/phpDoctor.php
index d4bfef6..44d5238 100644
--- a/classes/phpDoctor.php
+++ b/classes/phpDoctor.php
@@ -807,9 +807,18 @@ function &parse()
break;
case T_STRING:
+ $constOutsideOfClass = (isset($tokens[$key - 2][1]) && $tokens[$key - 2][1] == 'const');
+
// read global constant
- if ($token[1] == 'define') {// && $tokens[$key + 2][0] == T_CONSTANT_ENCAPSED_STRING) {
- $const =& new fieldDoc($this->_getNext($tokens, $key, T_CONSTANT_ENCAPSED_STRING), $ce, $rootDoc, $filename, $lineNumber, $this->sourcePath()); // create constant object
+ if ($token[1] == 'define' || $constOutsideOfClass) {// && $tokens[$key + 2][0] == T_CONSTANT_ENCAPSED_STRING) {
+ if (!$constOutsideOfClass) {
+ // Current token is define() function.
+ $constantName = $this->_getNext($tokens, $key, T_CONSTANT_ENCAPSED_STRING);
+ } else {
+ // Current token is constant's name.
+ $constantName = $token[1];
+ }
+ $const =& new fieldDoc($constantName, $ce, $rootDoc, $filename, $lineNumber, $this->sourcePath()); // create constant object
$this->verbose('Found '.get_class($const).': global constant '.$const->name());
$const->set('final', TRUE); // is constant
$value = '';