studio-variable/designtopack
4
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity Actions

update kirby

Browse source
This commit is contained in:
isUnknown 2025-02-07 17:11:37 +01:00
parent 652262ac94
commit 9c662bcbba
165 changed files with 1757 additions and 598 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/kirby/src/Database/Query.php
View file

@ -421,7 +421,7 @@ class Query
* @param string|null $order
* @return $this
*/
public function order(string $order = null)
public function order(string|null $order = null)
{
$this->order = $order;
return $this;
@ -828,13 +828,13 @@ class Query
if ($args[0] === null) {
return $current;
// ->where('username like "myuser"');
// ->where('username like "myuser"');
} elseif (is_string($args[0]) === true) {
// simply add the entire string to the where clause
// escaping or using bindings has to be done before calling this method
$result = $args[0];
// ->where(['username' => 'myuser']);
// ->where(['username' => 'myuser']);
} elseif (is_array($args[0]) === true) {
// simple array mode (AND operator)
$sql = $this->database->sql()->values($this->table, $args[0], ' AND ', true, true);
@ -868,7 +868,7 @@ class Query
// store the bindings
$this->bindings($args[1]);
// ->where('username like ?', 'myuser')
// ->where('username like ?', 'myuser')
} elseif (is_string($args[0]) === true && is_scalar($args[1]) === true) {
// prepared where clause
$result = $args[0];
@ -913,7 +913,7 @@ class Query
};
$result = $key . ' ' . $predicate . ' ' . $values;
// ->where('username', 'like', 'myuser');
// ->where('username', 'like', 'myuser');
} else {
$predicates = [
'=', '>=', '>', '<=', '<', '<>', '!=', '<=>',

2
public/kirby/src/Database/Sql.php
View file

@ -146,7 +146,7 @@ abstract class Sql
* Combines an identifier (table and column)
*
* @param $values bool Whether the identifier is going to be used for a VALUES clause;
* only relevant for SQLite
* only relevant for SQLite
*/
public function combineIdentifier(string $table, string $column, bool $values = false): string
{

2
public/kirby/src/Database/Sql/Sqlite.php
View file

@ -130,7 +130,7 @@ class Sqlite extends Sql
public function tables(): array
{
return [
'query' => 'SELECT name FROM sqlite_master WHERE type = "table" OR type = "view"',
'query' => 'SELECT name FROM sqlite_master WHERE type = \'table\' OR type = \'view\'',
'bindings' => []
];
}