Merge branch 'main' into new-json-functions

Author: martin-georgiev

composer.json

@@ -45,7 +45,7 @@
     "require-dev": {
         "doctrine/orm": "~2.14||~3.0",
         "ekino/phpstan-banned-code": "^1.0",
-        "friendsofphp/php-cs-fixer": "^3.71.0",
+        "friendsofphp/php-cs-fixer": "^3.72.0",
         "php-coveralls/php-coveralls": "^2.7.0",
         "phpstan/phpstan": "^1.12.21",
         "phpstan/phpstan-phpunit": "^1.4.2",

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/AllOnTheRightExistOnTheLeft.php

@@ -8,7 +8,7 @@
  * Implementation of PostgreSQL check if all texts on the right side exist on the left-side JSONB (using ?&).
  *
  * @see https://www.postgresql.org/docs/14/functions-json.html
- * @since 2.3.0
+ * @since 2.3
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
  */

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/AnyOnTheRightExistsOnTheLeft.php

@@ -8,7 +8,7 @@
  * Implementation of PostgreSQL check if any text on the right side exists on the left-side JSONB (using ?|).
  *
  * @see https://www.postgresql.org/docs/14/functions-json.html
- * @since 2.3.0
+ * @since 2.3
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
  */

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseVariadicFunction.php

@@ -38,6 +38,8 @@ public function feedParserWithNodes(Parser $parser): void
             }
             $aheadType = $lexer->lookahead->type;
         }
+
+        $this->validateArguments($this->nodes);
     }
 
     public function getSql(SqlWalker $sqlWalker): string
@@ -49,4 +51,11 @@ public function getSql(SqlWalker $sqlWalker): string
 
         return \sprintf($this->functionPrototype, \implode(', ', $dispatched));
     }
+
+    /**
+     * Validates the arguments passed to the function.
+     *
+     * @param mixed[] $arguments The array of arguments to validate
+     */
+    abstract protected function validateArguments(array $arguments): void;
 }

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Daterange.php

@@ -8,7 +8,7 @@
  * Implementation of PostgreSQL DATERANGE().
  *
  * @see https://www.postgresql.org/docs/17/rangetypes.html
- * @since 2.9.0
+ * @since 2.9
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
  */

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/DeleteAtPath.php

@@ -8,7 +8,7 @@
  * Implementation of PostgreSQL deletion of a field at the specified path (using #-).
  *
  * @see https://www.postgresql.org/docs/14/functions-json.html
- * @since 2.3.0
+ * @since 2.3
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
  */

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Exception/InvalidArgumentForVariadicFunctionException.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception;
+
+class InvalidArgumentForVariadicFunctionException extends \InvalidArgumentException
+{
+    public static function exactCount(string $functionName, int $expected): self
+    {
+        return new self(\sprintf(
+            '%s() requires exactly %d argument%s',
+            $functionName,
+            $expected,
+            $expected === 1 ? '' : 's'
+        ));
+    }
+
+    public static function atLeast(string $functionName, int $min): self
+    {
+        return new self(\sprintf(
+            '%s() requires at least %d argument%s',
+            $functionName,
+            $min,
+            $min === 1 ? '' : 's'
+        ));
+    }
+
+    public static function between(string $functionName, int $min, int $max): self
+    {
+        return new self(\sprintf(
+            '%s() requires between %d and %d arguments',
+            $functionName,
+            $min,
+            $max
+        ));
+    }
+
+    public static function evenNumber(string $functionName): self
+    {
+        return new self(\sprintf(
+            '%s() requires an even number of arguments',
+            $functionName
+        ));
+    }
+}

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/FlaggedRegexpReplace.php

@@ -8,7 +8,7 @@
  * Implementation of PostgreSQL REGEXP_REPLACE().
  *
  * @see https://www.postgresql.org/docs/15/functions-matching.html#FUNCTIONS-POSIX-REGEXP
- * @since 2.5.0
+ * @since 2.5
  *
  * @author Colin Doig
  */

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Greatest.php

@@ -4,6 +4,8 @@
 
 namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception\InvalidArgumentForVariadicFunctionException;
+
 /**
  * Implementation of PostgreSQL GREATEST().
  *
@@ -18,4 +20,12 @@ protected function customizeFunction(): void
     {
         $this->setFunctionPrototype('greatest(%s)');
     }
+
+    protected function validateArguments(array $arguments): void
+    {
+        $argumentCount = \count($arguments);
+        if ($argumentCount < 2) {
+            throw InvalidArgumentForVariadicFunctionException::atLeast('greatest', 2);
+        }
+    }
 }

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Int4range.php

@@ -8,7 +8,7 @@
  * Implementation of PostgreSQL INT4RANGE().
  *
  * @see https://www.postgresql.org/docs/17/rangetypes.html
- * @since 2.9.0
+ * @since 2.9
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
  */