Add new node 'children' in Differ

Author: NikolaiProgramist

src/Differ/Differ.php

@@ -34,19 +34,21 @@ function ($acc, $key) use ($tree1, $tree2) {
             if (!array_key_exists($key, $tree2)) {
                 $diff = array_merge($acc, [$key => ['status' => 'remove']]);
                 $innerContent = sortingFirstFile($tree1[$key], $tree1[$key]);
-                $diff[$key]['value'] = $innerContent;
+                $valueName = is_array($innerContent) ? 'children' : 'value';
+                $diff[$key][$valueName] = $innerContent;
                 return $diff;
             }
 
             if ($tree1[$key] === $tree2[$key]) {
                 $diff = array_merge($acc, [$key => ['status' => 'unchanged']]);
-                $diff[$key]['value'] = sortingFirstFile($tree1[$key], $tree1[$key]);
+                $valueName = is_array(sortingFirstFile($tree1[$key], $tree1[$key])) ? 'children' : 'value';
+                $diff[$key][$valueName] = sortingFirstFile($tree1[$key], $tree1[$key]);
                 return $diff;
             }
 
             if (is_array($tree1[$key]) && is_array($tree2[$key])) {
                 $diff = array_merge($acc, [$key => ['status' => 'changed']]);
-                $diff[$key]['value'] = sortingFirstFile($tree1[$key], $tree2[$key]);
+                $diff[$key]['children'] = sortingFirstFile($tree1[$key], $tree2[$key]);
             } else {
                 $diff = array_merge($acc, [$key => ['status' => 'remove']]);
                 $diff[$key]['beforeValue'] = sortingFirstFile($tree1[$key], $tree1[$key]);
@@ -69,11 +71,12 @@ function sortingSecondFile(mixed $tree2, mixed $tree1): mixed
         array_keys($tree2),
         function ($acc, $key) use ($tree1, $tree2) {
             if (!array_key_exists($key, $tree1)) {
-                return array_merge($acc, [$key => ['value' => getArrayContent($tree2[$key])]]);
+                $valueName = is_array(getArrayContent($tree2[$key])) ? 'children' : 'value';
+                return array_merge($acc, [$key => [$valueName => getArrayContent($tree2[$key])]]);
             }
 
             if (is_array($tree2[$key]) && is_array($tree1[$key])) {
-                return array_merge($acc, [$key => ['value' => sortingSecondFile($tree2[$key], $tree1[$key])]]);
+                return array_merge($acc, [$key => ['children' => sortingSecondFile($tree2[$key], $tree1[$key])]]);
             }
 
             return $acc;
@@ -89,7 +92,8 @@ function getArrayContent(mixed $tree): mixed
     }
 
     return array_reduce(array_keys($tree), function ($acc, $key) use ($tree) {
-        return array_merge($acc, [$key => ['value' => getArrayContent($tree[$key])]]);
+        $valueName = is_array(getArrayContent($tree[$key])) ? 'children' : 'value';
+        return array_merge($acc, [$key => [$valueName => getArrayContent($tree[$key])]]);
     }, []);
 }
 
@@ -103,7 +107,6 @@ function sortArrayByKeysRecursive(array $tree): array
         }
 
         $innerContent = sortArrayByKeysRecursive($tree[$key]);
-        $diffContent[$key] = $innerContent;
-        return array_merge($acc, $diffContent);
+        return array_merge($acc, [$key => $innerContent]);
     }, []);
 }

src/Formatters/Plain.php

@@ -14,13 +14,18 @@ function ($acc, $key) use ($tree, $path, $depth) {
             $keyData = $tree[$key];
             $status = $tree[$key]['status'] ?? 'add';
             $newPath = $depth === 1 ? $key : "{$path}.{$key}";
+            $resultString = $acc;
+
             $addMarker = ADD_MARKER;
             $removeMarker = REMOVE_MARKER;
             $updatedMarker = UPDATED_MARKER;
-            $resultString = $acc;
 
-            if (array_key_exists('value', $keyData)) {
-                $value = getString($keyData['value']);
+            if ($status === 'unchanged') {
+                return $resultString;
+            }
+
+            if (array_key_exists('children', $keyData)) {
+                $value = getString($keyData['children']);
 
                 if ($status === 'add') {
                     $string = "Property '{$newPath}' was {$addMarker} with value: {$value}\n";
@@ -32,12 +37,22 @@ function ($acc, $key) use ($tree, $path, $depth) {
                     return "{$resultString}{$string}";
                 }
 
-                if (is_array($keyData['value'])) {
-                    $string = plain($keyData['value'], $newPath, $depth + 1);
+                $string = plain($keyData['children'], $newPath, $depth + 1);
+                return "{$resultString}{$string}";
+            }
+
+            if (array_key_exists('value', $keyData)) {
+                $value = getString($keyData['value']);
+
+                if ($status === 'add') {
+                    $string = "Property '{$newPath}' was {$addMarker} with value: {$value}\n";
                     return "{$resultString}{$string}";
                 }
 
-                return $resultString;
+                if ($status === 'remove') {
+                    $string = "Property '{$newPath}' was {$removeMarker}\n";
+                    return "{$resultString}{$string}";
+                }
             }
 
             $beforeValue = getString($keyData['beforeValue']);

src/Formatters/Stylish.php

@@ -30,25 +30,26 @@ function ($acc, $key) use ($tree, $replacer, $spacesCount, $depth) {
             $indentationCount = $spacesCount * $depth - 2;
             $indentation = str_repeat($replacer, $indentationCount);
 
-            if (array_key_exists('value', $keyData)) {
-                $value = $keyData['value'];
-
-                if (!is_array($value)) {
-                    $string = getStylishString($status, $key, $value, $indentation);
-                    return "{$resultString}{$string}";
-                }
+            if (array_key_exists('children', $keyData)) {
+                $value = $keyData['children'];
 
                 if ($status === ADD_MARKER) {
                     $innerContent = getArrayContent($value, $replacer, $spacesCount, $depth + 1);
                     $string = getStylishInnerContent($status, $key, $innerContent, $indentation);
                     return "{$resultString}{$string}";
                 }
 
-                $innerContent = getStylish($keyData['value'], $replacer, $spacesCount, $depth + 1);
+                $innerContent = getStylish($value, $replacer, $spacesCount, $depth + 1);
                 $string = getStylishInnerContent($status, $key, $innerContent, $indentation);
                 return "{$resultString}{$string}";
             }
 
+            if (array_key_exists('value', $keyData)) {
+                $value = $keyData['value'];
+                $string = getStylishString($status, $key, $value, $indentation);
+                return "{$resultString}{$string}";
+            }
+
             $data = [
                 'indentation' => $indentation,
                 'replacer' => $replacer,
@@ -79,16 +80,17 @@ function ($acc, $key) use ($tree, $replacer, $spacesCount, $depth) {
 function getArrayContent(array $tree, string $replacer, int $spacesCount, int $depth): string
 {
     return array_reduce(array_keys($tree), function ($acc, $key) use ($tree, $replacer, $spacesCount, $depth) {
-        $value = $tree[$key]['value'];
         $indentationCount = $spacesCount * $depth - 2;
         $indentation = str_repeat($replacer, $indentationCount);
         $resultString = $acc;
 
-        if (!is_array($value)) {
+        if (array_key_exists('value', $tree[$key])) {
+            $value = $tree[$key]['value'];
             $string = getStylishString(UNCHANGED_MARKER, $key, $value, $indentation);
             return "{$resultString}{$string}";
         }
 
+        $value = $tree[$key]['children'];
         $innerContent = getArrayContent($value, $replacer, $spacesCount, $depth + 1);
         return getStylishInnerContent(UNCHANGED_MARKER, $key, $innerContent, $indentation);
     }, '');