Update parameters

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php
index a49edc505f5ec8798afb1105e7dc8eb33f58dd82..23a834a9c490b890b8f2c9aa33dc96d21a79ced3 100644 (file)
--- a/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php
+++ b/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php
@@ -27,6 +27,9 @@ namespace OC\DB\QueryBuilder\FunctionBuilder;
 use OC\DB\QueryBuilder\QueryFunction;
 use OC\DB\QueryBuilder\QuoteHelper;
 use OCP\DB\QueryBuilder\IFunctionBuilder;
+use OCP\DB\QueryBuilder\ILiteral;
+use OCP\DB\QueryBuilder\IParameter;
+use OCP\DB\QueryBuilder\IQueryFunction;
 
 class FunctionBuilder implements IFunctionBuilder {
        /** @var QuoteHelper */
@@ -87,10 +90,20 @@ class FunctionBuilder implements IFunctionBuilder {
                return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
        }
 
+       /**
+        * @param string|ILiteral|IParameter|IQueryFunction $x
+        * @param string|ILiteral|IParameter|IQueryFunction $y
+        * @return IQueryFunction
+        */
        public function greatest($x, $y) {
                return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
        }
 
+       /**
+        * @param string|ILiteral|IParameter|IQueryFunction $x
+        * @param string|ILiteral|IParameter|IQueryFunction $y
+        * @return IQueryFunction
+        */
        public function least($x, $y) {
                return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
        }

diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
index 556ef22144b70e1cba61752e11ca485bbad759f9..aec925745812498eaea8e06b3f424db695e81730 100644 (file)
--- a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
+++ b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
@@ -43,7 +43,7 @@ class OCIFunctionBuilder extends FunctionBuilder {
         *
         * @param string|ILiteral|IParameter|IQueryFunction $x
         * @param string|ILiteral|IParameter|IQueryFunction $y
-        * @return QueryFunction
+        * @return IQueryFunction
         */
        public function greatest($x, $y) {
                if (is_string($y) || $y instanceof IQueryFunction) {
@@ -63,7 +63,7 @@ class OCIFunctionBuilder extends FunctionBuilder {
         *
         * @param string|ILiteral|IParameter|IQueryFunction $x
         * @param string|ILiteral|IParameter|IQueryFunction $y
-        * @return QueryFunction
+        * @return IQueryFunction
         */
        public function least($x, $y) {
                if (is_string($y) || $y instanceof IQueryFunction) {

diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php
index 6d8e947c407f80e8f38d97ce4b0fc073f5a0e1b4..f759fb22fde1b3ff7a2123db07429940a23091fc 100644 (file)
--- a/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php
+++ b/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php
@@ -25,16 +25,29 @@
 namespace OC\DB\QueryBuilder\FunctionBuilder;
 
 use OC\DB\QueryBuilder\QueryFunction;
+use OCP\DB\QueryBuilder\ILiteral;
+use OCP\DB\QueryBuilder\IParameter;
+use OCP\DB\QueryBuilder\IQueryFunction;
 
 class SqliteFunctionBuilder extends FunctionBuilder {
        public function concat($x, $y) {
                return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
        }
 
+       /**
+        * @param string|ILiteral|IParameter|IQueryFunction $x
+        * @param string|ILiteral|IParameter|IQueryFunction $y
+        * @return IQueryFunction
+        */
        public function greatest($x, $y) {
                return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
        }
 
+       /**
+        * @param string|ILiteral|IParameter|IQueryFunction $x
+        * @param string|ILiteral|IParameter|IQueryFunction $y
+        * @return IQueryFunction
+        */
        public function least($x, $y) {
                return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
        }

diff --git a/lib/public/DB/QueryBuilder/IFunctionBuilder.php b/lib/public/DB/QueryBuilder/IFunctionBuilder.php
index e744d653d787f80988ceb54465ae7f4ba5091029..aa11e42d6220c8146e8efd146eef6a9166dc0d79 100644 (file)
--- a/lib/public/DB/QueryBuilder/IFunctionBuilder.php
+++ b/lib/public/DB/QueryBuilder/IFunctionBuilder.php
@@ -137,9 +137,8 @@ interface IFunctionBuilder {
         *
         * If you want to get the maximum value of all rows in a column, use `max` instead
         *
-        * @param mixed $x the first input field or number
-        * @param mixed $y the first input field or number
-        *
+        * @param string|ILiteral|IParameter|IQueryFunction $x
+        * @param string|ILiteral|IParameter|IQueryFunction $y
         * @return IQueryFunction
         * @since 18.0.0
         */
@@ -150,9 +149,8 @@ interface IFunctionBuilder {
         *
         * If you want to get the minimum value of all rows in a column, use `min` instead
         *
-        * @param mixed $x the first input field or number
-        * @param mixed $y the first input field or number
-        *
+        * @param string|ILiteral|IParameter|IQueryFunction $x
+        * @param string|ILiteral|IParameter|IQueryFunction $y
         * @return IQueryFunction
         * @since 18.0.0
         */