added insertParenthesis boolean to relevant factory methods in Traits

Author: transistive

src/Traits/BooleanTypeTrait.php

@@ -38,33 +38,36 @@ trait BooleanTypeTrait
      * Create a conjunction between this expression and the given expression.
      *
      * @param BooleanType $right
+     * @param bool $insertParentheses
      * @return AndOperator
      */
-    public function and(BooleanType $right): AndOperator
+    public function and(BooleanType $right, bool $insertParentheses = true): AndOperator
     {
-        return new AndOperator($this, $right);
+        return new AndOperator($this, $right, $insertParentheses);
     }
 
     /**
      * Create a disjunction between this expression and the given expression.
      *
      * @param BooleanType $right
+     * @param bool $insertParentheses
      * @return OrOperator
      */
-    public function or(BooleanType $right): OrOperator
+    public function or(BooleanType $right, bool $insertParentheses = true): OrOperator
     {
-        return new OrOperator($this, $right);
+        return new OrOperator($this, $right, $insertParentheses);
     }
 
     /**
      * Perform an XOR with the given expression.
      *
      * @param BooleanType $right
+     * @param bool $insertParentheses
      * @return XorOperator
      */
-    public function xor(BooleanType $right): XorOperator
+    public function xor(BooleanType $right, bool $insertParentheses = true): XorOperator
     {
-        return new XorOperator($this, $right);
+        return new XorOperator($this, $right, $insertParentheses);
     }
 
     /**

src/Traits/ListTypeTrait.php

@@ -33,10 +33,11 @@ trait ListTypeTrait
      * Checks whether the given element exists in this list.
      *
      * @param PropertyType $left
+     * @param bool $insertParentheses
      * @return In
      */
-    public function has(PropertyType $left): In
+    public function has(PropertyType $left, bool $insertParentheses = true): In
     {
-        return new In($left, $this);
+        return new In($left, $this, $insertParentheses);
     }
 }

src/Traits/NumeralTypeTrait.php

@@ -45,110 +45,120 @@ trait NumeralTypeTrait
      * Add this expression to the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return Addition
      */
-    public function plus(NumeralType $right): Addition
+    public function plus(NumeralType $right, bool $insertParentheses = true): Addition
     {
-        return new Addition($this, $right);
+        return new Addition($this, $right, $insertParentheses);
     }
 
     /**
      * Divide this expression by the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return Division
      */
-    public function divide(NumeralType $right): Division
+    public function divide(NumeralType $right, bool $insertParentheses = true): Division
     {
-        return new Division($this, $right);
+        return new Division($this, $right, $insertParentheses);
     }
 
     /**
      * Perform an exponentiation with the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return Exponentiation
      */
-    public function exponentiate(NumeralType $right): Exponentiation
+    public function exponentiate(NumeralType $right, bool $insertParentheses = true): Exponentiation
     {
-        return new Exponentiation($this, $right);
+        return new Exponentiation($this, $right, $insertParentheses);
     }
 
     /**
      * Perform a greater than comparison against the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return GreaterThan
      */
-    public function gt(NumeralType $right): GreaterThan
+    public function gt(NumeralType $right, bool $insertParentheses = true): GreaterThan
     {
-        return new GreaterThan($this, $right);
+        return new GreaterThan($this, $right, $insertParentheses);
     }
 
     /**
      * Perform a greater than or equal comparison against the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return GreaterThanOrEqual
      */
-    public function gte(NumeralType $right): GreaterThanOrEqual
+    public function gte(NumeralType $right, bool $insertParentheses = true): GreaterThanOrEqual
     {
-        return new GreaterThanOrEqual($this, $right);
+        return new GreaterThanOrEqual($this, $right, $insertParentheses);
     }
 
     /**
      * Perform a less than comparison against the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return LessThan
      */
-    public function lt(NumeralType $right): LessThan
+    public function lt(NumeralType $right, bool $insertParentheses = true): LessThan
     {
-        return new LessThan($this, $right);
+        return new LessThan($this, $right, $insertParentheses);
     }
 
     /**
      * Perform a less than or equal comparison against the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return LessThanOrEqual
      */
-    public function lte(NumeralType $right): LessThanOrEqual
+    public function lte(NumeralType $right, bool $insertParentheses = true): LessThanOrEqual
     {
-        return new LessThanOrEqual($this, $right);
+        return new LessThanOrEqual($this, $right, $insertParentheses);
     }
 
     /**
      * Perform the modulo operation with the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return Modulo
      */
-    public function mod(NumeralType $right): Modulo
+    public function mod(NumeralType $right, bool $insertParentheses = true): Modulo
     {
-        return new Modulo($this, $right);
+        return new Modulo($this, $right, $insertParentheses);
     }
 
     /**
      * Perform a multiplication with the given expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return Multiplication
      */
-    public function times(NumeralType $right): Multiplication
+    public function times(NumeralType $right, bool $insertParentheses = true): Multiplication
     {
-        return new Multiplication($this, $right);
+        return new Multiplication($this, $right, $insertParentheses);
     }
 
     /**
      * Subtract the given expression from this expression.
      *
      * @param NumeralType $right
+     * @param bool $insertParentheses
      * @return Subtraction
      */
-    public function minus(NumeralType $right): Subtraction
+    public function minus(NumeralType $right, bool $insertParentheses = true): Subtraction
     {
-        return new Subtraction($this, $right);
+        return new Subtraction($this, $right, $insertParentheses);
     }
 
     /**

src/Traits/PropertyTypeTrait.php

@@ -39,32 +39,35 @@ trait PropertyTypeTrait
      * Perform an equality check or an assignment with the given expression.
      *
      * @param PropertyType $right
+     * @param bool $insertParentheses
      * @return Equality
      */
-    public function equals(PropertyType $right): Equality
+    public function equals(PropertyType $right, bool $insertParentheses = true): Equality
     {
-        return new Equality($this, $right);
+        return new Equality($this, $right, $insertParentheses);
     }
 
     /**
      * Perform an inequality comparison against the given expression.
      *
      * @param PropertyType $right
+     * @param bool $insertParentheses
      * @return Inequality
      */
-    public function notEquals(PropertyType $right): Inequality
+    public function notEquals(PropertyType $right, bool $insertParentheses = true): Inequality
     {
-        return new Inequality($this, $right);
+        return new Inequality($this, $right, $insertParentheses);
     }
 
     /**
      * Checks whether the element exists in the given list.
      *
      * @param ListType $right
+     * @param bool $insertParentheses
      * @return In
      */
-    public function in(ListType $right): In
+    public function in(ListType $right, bool $insertParentheses = true): In
     {
-        return new In($this, $right);
+        return new In($this, $right, $insertParentheses);
     }
 }

src/Traits/StringTypeTrait.php

@@ -37,32 +37,35 @@ trait StringTypeTrait
      * Check whether this expression the given expression.
      *
      * @param StringType $right
+     * @param bool $insertParentheses
      * @return Contains
      */
-    public function contains(StringType $right): Contains
+    public function contains(StringType $right, bool $insertParentheses = true): Contains
     {
-        return new Contains($this, $right);
+        return new Contains($this, $right, $insertParentheses);
     }
 
     /**
      * Perform a suffix string search with the given expression.
      *
      * @param StringType $right
+     * @param bool $insertParentheses
      * @return EndsWith
      */
-    public function endsWith(StringType $right): EndsWith
+    public function endsWith(StringType $right, bool $insertParentheses = true): EndsWith
     {
-        return new EndsWith($this, $right);
+        return new EndsWith($this, $right, $insertParentheses);
     }
 
     /**
      * Perform a prefix string search with the given expression.
      *
      * @param StringType $right
+     * @param bool $insertParentheses
      * @return StartsWith
      */
-    public function startsWith(StringType $right): StartsWith
+    public function startsWith(StringType $right, bool $insertParentheses = true): StartsWith
     {
-        return new StartsWith($this, $right);
+        return new StartsWith($this, $right, $insertParentheses);
     }
 }