Author: ihabunek
Date: Mon Jan 24 07:32:15 2011
New Revision: 1062665
URL: http://svn.apache.org/viewvc?rev=1062665&view=rev
Log:
Changed default value of LoggerAppender::$requiresLayout to true, since this is
more frequent so less code is required. Changed appenders to reflect this.
Added tests.
Modified:
logging/log4php/trunk/src/main/php/LoggerAppender.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderFileTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php
Modified: logging/log4php/trunk/src/main/php/LoggerAppender.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/LoggerAppender.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/LoggerAppender.php (original)
+++ logging/log4php/trunk/src/main/php/LoggerAppender.php Mon Jan 24 07:32:15
2011
@@ -56,7 +56,7 @@ abstract class LoggerAppender {
/**
* @var boolean needs a layout formatting ?
*/
- protected $requiresLayout = false;
+ protected $requiresLayout = true;
/**
* Constructor
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php Mon
Jan 24 07:32:15 2011
@@ -54,12 +54,6 @@ class LoggerAppenderConsole extends Logg
private $target = self::STDOUT;
/**
- * @var boolean
- * @access private
- */
- protected $requiresLayout = true;
-
- /**
* @var mixed the resource used to open stdout/stderr
* @access private
*/
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php Mon Jan
24 07:32:15 2011
@@ -52,7 +52,6 @@ class LoggerAppenderEcho extends LoggerA
public function __construct($name = '') {
parent::__construct($name);
- $this->requiresLayout = true;
$this->firstAppend = true;
}
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php Mon Jan
24 07:32:15 2011
@@ -59,7 +59,6 @@ class LoggerAppenderFile extends LoggerA
public function __construct($name = '') {
parent::__construct($name);
- $this->requiresLayout = true;
}
public function __destruct() {
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php Mon Jan
24 07:32:15 2011
@@ -76,7 +76,6 @@ class LoggerAppenderMail extends LoggerA
*/
public function __construct($name = '') {
parent::__construct($name);
- $this->requiresLayout = true;
}
public function __destruct() {
Modified:
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
Mon Jan 24 07:32:15 2011
@@ -78,11 +78,6 @@ class LoggerAppenderMailEvent extends Lo
*/
private $to = null;
- /**
- * @access private
- */
- protected $requiresLayout = true;
-
/** @var indiciates if this appender should run in dry mode */
private $dry = false;
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php Mon Jan
24 07:32:15 2011
@@ -114,13 +114,17 @@ class LoggerAppenderPDO extends LoggerAp
private $canAppend = true;
/**
+ * This appender does not require a layout.
+ */
+ protected $requiresLayout = false;
+
+ /**
* Constructor.
* This apender doesn't require a layout.
* @param string $name appender name
*/
public function __construct($name = '') {
parent::__construct($name);
- $this->requiresLayout = false;
}
public function __destruct() {
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php Mon Jan
24 07:32:15 2011
@@ -42,7 +42,6 @@ class LoggerAppenderPhp extends LoggerAp
public function __construct($name = '') {
parent::__construct($name);
- $this->requiresLayout = true;
}
public function __destruct() {
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php Mon
Jan 24 07:32:15 2011
@@ -47,6 +47,11 @@
class LoggerAppenderSocket extends LoggerAppender {
/**
+ * This appender does not require a layout.
+ */
+ protected $requiresLayout = false;
+
+ /**
* @var mixed socket connection resource
* @access private
*/
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php Mon
Jan 24 07:32:15 2011
@@ -99,7 +99,6 @@ class LoggerAppenderSyslog extends Logge
public function __construct($name = '') {
parent::__construct($name);
- $this->requiresLayout = true;
}
public function __destruct() {
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
Mon Jan 24 07:32:15 2011
@@ -29,7 +29,12 @@
* to work for fwrite(STDOUT, ...)
*/
class LoggerAppenderConsoleTest extends PHPUnit_Framework_TestCase {
-
+
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderConsole();
+ self::assertTrue($appender->requiresLayout());
+ }
+
public function testSimpleStdOutLogging() {
$layout = new LoggerLayoutSimple();
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
---
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php
(original)
+++
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php
Mon Jan 24 07:32:15 2011
@@ -35,6 +35,11 @@ class LoggerAppenderDailyFileTest extend
}
}
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderDailyFile();
+ self::assertTrue($appender->requiresLayout());
+ }
+
public function testSimpleLogging() {
$layout = new LoggerLayoutSimple();
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php Mon
Jan 24 07:32:15 2011
@@ -40,6 +40,11 @@ class LoggerAppenderEchoTest extends PHP
self::assertEquals($expected, $actual);
}
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderEcho();
+ self::assertTrue($appender->requiresLayout());
+ }
+
public function testEchoHtml() {
$appender = new LoggerAppenderEcho("myname ");
$appender->setHtmlLineBreaks(true);
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderFileTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderFileTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderFileTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderFileTest.php Mon
Jan 24 07:32:15 2011
@@ -31,6 +31,11 @@ class LoggerAppenderFileTest extends PHP
}
}
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderFile();
+ self::assertTrue($appender->requiresLayout());
+ }
+
public function testSimpleLogging() {
$layout = new LoggerLayoutSimple();
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
---
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php
(original)
+++
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php
Mon Jan 24 07:32:15 2011
@@ -25,6 +25,11 @@
class LoggerAppenderMailEventTest extends PHPUnit_Framework_TestCase {
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderMailEvent();
+ self::assertTrue($appender->requiresLayout());
+ }
+
public function testMail() {
$appender = new LoggerAppenderMailEvent("myname ");
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php Mon
Jan 24 07:32:15 2011
@@ -25,6 +25,11 @@
class LoggerAppenderMailTest extends PHPUnit_Framework_TestCase {
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderMail();
+ self::assertTrue($appender->requiresLayout());
+ }
+
public function testMail() {
$appender = new LoggerAppenderMail("myname ");
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php Mon
Jan 24 07:32:15 2011
@@ -36,4 +36,9 @@ class LoggerAppenderNullTest extends PHP
$appender->append($event);
$appender->close();
}
+
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderNull();
+ self::assertFalse($appender->requiresLayout());
+ }
}
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php Mon
Jan 24 07:32:15 2011
@@ -40,6 +40,11 @@ class LoggerAppenderPDOTest extends PHPU
public static function tearDownAfterClass() {
if (file_exists(self::file)) unlink(self::file);
}
+
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderPDO();
+ self::assertFalse($appender->requiresLayout());
+ }
/** Tests new-style logging using prepared statements and the default SQL
definition. */
public function testSimpleWithDefaults() {
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php Mon
Jan 24 07:32:15 2011
@@ -43,6 +43,11 @@ class LoggerAppenderPhpTest extends PHPU
protected function setUp() {
set_error_handler("errorHandler");
}
+
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderPhp();
+ self::assertTrue($appender->requiresLayout());
+ }
public function testPhp() {
$appender = new LoggerAppenderPhp("TEST");
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
---
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
(original)
+++
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
Mon Jan 24 07:32:15 2011
@@ -37,6 +37,11 @@ class LoggerAppenderRollingFileTest exte
@unlink($this->dir.'/TEST-rolling.txt.1');
@unlink($this->dir.'/TEST-rolling.txt.2');
}
+
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderRollingFile();
+ self::assertTrue($appender->requiresLayout());
+ }
public function testMaxFileSize() {
$appender = new LoggerAppenderRollingFile("mylogger");
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php
Mon Jan 24 07:32:15 2011
@@ -25,6 +25,11 @@
class LoggerAppenderSocketTest extends PHPUnit_Framework_TestCase {
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderSocket();
+ self::assertFalse($appender->requiresLayout());
+ }
+
public function testSocketSerialized() {
$appender = new LoggerAppenderSocket("myname ");
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php?rev=1062665&r1=1062664&r2=1062665&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php
Mon Jan 24 07:32:15 2011
@@ -25,6 +25,11 @@
class LoggerAppenderSyslogTest extends PHPUnit_Framework_TestCase {
+ public function testRequiresLayout() {
+ $appender = new LoggerAppenderSyslog();
+ self::assertTrue($appender->requiresLayout());
+ }
+
public function testSyslog() {
$appender = new LoggerAppenderSyslog("myname ");
