svn: /phd/trunk/phpdotnet/phd/Package/ Default/XHTML.php PHP/XHTML.php

moacir Fri, 31 Jul 2009 15:22:22 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286596 Log: Fixing bug #49102 Bug: http://bugs.php.net/49102 (Assigned) Class reference pages weird again Changed paths: U phd/trunk/phpdotnet/phd/Package/Default/XHTML.php U phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php Modified: phd/trunk/phpdotnet/phd/Package/Default/XHTML.php =================================================================== --- phd/trunk/phpdotnet/phd/Package/Default/XHTML.php 2009-07-31 15:03:15 UTC (rev 286595) +++ phd/trunk/phpdotnet/phd/Package/Default/XHTML.php 2009-07-31 15:22:22 UTC (rev 286596) @@ -34,7 +34,6 @@ 'copyright' => 'format_copyright', 'date' => 'p', 'editor' => 'format_editor', - 'function' => 'b', 'email' => 'format_suppressed_tags', 'firstname' => 'format_name', 'footnote' => 'format_footnote', @@ -359,6 +358,21 @@ 'classsynopsis' => 'format_classsynopsis_ooclass_classname_text', ), ), + 'methodname' => array( + /* DEFAULT */ false, + 'constructorsynopsis' => array( + /* DEFAULT */ false, + 'classsynopsis' => 'format_classsynopsis_methodsynopsis_methodname_text', + ), + 'methodsynopsis' => array( + /* DEFAULT */ false, + 'classsynopsis' => 'format_classsynopsis_methodsynopsis_methodname_text', + ), + 'destructorsynopsis' => array( + /* DEFAULT */ false, + 'classsynopsis' => 'format_classsynopsis_methodsynopsis_methodname_text', + ), + ), 'para' => array( /* DEFAULT */ false, 'footnote' => 'format_footnote_para_text', @@ -813,6 +827,26 @@ return "</div>"; } + public function format_classsynopsis_methodsynopsis_methodname_text($value, $tag) { + $value = $this->TEXT($value); + if ($this->cchunk["classsynopsis"]["classname"] === false) { + return $value; + } + if (strpos($value, '::')) { + $explode = '::'; + } elseif (strpos($value, '->')) { + $explode = '->'; + } else { + return $value; + } + + list($class, $method) = explode($explode, $value); + if ($class !== $this->cchunk["classsynopsis"]["classname"]) { + return $value; + } + return $method; + } + public function format_classsynopsis_ooclass_classname_text($value, $tag) { $this->cchunk["classsynopsis"]["classname"] = $value; return $this->TEXT($value); Modified: phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php =================================================================== --- phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php 2009-07-31 15:03:15 UTC (rev 286595) +++ phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php 2009-07-31 15:22:22 UTC (rev 286596) @@ -57,26 +57,9 @@ ); private $mytextmap = array( 'acronym' => 'format_acronym_text', - 'classname' => 'format_classname_text', 'function' => 'format_function_text', 'interfacename' => 'format_classname_text', 'refname' => 'format_refname_text', - - 'methodname' => - /* DEFAULT */ 'format_function_text', -// 'constructorsynopsis' => array( -// /* DEFAULT */ 'format_function_text', -// 'classsynopsis' => 'format_classsynopsis_methodsynopsis_methodname_text', -// ), -// 'methodsynopsis' => array( -// /* DEFAULT */ 'format_function_text', -// 'classsynopsis' => 'format_classsynopsis_methodsynopsis_methodname_text', -// ), -// 'destructorsynopsis' => array( -// /* DEFAULT */ 'format_function_text', -// 'classsynopsis' => 'format_classsynopsis_methodsynopsis_methodname_text', -// ), - //), // 'type' => array( // /* DEFAULT */ 'format_type_text', // 'classsynopsisinfo' => false, @@ -286,6 +269,11 @@ return '<acronym>'.$value.'</acronym>'; } + public function format_classsynopsis_methodsynopsis_methodname_text($value, $tag) { + $display_value = parent::format_classsynopsis_methodsynopsis_methodname_text($value, $tag); + return $this->format_function_text($value, $tag, $display_value); + } + public function format_function_text($value, $tag, $display_value = null) { if ($display_value === null) { $display_value = $value;