Skip to content

refactor(QueryBuilder): Properly type the query builder #57763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CarlSchwan wants to merge 1 commit into
base: master
Choose a base branch
from
+1,158 −2,177
Open

refactor(QueryBuilder): Properly type the query builder #57763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dav/lib/CardDAV/CardDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ protected function addChange(int $addressBookId, string $objectUri, int $operati
'synctoken' => $query->createNamedParameter($syncToken),
'addressbookid' => $query->createNamedParameter($addressBookId),
'operation' => $query->createNamedParameter($operation),
'created_at' => time(),
'created_at' => $query->createNamedParameter(time()),
])
->executeStatement();

Expand Down
6 changes: 5 additions & 1 deletion apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use OCA\DAV\BackgroundJob\CleanupInvitationTokenJob;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\QueryBuilder\IExpressionBuilder;
use OCP\DB\QueryBuilder\IParameter;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use PHPUnit\Framework\MockObject\MockObject;
Expand Down Expand Up @@ -46,9 +47,12 @@ public function testRun(): void {
->willReturn($queryBuilder);
$queryBuilder->method('expr')
->willReturn($expr);
$parameter = $this->createMock(IParameter::class);
$parameter->method('__toString')
->willReturn('namedParameter1337');
$queryBuilder->method('createNamedParameter')
->willReturnMap([
[1337, \PDO::PARAM_STR, null, 'namedParameter1337']
[1337, \PDO::PARAM_STR, null, $parameter],
]);

$function = 'function1337';
Expand Down
6 changes: 5 additions & 1 deletion apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\IResult;
use OCP\DB\QueryBuilder\IExpressionBuilder;
use OCP\DB\QueryBuilder\IParameter;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IRequest;
Expand Down Expand Up @@ -415,9 +416,12 @@ private function buildQueryExpects(string $token, ?array $return, int $time): vo
->willReturn($queryBuilder);
$queryBuilder->method('expr')
->willReturn($expr);
$parameter = $this->createMock(IParameter::class);
$parameter->method('__toString')
->willReturn('namedParameterToken');
$queryBuilder->method('createNamedParameter')
->willReturnMap([
[$token, \PDO::PARAM_STR, null, 'namedParameterToken']
[$token, \PDO::PARAM_STR, null, $parameter]
]);

$stmt->expects($this->once())
Expand Down
45 changes: 0 additions & 45 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3503,42 +3503,6 @@
<code><![CDATA[0]]></code>
</TypeDoesNotContainType>
</file>
<file src="lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php">
<ImplicitToStringCast>
<code><![CDATA[$this->functionBuilder->lower($x)]]></code>
</ImplicitToStringCast>
<InvalidArgument>
<code><![CDATA[$y]]></code>
<code><![CDATA[$y]]></code>
</InvalidArgument>
</file>
<file src="lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php">
<InternalMethod>
<code><![CDATA[getParams]]></code>
</InternalMethod>
<InvalidArrayOffset>
<code><![CDATA[$params['collation']]]></code>
</InvalidArrayOffset>
</file>
<file src="lib/private/DB/QueryBuilder/QueryBuilder.php">
<InvalidNullableReturnType>
<code><![CDATA[string]]></code>
</InvalidNullableReturnType>
<NullableReturnStatement>
<code><![CDATA[$alias]]></code>
</NullableReturnStatement>
<ParamNameMismatch>
<code><![CDATA[$selects]]></code>
</ParamNameMismatch>
</file>
<file src="lib/private/DB/QueryBuilder/QuoteHelper.php">
<InvalidNullableReturnType>
<code><![CDATA[string]]></code>
</InvalidNullableReturnType>
<NullableReturnStatement>
<code><![CDATA[$string]]></code>
</NullableReturnStatement>
</file>
<file src="lib/private/DateTimeFormatter.php">
<FalsableReturnStatement>
<code><![CDATA[$l->l($type, $timestamp, [
Expand Down Expand Up @@ -4256,13 +4220,4 @@
<code><![CDATA[getAppValue]]></code>
</DeprecatedMethod>
</file>
<file src="tests/lib/TestCase.php">
<DeprecatedMethod>
<code><![CDATA[$container]]></code>
</DeprecatedMethod>
<InternalMethod>
<code><![CDATA[lockFile]]></code>
<code><![CDATA[unlockFile]]></code>
</InternalMethod>
</file>
</files>
4 changes: 4 additions & 0 deletions lib/private/DB/QueryBuilder/CompositeExpression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ class CompositeExpression implements ICompositeExpression, \Countable {
public const TYPE_AND = 'AND';
public const TYPE_OR = 'OR';

/**
* @param self::TYPE_* $type
* @param array<ICompositeExpression|string> $parts
*/
public function __construct(
private string $type,
private array $parts = [],
Expand Down
Loading
Loading