Added sorting to backup finder. (sort by newest to oldest). Updated readme with backup examples. Added backup sort testing.

Author: timothymarois

README.md

@@ -76,11 +76,12 @@ Usage Example (all options)
 
 ```php
 $db = new \Filebase\Database([
-    'dir'           => 'path/to/database/dir',
-    'format'        => \Filebase\Format\Json::class,
-    'cache'         => true,
-    'cache_expires' => 1800,
-    'pretty'        => true,
+    'dir'            => 'path/to/database/dir',
+    'backupLocation' => 'path/to/database/backup/dir',
+    'format'         => \Filebase\Format\Json::class,
+    'cache'          => true,
+    'cache_expires'  => 1800,
+    'pretty'         => true,
     'validate' => [
         'name'   => [
             'valid.type' => 'string',
@@ -93,6 +94,7 @@ $db = new \Filebase\Database([
 |Name				|Type		|Default Value	    |Description												|
 |---				|---		|---			         	|---														|
 |`dir`				|string		|current directory          |The directory where the database files are stored. 	    |
+|`backupLocation`   |string		|current directory (`/backups`)         |The directory where the backup zip files will be stored. 	    |
 |`format`			|object		|`\Filebase\Format\Json`   |The format class used to encode/decode data				|
 |`validate`			|array		|   |Check [Validation Rules](https://github.com/tmarois/Filebase#6-validation-optional) for more details |
 |`cache`			|bool		|false   |Stores [query](https://github.com/tmarois/Filebase#8-queries) results into cache for faster loading.				|
@@ -400,13 +402,34 @@ Cached queries will only be used if a specific saved cache is less than the expi
 ## (10) Database Backups
 By default you can backup your database using `$db->backup()->save()`, this will create a `.zip` file of your entire database based on your `dir` path.
 
-### Methods used with invoking the Backup class:
-These methods can be used when invoking `$db->backup()` on your `Database`.
+### Methods:
+These methods can be used when invoking `backup()` on your `Database`.
 
-- `save()` Saves a backup of your database.
-- `clean()` Purges all existing .zip files within the backup location
+- `save()` Saves a backup of your database (in your backup location `.zip`)
+- `clean()` Purges all existing backups (`.zip` files in your backup location)
 - `find()` Returns an `array` of all existing backups (array key by `time()` when backup was created)
-- `rollback()` Restore your database to an existing backup. (by default restores the latest backup if any exist)
+
+**Example:**
+
+```php
+
+// invoke your database
+$database = new \Filebase\Database([
+    'dir' => '/storage/users',
+    'backupLocation' => '/storage/backup',
+]);
+
+// save a new backup of your database
+// will look something like /storage/backup/1504631092.zip
+$database->backup()->save();
+
+// delete all existing backups
+$database->backup()->clean();
+
+// get a list of all existing backups (organized from new to old)
+$backups = $database->backup()->find();
+
+```
 
 ## Why Filebase?
 

src/Backup.php

@@ -65,7 +65,8 @@ public function save()
 
         if ($results = $this->zip($this->config->dir, $backupFile))
         {
-            return $backupFile;
+            $basename = basename($backupFile);
+            return $basename;
         }
 
         throw new \Exception('Error backing up database.');
@@ -88,9 +89,11 @@ public function find()
         foreach($files as $file)
         {
             $basename = str_replace('.zip','',basename($file));
-            $backups[$basename] = $file;
+            $backups[$basename] = $this->backupLocation.'/'.$basename.'.zip';
         }
 
+        krsort($backups);
+
         return $backups;
     }
 

tests/BackupTest.php

@@ -78,6 +78,35 @@ public function testBackupFind()
     }
 
 
+    public function testBackupFindSort()
+    {
+        $db = new \Filebase\Database([
+            'dir' => __DIR__.'/databases/mydatabasetobackup',
+            'backupLocation' => __DIR__.'/databases/storage/backups'
+        ]);
+
+        $db->flush(true);
+
+        for ($x = 1; $x <= 25; $x++)
+    	{
+    		$user = $db->get(uniqid());
+    		$user->name = 'John';
+    		$user->save();
+    	}
+
+        $db->backup()->save();
+        $db->backup()->save();
+        $last = str_replace('.zip','',$db->backup()->save());
+
+        $backups = $db->backup()->find();
+        $backupCurrent = current($backups);
+
+        $lastBackup = str_replace('.zip','',basename($backupCurrent));
+
+        $this->assertEquals($last,$lastBackup);
+    }
+
+
     public function testBackupCleanup()
     {
         $db = new \Filebase\Database([