locutus 2.0.32 → 2.0.34

package/php/array/array_keys.js

@@ -1,40 +1,38 @@
-'use strict';
-
 module.exports = function array_keys(input, searchValue, argStrict) {
-  //  discuss at: https://locutus.io/php/array_keys/
-  // original by: Kevin van Zonneveld (https://kvz.io)
-  //    input by: Brett Zamir (https://brett-zamir.me)
-  //    input by: P
-  // bugfixed by: Kevin van Zonneveld (https://kvz.io)
-  // bugfixed by: Brett Zamir (https://brett-zamir.me)
-  // improved by: jd
-  // improved by: Brett Zamir (https://brett-zamir.me)
-  //   example 1: array_keys( {firstname: 'Kevin', surname: 'van Zonneveld'} )
-  //   returns 1: [ 'firstname', 'surname' ]
+  //      discuss at: https://locutus.io/php/array_keys/
+  // parity verified: PHP 8.3
+  //     original by: Kevin van Zonneveld (https://kvz.io)
+  //        input by: Brett Zamir (https://brett-zamir.me)
+  //        input by: P
+  //     bugfixed by: Kevin van Zonneveld (https://kvz.io)
+  //     bugfixed by: Brett Zamir (https://brett-zamir.me)
+  //     improved by: jd
+  //     improved by: Brett Zamir (https://brett-zamir.me)
+  //       example 1: array_keys( {firstname: 'Kevin', surname: 'van Zonneveld'} )
+  //       returns 1: [ 'firstname', 'surname' ]
 
-  var search = typeof searchValue !== 'undefined';
-  var tmpArr = [];
-  var strict = !!argStrict;
-  var include = true;
-  var key = '';
+  const search = typeof searchValue !== 'undefined'
+  const tmpArr = []
+  const strict = !!argStrict
+  let include = true
+  let key = ''
 
   for (key in input) {
     if (input.hasOwnProperty(key)) {
-      include = true;
+      include = true
       if (search) {
         if (strict && input[key] !== searchValue) {
-          include = false;
+          include = false
         } else if (input[key] !== searchValue) {
-          include = false;
+          include = false
         }
       }
 
       if (include) {
-        tmpArr[tmpArr.length] = key;
+        tmpArr[tmpArr.length] = key
       }
     }
   }
 
-  return tmpArr;
-};
-//# sourceMappingURL=array_keys.js.map
+  return tmpArr
+}

package/php/array/array_map.js

@@ -1,7 +1,3 @@
-'use strict';
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
 module.exports = function array_map(callback) {
   //  discuss at: https://locutus.io/php/array_map/
   // original by: Andrea Giammarchi (https://webreflection.blogspot.com)
@@ -13,45 +9,44 @@ module.exports = function array_map(callback) {
   //   example 1: array_map( function (a){return (a * a * a)}, [1, 2, 3, 4, 5] )
   //   returns 1: [ 1, 8, 27, 64, 125 ]
 
-  var argc = arguments.length;
-  var argv = arguments;
-  var obj = null;
-  var cb = callback;
-  var j = argv[1].length;
-  var i = 0;
-  var k = 1;
-  var m = 0;
-  var tmp = [];
-  var tmpArr = [];
+  const argc = arguments.length
+  const argv = arguments
+  let obj = null
+  let cb = callback
+  const j = argv[1].length
+  let i = 0
+  let k = 1
+  let m = 0
+  let tmp = []
+  const tmpArr = []
 
-  var $global = typeof window !== 'undefined' ? window : global;
+  const $global = typeof window !== 'undefined' ? window : global
 
   while (i < j) {
     while (k < argc) {
-      tmp[m++] = argv[k++][i];
+      tmp[m++] = argv[k++][i]
     }
 
-    m = 0;
-    k = 1;
+    m = 0
+    k = 1
 
     if (callback) {
       if (typeof callback === 'string') {
-        cb = $global[callback];
-      } else if ((typeof callback === 'undefined' ? 'undefined' : _typeof(callback)) === 'object' && callback.length) {
-        obj = typeof callback[0] === 'string' ? $global[callback[0]] : callback[0];
+        cb = $global[callback]
+      } else if (typeof callback === 'object' && callback.length) {
+        obj = typeof callback[0] === 'string' ? $global[callback[0]] : callback[0]
         if (typeof obj === 'undefined') {
-          throw new Error('Object not found: ' + callback[0]);
+          throw new Error('Object not found: ' + callback[0])
         }
-        cb = typeof callback[1] === 'string' ? obj[callback[1]] : callback[1];
+        cb = typeof callback[1] === 'string' ? obj[callback[1]] : callback[1]
       }
-      tmpArr[i++] = cb.apply(obj, tmp);
+      tmpArr[i++] = cb.apply(obj, tmp)
     } else {
-      tmpArr[i++] = tmp;
+      tmpArr[i++] = tmp
     }
 
-    tmp = [];
+    tmp = []
   }
 
-  return tmpArr;
-};
-//# sourceMappingURL=array_map.js.map
+  return tmpArr
+}

package/php/array/array_merge.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = function array_merge() {
   //  discuss at: https://locutus.io/php/array_merge/
   // original by: Brett Zamir (https://brett-zamir.me)
@@ -15,52 +13,51 @@ module.exports = function array_merge() {
   //   example 2: array_merge($arr1, $arr2)
   //   returns 2: {0: "data"}
 
-  var args = Array.prototype.slice.call(arguments);
-  var argl = args.length;
-  var arg = void 0;
-  var retObj = {};
-  var k = '';
-  var argil = 0;
-  var j = 0;
-  var i = 0;
-  var ct = 0;
-  var toStr = Object.prototype.toString;
-  var retArr = true;
+  const args = Array.prototype.slice.call(arguments)
+  const argl = args.length
+  let arg
+  const retObj = {}
+  let k = ''
+  let argil = 0
+  let j = 0
+  let i = 0
+  let ct = 0
+  const toStr = Object.prototype.toString
+  let retArr = true
 
   for (i = 0; i < argl; i++) {
     if (toStr.call(args[i]) !== '[object Array]') {
-      retArr = false;
-      break;
+      retArr = false
+      break
     }
   }
 
   if (retArr) {
-    retArr = [];
+    retArr = []
     for (i = 0; i < argl; i++) {
-      retArr = retArr.concat(args[i]);
+      retArr = retArr.concat(args[i])
     }
-    return retArr;
+    return retArr
   }
 
   for (i = 0, ct = 0; i < argl; i++) {
-    arg = args[i];
+    arg = args[i]
     if (toStr.call(arg) === '[object Array]') {
       for (j = 0, argil = arg.length; j < argil; j++) {
-        retObj[ct++] = arg[j];
+        retObj[ct++] = arg[j]
       }
     } else {
       for (k in arg) {
         if (arg.hasOwnProperty(k)) {
           if (parseInt(k, 10) + '' === k) {
-            retObj[ct++] = arg[k];
+            retObj[ct++] = arg[k]
           } else {
-            retObj[k] = arg[k];
+            retObj[k] = arg[k]
           }
         }
       }
     }
   }
 
-  return retObj;
-};
-//# sourceMappingURL=array_merge.js.map
+  return retObj
+}

package/php/array/array_merge_recursive.js

@@ -1,39 +1,63 @@
-'use strict';
+module.exports = function array_merge_recursive(arr1, arr2) {
+  //       discuss at: https://locutus.io/php/array_merge_recursive/
+  //      original by: Subhasis Deb
+  //         input by: Brett Zamir (https://brett-zamir.me)
+  //      bugfixed by: Kevin van Zonneveld (https://kvz.io)
+  // reimplemented by: Kevin van Zonneveld (https://kvz.io)
+  //           note 1: Numeric keys are renumbered starting from 0, string keys are preserved
+  //        example 1: var $arr1 = {'color': {'favorite': 'red'}, 0: 5}
+  //        example 1: var $arr2 = {0: 10, 'color': {'favorite': 'green', 0: 'blue'}}
+  //        example 1: array_merge_recursive($arr1, $arr2)
+  //        returns 1: {'color': {'favorite': ['red', 'green'], 0: 'blue'}, 0: 5, 1: 10}
 
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  const result = {}
+  const toStr = Object.prototype.toString
+  let numericIdx = 0
 
-module.exports = function array_merge_recursive(arr1, arr2) {
-  //  discuss at: https://locutus.io/php/array_merge_recursive/
-  // original by: Subhasis Deb
-  //    input by: Brett Zamir (https://brett-zamir.me)
-  // bugfixed by: Kevin van Zonneveld (https://kvz.io)
-  //   example 1: var $arr1 = {'color': {'favorite': 'red'}, 0: 5}
-  //   example 1: var $arr2 = {0: 10, 'color': {'favorite': 'green', 0: 'blue'}}
-  //   example 1: array_merge_recursive($arr1, $arr2)
-  //   returns 1: {'color': {'favorite': {0: 'red', 1: 'green'}, 0: 'blue'}, 1: 5, 1: 10}
-  //        test: skip-1
+  // Helper to check if a key is numeric (PHP integer-indexed)
+  const isNumericKey = function (key) {
+    return parseInt(key, 10) + '' === key + ''
+  }
 
-  var arrayMerge = require('../array/array_merge');
-  var idx = '';
+  // Helper to check if value is a plain object (not array)
+  const isPlainObject = function (val) {
+    return val && typeof val === 'object' && toStr.call(val) !== '[object Array]'
+  }
 
-  if (arr1 && Object.prototype.toString.call(arr1) === '[object Array]' && arr2 && Object.prototype.toString.call(arr2) === '[object Array]') {
-    for (idx in arr2) {
-      arr1.push(arr2[idx]);
+  // Process arr1
+  for (const key in arr1) {
+    if (arr1.hasOwnProperty(key)) {
+      if (isNumericKey(key)) {
+        result[numericIdx++] = arr1[key]
+      } else {
+        result[key] = arr1[key]
+      }
     }
-  } else if (arr1 && arr1 instanceof Object && arr2 && arr2 instanceof Object) {
-    for (idx in arr2) {
-      if (idx in arr1) {
-        if (_typeof(arr1[idx]) === 'object' && (typeof arr2 === 'undefined' ? 'undefined' : _typeof(arr2)) === 'object') {
-          arr1[idx] = arrayMerge(arr1[idx], arr2[idx]);
+  }
+
+  // Process arr2
+  for (const key in arr2) {
+    if (arr2.hasOwnProperty(key)) {
+      if (isNumericKey(key)) {
+        // Numeric keys always append
+        result[numericIdx++] = arr2[key]
+      } else if (key in result) {
+        // String key exists in both - need to merge
+        if (isPlainObject(result[key]) && isPlainObject(arr2[key])) {
+          // Both are objects - recurse
+          result[key] = array_merge_recursive(result[key], arr2[key])
+        } else if (toStr.call(result[key]) === '[object Array]') {
+          // Result is already an array, push new value
+          result[key].push(arr2[key])
         } else {
-          arr1[idx] = arr2[idx];
+          // Create array with both values
+          result[key] = [result[key], arr2[key]]
         }
       } else {
-        arr1[idx] = arr2[idx];
+        result[key] = arr2[key]
       }
     }
   }
 
-  return arr1;
-};
-//# sourceMappingURL=array_merge_recursive.js.map
+  return result
+}