diff --git a/composer.lock b/composer.lock index 269a2e50..36fc63e8 100644 --- a/composer.lock +++ b/composer.lock @@ -1067,12 +1067,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "35711a5c821cc9589d58efa0ded87ae948ab71ed" + "reference": "2918f41059308f6ff088babc8b02e27765cb5a83" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/nextcloud-deps/ocp/zipball/35711a5c821cc9589d58efa0ded87ae948ab71ed", - "reference": "35711a5c821cc9589d58efa0ded87ae948ab71ed", + "url": "https://github.com/gitapi/repos/nextcloud-deps/ocp/zipball/2918f41059308f6ff088babc8b02e27765cb5a83", + "reference": "2918f41059308f6ff088babc8b02e27765cb5a83", "shasum": "" }, "require": { @@ -1100,9 +1100,10 @@ ], "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "support": { + "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2022-09-22T12:49:25+00:00" + "time": "2022-10-05T00:59:28+00:00" }, { "name": "nikic/php-parser", @@ -1804,16 +1805,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.24", + "version": "9.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "url": "https://github.com/gitapi/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", "shasum": "" }, "require": { @@ -1835,14 +1836,14 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "suggest": { @@ -1886,7 +1887,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" }, "funding": [ { @@ -1896,9 +1897,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-08-30T07:42:16+00:00" + "time": "2022-09-25T03:44:45+00:00" }, { "name": "psr/cache", @@ -3063,16 +3068,16 @@ }, { "name": "symfony/console", - "version": "v5.4.12", + "version": "v5.4.13", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1" + "reference": "3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1", - "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1", + "url": "https://github.com/gitapi/repos/symfony/console/zipball/3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be", + "reference": "3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be", "shasum": "" }, "require": { @@ -3142,7 +3147,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.12" + "source": "https://github.com/symfony/console/tree/v5.4.13" }, "funding": [ { @@ -3158,7 +3163,7 @@ "type": "tidelift" } ], - "time": "2022-08-17T13:18:05+00:00" + "time": "2022-08-26T13:50:20+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3393,16 +3398,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.12", + "version": "v5.4.13", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447" + "reference": "ac09569844a9109a5966b9438fc29113ce77cf51" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447", - "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447", + "url": "https://github.com/gitapi/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51", + "reference": "ac09569844a9109a5966b9438fc29113ce77cf51", "shasum": "" }, "require": { @@ -3437,7 +3442,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.12" + "source": "https://github.com/symfony/filesystem/tree/v5.4.13" }, "funding": [ { @@ -3453,7 +3458,7 @@ "type": "tidelift" } ], - "time": "2022-08-02T13:48:16+00:00" + "time": "2022-09-21T19:53:16+00:00" }, { "name": "symfony/finder", @@ -4305,16 +4310,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.5", + "version": "v5.4.13", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30" + "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", + "url": "https://github.com/gitapi/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69", + "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69", "shasum": "" }, "require": { @@ -4347,7 +4352,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.5" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.13" }, "funding": [ { @@ -4363,20 +4368,20 @@ "type": "tidelift" } ], - "time": "2022-02-18T16:06:09+00:00" + "time": "2022-09-28T13:19:49+00:00" }, { "name": "symfony/string", - "version": "v5.4.12", + "version": "v5.4.13", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058" + "reference": "2900c668a32138a34118740de3e4d5a701801f53" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058", - "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058", + "url": "https://github.com/gitapi/repos/symfony/string/zipball/2900c668a32138a34118740de3e4d5a701801f53", + "reference": "2900c668a32138a34118740de3e4d5a701801f53", "shasum": "" }, "require": { @@ -4433,7 +4438,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.12" + "source": "https://github.com/symfony/string/tree/v5.4.13" }, "funding": [ { @@ -4449,7 +4454,7 @@ "type": "tidelift" } ], - "time": "2022-08-12T17:03:11+00:00" + "time": "2022-09-01T01:52:16+00:00" }, { "name": "theseer/tokenizer", @@ -4503,16 +4508,16 @@ }, { "name": "vimeo/psalm", - "version": "4.27.0", + "version": "4.28.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff" + "reference": "52e96bea381e6cb07a672aefec791a5817694a26" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/vimeo/psalm/zipball/faf106e717c37b8c81721845dba9de3d8deed8ff", - "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff", + "url": "https://github.com/gitapi/repos/vimeo/psalm/zipball/52e96bea381e6cb07a672aefec791a5817694a26", + "reference": "52e96bea381e6cb07a672aefec791a5817694a26", "shasum": "" }, "require": { @@ -4551,6 +4556,7 @@ "phpdocumentor/reflection-docblock": "^5", "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", + "phpstan/phpdoc-parser": "1.2.* || 1.6.4", "phpunit/phpunit": "^9.0", "psalm/plugin-phpunit": "^0.16", "slevomat/coding-standard": "^7.0", @@ -4604,9 +4610,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.27.0" + "source": "https://github.com/vimeo/psalm/tree/4.28.0" }, - "time": "2022-08-31T13:47:09+00:00" + "time": "2022-10-07T16:13:24+00:00" }, { "name": "webmozart/assert", @@ -4730,5 +4736,5 @@ "platform-overrides": { "php": "7.4" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.0.0" } diff --git a/lib/Tools/Db/ExtendedQueryBuilder.php b/lib/Tools/Db/ExtendedQueryBuilder.php index 0f002b3f..63df5e3a 100644 --- a/lib/Tools/Db/ExtendedQueryBuilder.php +++ b/lib/Tools/Db/ExtendedQueryBuilder.php @@ -405,9 +405,9 @@ public function exprLike(string $field, string $value, string $alias = '', bool $expr = $this->expr(); if ($cs) { - return (string) $expr->like($field, $this->createNamedParameter($value)); + return $expr->like($field, $this->createNamedParameter($value)); } else { - return (string) $expr->iLike($field, $this->createNamedParameter($value)); + return $expr->iLike($field, $this->createNamedParameter($value)); } } @@ -418,14 +418,14 @@ public function exprLimit(string $field, string $value, string $alias = '', bool $expr = $this->expr(); if ($value === '') { - return (string) $expr->emptyString($field); + return $expr->emptyString($field); } if ($cs) { - return (string)$expr->eq($field, $this->createNamedParameter($value)); + return $expr->eq($field, $this->createNamedParameter($value)); } else { $func = $this->func(); - return (string)$expr->eq($func->lower($field), $func->lower($this->createNamedParameter($value))); + return $expr->eq($func->lower($field), $func->lower($this->createNamedParameter($value))); } } @@ -436,7 +436,7 @@ public function exprLimitInt(string $field, int $value, string $alias = ''): str $expr = $this->expr(); - return (string)$expr->eq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); + return $expr->eq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); } @@ -454,7 +454,7 @@ public function exprLimitBool(string $field, bool $value, string $alias = ''): s $expr = $this->expr(); - return (string)$expr->eq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_BOOL)); + return $expr->eq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_BOOL)); } /** @@ -555,7 +555,9 @@ public function exprLimitInArray(string $field, array $values, string $alias = ' $expr = $this->expr(); - return (string)$expr->in($field, $this->createNamedParameter($values, IQueryBuilder::PARAM_STR_ARRAY)); + return $expr->in( + $field, $this->createNamedParameter($values, IQueryBuilder::PARAM_STR_ARRAY) + ); } @@ -573,7 +575,7 @@ public function exprLimitBitwise(string $field, int $flag, string $alias = ''): $expr = $this->expr(); - return (string)$expr->gt( + return $expr->gt( $expr->bitwiseAnd($field, $flag), $this->createNamedParameter(0, IQueryBuilder::PARAM_INT) ); @@ -596,9 +598,9 @@ public function exprLt(string $field, int $value, bool $lte = false, string $ali $expr = $this->expr(); if ($lte) { - return (string)$expr->lte($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); + return $expr->lte($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); } else { - return (string)$expr->lt($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); + return $expr->lt($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); } } @@ -618,9 +620,9 @@ public function exprGt(string $field, int $value, bool $gte = false, string $ali $expr = $this->expr(); if ($gte) { - return (string)$expr->gte($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); + return $expr->gte($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); } else { - return (string)$expr->gt($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); + return $expr->gt($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); } } @@ -726,11 +728,11 @@ public function exprUnlike(string $field, string $value, string $alias = '', boo $expr = $this->expr(); if ($cs) { - return (string) $expr->notLike($field, $this->createNamedParameter($value)); + return $expr->notLike($field, $this->createNamedParameter($value)); } else { $func = $this->func(); - return (string) $expr->notLike($func->lower($field), $func->lower($this->createNamedParameter($value))); + return $expr->notLike($func->lower($field), $func->lower($this->createNamedParameter($value))); } } @@ -750,14 +752,14 @@ public function exprFilter(string $field, string $value, string $alias = '', boo $expr = $this->expr(); if ($value === '') { - return (string) $expr->nonEmptyString($field); + return $expr->nonEmptyString($field); } if ($cs) { - return (string) $expr->neq($field, $this->createNamedParameter($value)); + return $expr->neq($field, $this->createNamedParameter($value)); } else { $func = $this->func(); - return (string) $expr->neq($func->lower($field), $func->lower($this->createNamedParameter($value))); + return $expr->neq($func->lower($field), $func->lower($this->createNamedParameter($value))); } } @@ -776,7 +778,7 @@ public function exprFilterInt(string $field, int $value, string $alias = ''): st $expr = $this->expr(); - return (string) $expr->neq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); + return $expr->neq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_INT)); } @@ -794,7 +796,7 @@ public function exprFilterBool(string $field, bool $value, string $alias = ''): $expr = $this->expr(); - return (string) $expr->neq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_BOOL)); + return $expr->neq($field, $this->createNamedParameter($value, IQueryBuilder::PARAM_BOOL)); } /** @@ -895,7 +897,7 @@ public function exprFilterInArray(string $field, array $values, string $alias = $expr = $this->expr(); - return (string) $expr->notIn($field, $this->createNamedParameter($values, IQueryBuilder::PARAM_STR_ARRAY)); + return $expr->notIn($field, $this->createNamedParameter($values, IQueryBuilder::PARAM_STR_ARRAY)); } @@ -913,7 +915,7 @@ public function exprFilterBitwise(string $field, int $flag, string $alias = ''): $expr = $this->expr(); - return (string) $expr->eq( + return $expr->eq( $expr->bitwiseAnd($field, $flag), $this->createNamedParameter(0, IQueryBuilder::PARAM_INT) );