Package home | Report new bug | New search | Development Roadmap Status: Open | Feedback | All | Closed Since Version 1.5.0a1

Bug #6848 Reference Patch
Submitted: 2006-02-20 19:27 UTC Modified: 2006-02-23 10:09 UTC
From: jeichorn Assigned: cellog
Status: Closed Package: PhpDocumentor (version CVS)
PHP Version: 4.4.2 OS:
Roadmaps: (Not assigned)    
Subscription  


 [2006-02-20 19:27 UTC] jeichorn (Joshua Eichorn)
Description: ------------ Patch for 4.4.2 reference bugs, im guessing these would also be hit in newest 5.0.x and 5.1.x. This patch is from Christian Stadler stadler@ragnarokonline.de Looking for a review and then too be applied

Comments

 [2006-02-20 19:28 UTC] jeichorn at php dot net
Index: PhpDocumentor/phpDocumentor/Classes.inc =================================================================== RCS file: /repository/pear/PhpDocumentor/phpDocumentor/Classes.inc,v retrieving revision 1.3 diff -u -r1.3 Classes.inc --- PhpDocumentor/phpDocumentor/Classes.inc 4 Feb 2006 19:27:07 -0000 1.3 +++ PhpDocumentor/phpDocumentor/Classes.inc 19 Feb 2006 06:40:32 -0000 @@ -957,7 +957,8 @@ if (!isset($this->classesbynamefile[$class])) { // addWarning(PDERROR_CLASS_NOT_IN_PACKAGE,$class,$package); // removed, too many warnings, not very useful - return false; + $flag = false; + return $flag; } for($i=0; $i < count($this->classesbynamefile[$class]); $i++) { @@ -967,7 +968,8 @@ return $cls; } // addWarning(PDERROR_CLASS_NOT_IN_PACKAGE,$class,$package); - return false; + $flag = false; + return $flag; } /** Index: PhpDocumentor/phpDocumentor/DocBlockTags.inc =================================================================== RCS file: /repository/pear/PhpDocumentor/phpDocumentor/DocBlockTags.inc,v retrieving revision 1.1 diff -u -r1.1 DocBlockTags.inc --- PhpDocumentor/phpDocumentor/DocBlockTags.inc 17 Oct 2005 18:36:55 -0000 1.1 +++ PhpDocumentor/phpDocumentor/DocBlockTags.inc 19 Feb 2006 06:36:17 -0000 @@ -78,7 +78,7 @@ if (count($this->value) == 1) { list(,$val) = each($this->value); - reset($this->value); + $val = reset($this->value); return $val->Convert($converter); } $result = ''; Index: PhpDocumentor/phpDocumentor/XMLpackagePageParser.inc =================================================================== RCS file: /repository/pear/PhpDocumentor/phpDocumentor/XMLpackagePageParser.inc,v retrieving revision 1.1 diff -u -r1.1 XMLpackagePageParser.inc --- PhpDocumentor/phpDocumentor/XMLpackagePageParser.inc 17 Oct 2005 18:36:57 -0000 1.1 +++ PhpDocumentor/phpDocumentor/XMLpackagePageParser.inc 19 Feb 2006 06:20:46 -0000 @@ -213,20 +213,17 @@ $this->p_vars['quote_data'] = ""; } if (!is_object($word)) $this->checkEventPush( $word, $pevent); - if ($word != "\"") + if (is_object($word)) { - if (is_object($word)) - { - $this->p_vars['quote_data'] = $word; - } - else + $this->p_vars['quote_data'] = $word; + } + else + { + if ($word != "\"") { if (!is_object($this->p_vars['quote_data'])) $this->p_vars['quote_data'] .= $word; } - } - if (!is_object($word)) - { if ($word == '>') { if (is_object($this->p_vars['quote_data'])) $this->p_vars['quote_data'] = '{@id '.$this->p_vars['quote_data']->id.'}'; @@ -346,7 +343,7 @@ return; } } - if ($word == '<![CDATA[') + if (!is_object($word) && $word == '<![CDATA[') { $this->curtag->startCData(); $this->p_flags['in_cdata'] = true;
 [2006-02-23 10:09 UTC] cellog
This bug has been fixed in CVS. If this was a documentation problem, the fix will appear on pear.php.net by the end of next Sunday (CET). If this was a problem with the pear.php.net website, the change should be live shortly. Otherwise, the fix will appear in the package's next release. Thank you for the report and for helping us make PEAR better. there was one minor bug in the patch, but otherwise it is fine.