Use TaggedValue for changes in recorded diff yml.

Author: donquixote

src/Diff/ExportedArrayDiffer.php

@@ -138,7 +138,7 @@ protected function doCompareLists(array $before, array $after, int $i_before = 0
       if ($i_after >= count($after)) {
         // There are more items in "before" list.
         for (; $i_before < count($before); ++$i_before) {
-          $diff[] = new TaggedValue('--', $before[$i_before]);
+          $diff[] = new TaggedValue('rm', $before[$i_before]);
         }
         return $diff;
       }
@@ -165,7 +165,7 @@ protected function doCompareLists(array $before, array $after, int $i_before = 0
       if (count($diff_minus) <= count($diff_plus)) {
         return [
           ...$diff,
-          new TaggedValue('--', $before[$i_before]),
+          new TaggedValue('rm', $before[$i_before]),
           ...$diff_minus,
         ];
       }
@@ -193,16 +193,15 @@ protected function compareAssoc(array $before, array $after): array|false {
     $diff = [];
     $similar = false;
     foreach (array_diff_key($before, $after) as $key => $item) {
-      $diff['-- ' . $key] = $item;
+      $diff[$key] = new TaggedValue('rm', $item);
     }
     foreach ($shared_keys as $key) {
       $item_diff = $this->compareValues($before[$key], $after[$key]);
       if ($item_diff === false) {
-        $diff['~- ' . $key] = $before[$key];
-        $diff['~+ ' . $key] = $after[$key];
+        $diff[$key] = new TaggedValue('replace', $after[$key]);
       }
       elseif ($item_diff) {
-        $diff['~~ ' . $key] = $item_diff;
+        $diff[$key] = new TaggedValue('diff', $item_diff);
         $similar = true;
       }
       else {
@@ -213,7 +212,7 @@ protected function compareAssoc(array $before, array $after): array|false {
       return false;
     }
     foreach (array_diff_key($after, $before) as $key => $item) {
-      $diff['++ ' . $key] = $item;
+      $diff[$key] = new TaggedValue('add', $item);
     }
     return $diff;
   }
@@ -235,16 +234,15 @@ protected function compareExportedObjects(array $before, array $after, string $c
     );
     $diff = [];
     foreach (array_diff_key($before, $after) as $key => $item) {
-      $diff['-- ' . $key] = $item;
+      $diff[$key] = new TaggedValue('rm', $item);
     }
     foreach ($shared_keys as $key) {
       $item_diff = $this->compareExportedObjectProperty($class, $key, $before[$key], $after[$key]);
       if ($item_diff === false) {
-        $diff['~- ' . $key] = $before[$key];
-        $diff['~+ ' . $key] = $after[$key];
+        $diff[$key] = new TaggedValue('replace', $after[$key]);
       }
       elseif ($item_diff) {
-        $diff['~~ ' . $key] = $item_diff;
+        $diff[$key] = new TaggedValue('diff', $item_diff);
       }
     }
     if (!$diff) {

tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml

@@ -29,22 +29,16 @@ after:
   'good day': bonjour
   internet: internet
 diff:
-  '-- assoc_drop':
+  assoc_drop: !rm
     x: X
-  '-- remove': remove
-  '~~ assoc_diff':
-    '~- b': B
-    '~+ b': BB
-  '~- assoc_replace':
-    r: R
-  '~+ assoc_replace':
+  remove: !rm remove
+  assoc_diff: !diff
+    b: !replace BB
+  assoc_replace: !replace
     rr: RR
-  '~- good day': 'good day'
-  '~+ good day': bonjour
-  '~- goodbye': goodbye
-  '~+ goodbye': 'a bientot'
-  '~- hello': hello
-  '~+ hello': salut
-  '++ ajouter': ajouter
-  '++ assoc_new':
+  'good day': !replace bonjour
+  goodbye: !replace 'a bientot'
+  hello: !replace salut
+  ajouter: !add ajouter
+  assoc_new: !add
     new: New

tests/fixtures/ExportedArrayDifferTest/list.change-assoc-value.yml

@@ -17,12 +17,11 @@ after:
     b: 'B orig'
   - after
 diff:
-  - !--
+  - !rm
     a: 'A orig'
     b: 'B orig'
   - !add
     a: 'A changed'
     b: 'B changed'
   - !diff
-    '~- a': 'A orig'
-    '~+ a': 'A changed'
+    a: !replace 'A changed'

tests/fixtures/ExportedArrayDifferTest/list.hello.yml

@@ -5,5 +5,5 @@ after:
   - goodbye
   - world
 diff:
-  - !-- hello
+  - !rm hello
   - !add goodbye