changed Arr::map to support laravel 7/8

David Nahodyl · David Nahodyl · commit 2136f14cdabc · 2022-08-23T23:07:39.000-04:00
diff --git a/src/Database/Query/FMBaseBuilder.php b/src/Database/Query/FMBaseBuilder.php
@@ -542,9 +542,12 @@ protected function computeWhereIns()
             return;
         }
 
-        $this->wheres = Arr::map(Arr::crossJoin($this->wheres, ...$whereIns), function ($conditions) {
+        $arr = Arr::crossJoin($this->wheres, ...$whereIns);
+        $function = function ($conditions) {
             return array_merge(...array_values($conditions));
-        });
+        };
+
+        $this->wheres = array_map($function, $arr);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -542,9 +542,12 @@ protected function computeWhereIns()`
`542`	`542`	`return;`
`543`	`543`	`}`
`544`	`544`
`545`		`- $this->wheres = Arr::map(Arr::crossJoin($this->wheres, ...$whereIns), function ($conditions) {`
	`545`	`+ $arr = Arr::crossJoin($this->wheres, ...$whereIns);`
	`546`	`+ $function = function ($conditions) {`
`546`	`547`	`return array_merge(...array_values($conditions));`
`547`		`- });`
	`548`	`+ };`
	`549`	`+`
	`550`	`+ $this->wheres = array_map($function, $arr);`
`548`	`551`	`}`
`549`	`552`
`550`	`553`	`/**`