Correção teste unitario.

Author: eduavila

composer.json

@@ -13,8 +13,8 @@
         "illuminate/database": "^6.15"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "mockery/mockery": "dev-master"
+        "phpunit/phpunit": "^7.5.20",
+        "mockery/mockery": "^1.3.3"
     },
     "scripts": {
         "test": "vendor/bin/phpunit --verbose --coverage-text"

src/NQuery.php

@@ -494,13 +494,15 @@ private function setSubWhere($callback,$isOr = false){
 
         $this->wheres .= "($subCondition)";
     }
+    
     private function checkInitialWhere(){
         return (strlen($this->wheres) == 0);
     }
 
     private function checkInitialHaving(){
         return (strlen($this->havingValue) == 0);
     }
+
     private function convertArrayToIn(array $value){
         if(is_int($value[0])){
             $value = implode(",",$value);
@@ -513,16 +515,7 @@ private function convertArrayToIn(array $value){
         }
         return $value;
     }
-    
-    private function antiInjection($obj) {
-        $obj = preg_replace("/(from|alter table|select|insert|delete|update|where|drop table|show tables|#|--|\\)/i", "", $obj);
-        $obj = trim($obj);
-        $obj = strip_tags($obj);
-        if(!get_magic_quotes_gpc()) {
-            $obj = addslashes($obj);
-            return $obj;	   
-        }
-    }   
+
     function sqlEscapeMimic($inp) {
         if(is_array($inp)) 
             return array_map(__METHOD__, $inp); 

src/tests/Unit/NQueryTest.php

@@ -149,6 +149,16 @@ public function testWhereRaw()
         $this->assertEquals('select coluna from tab_usuario b where b.coluna = 1 AND b.coluna = 2 or b.coluna = 3',$query->toSql());
     }
 
+    public function testWhereRawOr()
+    {
+        $query = new NQuery('select coluna from tab_usuario b');
+        $query->where('b.coluna',1);
+        $query->whereRaw('b.coluna = 2 OR b.coluna = 3',NQuery::OR);
+        
+
+        $this->assertEquals('select coluna from tab_usuario b where b.coluna = 1 OR b.coluna = 2 OR b.coluna = 3',$query->toSql());
+    }
+
     public function testWhereBetween()
     {
         $query = new NQuery('select coluna from tab_usuario b');