From 6d02d935df4b8c6525a00670d54f37a9de0a87e0 Mon Sep 17 00:00:00 2001 From: rojaro <> Date: Sat, 3 Oct 2009 00:11:50 +0000 Subject: php 5.3 compatibility fixes --- buildscripts/PhpDocumentor/phpDocumentor/InlineTags.inc | 6 +++--- buildscripts/PhpDocumentor/phpDocumentor/Io.inc | 5 +++-- buildscripts/PhpDocumentor/phpDocumentor/common.inc.php | 6 ++++-- buildscripts/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) (limited to 'buildscripts') diff --git a/buildscripts/PhpDocumentor/phpDocumentor/InlineTags.inc b/buildscripts/PhpDocumentor/phpDocumentor/InlineTags.inc index 1bea7734..27ae3165 100644 --- a/buildscripts/PhpDocumentor/phpDocumentor/InlineTags.inc +++ b/buildscripts/PhpDocumentor/phpDocumentor/InlineTags.inc @@ -260,21 +260,21 @@ class parserTutorialInlineTag extends parserLinkInlineTag { if (strpos(trim($this->value),' ')) { - $v = split(' ',trim($this->value)); + $v = explode(' ', trim($this->value)); $value = $c->getTutorialLink($v[0]); array_shift($v); $descrip = join($v,' '); } else $value = $c->getTutorialLink($this->value); } else { - $vals = split(',',$this->value); + $vals = explode(',',$this->value); $descrip = array(); foreach($vals as $val) { $val = trim($val); if (strpos($val,' ')) { - $v = split(' ',$val); + $v = explode(' ',$val); $value[] = $c->getTutorialLink($v[0]); array_shift($v); $descrip[] = join($v,' '); diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Io.inc b/buildscripts/PhpDocumentor/phpDocumentor/Io.inc index 0425096d..dac36bec 100644 --- a/buildscripts/PhpDocumentor/phpDocumentor/Io.inc +++ b/buildscripts/PhpDocumentor/phpDocumentor/Io.inc @@ -361,8 +361,9 @@ class Io { if (dirname($path) != $masterPath) { - $mp = split(PATH_DELIMITER,$masterPath); - $np = split(PATH_DELIMITER,str_replace('\\','/',dirname($path))); + $mp = explode(PATH_DELIMITER, $masterPath); + $np = explode(PATH_DELIMITER, str_replace('\\', '/', dirname($path))); + if (count($np) < count($mp)) { $masterPath = join($np, PATH_DELIMITER); diff --git a/buildscripts/PhpDocumentor/phpDocumentor/common.inc.php b/buildscripts/PhpDocumentor/phpDocumentor/common.inc.php index 787afd67..f86ed5da 100644 --- a/buildscripts/PhpDocumentor/phpDocumentor/common.inc.php +++ b/buildscripts/PhpDocumentor/phpDocumentor/common.inc.php @@ -238,7 +238,9 @@ function fancy_debug($s,$v) */ function phpDocumentor_get_class($object) { - return strtolower(get_class($object)); + if(is_object($object)) + return strtolower(get_class($object)); + return false; } -?> \ No newline at end of file +?> diff --git a/buildscripts/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc b/buildscripts/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc index b5c5c733..24a816e9 100644 --- a/buildscripts/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc +++ b/buildscripts/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc @@ -1660,7 +1660,7 @@ class phpDocumentorTParser extends Parser } else { $save = $value[$i]; - $value[$i] = split("[\t ]",str_replace("\t",' ',$value[$i])); + $value[$i] = preg_split("/[\t ]/", str_replace("\t", ' ', $value[$i])); $word = trim(array_shift($value[$i])); $val = join(' ',$value[$i]); if (trim($word) == 'internal') @@ -2612,4 +2612,4 @@ class phpDocumentorTParser extends Parser $this->_wp->setWhitespace(false); } } -?> \ No newline at end of file +?> -- cgit v1.2.3