fixing bug in mergeObjectValues

dcarbone · dcarbone · commit 0f258832f0de · 2020-06-03T19:00:30.000-05:00
diff --git a/src/ObjectMerge.php b/src/ObjectMerge.php
@@ -58,7 +58,7 @@ class ObjectMerge
      */
     public function __invoke(stdClass $root, stdClass ...$others)
     {
-        return self::doMerge(false, $root, self::DEFAULT_OPTS, ...$others);
+        return self::doMerge(false, $root, self::DEFAULT_OPTS, $others);
     }
 
     /**
@@ -190,7 +190,7 @@ private static function mergeValues($recurse, $key, $leftValue, $rightValue, $op
             return self::mergeArrayValues($leftValue, $rightValue, $opts);
         }
 
-        return self::mergeObjectValues($recurse, $leftValue, $rightValue, $leftValue);
+        return self::mergeObjectValues($recurse, $leftValue, $rightValue, $opts);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class ObjectMerge`
`58`	`58`	`*/`
`59`	`59`	`public function __invoke(stdClass $root, stdClass ...$others)`
`60`	`60`	`{`
`61`		`- return self::doMerge(false, $root, self::DEFAULT_OPTS, ...$others);`
	`61`	`+ return self::doMerge(false, $root, self::DEFAULT_OPTS, $others);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
`@@ -190,7 +190,7 @@ private static function mergeValues($recurse, $key, $leftValue, $rightValue, $op`
`190`	`190`	`return self::mergeArrayValues($leftValue, $rightValue, $opts);`
`191`	`191`	`}`
`192`	`192`
`193`		`- return self::mergeObjectValues($recurse, $leftValue, $rightValue, $leftValue);`
	`193`	`+ return self::mergeObjectValues($recurse, $leftValue, $rightValue, $opts);`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`/**`