cvs: pear-core /PEAR/Task Replace.php Unixeol.php Windowseol.php

cellog Sun Feb 6 16:35:41 2005 EDT Modified files: /pear-core/PEAR/Task Replace.php Unixeol.php Windowseol.php Log: change $this->installer to $this->logger to match changes in PEAR_Task_Common http://cvs.php.net/diff.php/pear-core/PEAR/Task/Replace.php?r1=1.7&r2=1.8&ty=u Index: pear-core/PEAR/Task/Replace.php diff -u pear-core/PEAR/Task/Replace.php:1.7 pear-core/PEAR/Task/Replace.php:1.8 --- pear-core/PEAR/Task/Replace.php:1.7 Thu Nov 25 01:53:56 2004 +++ pear-core/PEAR/Task/Replace.php Sun Feb 6 16:35:41 2005 @@ -92,7 +92,7 @@ if ($chan) { $to = $chan->getServer(); } else { - $this->installer->log(0, "invalid pear-config replacement: $a[to]"); + $this->logger->log(0, "invalid pear-config replacement: $a[to]"); return false; } } else { @@ -108,14 +108,14 @@ } } if (is_null($to)) { - $this->installer->log(0, "invalid pear-config replacement: $a[to]"); + $this->logger->log(0, "invalid pear-config replacement: $a[to]"); return false; } } else { if ($t = $pkg->packageInfo($a['to'])) { $to = $t; } else { - $this->installer->log(0, "invalid package-info replacement: $a[to]"); + $this->logger->log(0, "invalid package-info replacement: $a[to]"); return false; } } @@ -124,7 +124,7 @@ $subst_to[] = $to; } } - $this->installer->log(3, "doing " . sizeof($subst_from) . + $this->logger->log(3, "doing " . sizeof($subst_from) . " substitution(s) for $dest"); if (sizeof($subst_from)) { $contents = str_replace($subst_from, $subst_to, $contents); http://cvs.php.net/diff.php/pear-core/PEAR/Task/Unixeol.php?r1=1.2&r2=1.3&ty=u Index: pear-core/PEAR/Task/Unixeol.php diff -u pear-core/PEAR/Task/Unixeol.php:1.2 pear-core/PEAR/Task/Unixeol.php:1.3 --- pear-core/PEAR/Task/Unixeol.php:1.2 Fri Dec 31 18:51:32 2004 +++ pear-core/PEAR/Task/Unixeol.php Sun Feb 6 16:35:41 2005 @@ -46,7 +46,7 @@ */ function startSession($pkg, $contents, $dest) { - $this->installer->log(3, "replacing all line endings with \\n in $dest"); + $this->logger->log(3, "replacing all line endings with \\n in $dest"); return preg_replace("/\r\n|\n\r|\r|\n/", "\n", $contents); } } http://cvs.php.net/diff.php/pear-core/PEAR/Task/Windowseol.php?r1=1.2&r2=1.3&ty=u Index: pear-core/PEAR/Task/Windowseol.php diff -u pear-core/PEAR/Task/Windowseol.php:1.2 pear-core/PEAR/Task/Windowseol.php:1.3 --- pear-core/PEAR/Task/Windowseol.php:1.2 Fri Dec 31 18:51:33 2004 +++ pear-core/PEAR/Task/Windowseol.php Sun Feb 6 16:35:41 2005 @@ -46,7 +46,7 @@ */ function startSession($pkg, $contents, $dest) { - $this->installer->log(3, "replacing all line endings with \\r\\n in $dest"); + $this->logger->log(3, "replacing all line endings with \\r\\n in $dest"); return preg_replace("/\r\n|\n\r|\r|\n/", "\r\n", $contents); } }