made parentheses optional

Author: transistive

src/IsNotNull.php

@@ -20,15 +20,17 @@ class IsNotNull implements BooleanType
      * @var AnyType The type to test against null
      */
     private AnyType $expression;
+    private bool $insertParentheses;
 
     /**
      * IS NOT NULL constructor.
      *
      * @param AnyType $expression The type to test against null.
      */
-    public function __construct(AnyType $expression)
+    public function __construct(AnyType $expression, bool $insertParentheses = true)
     {
         $this->expression = $expression;
+        $this->insertParentheses = $insertParentheses;
     }
 
     /**
@@ -46,6 +48,16 @@ public function getExpression(): AnyType
      */
     public function toQuery(): string
     {
-        return sprintf("(%s IS NOT NULL)", $this->expression->toQuery());
+        return sprintf($this->insertParentheses ? "(%s IS NOT NULL)" : "%s IS NOT NULL", $this->expression->toQuery());
+    }
+
+    /**
+     * Returns whether or not the operator inserts parenthesis.
+     *
+     * @return bool
+     */
+    public function insertsParentheses(): bool
+    {
+        return $this->insertParentheses;
     }
 }

src/IsNull.php

@@ -20,15 +20,17 @@ class IsNull implements BooleanType
      * @var AnyType The type to test against null
      */
     private AnyType $expression;
+    private bool $insertParentheses;
 
     /**
      * IS NULL constructor.
      *
      * @param AnyType $expression The type to test against null.
      */
-    public function __construct(AnyType $expression)
+    public function __construct(AnyType $expression, bool $insertParentheses = true)
     {
         $this->expression = $expression;
+        $this->insertParentheses = $insertParentheses;
     }
 
     /**
@@ -46,6 +48,16 @@ public function getExpression(): AnyType
      */
     public function toQuery(): string
     {
-        return sprintf("(%s IS NULL)", $this->expression->toQuery());
+        return sprintf($this->insertParentheses ? "(%s IS NULL)" : "%s IS NULL", $this->expression->toQuery());
+    }
+
+    /**
+     * Returns whether or not the operator inserts parenthesis.
+     *
+     * @return bool
+     */
+    public function insertsParentheses(): bool
+    {
+        return $this->insertParentheses;
     }
 }

src/Traits/PropertyTypeTrait.php

@@ -76,16 +76,16 @@ public function in(ListType $right, bool $insertParentheses = true): In
     /**
      * @inheritDoc
      */
-    public function isNull(): IsNull
+    public function isNull(bool $insertParentheses = true): IsNull
     {
-        return new IsNull($this);
+        return new IsNull($this, $insertParentheses);
     }
 
     /**
      * @inheritDoc
      */
-    public function isNotNull(): IsNotNull
+    public function isNotNull(bool $insertParentheses = true): IsNotNull
     {
-        return new IsNotNull($this);
+        return new IsNotNull($this, $insertParentheses);
     }
 }

src/Types/PropertyTypes/PropertyType.php

@@ -63,14 +63,18 @@ public function in(ListType $right): In;
     /**
      * Checks whether the element is null.
      *
+     * @param bool $insertsParentheses whether to insert parentheses.
+     *
      * @return IsNull
      */
-    public function isNull(): IsNull;
+    public function isNull(bool $insertsParentheses = true): IsNull;
 
     /**
      * Checks whether the element is not null.
      *
+     * @param bool $insertsParentheses whether to insert parentheses.
+     *
      * @return IsNotNull
      */
-    public function isNotNull(): IsNotNull;
+    public function isNotNull(bool $insertsParentheses = true): IsNotNull;
 }

tests/Unit/IsNotNullTest.php

@@ -34,12 +34,16 @@ class IsNotNullTest extends TestCase
 
     public function testToQuery(): void
     {
-        $not = new IsNotNull($this->getQueryConvertableMock(BooleanType::class, "true"));
+        $not = new IsNotNull($this->getQueryConvertableMock(BooleanType::class, "true"), false);
 
-        $this->assertSame("(true IS NOT NULL)", $not->toQuery());
+        $this->assertFalse($not->insertsParentheses());
+
+        $this->assertSame("true IS NOT NULL", $not->toQuery());
 
         $not = new IsNotNull($not);
 
-        $this->assertSame("((true IS NOT NULL) IS NOT NULL)", $not->toQuery());
+        $this->assertSame("(true IS NOT NULL IS NOT NULL)", $not->toQuery());
+
+        $this->assertTrue($not->insertsParentheses());
     }
 }

tests/Unit/IsNullTest.php

@@ -34,12 +34,16 @@ class IsNullTest extends TestCase
 
     public function testToQuery(): void
     {
-        $not = new IsNull($this->getQueryConvertableMock(BooleanType::class, "true"));
+        $not = new IsNull($this->getQueryConvertableMock(BooleanType::class, "true"), false);
 
-        $this->assertSame("(true IS NULL)", $not->toQuery());
+        $this->assertFalse($not->insertsParentheses());
+
+        $this->assertSame("true IS NULL", $not->toQuery());
 
         $not = new IsNull($not);
 
-        $this->assertSame("((true IS NULL) IS NULL)", $not->toQuery());
+        $this->assertSame("(true IS NULL IS NULL)", $not->toQuery());
+
+        $this->assertTrue($not->insertsParentheses());
     }
 }