1
0
mirror of synced 2024-11-22 05:16:07 +03:00

Merge pull request #79 from moriony/master

Add orders merge technique
This commit is contained in:
Ilyas Salikhov 2020-01-20 19:35:13 +03:00 committed by GitHub
commit 5371a9750e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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(