some more complex nested tests

Author: dcarbone

src/ObjectMerge.php

@@ -233,10 +233,17 @@ private static function mergeValues($recurse, $opts, $cb, $key, $leftValue, $rig
                     $key
                 )
             );
-        } elseif ($leftUndefined) {
+        }
+
+        // if the right value was undefined, return left value and move on.
+        if ($rightUndefined) {
+            return $leftValue;
+        }
+
+        // if left side undefined, create new empty representation of the right type to allow processing to continue
+        // todo: revisit this, bit wasteful.
+        if ($leftUndefined) {
             $leftValue = self::newEmptyValue($rightValue);
-        } elseif ($rightUndefined) {
-            $rightValue = self::newEmptyValue($leftValue);
         }
 
         list($leftType, $rightType, $equal) = self::compareTypes($leftValue, $rightValue);
@@ -252,10 +259,6 @@ private static function mergeValues($recurse, $opts, $cb, $key, $leftValue, $rig
             );
         }
 
-        if ($rightUndefined) {
-            return $leftValue;
-        }
-
         if (!$recurse || in_array($leftType, self::$_SIMPLE_TYPES, true)) {
             return $rightValue;
         }

tests/ObjectMergeTest.php

@@ -107,6 +107,23 @@ class ObjectMergeTest extends TestCase
             ],
             'expected' => '{"key":{"sub":{"sub2":{"sub3":"value"},"sub22":{"sub223":"value2"}}}}',
             'recurse'  => true
+        ],
+        [
+            'objects'  => [
+                '{"glossary":{"GlossDiv":{"GlossList":{"GlossEntry":{"Abbrev":"ISO 8879:1986","Acronym":"SGML","GlossDef":{"GlossSeeAlso":["GML","XML"],"para":"A meta-markup language, used to create markup languages such as DocBook.","leftOnly":["things"]},"GlossSee":"markup","leftOnly":{"leftKey":"leftValue"},"GlossTerm":"Standard Generalized Markup Language","ID":"SGML","SortAs":"SGML","bothSides":{"leftKey":"leftValue"}}},"title":"S","leftOnly":"hello"},"title":"example glossary"}}',
+                '{"glossary":{"GlossDiv":{"GlossList":{"GlossEntry":{"Abbrev":"ISO 8879:1986","Acronym":"SGML","GlossDef":{"GlossSeeAlso":["GML","XML"],"para":"A meta-markup language, used to create markup languages such as DocBook."},"GlossSee":"markup","GlossTerm":"Standard Generalized Markup Language","ID":"SGML","SortAs":"SGML","rightOnly":{"rightKey":"rightKey"},"bothSides":{"rightKey":"rightValue"}}},"title":"S"},"title":"example glossary","rightOnly":"hello"}}',
+            ],
+            'expected' => '{"glossary":{"GlossDiv":{"GlossList":{"GlossEntry":{"Abbrev":"ISO 8879:1986","Acronym":"SGML","GlossDef":{"GlossSeeAlso":["GML","XML","GML","XML"],"leftOnly":["things"],"para":"A meta-markup language, used to create markup languages such as DocBook."},"GlossSee":"markup","GlossTerm":"Standard Generalized Markup Language","ID":"SGML","SortAs":"SGML","bothSides":{"leftKey":"leftValue","rightKey":"rightValue"},"leftOnly":{"leftKey":"leftValue"},"rightOnly":{"rightKey":"rightKey"}}},"leftOnly":"hello","title":"S"},"rightOnly":"hello","title":"example glossary"}}',
+            'recurse'  => true,
+        ],
+        [
+            'objects'  => [
+                '{"glossary":{"GlossDiv":{"GlossList":{"GlossEntry":{"Abbrev":"ISO 8879:1986","Acronym":"SGML","GlossDef":{"GlossSeeAlso":["GML","XML"],"para":"A meta-markup language, used to create markup languages such as DocBook.","leftOnly":["things"]},"GlossSee":"markup","leftOnly":{"leftKey":"leftValue"},"GlossTerm":"Standard Generalized Markup Language","ID":"SGML","SortAs":"SGML","bothSides":{"leftKey":"leftValue"}}},"title":"S","leftOnly":"hello"},"title":"example glossary"}}',
+                '{"glossary":{"GlossDiv":{"GlossList":{"GlossEntry":{"Abbrev":"ISO 8879:1986","Acronym":"SGML","GlossDef":{"GlossSeeAlso":["GML","XML"],"para":"A meta-markup language, used to create markup languages such as DocBook."},"GlossSee":"markup","GlossTerm":"Standard Generalized Markup Language","ID":"SGML","SortAs":"SGML","rightOnly":{"rightKey":"rightKey"},"bothSides":{"rightKey":"rightValue"}}},"title":"S"},"title":"example glossary","rightOnly":"hello"}}',
+            ],
+            'expected' => '{"glossary":{"GlossDiv":{"GlossList":{"GlossEntry":{"Abbrev":"ISO 8879:1986","Acronym":"SGML","GlossDef":{"GlossSeeAlso":["GML","XML"],"leftOnly":["things"],"para":"A meta-markup language, used to create markup languages such as DocBook."},"GlossSee":"markup","GlossTerm":"Standard Generalized Markup Language","ID":"SGML","SortAs":"SGML","bothSides":{"leftKey":"leftValue","rightKey":"rightValue"},"leftOnly":{"leftKey":"leftValue"},"rightOnly":{"rightKey":"rightKey"}}},"leftOnly":"hello","title":"S"},"rightOnly":"hello","title":"example glossary"}}',
+            'recurse'  => true,
+            'opts'     => OBJECT_MERGE_OPT_UNIQUE_ARRAYS,
         ]
     );
 
@@ -120,7 +137,12 @@ private function doDecode($test, $json)
         $out = json_decode($json);
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new RuntimeException(
-                sprintf('json_decode returned error while processing test "%s": %s', $test, $json)
+                sprintf(
+                    'json_decode returned error while processing test "%s": %s; json =%s',
+                    $test,
+                    json_last_error_msg(),
+                    $json
+                )
             );
         }
         return $out;