svn: /phd/trunk/ phpdotnet/phd/Format.php phpdotnet/phd/Package/Default/XHTML.php phpdotnet/phd/Package/PHP/XHTML.php phpdotnet/phd/Render.php
render.php
| From: | Moacir de Oliveira Miranda Júnior | Date: | Sat, 01 Aug 2009 20:04:21 +0000 |
| Subject: | svn: /phd/trunk/ phpdotnet/phd/Format.php phpdotnet/phd/Package/Default/XHTML.php phpdotnet/phd/Package/PHP/XHTML.php phpdotnet/phd/Render.php render.php |
||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-4591@lists.php.net to get a copy of this message | ||
moacir Sat, 01 Aug 2009 20:04:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286633
Log:
changing the name of the method render() of the Render class, now execute(). Conflict with the
constructor
Changed paths:
U phd/trunk/phpdotnet/phd/Format.php
U phd/trunk/phpdotnet/phd/Package/Default/XHTML.php
U phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php
U phd/trunk/phpdotnet/phd/Render.php
U phd/trunk/render.php
Modified: phd/trunk/phpdotnet/phd/Format.php
===================================================================
--- phd/trunk/phpdotnet/phd/Format.php 2009-08-01 19:19:10 UTC (rev 286632)
+++ phd/trunk/phpdotnet/phd/Format.php 2009-08-01 20:04:21 UTC (rev 286633)
@@ -217,7 +217,7 @@
$this->appendToBuffer = true;
$render->attach($this);
- $render->render($reader);
+ $render->execute($reader);
$this->appendToBuffer = false;
$parsed = $this->buffer;
$this->buffer = "";
Modified: phd/trunk/phpdotnet/phd/Package/Default/XHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/Default/XHTML.php 2009-08-01 19:19:10 UTC (rev 286632)
+++ phd/trunk/phpdotnet/phd/Package/Default/XHTML.php 2009-08-01 20:04:21 UTC (rev 286633)
@@ -1411,7 +1411,7 @@
$render = new Render;
$render->attach($this);
- $render->render($r);
+ $render->execute($r);
}
}
public function format_question($open, $name, $attrs, $props) {
Modified: phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php 2009-08-01 19:19:10 UTC (rev 286632)
+++ phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php 2009-08-01 20:04:21 UTC (rev 286633)
@@ -113,7 +113,7 @@
protected $cchunk = array();
/* Default Chunk settings */
- private $dchunk = array(
+ protected $dchunk = array(
"phpdoc:classref" => null,
"fieldsynopsis" => array(
"modifier" => "public",
Modified: phd/trunk/phpdotnet/phd/Render.php
===================================================================
--- phd/trunk/phpdotnet/phd/Render.php 2009-08-01 19:19:10 UTC (rev 286632)
+++ phd/trunk/phpdotnet/phd/Render.php 2009-08-01 20:04:21 UTC (rev 286633)
@@ -39,7 +39,7 @@
return parent::attach($obj, $inf);
} /* }}} */
- public function render(Reader $r) { /* {{{ */
+ public function execute(Reader $r) { /* {{{ */
ObjectStorage::setReader($r);
foreach($this as $format) {
Modified: phd/trunk/render.php
===================================================================
--- phd/trunk/render.php 2009-08-01 19:19:10 UTC (rev 286632)
+++ phd/trunk/render.php 2009-08-01 20:04:21 UTC (rev 286633)
@@ -45,7 +45,7 @@
$format = $render->attach(new Index);
$reader->open(Config::xml_file());
- $render->render($reader);
+ $render->execute($reader);
$render->detach($format);
@@ -74,7 +74,7 @@
foreach($render as $format) {
$format->notify(Render::VERBOSE, true);
}
- $render->render($reader);
+ $render->execute($reader);
}
v("Finished rendering", VERBOSE_FORMAT_RENDERING);