diff --git a/phpdotnet/phd/Format.php b/phpdotnet/phd/Format.php index d5a217a1..215c932e 100644 --- a/phpdotnet/phd/Format.php +++ b/phpdotnet/phd/Format.php @@ -290,12 +290,12 @@ final public function registerElementMap(array $map) { final public function registerTextMap(array $map) { $this->textmap = $map; } - final public function attach($obj, $inf = array()): void { - if (!($obj instanceof $this) && get_class($obj) != get_class($this)) { - throw new \InvalidArgumentException(get_class($this) . " themes *MUST* _inherit_ " .get_class($this). ", got " . get_class($obj)); + final public function attach(object $object, mixed $info = array()): void { + if (!($object instanceof $this) && get_class($object) != get_class($this)) { + throw new \InvalidArgumentException(get_class($this) . " themes *MUST* _inherit_ " .get_class($this). ", got " . get_class($object)); } - $obj->notify(Render::STANDALONE, false); - parent::attach($obj, $inf); + $object->notify(Render::STANDALONE, false); + parent::attach($object, $info); } final public function getElementMap() { return $this->elementmap; diff --git a/phpdotnet/phd/Format/Abstract/Manpage.php b/phpdotnet/phd/Format/Abstract/Manpage.php index 1e821b21..9e940279 100644 --- a/phpdotnet/phd/Format/Abstract/Manpage.php +++ b/phpdotnet/phd/Format/Abstract/Manpage.php @@ -15,12 +15,12 @@ public function UNDEF($open, $name, $attrs, $props) { return "\n.B [NOT PROCESSED] $name [/NOT PROCESSED]"; } - public function CDATA($str) { - return $this->highlight(trim($str), $this->role, 'troff'); + public function CDATA($value) { + return $this->highlight(trim($value), $this->role, 'troff'); } - public function TEXT($str) { - $ret = preg_replace( '/[ \n\t]+/', ' ', $str); + public function TEXT($value) { + $ret = preg_replace( '/[ \n\t]+/', ' ', $value); // Escape \ ' and NUL byte $ret = addcslashes($ret, "\\'\0"); diff --git a/phpdotnet/phd/Format/Abstract/PDF.php b/phpdotnet/phd/Format/Abstract/PDF.php index 14f0589c..13e68bed 100644 --- a/phpdotnet/phd/Format/Abstract/PDF.php +++ b/phpdotnet/phd/Format/Abstract/PDF.php @@ -22,8 +22,8 @@ public function UNDEF($open, $name, $attrs, $props) { return ""; } - public function CDATA($str) { - $this->pdfDoc->appendText(utf8_decode(trim($str))); + public function CDATA($value) { + $this->pdfDoc->appendText(utf8_decode(trim($value))); return ""; } @@ -33,7 +33,7 @@ public function transformFromMap($open, $tag, $name, $attrs, $props) { public function createLink($for, &$desc = null, $type = Format::SDESC){} - public function TEXT($str) {} + public function TEXT($value) {} } diff --git a/phpdotnet/phd/Format/Abstract/XHTML.php b/phpdotnet/phd/Format/Abstract/XHTML.php index b62471b0..ef1cc3ac 100644 --- a/phpdotnet/phd/Format/Abstract/XHTML.php +++ b/phpdotnet/phd/Format/Abstract/XHTML.php @@ -30,8 +30,8 @@ public function transformFromMap($open, $tag, $name, $attrs, $props) { return ''; } - public function TEXT($str) { - return htmlspecialchars($str, ENT_QUOTES, "UTF-8"); + public function TEXT($value) { + return htmlspecialchars($value, ENT_QUOTES, "UTF-8"); } public function UNDEF($open, $name, $attrs, $props) { @@ -40,15 +40,15 @@ public function UNDEF($open, $name, $attrs, $props) { } } - public function CDATA($str) { + public function CDATA($value) { switch($this->getRole()) { case '': return '
'
-                . htmlspecialchars($str, ENT_QUOTES, "UTF-8")
+                . htmlspecialchars($value, ENT_QUOTES, "UTF-8")
                 . '
'; default: return '
' - . $this->highlight(trim($str), $this->getRole(), 'xhtml') + . $this->highlight(trim($value), $this->getRole(), 'xhtml') . '
'; } } diff --git a/phpdotnet/phd/ObjectStorage.php b/phpdotnet/phd/ObjectStorage.php index 7b6416fd..1d5218d3 100644 --- a/phpdotnet/phd/ObjectStorage.php +++ b/phpdotnet/phd/ObjectStorage.php @@ -3,19 +3,19 @@ class ObjectStorage extends \SplObjectStorage { - public function attach($obj, $inf = array()): void { - if (!($obj instanceof Format)) { + public function attach(object $object, mixed $info = array()): void { + if (!($object instanceof Format)) { throw new \InvalidArgumentException( 'Only classess inheriting ' . __NAMESPACE__ . '\\Format supported' ); } - if (empty($inf)) { - $inf = array( - \XMLReader::ELEMENT => $obj->getElementMap(), - \XMLReader::TEXT => $obj->getTextMap(), + if (empty($info)) { + $info = array( + \XMLReader::ELEMENT => $object->getElementMap(), + \XMLReader::TEXT => $object->getTextMap(), ); } - parent::attach($obj, $inf); + parent::attach($object, $info); } } diff --git a/phpdotnet/phd/Package/Generic/BigXHTML.php b/phpdotnet/phd/Package/Generic/BigXHTML.php index 7d718964..5bbaf627 100644 --- a/phpdotnet/phd/Package/Generic/BigXHTML.php +++ b/phpdotnet/phd/Package/Generic/BigXHTML.php @@ -60,21 +60,21 @@ public function close() { } } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - $this->flags = $val; + $this->flags = $value; break; case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(parent::getDefaultElementMap()); $this->registerTextMap(parent::getDefaultTextMap()); } break; case Render::INIT: - if ($val) { + if ($value) { if (!is_resource($this->getFileStream())) { $filename = $this->config->output_dir(); if ($this->config->output_filename()) { diff --git a/phpdotnet/phd/Package/Generic/ChunkedXHTML.php b/phpdotnet/phd/Package/Generic/ChunkedXHTML.php index 1b97eb5e..9e2e6eeb 100644 --- a/phpdotnet/phd/Package/Generic/ChunkedXHTML.php +++ b/phpdotnet/phd/Package/Generic/ChunkedXHTML.php @@ -52,14 +52,14 @@ public function close() { } } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - $this->flags = $val; + $this->flags = $value; break; case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(static::getDefaultElementMap()); $this->registerTextMap(static::getDefaultTextMap()); } diff --git a/phpdotnet/phd/Package/Generic/Manpage.php b/phpdotnet/phd/Package/Generic/Manpage.php index 1c18a128..b839bccb 100644 --- a/phpdotnet/phd/Package/Generic/Manpage.php +++ b/phpdotnet/phd/Package/Generic/Manpage.php @@ -265,10 +265,10 @@ public function __construct(Config $config) { $this->cchunk = $this->dchunk; } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - switch($val) { + switch($value) { case self::OPEN_CHUNK: if ($this->getFileStream()) { /* I have an already open stream, back it up */ @@ -299,7 +299,7 @@ public function update($event, $val = null) { break; case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(self::getDefaultElementMap()); $this->registerTextMap(self::getDefaultTextMap()); } else { diff --git a/phpdotnet/phd/Package/Generic/PDF.php b/phpdotnet/phd/Package/Generic/PDF.php index 407dfb46..a829b104 100644 --- a/phpdotnet/phd/Package/Generic/PDF.php +++ b/phpdotnet/phd/Package/Generic/PDF.php @@ -328,16 +328,16 @@ public function getDefaultTextmap() { return $this->textmap; } - public function TEXT($str) { + public function TEXT($value) { if (isset($this->cchunk["refsection"]) && $this->cchunk["refsection"]) // DUMMY REFSECTION DELETION return ""; if (isset($this->cchunk["verbatim-block"]) && $this->cchunk["verbatim-block"]) { - $this->pdfDoc->appendText(utf8_decode($str)); + $this->pdfDoc->appendText(utf8_decode($value)); return ""; } - $ret = utf8_decode(trim(preg_replace('/[ \n\t]+/', ' ', $str))); + $ret = utf8_decode(trim(preg_replace('/[ \n\t]+/', ' ', $value))); // No whitespace if current text value begins with ',', ';', ':', '.' if (strncmp($ret, ",", 1) && strncmp($ret, ";", 1) && strncmp($ret, ":", 1) && strncmp($ret, ".", 1)) $this->pdfDoc->appendText(" " . $ret); diff --git a/phpdotnet/phd/Package/Generic/TocFeed.php b/phpdotnet/phd/Package/Generic/TocFeed.php index a7ca9eb2..9ff9c360 100644 --- a/phpdotnet/phd/Package/Generic/TocFeed.php +++ b/phpdotnet/phd/Package/Generic/TocFeed.php @@ -204,11 +204,11 @@ public function close() * * @return void */ - public function update($event, $val = null) + public function update($event, $value = null) { switch($event) { case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(static::getDefaultElementMap()); $this->registerTextMap(static::getDefaultTextMap()); } @@ -499,9 +499,9 @@ public function CDATA($value) * * @uses $targetBaseUri */ - public function createLink($id, &$desc = null, $type = Format::SDESC) + public function createLink($for, &$desc = null, $type = Format::SDESC) { - return $this->feedBaseUri . $id . $this->ext; + return $this->feedBaseUri . $for . $this->ext; } /** diff --git a/phpdotnet/phd/Package/PEAR/BigXHTML.php b/phpdotnet/phd/Package/PEAR/BigXHTML.php index 114c1fc7..c5052d90 100755 --- a/phpdotnet/phd/Package/PEAR/BigXHTML.php +++ b/phpdotnet/phd/Package/PEAR/BigXHTML.php @@ -78,21 +78,21 @@ public function appendData($data) { } } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - $this->flags = $val; + $this->flags = $value; break; case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(parent::getDefaultElementMap()); $this->registerTextMap(parent::getDefaultTextMap()); } break; case Render::INIT: - if ($val) { + if ($value) { $this->postConstruct(); if ($this->config->css()) { $this->fetchStylesheet(); diff --git a/phpdotnet/phd/Package/PEAR/CHM.php b/phpdotnet/phd/Package/PEAR/CHM.php index 3c25e455..91aecf7b 100755 --- a/phpdotnet/phd/Package/PEAR/CHM.php +++ b/phpdotnet/phd/Package/PEAR/CHM.php @@ -209,13 +209,13 @@ public function __destruct() { parent::__destruct(); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - parent::update($event, $val); + parent::update($event, $value); break; case Render::STANDALONE: - parent::update($event, $val); + parent::update($event, $value); break; case Render::INIT: $this->chmdir = $this->config->output_dir() . strtolower($this->getFormatName()) . DIRECTORY_SEPARATOR; @@ -239,7 +239,7 @@ public function update($event, $val = null) { self::headerChm(); break; case Render::VERBOSE: - parent::update($event, $val); + parent::update($event, $value); break; } } diff --git a/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php b/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php index c9fd2136..7a8eb9f6 100755 --- a/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php +++ b/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php @@ -54,14 +54,14 @@ public function close() { } } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - $this->flags = $val; + $this->flags = $value; break; case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(static::getDefaultElementMap()); $this->registerTextMap(static::getDefaultTextMap()); } diff --git a/phpdotnet/phd/Package/PEAR/XHTML.php b/phpdotnet/phd/Package/PEAR/XHTML.php index e4e78201..f78e770b 100755 --- a/phpdotnet/phd/Package/PEAR/XHTML.php +++ b/phpdotnet/phd/Package/PEAR/XHTML.php @@ -744,42 +744,42 @@ public function format_literallayout($open, $name, $attrs) * Format a CDATA section. Automatically trims and highlights * the text when necessary. * - * @param string $str CDATA content + * @param string $value CDATA content * * @return string Formatted string * * @see $trim * @see $role */ - public function CDATA($str) + public function CDATA($value) { if ($this->trim) { - $str = rtrim($str); + $value = rtrim($value); } if (!$this->getRole()) { return str_replace( array("\n", ' '), array('
', ' '), - htmlspecialchars($str, ENT_QUOTES, 'UTF-8') + htmlspecialchars($value, ENT_QUOTES, 'UTF-8') ); } switch ($this->getRole()) { case 'php': - if (strrpos($str, '')) { - $str = $this->highlight(trim($str), $this->getRole(), 'xhtml'); + if (strrpos($value, '')) { + $value = $this->highlight(trim($value), $this->getRole(), 'xhtml'); } else { - $str = $this->highlight("", $this->getRole(), 'xhtml'); + $value = $this->highlight("", $this->getRole(), 'xhtml'); } break; case '': - $str = htmlspecialchars($str, ENT_QUOTES, 'UTF-8'); + $value = htmlspecialchars($value, ENT_QUOTES, 'UTF-8'); break; default: - $str = $this->highlight($str, $this->getRole(), 'xhtml'); + $value = $this->highlight($value, $this->getRole(), 'xhtml'); break; } - return $str; + return $value; } public function format_surname($open, $name, $attrs) diff --git a/phpdotnet/phd/Package/PHP/BigPDF.php b/phpdotnet/phd/Package/PHP/BigPDF.php index add32ad2..73c989e7 100644 --- a/phpdotnet/phd/Package/PHP/BigPDF.php +++ b/phpdotnet/phd/Package/PHP/BigPDF.php @@ -7,10 +7,10 @@ public function __construct(Config $config) { $this->registerFormatName("PHP-BigPDF"); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(parent::getDefaultElementMap()); $this->registerTextMap(parent::getDefaultTextMap()); } diff --git a/phpdotnet/phd/Package/PHP/BigXHTML.php b/phpdotnet/phd/Package/PHP/BigXHTML.php index 6ab415a9..7fe771b6 100644 --- a/phpdotnet/phd/Package/PHP/BigXHTML.php +++ b/phpdotnet/phd/Package/PHP/BigXHTML.php @@ -73,21 +73,21 @@ public function appendData($data) { } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - $this->flags = $val; + $this->flags = $value; break; case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(parent::getDefaultElementMap()); $this->registerTextMap(parent::getDefaultTextMap()); } break; case Render::INIT: - if ($val) { + if ($value) { $this->loadVersionAcronymInfo(); $this->postConstruct(); if ($this->config->css()) { diff --git a/phpdotnet/phd/Package/PHP/CHM.php b/phpdotnet/phd/Package/PHP/CHM.php index 3deac77f..ebe64ab2 100644 --- a/phpdotnet/phd/Package/PHP/CHM.php +++ b/phpdotnet/phd/Package/PHP/CHM.php @@ -217,14 +217,14 @@ public function __destruct() { parent::__destruct(); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - parent::update($event, $val); + parent::update($event, $value); break; case Render::STANDALONE: - parent::update($event, $val); + parent::update($event, $value); break; case Render::INIT: @@ -254,7 +254,7 @@ public function update($event, $val = null) { ); break; case Render::VERBOSE: - parent::update($event, $val); + parent::update($event, $value); break; } } diff --git a/phpdotnet/phd/Package/PHP/EnhancedCHM.php b/phpdotnet/phd/Package/PHP/EnhancedCHM.php index 662202fa..a2fd6bb0 100644 --- a/phpdotnet/phd/Package/PHP/EnhancedCHM.php +++ b/phpdotnet/phd/Package/PHP/EnhancedCHM.php @@ -14,10 +14,10 @@ public function __construct(Config $config) { $this->registerFormatName("PHP-EnhancedCHM"); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::INIT: - parent::update($event, $val); + parent::update($event, $value); // Use %TEMP%/usernotes as base directory for Usernotes. $temp = sys_get_temp_dir(); @@ -105,7 +105,7 @@ public function update($event, $val = null) { break; default: - parent::update($event, $val); + parent::update($event, $value); } } diff --git a/phpdotnet/phd/Package/PHP/Epub.php b/phpdotnet/phd/Package/PHP/Epub.php index a5814ac5..ffe5918d 100644 --- a/phpdotnet/phd/Package/PHP/Epub.php +++ b/phpdotnet/phd/Package/PHP/Epub.php @@ -29,7 +29,7 @@ public function __construct(Config $config) { $this->registerFormatName("PHP-Epub"); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::INIT: $this->parentdir = $this->config->output_dir() @@ -64,7 +64,7 @@ public function update($event, $val = null) { $this->closeNCX(); break; default: - parent::update($event, $val); + parent::update($event, $value); } } diff --git a/phpdotnet/phd/Package/PHP/HowTo.php b/phpdotnet/phd/Package/PHP/HowTo.php index 36051b42..c74a523e 100644 --- a/phpdotnet/phd/Package/PHP/HowTo.php +++ b/phpdotnet/phd/Package/PHP/HowTo.php @@ -13,12 +13,12 @@ public function __destruct() { parent::__destruct(); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: case Render::STANDALONE: case Render::VERBOSE: - parent::update($event, $val); + parent::update($event, $value); break; case Render::INIT: $this->setOutputDir($this->config->output_dir() . strtolower($this->getFormatName()) . '/'); diff --git a/phpdotnet/phd/Package/PHP/KDevelop.php b/phpdotnet/phd/Package/PHP/KDevelop.php index 13e766de..b51f68f8 100644 --- a/phpdotnet/phd/Package/PHP/KDevelop.php +++ b/phpdotnet/phd/Package/PHP/KDevelop.php @@ -84,16 +84,16 @@ public function CDATA($value) {} public function createLink($for, &$desc = null, $type = Format::SDESC) {} public function appendData($data) {} - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap($this->elementmap); $this->registerTextMap($this->textmap); } break; case Render::INIT: - if ($val) { + if ($value) { $this->setOutputDir($this->config->output_dir()); $this->setFileStream(fopen($this->getOutputDir() . strtolower($this->getFormatName()), "w")); self::headerToc(); diff --git a/phpdotnet/phd/Package/PHP/Manpage.php b/phpdotnet/phd/Package/PHP/Manpage.php index 929e0ec2..eeacf179 100644 --- a/phpdotnet/phd/Package/PHP/Manpage.php +++ b/phpdotnet/phd/Package/PHP/Manpage.php @@ -49,10 +49,10 @@ public function __destruct() { $this->close(); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(array_merge(parent::getDefaultElementMap(), $this->elementmap)); $this->registerTextMap(array_merge(parent::getDefaultTextMap(), $this->textmap)); } else { @@ -61,7 +61,7 @@ public function update($event, $val = null) { } break; default: - return parent::update($event, $val); + return parent::update($event, $value); break; } } diff --git a/phpdotnet/phd/Package/PHP/PDF.php b/phpdotnet/phd/Package/PHP/PDF.php index 8a528286..83b9c718 100644 --- a/phpdotnet/phd/Package/PHP/PDF.php +++ b/phpdotnet/phd/Package/PHP/PDF.php @@ -103,10 +103,10 @@ public function __construct(Config $config) { public function __destruct() {} - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap($this->getDefaultElementMap()); $this->registerTextMap($this->getDefaultTextMap()); } else { diff --git a/phpdotnet/phd/Package/PHP/TocFeed.php b/phpdotnet/phd/Package/PHP/TocFeed.php index 343cb987..196a9efd 100644 --- a/phpdotnet/phd/Package/PHP/TocFeed.php +++ b/phpdotnet/phd/Package/PHP/TocFeed.php @@ -115,17 +115,17 @@ class Package_PHP_TocFeed extends Package_Generic_TocFeed * Overriding the update() method to extend the parent element map. * Only the Render::STANDALONE event is overrided. */ - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(array_merge( parent::getDefaultElementMap(), $this->myelementmap)); } break; default: - parent::update($event, $val); + parent::update($event, $value); } } diff --git a/phpdotnet/phd/Package/PHP/Web.php b/phpdotnet/phd/Package/PHP/Web.php index 73f086e9..e6e5dea4 100644 --- a/phpdotnet/phd/Package/PHP/Web.php +++ b/phpdotnet/phd/Package/PHP/Web.php @@ -59,18 +59,18 @@ public function writeChunk($id, $fp) { file_put_contents($filename, $this->footer($id), FILE_APPEND); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::FINALIZE: $this->writeJsonIndex(); break; case Render::CHUNK: - $this->flags = $val; + $this->flags = $value; break; case Render::STANDALONE: - if ($val) { + if ($value) { $this->registerElementMap(static::getDefaultElementMap()); $this->registerTextMap(static::getDefaultTextMap()); } diff --git a/phpdotnet/phd/Render.php b/phpdotnet/phd/Render.php index d58d50e2..1e536920 100644 --- a/phpdotnet/phd/Render.php +++ b/phpdotnet/phd/Render.php @@ -27,15 +27,15 @@ public function notXPath($tag, $depth) { /* {{{ */ return $tag; } /* }}} */ - public function attach($obj, $inf = array()): void { /* {{{ */ - if (!($obj instanceof Format)) { + public function attach(object $object, mixed $info = array()): void { /* {{{ */ + if (!($object instanceof Format)) { throw new \InvalidArgumentException( 'All formats *MUST* inherit ' . __NAMESPACE__ . '\\Format' ); } - $obj->notify(Render::STANDALONE, true); + $object->notify(Render::STANDALONE, true); - parent::attach($obj, $inf); + parent::attach($object, $info); } /* }}} */ public function execute(Reader $r) { /* {{{ */ diff --git a/phpdotnet/phd/TestGenericChunkedXHTML.php b/phpdotnet/phd/TestGenericChunkedXHTML.php index d7cd2d28..a8d199a1 100644 --- a/phpdotnet/phd/TestGenericChunkedXHTML.php +++ b/phpdotnet/phd/TestGenericChunkedXHTML.php @@ -6,13 +6,13 @@ public function __construct(Config $config) { parent::__construct($config); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - parent::update($event, $val); + parent::update($event, $value); break; case Render::STANDALONE: - parent::update($event, $val); + parent::update($event, $value); break; case Render::INIT: $this->setOutputDir($this->config->output_dir() . strtolower($this->getFormatName()) . '/'); diff --git a/phpdotnet/phd/TestPHPBigXHTML.php b/phpdotnet/phd/TestPHPBigXHTML.php index 1355dbf8..b2bfb873 100644 --- a/phpdotnet/phd/TestPHPBigXHTML.php +++ b/phpdotnet/phd/TestPHPBigXHTML.php @@ -2,13 +2,13 @@ namespace phpdotnet\phd; class TestPHPBigXHTML extends Package_PHP_BigXHTML { - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - parent::update($event, $val); + parent::update($event, $value); break; case Render::STANDALONE: - parent::update($event, $val); + parent::update($event, $value); break; case Render::INIT: echo "Filename: " . $this->createFileName() . "\n"; diff --git a/phpdotnet/phd/TestPHPChunkedXHTML.php b/phpdotnet/phd/TestPHPChunkedXHTML.php index 64990c07..6deeed4f 100644 --- a/phpdotnet/phd/TestPHPChunkedXHTML.php +++ b/phpdotnet/phd/TestPHPChunkedXHTML.php @@ -6,13 +6,13 @@ public function __construct(Config $config) { parent::__construct($config); } - public function update($event, $val = null) { + public function update($event, $value = null) { switch($event) { case Render::CHUNK: - parent::update($event, $val); + parent::update($event, $value); break; case Render::STANDALONE: - parent::update($event, $val); + parent::update($event, $value); break; case Render::INIT: $this->setOutputDir($this->config->output_dir() . strtolower($this->getFormatName()) . '/');