formatting

Author: taylorotwell

src/Illuminate/Database/Query/Builder.php

@@ -204,11 +204,11 @@ class Builder
     ];
 
     /**
-     * All of the available binary operators.
+     * All of the available bit operators.
      *
      * @var string[]
      */
-    public $binaryOperators = [
+    public $bitOperators = [
         '&', '|', '^', '<<', '>>', '&~',
     ];
 
@@ -763,8 +763,8 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
             }
         }
 
-        if ($this->isBinaryOperator($operator)) {
-            $type = 'Binary';
+        if ($this->isBitOperator($operator)) {
+            $type = 'Bit';
         }
 
         // Now that we are working with just a simple query we can put the elements
@@ -850,10 +850,16 @@ protected function invalidOperator($operator)
                ! in_array(strtolower($operator), $this->grammar->getOperators(), true);
     }
 
-    protected function isBinaryOperator($operator)
+    /**
+     * Determine if the operator is a bit operator.
+     *
+     * @param  string  $operator
+     * @return bool
+     */
+    protected function isBitOperator($operator)
     {
-        return in_array(strtolower($operator), $this->binaryOperators, true) ||
-               in_array(strtolower($operator), $this->grammar->getBinaryOperators(), true);
+        return in_array(strtolower($operator), $this->bitOperators, true) ||
+               in_array(strtolower($operator), $this->grammar->getBitOperators(), true);
     }
 
     /**
@@ -1934,8 +1940,8 @@ public function having($column, $operator = null, $value = null, $boolean = 'and
             [$value, $operator] = [$operator, '='];
         }
 
-        if ($this->isBinaryOperator($operator)) {
-            $type = 'binary';
+        if ($this->isBitOperator($operator)) {
+            $type = 'bit';
         }
 
         $this->havings[] = compact('type', 'column', 'operator', 'value', 'boolean');

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -19,11 +19,11 @@ class Grammar extends BaseGrammar
     protected $operators = [];
 
     /**
-     * The grammar specific binary operators.
+     * The grammar specific bit operators.
      *
      * @var array
      */
-    protected $binaryOperators = [];
+    protected $bitOperators = [];
 
     /**
      * The components that make up a select clause.
@@ -262,7 +262,14 @@ protected function whereBasic(Builder $query, $where)
         return $this->wrap($where['column']).' '.$operator.' '.$value;
     }
 
-    protected function whereBinary(Builder $query, $where)
+    /**
+     * Compile a bit operator where clause.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $where
+     * @return string
+     */
+    protected function whereBit(Builder $query, $where)
     {
         $value = $this->parameter($where['value']);
 
@@ -701,8 +708,8 @@ protected function compileHaving(array $having)
             return $having['boolean'].' '.$having['sql'];
         } elseif ($having['type'] === 'between') {
             return $this->compileHavingBetween($having);
-        } elseif ($having['type'] === 'binary') {
-            return $this->compileHavingBinary($having);
+        } elseif ($having['type'] === 'bit') {
+            return $this->compileHavingBit($having);
         }
 
         return $this->compileBasicHaving($having);
@@ -743,12 +750,12 @@ protected function compileHavingBetween($having)
     }
 
     /**
-     * Compile a having clause involving a binary operator.
+     * Compile a having clause involving a bit operator.
      *
      * @param  array  $having
      * @return string
      */
-    protected function compileHavingBinary($having)
+    protected function compileHavingBit($having)
     {
         $column = $this->wrap($having['column']);
 
@@ -1334,12 +1341,12 @@ public function getOperators()
     }
 
     /**
-     * Get the grammar specific binary operators.
+     * Get the grammar specific bit operators.
      *
      * @return array
      */
-    public function getBinaryOperators()
+    public function getBitOperators()
     {
-        return $this->binaryOperators;
+        return $this->bitOperators;
     }
 }

src/Illuminate/Database/Query/Grammars/PostgresGrammar.php

@@ -22,11 +22,11 @@ class PostgresGrammar extends Grammar
     ];
 
     /**
-     * The grammar specific binary operators.
+     * The grammar specific bit operators.
      *
      * @var array
      */
-    protected $binaryOperators = [
+    protected $bitOperators = [
         '~', '&', '|', '#', '<<', '>>', '<<=', '>>=',
     ];
 

tests/Database/DatabaseEloquentModelTest.php

@@ -2153,7 +2153,7 @@ protected function addMockConnection($model)
         $model->setConnectionResolver($resolver = m::mock(ConnectionResolverInterface::class));
         $resolver->shouldReceive('connection')->andReturn($connection = m::mock(Connection::class));
         $connection->shouldReceive('getQueryGrammar')->andReturn($grammar = m::mock(Grammar::class));
-        $grammar->shouldReceive('getBinaryOperators')->andReturn([]);
+        $grammar->shouldReceive('getBitOperators')->andReturn([]);
         $connection->shouldReceive('getPostProcessor')->andReturn($processor = m::mock(Processor::class));
         $connection->shouldReceive('query')->andReturnUsing(function () use ($connection, $grammar, $processor) {
             return new BaseBuilder($connection, $grammar, $processor);
@@ -2441,7 +2441,7 @@ public function getConnection()
     {
         $mock = m::mock(Connection::class);
         $mock->shouldReceive('getQueryGrammar')->andReturn($grammar = m::mock(Grammar::class));
-        $grammar->shouldReceive('getBinaryOperators')->andReturn([]);
+        $grammar->shouldReceive('getBitOperators')->andReturn([]);
         $mock->shouldReceive('getPostProcessor')->andReturn($processor = m::mock(Processor::class));
         $mock->shouldReceive('getName')->andReturn('name');
         $mock->shouldReceive('query')->andReturnUsing(function () use ($mock, $grammar, $processor) {

tests/Database/DatabaseQueryBuilderTest.php

@@ -3209,7 +3209,7 @@ public function testMySqlSoundsLikeOperator()
         $this->assertEquals(['John Doe'], $builder->getBindings());
     }
 
-    public function testBinaryOperators()
+    public function testBitOperators()
     {
         $builder = $this->getBuilder();
         $builder->select('*')->from('users')->where('bar', '&', 1);