refactor: use happy path

ecastro98 · ecastro98 · commit 8e78c5318933 · 2019-09-10T22:21:09.000-03:00
diff --git a/src/Transformer/ElementTransformer.php b/src/Transformer/ElementTransformer.php
@@ -20,14 +20,17 @@ abstract class ElementTransformer
 {
     public static function fromServer(?string $dataFromServer): ?array
     {
-        if (!empty($dataFromServer)) {
-            $dataFromServer = json_decode($dataFromServer, true);
-            foreach ($dataFromServer as &$value) {
-                ElementTransformer::stringValuesToObjects($value);
-            }
+        if (empty($dataFromServer)) {
+            return null;
+        }
+
+        $data = json_decode($dataFromServer);
+
+        foreach ($data as &$value) {
+            ElementTransformer::stringValuesToObjects($value);
         }
 
-        return $dataFromServer;
+        return $data;
     }
 
     public static function toServer(array $inputData): string

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,17 @@ abstract class ElementTransformer`
`20`	`20`	`{`
`21`	`21`	`public static function fromServer(?string $dataFromServer): ?array`
`22`	`22`	`{`
`23`		`- if (!empty($dataFromServer)) {`
`24`		`- $dataFromServer = json_decode($dataFromServer, true);`
`25`		`- foreach ($dataFromServer as &$value) {`
`26`		`- ElementTransformer::stringValuesToObjects($value);`
`27`		`- }`
	`23`	`+ if (empty($dataFromServer)) {`
	`24`	`+ return null;`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ $data = json_decode($dataFromServer);`
	`28`	`+`
	`29`	`+ foreach ($data as &$value) {`
	`30`	`+ ElementTransformer::stringValuesToObjects($value);`
`28`	`31`	`}`
`29`	`32`
`30`		`- return $dataFromServer;`
	`33`	`+ return $data;`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`public static function toServer(array $inputData): string`