diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index 439944a7..08fb0706 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -4,7 +4,7 @@ * Added Monolog\Logger::isHandling() to check if a handler will handle the given log level - * Added ChromePhpHandler + * Added ChromePHPHandler * 1.0.2 (2011-10-24) diff --git a/README.mdown b/README.mdown index 5af707eb..516c6513 100644 --- a/README.mdown +++ b/README.mdown @@ -41,7 +41,7 @@ Handlers - _StreamHandler_: Logs records into any php stream, use this for log files. - _RotatingFileHandler_: Logs records to a file and creates one logfile per day. It will also delete files older than $maxFiles. You should use [logrotate](http://linuxcommand.org/man_pages/logrotate8.html) for high profile setups though, this is just meant as a quick and dirty solution. - _FirePHPHandler_: Handler for [FirePHP](http://www.firephp.org/), providing inline `console` messages within [FireBug](http://getfirebug.com/). -- _ChromePhpHandler_: Handler for [ChromePHP](http://www.chromephp.com/), providing inline `console` messages within Chrome. +- _ChromePHPHandler_: Handler for [ChromePHP](http://www.chromephp.com/), providing inline `console` messages within Chrome. - _NativeMailHandler_: Sends emails using PHP's mail() function. - _SwiftMailerHandler_: Sends emails using a SwiftMailer instance. - _SyslogHandler_: Logs records to the syslog. @@ -61,7 +61,7 @@ Formatters - _LineFormatter_: Formats a log record into a one-line string. - _JsonFormatter_: Encodes a log record into json. - _WildfireFormatter_: Used to format log records into the Wildfire/FirePHP protocol, only useful for the FirePHPHandler. -- _ChromePhpFormatter_: Used to format log records into the ChromePhp format, only useful for the ChromePhpHandler. +- _ChromePHPFormatter_: Used to format log records into the ChromePHP format, only useful for the ChromePHPHandler. Processors ---------- diff --git a/src/Monolog/Formatter/ChromePhpFormatter.php b/src/Monolog/Formatter/ChromePHPFormatter.php similarity index 94% rename from src/Monolog/Formatter/ChromePhpFormatter.php rename to src/Monolog/Formatter/ChromePHPFormatter.php index ace594e7..44335b54 100644 --- a/src/Monolog/Formatter/ChromePhpFormatter.php +++ b/src/Monolog/Formatter/ChromePHPFormatter.php @@ -14,11 +14,11 @@ namespace Monolog\Formatter; use Monolog\Logger; /** - * Formats a log message according to the ChromePhp array format + * Formats a log message according to the ChromePHP array format * * @author Christophe Coevoet */ -class ChromePhpFormatter implements FormatterInterface +class ChromePHPFormatter implements FormatterInterface { /** * Translates Monolog log levels to Wildfire levels. diff --git a/src/Monolog/Handler/ChromePhpHandler.php b/src/Monolog/Handler/ChromePHPHandler.php similarity index 95% rename from src/Monolog/Handler/ChromePhpHandler.php rename to src/Monolog/Handler/ChromePHPHandler.php index f76cf1ab..4d7ae8cc 100644 --- a/src/Monolog/Handler/ChromePhpHandler.php +++ b/src/Monolog/Handler/ChromePHPHandler.php @@ -12,14 +12,14 @@ namespace Monolog\Handler; use Monolog\Logger; -use Monolog\Formatter\ChromePhpFormatter; +use Monolog\Formatter\ChromePHPFormatter; /** * Handler sending logs to the ChromePHP extension (http://www.chromephp.com/) * * @author Christophe Coevoet */ -class ChromePhpHandler extends AbstractProcessingHandler +class ChromePHPHandler extends AbstractProcessingHandler { /** * Version of the extension @@ -67,7 +67,7 @@ class ChromePhpHandler extends AbstractProcessingHandler */ protected function getDefaultFormatter() { - return new ChromePhpFormatter(); + return new ChromePHPFormatter(); } /** diff --git a/tests/Monolog/Formatter/ChromePhpFormatterTest.php b/tests/Monolog/Formatter/ChromePHPFormatterTest.php similarity index 88% rename from tests/Monolog/Formatter/ChromePhpFormatterTest.php rename to tests/Monolog/Formatter/ChromePHPFormatterTest.php index e3d58be2..e7f7334e 100644 --- a/tests/Monolog/Formatter/ChromePhpFormatterTest.php +++ b/tests/Monolog/Formatter/ChromePHPFormatterTest.php @@ -13,14 +13,14 @@ namespace Monolog\Formatter; use Monolog\Logger; -class ChromePhpFormatterTest extends \PHPUnit_Framework_TestCase +class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase { /** - * @covers Monolog\Formatter\ChromePhpFormatter::format + * @covers Monolog\Formatter\ChromePHPFormatter::format */ public function testDefaultFormat() { - $formatter = new ChromePhpFormatter(); + $formatter = new ChromePHPFormatter(); $record = array( 'level' => Logger::ERROR, 'level_name' => 'ERROR', @@ -49,11 +49,11 @@ class ChromePhpFormatterTest extends \PHPUnit_Framework_TestCase } /** - * @covers Monolog\Formatter\ChromePhpFormatter::format + * @covers Monolog\Formatter\ChromePHPFormatter::format */ public function testFormatWithFileAndLine() { - $formatter = new ChromePhpFormatter(); + $formatter = new ChromePHPFormatter(); $record = array( 'level' => Logger::CRITICAL, 'level_name' => 'CRITICAL', @@ -82,11 +82,11 @@ class ChromePhpFormatterTest extends \PHPUnit_Framework_TestCase } /** - * @covers Monolog\Formatter\ChromePhpFormatter::format + * @covers Monolog\Formatter\ChromePHPFormatter::format */ public function testFormatWithoutContext() { - $formatter = new ChromePhpFormatter(); + $formatter = new ChromePHPFormatter(); $record = array( 'level' => Logger::DEBUG, 'level_name' => 'DEBUG', @@ -111,11 +111,11 @@ class ChromePhpFormatterTest extends \PHPUnit_Framework_TestCase } /** - * @covers Monolog\Formatter\ChromePhpFormatter::formatBatch + * @covers Monolog\Formatter\ChromePHPFormatter::formatBatch */ public function testBatchFormatThrowException() { - $formatter = new ChromePhpFormatter(); + $formatter = new ChromePHPFormatter(); $records = array( array( 'level' => Logger::INFO, diff --git a/tests/Monolog/Functional/Handler/FirePHPHandlerTest.php b/tests/Monolog/Functional/Handler/FirePHPHandlerTest.php index 7d95547a..49a4263f 100644 --- a/tests/Monolog/Functional/Handler/FirePHPHandlerTest.php +++ b/tests/Monolog/Functional/Handler/FirePHPHandlerTest.php @@ -20,11 +20,11 @@ spl_autoload_register(function($class) use Monolog\Logger; use Monolog\Handler\FirePHPHandler; -use Monolog\Handler\ChromePhpHandler; +use Monolog\Handler\ChromePHPHandler; $logger = new Logger('firephp'); $logger->pushHandler(new FirePHPHandler); -$logger->pushHandler(new ChromePhpHandler()); +$logger->pushHandler(new ChromePHPHandler()); $logger->addDebug('Debug'); $logger->addInfo('Info'); diff --git a/tests/Monolog/Handler/ChromePhpHandlerTest.php b/tests/Monolog/Handler/ChromePHPHandlerTest.php similarity index 83% rename from tests/Monolog/Handler/ChromePhpHandlerTest.php rename to tests/Monolog/Handler/ChromePHPHandlerTest.php index c6a2020f..812ea077 100644 --- a/tests/Monolog/Handler/ChromePhpHandlerTest.php +++ b/tests/Monolog/Handler/ChromePHPHandlerTest.php @@ -15,25 +15,25 @@ use Monolog\TestCase; use Monolog\Logger; /** - * @covers Monolog\Handler\ChromePhpHandler + * @covers Monolog\Handler\ChromePHPHandler */ -class ChromePhpHandlerTest extends TestCase +class ChromePHPHandlerTest extends TestCase { protected function setUp() { - TestChromePhpHandler::reset(); + TestChromePHPHandler::reset(); } public function testHeaders() { - $handler = new TestChromePhpHandler(); + $handler = new TestChromePHPHandler(); $handler->setFormatter($this->getIdentityFormatter()); $handler->handle($this->getRecord(Logger::DEBUG)); $handler->handle($this->getRecord(Logger::WARNING)); $expected = array( 'X-ChromePhp-Data' => base64_encode(utf8_encode(json_encode(array( - 'version' => ChromePhpHandler::VERSION, + 'version' => ChromePHPHandler::VERSION, 'columns' => array('label', 'log', 'backtrace', 'type'), 'rows' => array( 'test', @@ -48,19 +48,19 @@ class ChromePhpHandlerTest extends TestCase public function testConcurrentHandlers() { - $handler = new TestChromePhpHandler(); + $handler = new TestChromePHPHandler(); $handler->setFormatter($this->getIdentityFormatter()); $handler->handle($this->getRecord(Logger::DEBUG)); $handler->handle($this->getRecord(Logger::WARNING)); - $handler2 = new TestChromePhpHandler(); + $handler2 = new TestChromePHPHandler(); $handler2->setFormatter($this->getIdentityFormatter()); $handler2->handle($this->getRecord(Logger::DEBUG)); $handler2->handle($this->getRecord(Logger::WARNING)); $expected = array( 'X-ChromePhp-Data' => base64_encode(utf8_encode(json_encode(array( - 'version' => ChromePhpHandler::VERSION, + 'version' => ChromePHPHandler::VERSION, 'columns' => array('label', 'log', 'backtrace', 'type'), 'rows' => array( 'test', @@ -76,7 +76,7 @@ class ChromePhpHandlerTest extends TestCase } } -class TestChromePhpHandler extends ChromePhpHandler +class TestChromePHPHandler extends ChromePHPHandler { protected $headers = array();