[#13438] - Corrections to the Json formatter; Added date format for it

phalcon · Dec 7, 2018 · 19167c1 · 19167c1
1 parent aa2cd09
commit 19167c1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 78 deletions.
diff --git a/phalcon/logger/formatter/json.zep b/phalcon/logger/formatter/json.zep
@@ -20,6 +20,25 @@ use Phalcon\Logger\Item;
  */
 class Json extends AbstractFormatter
 {
+	/**
+	 * Default date format
+	 *
+	 * @var string
+	 */
+	protected dateFormat = "D, d M y H:i:s O" { get, set };
+
+	/**
+	 * Phalcon\Logger\Formatter\Json construct
+	 *
+	 * @param string dateFormat
+	 */
+	public function __construct(string dateFormat = "") -> void
+	{
+		if dateFormat {
+			let this->dateFormat = dateFormat;
+		}
+	}
+
 	/**
 	 * Applies a format to a message before sent it to the internal log
 	 *
@@ -41,8 +60,8 @@ class Json extends AbstractFormatter
 			[
 				"type"      : item->getName(),
 				"message"   : message,
-				"timestamp" : item->getTime()
+				"timestamp" : date(this->dateFormat, item->getTime())
 			]
-		) . PHP_EOL;
+		);
 	}
 }
diff --git a/phalcon/logger/formatter/line.zep b/phalcon/logger/formatter/line.zep
@@ -20,7 +20,6 @@ use Phalcon\Logger\Item;
  */
 class Line extends AbstractFormatter
 {
-
 	/**
 	 * Default date format
 	 *
@@ -41,7 +40,7 @@ class Line extends AbstractFormatter
 	 * @param string format
 	 * @param string dateFormat
 	 */
-	public function __construct(format = null, dateFormat = null)
+	public function __construct(string format = "", string dateFormat = "") -> void
 	{
 		if format {
 			let this->format = format;

diff --git a/tests/unit/Logger/Formatter/AbstractFormatter/FormatCest.php b/tests/unit/Logger/Formatter/AbstractFormatter/FormatCest.php
diff --git a/tests/unit/Logger/Formatter/AbstractFormatter/InterpolateCest.php b/tests/unit/Logger/Formatter/AbstractFormatter/InterpolateCest.php