added insertParenthesis boolean to relevant constructors

transistive · transistive · commit 75fe29fd3fb8 · 2022-01-30T18:15:05.000+01:00
diff --git a/src/Addition.php b/src/Addition.php
@@ -36,9 +36,9 @@ class Addition extends BinaryOperator implements NumeralType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/AndOperator.php b/src/AndOperator.php
@@ -36,9 +36,9 @@ class AndOperator extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(BooleanType $left, BooleanType $right)
+    public function __construct(BooleanType $left, BooleanType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Contains.php b/src/Contains.php
@@ -37,9 +37,9 @@ class Contains extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(StringType $left, StringType $right)
+    public function __construct(StringType $left, StringType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Division.php b/src/Division.php
@@ -36,9 +36,9 @@ class Division extends BinaryOperator implements NumeralType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/EndsWith.php b/src/EndsWith.php
@@ -37,9 +37,9 @@ class EndsWith extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(StringType $left, StringType $right)
+    public function __construct(StringType $left, StringType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Equality.php b/src/Equality.php
@@ -38,9 +38,9 @@ class Equality extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(PropertyType $left, PropertyType $right)
+    public function __construct(PropertyType $left, PropertyType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Exponentiation.php b/src/Exponentiation.php
@@ -36,9 +36,9 @@ class Exponentiation extends BinaryOperator implements NumeralType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/GreaterThan.php b/src/GreaterThan.php
@@ -37,9 +37,9 @@ class GreaterThan extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/GreaterThanOrEqual.php b/src/GreaterThanOrEqual.php
@@ -37,9 +37,9 @@ class GreaterThanOrEqual extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/In.php b/src/In.php
@@ -38,9 +38,9 @@ class In extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(PropertyType $left, ListType $right)
+    public function __construct(PropertyType $left, ListType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Inequality.php b/src/Inequality.php
@@ -37,9 +37,9 @@ class Inequality extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(PropertyType $left, PropertyType $right)
+    public function __construct(PropertyType $left, PropertyType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/LessThan.php b/src/LessThan.php
@@ -37,9 +37,9 @@ class LessThan extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/LessThanOrEqual.php b/src/LessThanOrEqual.php
@@ -37,9 +37,9 @@ class LessThanOrEqual extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Modulo.php b/src/Modulo.php
@@ -36,9 +36,9 @@ class Modulo extends BinaryOperator implements NumeralType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Multiplication.php b/src/Multiplication.php
@@ -36,9 +36,9 @@ class Multiplication extends BinaryOperator implements NumeralType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/OrOperator.php b/src/OrOperator.php
@@ -36,9 +36,9 @@ class OrOperator extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(BooleanType $left, BooleanType $right)
+    public function __construct(BooleanType $left, BooleanType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/StartsWith.php b/src/StartsWith.php
@@ -37,9 +37,9 @@ class StartsWith extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(StringType $left, StringType $right)
+    public function __construct(StringType $left, StringType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Subtraction.php b/src/Subtraction.php
@@ -36,9 +36,9 @@ class Subtraction extends BinaryOperator implements NumeralType
     /**
      * @inheritDoc
      */
-    public function __construct(NumeralType $left, NumeralType $right)
+    public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**
diff --git a/src/Traits/BooleanTypeTrait.php b/src/Traits/BooleanTypeTrait.php
@@ -22,7 +22,6 @@
 namespace WikibaseSolutions\CypherDSL\Traits;
 
 use WikibaseSolutions\CypherDSL\AndOperator;
-use WikibaseSolutions\CypherDSL\Minus;
 use WikibaseSolutions\CypherDSL\Not;
 use WikibaseSolutions\CypherDSL\OrOperator;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
diff --git a/src/XorOperator.php b/src/XorOperator.php
@@ -36,9 +36,9 @@ class XorOperator extends BinaryOperator implements BooleanType
     /**
      * @inheritDoc
      */
-    public function __construct(BooleanType $left, BooleanType $right)
+    public function __construct(BooleanType $left, BooleanType $right, bool $insertParentheses = true)
     {
-        parent::__construct($left, $right);
+        parent::__construct($left, $right, $insertParentheses);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ class Addition extends BinaryOperator implements NumeralType`
`36`	`36`	`/**`
`37`	`37`	`* @inheritDoc`
`38`	`38`	`*/`
`39`		`- public function __construct(NumeralType $left, NumeralType $right)`
	`39`	`+ public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)`
`40`	`40`	`{`
`41`		`- parent::__construct($left, $right);`
	`41`	`+ parent::__construct($left, $right, $insertParentheses);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ class AndOperator extends BinaryOperator implements BooleanType`
`36`	`36`	`/**`
`37`	`37`	`* @inheritDoc`
`38`	`38`	`*/`
`39`		`- public function __construct(BooleanType $left, BooleanType $right)`
	`39`	`+ public function __construct(BooleanType $left, BooleanType $right, bool $insertParentheses = true)`
`40`	`40`	`{`
`41`		`- parent::__construct($left, $right);`
	`41`	`+ parent::__construct($left, $right, $insertParentheses);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ class Contains extends BinaryOperator implements BooleanType`
`37`	`37`	`/**`
`38`	`38`	`* @inheritDoc`
`39`	`39`	`*/`
`40`		`- public function __construct(StringType $left, StringType $right)`
	`40`	`+ public function __construct(StringType $left, StringType $right, bool $insertParentheses = true)`
`41`	`41`	`{`
`42`		`- parent::__construct($left, $right);`
	`42`	`+ parent::__construct($left, $right, $insertParentheses);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ class Division extends BinaryOperator implements NumeralType`
`36`	`36`	`/**`
`37`	`37`	`* @inheritDoc`
`38`	`38`	`*/`
`39`		`- public function __construct(NumeralType $left, NumeralType $right)`
	`39`	`+ public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)`
`40`	`40`	`{`
`41`		`- parent::__construct($left, $right);`
	`41`	`+ parent::__construct($left, $right, $insertParentheses);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ class EndsWith extends BinaryOperator implements BooleanType`
`37`	`37`	`/**`
`38`	`38`	`* @inheritDoc`
`39`	`39`	`*/`
`40`		`- public function __construct(StringType $left, StringType $right)`
	`40`	`+ public function __construct(StringType $left, StringType $right, bool $insertParentheses = true)`
`41`	`41`	`{`
`42`		`- parent::__construct($left, $right);`
	`42`	`+ parent::__construct($left, $right, $insertParentheses);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ class Equality extends BinaryOperator implements BooleanType`
`38`	`38`	`/**`
`39`	`39`	`* @inheritDoc`
`40`	`40`	`*/`
`41`		`- public function __construct(PropertyType $left, PropertyType $right)`
	`41`	`+ public function __construct(PropertyType $left, PropertyType $right, bool $insertParentheses = true)`
`42`	`42`	`{`
`43`		`- parent::__construct($left, $right);`
	`43`	`+ parent::__construct($left, $right, $insertParentheses);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ class Exponentiation extends BinaryOperator implements NumeralType`
`36`	`36`	`/**`
`37`	`37`	`* @inheritDoc`
`38`	`38`	`*/`
`39`		`- public function __construct(NumeralType $left, NumeralType $right)`
	`39`	`+ public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)`
`40`	`40`	`{`
`41`		`- parent::__construct($left, $right);`
	`41`	`+ parent::__construct($left, $right, $insertParentheses);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ class GreaterThan extends BinaryOperator implements BooleanType`
`37`	`37`	`/**`
`38`	`38`	`* @inheritDoc`
`39`	`39`	`*/`
`40`		`- public function __construct(NumeralType $left, NumeralType $right)`
	`40`	`+ public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)`
`41`	`41`	`{`
`42`		`- parent::__construct($left, $right);`
	`42`	`+ parent::__construct($left, $right, $insertParentheses);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ class GreaterThanOrEqual extends BinaryOperator implements BooleanType`
`37`	`37`	`/**`
`38`	`38`	`* @inheritDoc`
`39`	`39`	`*/`
`40`		`- public function __construct(NumeralType $left, NumeralType $right)`
	`40`	`+ public function __construct(NumeralType $left, NumeralType $right, bool $insertParentheses = true)`
`41`	`41`	`{`
`42`		`- parent::__construct($left, $right);`
	`42`	`+ parent::__construct($left, $right, $insertParentheses);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ class In extends BinaryOperator implements BooleanType`
`38`	`38`	`/**`
`39`	`39`	`* @inheritDoc`
`40`	`40`	`*/`
`41`		`- public function __construct(PropertyType $left, ListType $right)`
	`41`	`+ public function __construct(PropertyType $left, ListType $right, bool $insertParentheses = true)`
`42`	`42`	`{`
`43`		`- parent::__construct($left, $right);`
	`43`	`+ parent::__construct($left, $right, $insertParentheses);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`