commit
5371a9750e
@ -42,7 +42,7 @@ trait Orders
|
|||||||
*/
|
*/
|
||||||
public function ordersCombine($order, $resultOrder, $technique = 'ours')
|
public function ordersCombine($order, $resultOrder, $technique = 'ours')
|
||||||
{
|
{
|
||||||
$techniques = ['ours', 'summ', 'theirs'];
|
$techniques = ['ours', 'summ', 'theirs', 'merge'];
|
||||||
|
|
||||||
if (!count($order) || !count($resultOrder)) {
|
if (!count($order) || !count($resultOrder)) {
|
||||||
throw new \InvalidArgumentException(
|
throw new \InvalidArgumentException(
|
||||||
|
Loading…
Reference in New Issue
Block a user