Skip to content

Commit 16cccf7

Browse files
committed
Updated CS-Fixer and rerun
1 parent ca9fa27 commit 16cccf7

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

system/Database/BaseBuilder.php

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ class BaseBuilder
170170
* sql?: string,
171171
* alias?: string
172172
* }
173-
*
174173
* @var array
175174
*/
176175
protected $QBOptions;
@@ -498,10 +497,10 @@ public function selectSubquery(BaseBuilder $subquery, string $as): self
498497
* @used-by selectAvg()
499498
* @used-by selectSum()
500499
*
500+
* @return $this
501+
*
501502
* @throws DatabaseException
502503
* @throws DataException
503-
*
504-
* @return $this
505504
*/
506505
protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
507506
{
@@ -910,9 +909,9 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
910909
*
911910
* @param array|BaseBuilder|Closure|null $values The values searched on, or anonymous function with subquery
912911
*
913-
* @throws InvalidArgumentException
914-
*
915912
* @return $this
913+
*
914+
* @throws InvalidArgumentException
916915
*/
917916
protected function _whereIn(?string $key = null, $values = null, bool $not = false, string $type = 'AND ', ?bool $escape = null, string $clause = 'QBWhere')
918917
{
@@ -1744,9 +1743,9 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
17441743
/**
17451744
* Compiles batch insert/update/upsert strings and runs the queries
17461745
*
1747-
* @throws DatabaseException
1748-
*
17491746
* @return false|int|string[] Number of rows inserted or FALSE on failure, SQL array when testMode
1747+
*
1748+
* @throws DatabaseException
17501749
*/
17511750
protected function batchExecute(string $renderMethod, int $batchSize = 100)
17521751
{
@@ -1859,9 +1858,9 @@ public function setData($set, ?bool $escape = null, string $alias = '')
18591858
/**
18601859
* Compiles an upsert query and returns the sql
18611860
*
1862-
* @throws DatabaseException
1863-
*
18641861
* @return string
1862+
*
1863+
* @throws DatabaseException
18651864
*/
18661865
public function getCompiledUpsert()
18671866
{
@@ -1879,9 +1878,9 @@ public function getCompiledUpsert()
18791878
*
18801879
* @param array|object|null $set
18811880
*
1882-
* @throws DatabaseException
1883-
*
18841881
* @return false|int|string[] Number of affected rows or FALSE on failure, SQL array when testMode
1882+
*
1883+
* @throws DatabaseException
18851884
*/
18861885
public function upsert($set = null, ?bool $escape = null)
18871886
{
@@ -1908,9 +1907,9 @@ public function upsert($set = null, ?bool $escape = null)
19081907
*
19091908
* @param array|object|null $set a dataset
19101909
*
1911-
* @throws DatabaseException
1912-
*
19131910
* @return false|int|string[] Number of affected rows or FALSE on failure, SQL array when testMode
1911+
*
1912+
* @throws DatabaseException
19141913
*/
19151914
public function upsertBatch($set = null, ?bool $escape = null, int $batchSize = 100)
19161915
{
@@ -2115,9 +2114,9 @@ public function setInsertBatch($key, string $value = '', ?bool $escape = null)
21152114
/**
21162115
* Compiles an insert query and returns the sql
21172116
*
2118-
* @throws DatabaseException
2119-
*
21202117
* @return bool|string
2118+
*
2119+
* @throws DatabaseException
21212120
*/
21222121
public function getCompiledInsert(bool $reset = true)
21232122
{
@@ -2148,9 +2147,9 @@ public function getCompiledInsert(bool $reset = true)
21482147
*
21492148
* @param array|object|null $set
21502149
*
2151-
* @throws DatabaseException
2152-
*
21532150
* @return bool
2151+
*
2152+
* @throws DatabaseException
21542153
*/
21552154
public function insert($set = null, ?bool $escape = null)
21562155
{
@@ -2238,9 +2237,9 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
22382237
/**
22392238
* Compiles a replace into string and runs the query
22402239
*
2241-
* @throws DatabaseException
2242-
*
22432240
* @return BaseResult|false|Query|string
2241+
*
2242+
* @throws DatabaseException
22442243
*/
22452244
public function replace(?array $set = null)
22462245
{
@@ -2491,10 +2490,10 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
24912490
*
24922491
* @param array|object $key
24932492
*
2494-
* @throws DatabaseException
2495-
*
24962493
* @return $this
24972494
*
2495+
* @throws DatabaseException
2496+
*
24982497
* @deprecated
24992498
*/
25002499
public function setUpdateBatch($key, string $index = '', ?bool $escape = null)
@@ -2577,9 +2576,9 @@ public function getCompiledDelete(bool $reset = true): string
25772576
*
25782577
* @param mixed $where
25792578
*
2580-
* @throws DatabaseException
2581-
*
25822579
* @return bool|string
2580+
*
2581+
* @throws DatabaseException
25832582
*/
25842583
public function delete($where = '', ?int $limit = null, bool $resetData = true)
25852584
{

0 commit comments

Comments
 (0)