Add files via upload

Author: ruslan-avantis

src/Database.php

@@ -1,11 +1,11 @@
 <?php
-
+ 
 namespace jsonDB;
-
+ 
 use jsonDB\dbException;
 use jsonDB\Relation;
 use jsonDB;
-
+ 
 /**
  * Core class of jsonDB.
  *
@@ -15,37 +15,37 @@
  *
  */
 class Database implements \IteratorAggregate, \Countable {
-
+ 
     /**
      * Contain returned data from file as object or array of objects
      * @var mixed Data from table
      */
     protected $data;
-
+ 
     /**
      * Name of file (table)
      * @var string Name of table
      */
     protected $name;
-
+ 
     /**
      * Object with setted data
      * @var object Setted data
      */
     protected $set;
-
+ 
     /**
      * ID of current row if setted
      * @var integer Current ID
      */
     protected $currentId;
-
+ 
     /**
      * Key if current row if setted
      * @var integer Current key
      */
     protected $currentKey;
-
+ 
     /**
      * Pending functions with values
      * @see \jsonDB\Database::setPending()
@@ -130,7 +130,7 @@ protected function clearKeyInfo()
     protected function setFields()
     {
         $this->set = new \stdClass();
-        $schema    = $this->schema();
+        $schema = $this->schema();
 
         foreach ($schema as $field => $type)
         {
@@ -177,11 +177,22 @@ protected function clearQuery()
      */
     public function __set($name, $value)
     {
+        /*      
         if (Validate::table($this->name)->field($name) && Validate::table($this->name)->type($name, $value))
         {
             $this->set->{$name} = $value;
+        } 
+        */   
+        try {
+            Validate::table($this->name)->field($name);
+            Validate::table($this->name)->type($name, $value);
+            $this->set->{$name} = $value;
+        } catch(dbException $error) {
+            echo $error;
         }
+        
     }
+    
 
     /**
      * Returning variable from Object
@@ -521,7 +532,7 @@ protected function wherePending()
                 elseif (!is_array($value) && in_array($op, array('LIKE', 'like')))
                 {
 
-					//$specials = '.\+*?[^]$(){}=!<>|:-';
+                    //$specials = '.\+*?[^]$(){}=!<>|:-';
                     $regex = "/^" . str_replace('%', '(.*?)', preg_quote($value)) . "$/si";
                     $value = preg_match($regex, $row->{$field});
                     $op    = '==';
@@ -794,13 +805,13 @@ public function save()
         }
         else
         {
-            $this->set->id           = $this->currentId;
+            $this->set->id = $this->currentId;
             $data[$this->currentKey] = $this->set;
         }
 
         Data::table($this->name)->put($data);
 
-//         $this->setFields();
+//      $this->setFields();
     }
 
     /**
@@ -856,8 +867,8 @@ public function find($id = NULL)
     {
         if ($id !== NULL)
         {
-            $data             = $this->getData();
-            $this->currentId  = $id;
+            $data = $this->getData();
+            $this->currentId = $id;
             $this->currentKey = $this->getRowKey($id);
             foreach ($data[$this->currentKey] as $field => $value)
             {
@@ -907,7 +918,7 @@ public function getIterator()
      */
     public function debug()
     {
-        $print = "jsonDB::table(" . $this->name . ")\n";
+        $print = "jsonDB::table(".$this->name.")\n";
         foreach ($this->pending as $function => $values)
         {
             if (!empty($values))

src/File.php

@@ -61,7 +61,7 @@ public final function get($assoc = false)
 
         $getPath = file_get_contents($this->getPath());
 
-        //    Если ключ шифрования установлен расшифровываем
+        // Если ключ шифрования установлен расшифровываем
         if (defined('JSON_DB_KEY') && JSON_DB_CRYPT == true){
 
             try {
@@ -96,7 +96,7 @@ public final function get($assoc = false)
 
     public final function put($data)
     {
-        //    Если ключ шифрования установлен шифруем
+        // Если ключ шифрования установлен шифруем
         if (defined('JSON_DB_KEY') && JSON_DB_CRYPT == true){
             try {
                 $getPath = Crypto::encrypt(json_encode($data), Key::loadFromAsciiSafeString(JSON_DB_KEY));

src/Validate.php

@@ -1,10 +1,10 @@
 <?php
-
+    
 namespace jsonDB;
-
+ 
 use jsonDB\dbException;
 use jsonDB\Relation;
-
+ 
 /**
  * Validation for tables
  *
@@ -37,7 +37,7 @@ public static function table($name)
      */
     public static function isNumeric($type)
     {
-        $defined = array('integer', 'double');
+        $defined = array("integer", "double");
 
         if (in_array($type, $defined))
         {
@@ -56,7 +56,7 @@ public static function isNumeric($type)
     public static function types(array $types)
     {
         $defined = array('boolean', 'integer', 'double', 'string', 'text', 'datetime');
-        $diff    = array_diff($types, $defined);
+        $diff = array_diff($types, $defined);
 
         if (empty($diff))
         {
@@ -162,7 +162,6 @@ public function type($name, $value)
         {
             return TRUE;
         }
-
         throw new dbException('Wrong data type');
     }