Merge pull request #1498 from sjinks/logger

[1.3.0] Fix Log Formatter getTypeString EMERGENCY bug
phalcon · Nov 1, 2013 · 7437261 · 7437261
2 parents b5b622a + dfe768d
commit 7437261
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ext/logger/formatter.c b/ext/logger/formatter.c
@@ -1,4 +1,3 @@
-
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
@@ -70,7 +69,7 @@ PHP_METHOD(Phalcon_Logger_Formatter, getTypeString){
 	phalcon_fetch_params(0, 1, 0, &type);
 
 	itype = phalcon_get_intval(type);
-	if (itype > 0 && itype < 10) {
+	if (itype >= 0 && itype < 10) {
 		RETURN_STRING(lut[itype], 1);
 	}
 

diff --git a/ext/tests/issue-1498.phpt b/ext/tests/issue-1498.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Log Formatter getTypeString EMERGENCY bug - https://github.com/phalcon/cphalcon/pull/1498
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$logger = new \Phalcon\Logger\Adapter\Stream("php://stdout");
+$logger->emergence("This is an emergency");
+?>
+--EXPECTF--
+[%s, %d %s %d %d:%d:%d %s][EMERGENCY] This is an emergency