refactor(QueryBuilder): Properly type the query builder

And make sure the related unit tests are also typed and checked by
psalm.

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -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();
 

apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php

@@ -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;
@@ -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';

apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php

@@ -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;
@@ -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())

build/psalm-baseline.xml

@@ -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, [
@@ -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>

lib/private/DB/QueryBuilder/CompositeExpression.php

@@ -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 = [],