diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9e6c97b..d4bf76b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -8,9 +8,8 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" verbose="true" > - + ./tests diff --git a/src/QueryLogic.php b/src/QueryLogic.php index f89889b..764e190 100644 --- a/src/QueryLogic.php +++ b/src/QueryLogic.php @@ -205,12 +205,19 @@ protected function sort() $propA = $a->field($orderBy); $propB = $b->field($orderBy); + + if (strnatcasecmp($propB, $propA) == strnatcasecmp($propA, $propB)) { + return 0; + } + if ($sortBy == 'DESC') { - return strnatcasecmp($propB, $propA) <=> strnatcasecmp($propA, $propB); + return (strnatcasecmp($propB, $propA) < strnatcasecmp($propA, $propB)) ? -1 : 1; + } + else + { + return (strnatcasecmp($propA, $propB) < strnatcasecmp($propB, $propA)) ? -1 : 1; } - - return strnatcasecmp($propA, $propB) <=> strnatcasecmp($propB, $propA); });