Rename Sql::_and(), _or() to and(), or()

emonkak · Jun 18, 2020 · d7439be · d7439be
1 parent 6661bdd
commit d7439be
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/DeleteBuilder.php b/src/DeleteBuilder.php
@@ -83,7 +83,7 @@ public function where($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->where = $this->where ? Sql::_and($this->where, $condition) : $condition;
+        $cloned->where = $this->where ? Sql::and($this->where, $condition) : $condition;
         return $cloned;
     }
 
@@ -97,7 +97,7 @@ public function orWhere($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->where = $this->where ? Sql::_or($this->where, $condition) : $condition;
+        $cloned->where = $this->where ? Sql::or($this->where, $condition) : $condition;
         return $cloned;
     }
 

diff --git a/src/SelectBuilder.php b/src/SelectBuilder.php
@@ -275,7 +275,7 @@ public function where($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->where = $this->where ? Sql::_and($this->where, $condition) : $condition;
+        $cloned->where = $this->where ? Sql::and($this->where, $condition) : $condition;
         return $cloned;
     }
 
@@ -289,7 +289,7 @@ public function orWhere($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->where = $this->where ? Sql::_or($this->where, $condition) : $condition;
+        $cloned->where = $this->where ? Sql::or($this->where, $condition) : $condition;
         return $cloned;
     }
 
@@ -348,7 +348,7 @@ public function having($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->having = $this->having ? Sql::_and($this->having, $condition) : $condition;
+        $cloned->having = $this->having ? Sql::and($this->having, $condition) : $condition;
         return $cloned;
     }
 
@@ -362,7 +362,7 @@ public function orHaving($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->having = $this->having ? Sql::_or($this->having, $condition) : $condition;
+        $cloned->having = $this->having ? Sql::or($this->having, $condition) : $condition;
         return $cloned;
     }
 

diff --git a/src/Sql.php b/src/Sql.php
@@ -76,7 +76,7 @@ public static function values(array $values): self
         return new Sql($sql, $values);
     }
 
-    public static function _and(Sql $lhs, Sql ...$rest): self
+    public static function and(Sql $lhs, Sql ...$rest): self
     {
         $tmpSql = $lhs->sql;
         $tmpBindings = [$lhs->bindings];
@@ -91,7 +91,7 @@ public static function _and(Sql $lhs, Sql ...$rest): self
         return new Sql($tmpSql, $bindings);
     }
 
-    public static function _or(Sql $lhs, Sql ...$rest): self
+    public static function or(Sql $lhs, Sql ...$rest): self
     {
         $tmpSql = $lhs->sql;
         $tmpBindings = [$lhs->bindings];

diff --git a/src/UpdateBuilder.php b/src/UpdateBuilder.php
@@ -116,7 +116,7 @@ public function where($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->where = $this->where ? Sql::_and($this->where, $condition) : $condition;
+        $cloned->where = $this->where ? Sql::and($this->where, $condition) : $condition;
         return $cloned;
     }
 
@@ -130,7 +130,7 @@ public function orWhere($arg1, $arg2 = null, $arg3 = null, $arg4 = null): self
     {
         $condition = $this->grammar->condition(...func_get_args());
         $cloned = clone $this;
-        $cloned->where = $this->where ? Sql::_or($this->where, $condition) : $condition;
+        $cloned->where = $this->where ? Sql::or($this->where, $condition) : $condition;
         return $cloned;
     }
 

diff --git a/tests/SqlTest.php b/tests/SqlTest.php
@@ -64,8 +64,8 @@ public function testValues(): void
 
     public function testAnd(): void
     {
-        $query = Sql::_and(
-            Sql::_or(
+        $query = Sql::and(
+            Sql::or(
                 new Sql('foo = ?', [1]),
                 new Sql('bar = ?', [2])
             ),