Added Encryption to the project and updated the readme

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 5.6
   - 7
   - 7.1
+  - 7.2
 
 sudo: required
 dist: precise

CHANGELOG.md

@@ -1,6 +1,22 @@
 Change Log
 ==========
 
+### 02/24/2019 - 1.0.24
+* Merged [Pull Request](https://github.com/filebase/Filebase/pull/50) Fixed [bug](https://github.com/filebase/Filebase/issues/41) returning unexpected results.
+
+### 02/24/2019 - 1.0.23
+* Merged [Pull Request](https://github.com/filebase/Filebase/pull/49) Added support for order by multiple columns
+* Merged [Pull Request](https://github.com/filebase/Filebase/pull/46) Added ability to query document ids (internal id)
+* Added ability to use query `delete()` on all items that match the query (making the custom filter optional)
+
+### 02/23/2019 - 1.0.22
+* Merged [Pull Request](https://github.com/filebase/Filebase/pull/47) for deleting items with a custom filter. (this adds the `delete()` method on queries.)
+* Merged [Pull Request](https://github.com/filebase/Filebase/pull/48) for calling to the Query methods directly on the database class.
+* Merged [Pull Request](https://github.com/filebase/Filebase/pull/45) for sorting by update/created at times (ability to fetch `__created_at` and `__updated_at`)
+
+### 12/26/2018 - 1.0.21
+* Merged [Pull Request](https://github.com/filebase/Filebase/pull/30) for YAML format.
+
 ### 08/16/2018 - 1.0.20
 * Fixed #23 – Caching is cleared when deleting/saving documents to prevent cache from being out of sync with document data.
 

composer.json

@@ -1,8 +1,8 @@
 {
 	"description": "A Simple but Powerful Flat File Database Storage.",
 	"keywords": ["filebase", "key-value","file-files", "flat", "file", "database", "document", "flat-file", "serverless"],
-	"name": "filebase/filebase",
-	"homepage": "https://github.com/filebase/Filebase",
+	"name": "tmarois/filebase",
+	"homepage": "https://github.com/tmarois/Filebase",
 	"type": "package",
 	"licence": "MIT",
 
@@ -14,14 +14,20 @@
     ],
 
 	"require": {
-		"php": ">=5.6"
+		"php": ">=5.6",
+		"paragonie/halite": "5"
 	},
 
 	"require-dev": {
-		"satooshi/php-coveralls": "^2.0",
-		"phpunit/phpunit": "5.*"
+		"php-coveralls/php-coveralls": "^2.0",
+		"phpunit/phpunit": "5.*",
+		"symfony/yaml": "^3.4"
 	},
 
+	"suggest": {
+        "symfony/yaml": "Allows Yaml format"
+    },
+
 	"autoload": {
 		"psr-4": {
 			"Filebase\\": "src/"

src/Backup.php

@@ -12,10 +12,6 @@ class Backup
     */
     protected $backupLocation;
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * $config
     *
@@ -24,27 +20,20 @@ class Backup
     */
     protected $config;
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * $database
     *
     * \Filebase\Database
     */
     protected $database;
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * __construct
     *
     */
-    public function __construct($backupLocation = '', Database $database)
+    public function __construct($backupLocation, Database $database)
     {
+
         $this->backupLocation = $backupLocation;
         $this->config = $database->getConfig();
         $this->database = $database;
@@ -63,10 +52,6 @@ public function __construct($backupLocation = '', Database $database)
         }
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * save()
     *
@@ -84,10 +69,6 @@ public function create()
         throw new \Exception('Error backing up database.');
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * find()
     *
@@ -109,10 +90,6 @@ public function find()
         return $backups;
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * clean()
     *
@@ -124,10 +101,6 @@ public function clean()
         return array_map('unlink', glob(realpath($this->backupLocation)."/*.zip"));
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * rollback()
     *
@@ -144,10 +117,6 @@ public function rollback()
         return $this->extract($restore, $this->config->dir);
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
      * extract()
      *
@@ -157,28 +126,21 @@ public function rollback()
      */
     protected function extract($source = '', $target = '')
     {
-        if (extension_loaded('zip'))
+        if (!extension_loaded('zip') && !file_exists($source))
         {
-            if (file_exists($source))
-            {
-                $zip = new \ZipArchive();
-                if ($zip->open($source) === TRUE)
-                {
-                    $zip->extractTo($target);
-                    $zip->close();
-
-                    return true;
-                }
-            }
+            return false;
         }
+        $zip = new \ZipArchive();
+        if ($zip->open($source) === TRUE)
+        {
+            $zip->extractTo($target);
+            $zip->close();
 
+            return true;
+        }
         return false;
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * zip()
     *
@@ -187,52 +149,45 @@ protected function extract($source = '', $target = '')
     */
     protected function zip($source = '', $target = '')
     {
-        if (extension_loaded('zip'))
+        if (!extension_loaded('zip') || !file_exists($source))
         {
-           if (file_exists($source))
-           {
-               $zip = new \ZipArchive();
-               if ($zip->open($target, \ZIPARCHIVE::CREATE))
-               {
-                   $source = realpath($source);
-                   if (is_dir($source))
-                   {
-                       $iterator = new \RecursiveDirectoryIterator($source);
-                       $iterator->setFlags(\RecursiveDirectoryIterator::SKIP_DOTS);
-                       $files = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST);
-                       foreach ($files as $file)
-                       {
-                           $file = realpath($file);
-
-                           if (preg_match('|'.realpath($this->backupLocation).'|',$file))
-                           {
-                               continue;
-                           }
-
-                           if (is_dir($file))
-                           {
-                               $zip->addEmptyDir(str_replace($source . '/', '', $file . '/'));
-                           }
-                           else if (is_file($file))
-                           {
-                               $zip->addFromString(str_replace($source . '/', '', $file), file_get_contents($file));
-                           }
-                       }
-
-                   }
-                   else if (is_file($source))
-                   {
-                       $zip->addFromString(basename($source), file_get_contents($source));
-                   }
-               }
-
-               return $zip->close();
-           }
-       }
-
-       return false;
-    }
+            return false;
+        }
+
+        $zip = new \ZipArchive();
+        if (!$zip->open($target, \ZIPARCHIVE::CREATE))
+        {
+            $zip->addFromString(basename($source), file_get_contents($source));
+        }
+        $source = realpath($source);
+        if (is_dir($source))
+        {
+            $iterator = new \RecursiveDirectoryIterator($source);
+            $iterator->setFlags(\RecursiveDirectoryIterator::SKIP_DOTS);
+            $files = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST);
+            foreach ($files as $file)
+            {
+                $file = realpath($file);
 
+                if (preg_match('|'.realpath($this->backupLocation).'|',$file))
+                {
+                    continue;
+                }
 
+                if (is_dir($file))
+                {
+                    $zip->addEmptyDir(str_replace($source . '/', '', $file . '/'));
+                }
+                else if (is_file($file))
+                {
+                    $zip->addFromString(str_replace($source . '/', '', $file), file_get_contents($file));
+                }
+            }
+
+        }
+
+        return $zip->close();
+
+    }
 
 }

src/Cache.php

@@ -26,9 +26,6 @@ class Cache
     */
     protected $key;
 
-
-    //--------------------------------------------------------------------
-
     /**
     * __construct()
     *
@@ -44,10 +41,6 @@ public function __construct(Database $database)
     	]);
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * setKey()
     *
@@ -60,10 +53,6 @@ public function setKey($key)
         $this->key = md5($key);
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * getKey()
     *
@@ -73,10 +62,6 @@ public function getKey()
         return $this->key;
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * flush()
     *
@@ -86,10 +71,6 @@ public function flush()
         $this->cache_database->flush(true);
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * expired()
     *
@@ -106,10 +87,6 @@ public function expired($time)
         return true;
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * getDocuments()
     *
@@ -125,10 +102,6 @@ public function getDocuments($documents)
         return $d;
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * get()
     *
@@ -155,10 +128,6 @@ public function get()
         return $this->getDocuments($cache_doc->toArray());
     }
 
-
-    //--------------------------------------------------------------------
-
-
     /**
     * store()
     *
@@ -173,8 +142,4 @@ public function store($data)
         return $this->cache_database->get( $this->getKey() )->set($data)->save();
     }
 
-
-    //--------------------------------------------------------------------
-
-
 }