diff --git a/.gitignore b/.gitignore index b926d9710..84fba9520 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build/ .settings/ vendor/ .php-cs-fixer.cache +.php_cs.cache diff --git a/composer.lock b/composer.lock index 8ab9e6c91..963a864b3 100644 --- a/composer.lock +++ b/composer.lock @@ -179,17 +179,17 @@ "source": { "type": "git", "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "5e2c78469a4f669ed11016cf8a6668792efcbedf" + "reference": "9f9f727cf66a75ece93cee24c01074a477e1615e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/5e2c78469a4f669ed11016cf8a6668792efcbedf", - "reference": "5e2c78469a4f669ed11016cf8a6668792efcbedf", + "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/9f9f727cf66a75ece93cee24c01074a477e1615e", + "reference": "9f9f727cf66a75ece93cee24c01074a477e1615e", "shasum": "" }, "require": { "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.0", + "psr/container": "^1.1.1", "psr/event-dispatcher": "^1.0", "psr/log": "^1.1" }, @@ -197,7 +197,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "24.0.0-dev" + "dev-master": "25.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -215,7 +215,7 @@ "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master" }, - "time": "2022-04-15T01:52:26+00:00" + "time": "2022-08-18T02:33:31+00:00" }, { "name": "composer/package-versions-deprecated", @@ -4853,5 +4853,5 @@ "platform-overrides": { "php": "7.4" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/lib/Db/DeprecatedCirclesRequestBuilder.php b/lib/Db/DeprecatedCirclesRequestBuilder.php index e15cc2ef7..3f417d875 100644 --- a/lib/Db/DeprecatedCirclesRequestBuilder.php +++ b/lib/Db/DeprecatedCirclesRequestBuilder.php @@ -36,7 +36,6 @@ use OCA\Circles\Service\TimezoneService; use OCP\DB\QueryBuilder\ICompositeExpression; use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\DB\QueryBuilder\IQueryFunction; use OCP\IDBConnection; use OCP\IL10N; @@ -195,7 +194,7 @@ private function generateLimitSecret(IQueryBuilder $qb, $circleUniqueId, $type, * @param IQueryBuilder $qb * @param int $type * - * @return IQueryFunction + * @return null|string */ private function generateLimitClosed(IQueryBuilder $qb, $type) { if (!(DeprecatedCircle::CIRCLES_CLOSED & (int)$type)) { @@ -214,7 +213,7 @@ private function generateLimitClosed(IQueryBuilder $qb, $type) { * @param IQueryBuilder $qb * @param int $type * - * @return IQueryFunction + * @return null|string */ private function generateLimitPublic(IQueryBuilder $qb, $type) { if (!(DeprecatedCircle::CIRCLES_PUBLIC & (int)$type)) { diff --git a/lib/Tools/Db/ExtendedQueryBuilder.php b/lib/Tools/Db/ExtendedQueryBuilder.php index 970c75e49..414a4b797 100644 --- a/lib/Tools/Db/ExtendedQueryBuilder.php +++ b/lib/Tools/Db/ExtendedQueryBuilder.php @@ -44,7 +44,6 @@ use OCA\Circles\Tools\Traits\TArrayTools; use OCP\DB\QueryBuilder\ICompositeExpression; use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\DB\QueryBuilder\IQueryFunction; use OCP\IDBConnection; use Psr\Log\LoggerInterface; @@ -403,7 +402,7 @@ public function lt(string $field, int $value, bool $lte = false, string $alias = * * @return string */ - public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): IQueryFunction { + public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -416,7 +415,7 @@ public function exprLike(string $field, string $value, string $alias = '', bool } } - public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): IQueryFunction { + public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -434,7 +433,7 @@ public function exprLimit(string $field, string $value, string $alias = '', bool } } - public function exprLimitInt(string $field, int $value, string $alias = ''): IQueryFunction { + public function exprLimitInt(string $field, int $value, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -452,7 +451,7 @@ public function exprLimitInt(string $field, int $value, string $alias = ''): IQu * * @return string */ - public function exprLimitBool(string $field, bool $value, string $alias = ''): IQueryFunction { + public function exprLimitBool(string $field, bool $value, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -553,7 +552,7 @@ public function exprLimitArray( * * @return string */ - public function exprLimitInArray(string $field, array $values, string $alias = ''): IQueryFunction { + public function exprLimitInArray(string $field, array $values, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -571,7 +570,7 @@ public function exprLimitInArray(string $field, array $values, string $alias = ' * * @return string */ - public function exprLimitBitwise(string $field, int $flag, string $alias = ''): IQueryFunction { + public function exprLimitBitwise(string $field, int $flag, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -593,7 +592,7 @@ public function exprLimitBitwise(string $field, int $flag, string $alias = ''): * * @return string */ - public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): IQueryFunction { + public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -615,7 +614,7 @@ public function exprLt(string $field, int $value, bool $lte = false, string $ali * * @return string */ - public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): IQueryFunction { + public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -724,7 +723,7 @@ public function filterBitwise(string $field, int $flag, string $alias = ''): voi * * @return string */ - public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): IQueryFunction { + public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -748,7 +747,7 @@ public function exprUnlike(string $field, string $value, string $alias = '', boo * * @return string */ - public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): IQueryFunction { + public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -774,7 +773,7 @@ public function exprFilter(string $field, string $value, string $alias = '', boo * * @return string */ - public function exprFilterInt(string $field, int $value, string $alias = ''): IQueryFunction { + public function exprFilterInt(string $field, int $value, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -792,7 +791,7 @@ public function exprFilterInt(string $field, int $value, string $alias = ''): IQ * * @return string */ - public function exprFilterBool(string $field, bool $value, string $alias = ''): IQueryFunction { + public function exprFilterBool(string $field, bool $value, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -893,7 +892,7 @@ public function exprFilterArray( * * @return string */ - public function exprFilterInArray(string $field, array $values, string $alias = ''): IQueryFunction { + public function exprFilterInArray(string $field, array $values, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } @@ -911,7 +910,7 @@ public function exprFilterInArray(string $field, array $values, string $alias = * * @return string */ - public function exprFilterBitwise(string $field, int $flag, string $alias = ''): IQueryFunction { + public function exprFilterBitwise(string $field, int $flag, string $alias = ''): string { if ($this->getType() === DBALQueryBuilder::SELECT) { $field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field; } diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 99644a992..b5dd4c686 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -34,9 +34,6 @@ $this->federationNotifications Notifications - - setSubject($subject) - getLazyRootFolder setHtmlBody @@ -145,16 +142,14 @@ - + ICompositeExpression - string - string string - + null null null @@ -209,9 +204,6 @@ $id - - $getData - @@ -784,9 +776,6 @@ IShare IShare - - iterable - array @@ -800,12 +789,6 @@ $shareId - - !is_null($node) - - - 0 -