Merge branch '1.x' of github.com:hardeepvicky/Php-Query-Builder into 1.x

Author: hardeepvicky

README.md

@@ -19,7 +19,5 @@
     },
     "minimum-stability" : "stable",
     "prefer-stable": true,
-    "require-dev": {
-        "symfony/var-dumper": "^6.3"
-    }
+    "require-dev": {}
 }

composer.json

@@ -1,9 +1,9 @@
 <?php
 namespace HardeepVicky\QueryBuilder;
 
-class Where
+class Condition
 {
-    private $op = null, $fields = array(), $where_list = array();
+    private $op = null, $fields = array(), $Condition_list = array();
 
     /**
      * @param String $op
@@ -16,11 +16,11 @@ public function __construct(String $op)
     /**
      * @param String $op
      * 
-     * @return Where
+     * @return Condition
      */
     public static function init(String $op)
     {
-        return new Where($op);
+        return new Condition($op);
     }
 
     /**
@@ -29,7 +29,7 @@ public static function init(String $op)
      * @param String $operator
      * @param String $value_type
      * 
-     * @return Where
+     * @return Condition
      */
     public function add(String $field, $value, String $operator = "=", String $value_type = "string")
     {
@@ -158,7 +158,7 @@ private function _parseStringValue($value, $value_type = "string")
      * @param Array $arr 
      * @param String $operator
      * 
-     * @return Where
+     * @return Condition
      */
     public function addList(Array $arr, String $operator = "=")
     {
@@ -171,13 +171,13 @@ public function addList(Array $arr, String $operator = "=")
     }
 
     /**
-     * @param Where $wh
+     * @param Condition $wh
      * 
-     * @return Where
+     * @return Condition
      */
-    public function addWhere(Where $wh)
+    public function addCondition(Condition $wh)
     {
-        $this->where_list[] = $wh;
+        $this->Condition_list[] = $wh;
         return $this;
     }
 
@@ -186,50 +186,41 @@ public function addWhere(Where $wh)
      * 
      * @return String
      */
-    public function get(String $table = "")
+    public function get(String $table_name = "")
     {
-        $list = array();
+        $list = [];
 
         foreach($this->fields as $field)
         {
             if (strlen($field["value"]) > 0)
             {
                 $key = $field["field"];
 
-                if ($table)
+                if ($table_name)
                 {
-                    $key = $table . "." . $key;
+                    $key = $table_name . "." . $key;
                 }
 
                 if ($field["op"])
                 {
                     $key = $key . " " . $field["op"];
                 }
 
-                $list[$key] = $field["value"];
+                $list[] = $key . " " . $field["value"];
             }
         }
 
-        $list = $this->_listToStr($list);
-        
-        foreach($this->where_list as $wh)
+        foreach($this->Condition_list as $wh)
         {
-            $list[] = $wh->get($table);
+            $list[] = $wh->get($table_name);
         }
-        
-        return "(" . implode($this->op, $list) . ")";
-    }
-    
-    private function _listToStr($data)
-    {
-        $list = array();
-        
-        foreach($data as $k => $v)
+
+        if (empty($list))
         {
-            $list[] = $k . " " . $v ;
+            return "";
         }
 
-        return $list;
+        return "(" . implode($this->op, $list) . ")";
     }
 }