improved recursion and updated api

Author: dcarbone

README.md

@@ -57,7 +57,7 @@ class stdClass#56 (1) {
 
 ## Merge Options
 The `object_merge` and `object_merge_recursive` functions have sister functions named `object_merge_opts` and
-`object_merge_recursive_opts` respectively.  Each of these requires a 2nd `$opts` argument that must be a bitwise
+`object_merge_recursive_opts` respectively.  Each of these has a required `$opts` argument that must be a bitwise
 inclusive or of your desired options.
 
 #### `OBJECT_MERGE_OPT_CONFLICT_OVERWRITE`
@@ -95,7 +95,7 @@ $o1 = json_decode('{"key":'.PHP_INT_MAX.'}');
 $o2 = json_decode('{"key":true');
 $o3 = json_decode('{"key":"not a number"}');
 
-$out = object_merge_opts($o1, OBJECT_MERGE_OPT_CONFLICT_EXCEPTION, $o2, $o3);
+$out = object_merge_opts(OBJECT_MERGE_OPT_CONFLICT_EXCEPTION, $o1, $o2, $o3);
 
 // UnexpectedValueException thrown
 ```
@@ -115,7 +115,7 @@ $o1 = json_decode('{"key":["one"]}');
 $o2 = json_decode('{"key":["one","two"]}');
 $o3 = json_decode('{"key":["one","two","three"]}');
 
-$out = object_merge_recursive_opts($o1, OBJECT_MERGE_OPT_UNIQUE_ARRAYS, $o2, $o3);
+$out = object_merge_recursive_opts(OBJECT_MERGE_OPT_UNIQUE_ARRAYS, $o1, $o2, $o3);
 
 var_dump($out);
 

files/constants.php

@@ -19,3 +19,5 @@
 const OBJECT_MERGE_OPT_CONFLICT_OVERWRITE = 0x0;
 const OBJECT_MERGE_OPT_CONFLICT_EXCEPTION = 0x1;
 const OBJECT_MERGE_OPT_UNIQUE_ARRAYS = 0x2;
+
+define('OBJECT_MERGE_UNDEFINED', uniqid('__OBJECT_MERGE_UNDEFINED_'));

files/functions.php

@@ -18,49 +18,56 @@
 
 use DCarbone\ObjectMerge;
 
+if (!function_exists('object_merge_value_undefined')) {
+    /**
+     * @param mixed $value
+     * @return bool
+     */
+    function object_merge_value_undefined($value)
+    {
+        return $value === OBJECT_MERGE_UNDEFINED;
+    }
+}
+
 if (!function_exists('object_merge')) {
     /**
-     * @param stdClass $root
-     * @param stdClass ...$others
+     * @param stdClass ...$objects
      * @return stdClass
      */
-    function object_merge(stdClass $root, stdClass ...$others)
+    function object_merge(stdClass ...$objects)
     {
-        return ObjectMerge::merge($root, ...$others);
+        return ObjectMerge::merge($objects);
     }
 }
-if (!function_exists('object_merge_opts')) {
+if (!function_exists('object_merge_recursive')) {
     /**
-     * @param stdClass $root
-     * @param int $opts
-     * @param stdClass ...$others
+     * @param stdClass ...$objects
      * @return stdClass
      */
-    function object_merge_opts(stdClass $root, $opts, stdClass ...$others)
+    function object_merge_recursive(stdClass ...$objects)
     {
-        return ObjectMerge::mergeOpts($root, $opts, ...$others);
+        return ObjectMerge::mergeRecursive($objects);
     }
 }
-if (!function_exists('object_merge_recursive')) {
+if (!function_exists('object_merge_opts')) {
     /**
-     * @param stdClass $root
-     * @param stdClass ...$others
+     * @param int $opts
+     * @param stdClass ...$objects
      * @return stdClass
      */
-    function object_merge_recursive(stdClass $root, stdClass ...$others)
+    function object_merge_opts($opts, stdClass ...$objects)
     {
-        return ObjectMerge::mergeRecursive($root, ...$others);
+        return ObjectMerge::mergeOpts($opts, $objects);
     }
 }
 if (!function_exists('object_merge_recursive_opts')) {
     /**
-     * @param stdClass $root
      * @param int $opts
-     * @param stdClass ...$others
+     * @param stdClass ...$objects
      * @return stdClass
      */
-    function object_merge_recursive_opts(stdClass $root, $opts, stdClass ...$others)
+    function object_merge_recursive_opts($opts, stdClass ...$objects)
     {
-        return ObjectMerge::mergeRecursiveOpts($root, $opts, ...$others);
+        return ObjectMerge::mergeRecursiveOpts($opts, $objects);
     }
 }