Author: grobmeier
Date: Tue Jul 28 05:45:54 2009
New Revision: 798408
URL: http://svn.apache.org/viewvc?rev=798408&view=rev
Log:
LOG4PHP-64: Remove deprecated call-by-reference in LoggerLayoutPattern (patch
applied from Christian Hammers)
Modified:
incubator/log4php/trunk/src/changes/changes.xml
incubator/log4php/trunk/src/main/php/helpers/LoggerLiteralPatternConverter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php
Modified: incubator/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/changes/changes.xml?rev=798408&r1=798407&r2=798408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/changes/changes.xml (original)
+++ incubator/log4php/trunk/src/changes/changes.xml Tue Jul 28 05:45:54 2009
@@ -62,6 +62,7 @@
<action type="fix" issue="LOG4PHP-54">PHPDoc is wrong due to
class movements - clean up (Christian Grobmeier)</action>
<action type="update" issue="LOG4PHP-60">Improved
quickstart.apt (Christian Hammers)</action>
<action type="update" issue="LOG4PHP-62">Does not print warning
if ini file is corrupt (Christian Hammers)</action>
+ <action type="fix" issue="LOG4PHP-64">Remove deprecated
call-by-reference in LoggerLayoutPattern (Christian Hammers)</action>
<action type="update">Initial port to PHP 5 (Knut
Urdalen)</action>
<action type="update">Established new unit test suite (Knut
Urdalen)</action>
<action type="update">Added a range of examples (Knut
Urdalen)</action>
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerLiteralPatternConverter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerLiteralPatternConverter.php?rev=798408&r1=798407&r2=798408&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/helpers/LoggerLiteralPatternConverter.php
(original)
+++
incubator/log4php/trunk/src/main/php/helpers/LoggerLiteralPatternConverter.php
Tue Jul 28 05:45:54 2009
@@ -41,7 +41,7 @@
* @param string $sbuf
* @param LoggerLoggingEvent $event
*/
- public function format($sbuf, $event) {
+ public function format(&$sbuf, $event) {
$sbuf .= $this->literal;
}
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php?rev=798408&r1=798407&r2=798408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php Tue
Jul 28 05:45:54 2009
@@ -85,7 +85,7 @@
* @param string $sbuf string buffer
* @param LoggerLoggingEvent $e
*/
- public function format($sbuf, $e) {
+ public function format(&$sbuf, $e) {
$s = $this->convert($e);
if($s == null or empty($s)) {
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php?rev=798408&r1=798407&r2=798408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php
(original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php Tue
Jul 28 05:45:54 2009
@@ -187,7 +187,7 @@
$sbuf = '';
$c = $this->head;
while ($c !== null) {
- $c->format(&$sbuf, $event);
+ $c->format($sbuf, $event);
$c = $c->next;
}
return $sbuf;
