ICL: Formatter simplified, unnecessary dependency removed.

dmitry-ivanov · dmitry-ivanov · commit dae214f7d509 · 2016-06-17T20:40:03.000+03:00
diff --git a/composer.json b/composer.json
@@ -12,7 +12,6 @@
     "require": {
         "php": ">=5.4.0",
         "illuminate/console": "^5.2",
-        "illuminated/helper-functions": "^0.1.1",
         "monolog/monolog": "^1.19"
     },
     "autoload": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Log/Formatter.php b/src/Log/Formatter.php
@@ -19,15 +19,10 @@ public function format(array $record)
 
     protected function convertToString($data)
     {
-        $decoded = is_json($data, true);
-        if ($decoded) {
-            $data = $decoded;
+        if (is_array($data)) {
+            return var_export($data, true);
         }
 
-        if (is_string($data)) {
-            return $data;
-        }
-
-        return var_export($data, true);
+        return parent::convertToString($data);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,10 @@ public function format(array $record)`
`19`	`19`
`20`	`20`	`protected function convertToString($data)`
`21`	`21`	`{`
`22`		`- $decoded = is_json($data, true);`
`23`		`- if ($decoded) {`
`24`		`- $data = $decoded;`
	`22`	`+ if (is_array($data)) {`
	`23`	`+ return var_export($data, true);`
`25`	`24`	`}`
`26`	`25`
`27`		`- if (is_string($data)) {`
`28`		`- return $data;`
`29`		`- }`
`30`		`-`
`31`		`- return var_export($data, true);`
	`26`	`+ return parent::convertToString($data);`
`32`	`27`	`}`
`33`	`28`	`}`