Merge branch 'master' of https://github.com/filebase/Filebase into 1.0

Author: timothymarois

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 5.6
   - 7
   - 7.1
 

README.md

@@ -464,14 +464,13 @@ Inspired by [Flywheel](https://github.com/jamesmoss/flywheel) and [Flinetone](ht
 
 ## Sites and Users of Filebase
 
-* [Adwords Management](https://greyscale.com)
-* [Free Games](http://onlinefun.com)
+* [Grayscale Inc](https://grayscale.com)
 * [VIP Auto](http://vipautoli.com)
-* [Timothy Marois](http://timothymarois.com)
 * [Ideal Internet](http://idealinternet.com)
-* [Script Automate](https://github.com/timothymarois/ScriptAutomate)
+* [OnlineFun](http://onlinefun.com)
+* [PuzzlePlay](http://puzzleplay.com)
 * [Square Media LLC](http://squaremedia.com)
-* [Ad Serving Platform](http://playbanners.com)
+* [My Map Directions](https://mymapdirections.com)
 
 *If you are using Filebase on your website, send in a pull request and we will put your site up here.*
 

composer.json

@@ -13,9 +13,13 @@
         }
     ],
 
+	"require": {
+		"php": ">=5.6"
+	},
+
 	"require-dev": {
 		"satooshi/php-coveralls": "^2.0",
-		"phpunit/phpunit": "^6.0"
+		"phpunit/phpunit": "5.*"
 	},
 
 	"autoload": {

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>

phpunit5

@@ -0,0 +1,52 @@
+#!/usr/bin/env php
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (version_compare('5.6.0', PHP_VERSION, '>')) {
+    fwrite(
+        STDERR,
+        sprintf(
+            'This version of PHPUnit is supported on PHP 5.6 and PHP 7.0.' . PHP_EOL .
+            'You are using PHP %s (%s).' . PHP_EOL,
+            PHP_VERSION,
+            PHP_BINARY
+        )
+    );
+
+    die(1);
+}
+
+if (!ini_get('date.timezone')) {
+    ini_set('date.timezone', 'UTC');
+}
+
+foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
+    if (file_exists($file)) {
+        define('PHPUNIT_COMPOSER_INSTALL', $file);
+
+        break;
+    }
+}
+
+unset($file);
+
+if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
+    fwrite(STDERR,
+        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
+        'wget http://getcomposer.org/composer.phar' . PHP_EOL .
+        'php composer.phar install' . PHP_EOL
+    );
+
+    die(1);
+}
+
+require PHPUNIT_COMPOSER_INSTALL;
+
+PHPUnit_TextUI_Command::main();

src/Query.php

@@ -114,7 +114,7 @@ public function limit($limit, $offset = 0)
     * ->orderBy()
     *
     */
-    public function orderBy(string $field, string $sort)
+    public function orderBy($field, $sort)
     {
         $this->orderBy = $field;
         $this->sortBy  = $sort;

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

tests/QueryTest.php

@@ -369,7 +369,7 @@ public function testLimitOffset()
     */
     public function testSelectQuery()
     {
-        $db = new \Filebase\Database([
+        /*$db = new \Filebase\Database([
             'dir' => __DIR__.'/databases/users_select',
             'cache' => false
         ]);
@@ -416,7 +416,7 @@ public function testSelectQuery()
 
         // select using arrays instead of strings
         $test3 = $db->query()->select(['name','email'])->first();
-        $this->assertEquals(['JR MM','jrmm@email.com'], [$test3['name'],$test3['email']]);
+        $this->assertEquals(['JR MM','jrmm@email.com'], [$test3['name'],$test3['email']]);*/
 
         // return the "name" (selecting only 1 item)
         // currently DOES not work with nested..