Renamed function tap because have conflict with laravel function. T…

…hey incompatible. (#65) * Renamed function `tap` because have conflict with laravel function. They incompatible. * Fix by continuous-integration/styleci/pr Co-authored-by: Volodymyr Razumniak <[email protected]>
the-tinderbox · Nov 15, 2022 · 05f63ce · 05f63ce
1 parent 1a1601e
commit 05f63ce
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 65 deletions.
diff --git a/src/Query/BaseBuilder.php b/src/Query/BaseBuilder.php
diff --git a/src/Query/Column.php b/src/Query/Column.php
@@ -66,7 +66,7 @@ public function __construct(BaseBuilder $query)
     public function name($columnName): self
     {
         if ($columnName instanceof \Closure) {
-            $columnName = tap(new static($this->query), $columnName);
+            $columnName = tp(new static($this->query), $columnName);
         }
 
         if (is_string($columnName)) {
@@ -303,7 +303,7 @@ public function query($query = null)
         }
 
         if ($query instanceof \Closure) {
-            $query = tap($this->query->newQuery(), $query);
+            $query = tp($this->query->newQuery(), $query);
         }
 
         if ($query instanceof BaseBuilder) {

diff --git a/src/Query/From.php b/src/Query/From.php
@@ -153,7 +153,7 @@ public function query($query = null)
         }
 
         if ($query instanceof \Closure) {
-            $query = tap($this->query->newQuery(), $query);
+            $query = tp($this->query->newQuery(), $query);
         }
 
         if ($query instanceof BaseBuilder) {

diff --git a/src/Query/JoinClause.php b/src/Query/JoinClause.php
@@ -257,7 +257,7 @@ public function query($query = null)
         }
 
         if ($query instanceof Closure) {
-            $query = tap($this->query->newQuery(), $query);
+            $query = tp($this->query->newQuery(), $query);
         }
 
         if ($query instanceof BaseBuilder) {

diff --git a/src/Query/TwoElementsLogicExpression.php b/src/Query/TwoElementsLogicExpression.php
@@ -121,7 +121,7 @@ public function concatOperator(string $operator)
     public function firstElementQuery($query): self
     {
         if ($query instanceof \Closure) {
-            $query = tap($this->query->newQuery(), $query);
+            $query = tp($this->query->newQuery(), $query);
         }
 
         if ($query instanceof BaseBuilder) {
@@ -141,7 +141,7 @@ public function firstElementQuery($query): self
     public function secondElementQuery($query): self
     {
         if ($query instanceof \Closure) {
-            $query = tap($this->query->newQuery(), $query);
+            $query = tp($this->query->newQuery(), $query);
         }
 
         if ($query instanceof BaseBuilder) {

diff --git a/src/functions.php b/src/functions.php
@@ -1,7 +1,7 @@
 <?php
 
 // @codeCoverageIgnoreStart
-if (!function_exists('tap')) {
+if (!function_exists('tp')) {
     /**
      * Call the given Closure with the given value then return the value.
      *
@@ -10,7 +10,7 @@
      *
      * @return mixed
      */
-    function tap($value, $callback)
+    function tp($value, $callback)
     {
         $callback($value);
 

diff --git a/tests/BuilderTest.php b/tests/BuilderTest.php
@@ -582,7 +582,7 @@ public function test_wheres_basic()
         $element->firstElement('a');
         $element->operator('=');
         $element->secondElement('b');
-        $element->concatOperator(Operator:: OR);
+        $element->concatOperator(Operator::OR);
 
         $builder->where($element);
         $this->assertEquals('SELECT * WHERE \'a\' = \'b\'', $builder->toSql());
@@ -592,13 +592,13 @@ public function test_wheres_basic()
         $element->firstElement('a');
         $element->operator('=');
         $element->secondElement('b');
-        $element->concatOperator(Operator:: OR);
+        $element->concatOperator(Operator::OR);
 
         $element2 = new TwoElementsLogicExpression($builder);
         $element2->firstElement('c');
         $element2->operator('=');
         $element2->secondElement('d');
-        $element2->concatOperator(Operator:: OR);
+        $element2->concatOperator(Operator::OR);
 
         $builder->where($element, '=', $element2);
         $this->assertEquals('SELECT * WHERE \'a\' = \'b\' = \'c\' = \'d\'', $builder->toSql());

diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php
@@ -26,7 +26,7 @@ public function testTap()
             $result = 2;
         };
 
-        $returnedValue = tap($value, $callback);
+        $returnedValue = tp($value, $callback);
 
         $this->assertEquals($value, $returnedValue);
         $this->assertEquals(2, $result);