Fixed spaceship operator for php 5.6 (and minor fixes for phpunit tests)

tmarois · Jul 14, 2018 · 3d35763 · 3d35763
1 parent f4158b3
commit 3d35763
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,9 +8,8 @@
 		 convertWarningsToExceptions="true"
 		 processIsolation="false"
 		 stopOnFailure="false"
-		 syntaxCheck="true"
 		 verbose="true" >
-    <testsuites name="Filebase Test Case">
+    <testsuites>
         <testsuite name="All">
             <directory>./tests</directory>
         </testsuite>

diff --git 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);
 
         });