interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.8.3

Browse Source
This commit is contained in:
Bastian Allgeier
2022-12-06 15:37:13 +01:00
parent f9e812cb0c
commit 8381ccb96c
69 changed files with 752 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kirby/bootstrap.php
View File

@@ -16,11 +16,15 @@ if (is_file($autoloader = dirname(__DIR__) . '/vendor/autoload.php')) {
* Always prefer a site-wide Composer autoloader
* if it exists, it means that the user has probably
* installed additional packages
*
* @psalm-suppress MissingFile
*/
include $autoloader;
} elseif (is_file($autoloader = __DIR__ . '/vendor/autoload.php')) {
/**
* Fall back to the local autoloader if that exists
*
* @psalm-suppress MissingFile
*/
include $autoloader;
} else {

4
kirby/composer.json
View File

@@ -3,7 +3,7 @@
"description": "The Kirby 3 core",
"license": "proprietary",
"type": "kirby-cms",
"version": "3.8.2",
"version": "3.8.3",
"keywords": [
"kirby",
"cms",
@@ -38,7 +38,7 @@
"ext-openssl": "*",
"claviska/simpleimage": "3.7.0",
"composer/semver": "3.3.2",
"filp/whoops": "2.14.5",
"filp/whoops": "2.14.6",
"getkirby/composer-installer": "^1.2.1",
"laminas/laminas-escaper": "2.12.0",
"michelf/php-smartypants": "1.8.1",

28
kirby/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "7c0268af0d99aa02157532f2a6a9ed36",
"content-hash": "a2b48616382734757b5cf4a9bd73ccdb",
"packages": [
{
"name": "claviska/simpleimage",
@@ -138,16 +138,16 @@
},
{
"name": "filp/whoops",
"version": "2.14.5",
"version": "2.14.6",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"
"reference": "f7948baaa0330277c729714910336383286305da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
"reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
"url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da",
"reference": "f7948baaa0330277c729714910336383286305da",
"shasum": ""
},
"require": {
@@ -197,7 +197,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.14.5"
"source": "https://github.com/filp/whoops/tree/2.14.6"
},
"funding": [
{
@@ -205,7 +205,7 @@
"type": "github"
}
],
"time": "2022-01-07T12:00:00+00:00"
"time": "2022-11-02T16:23:29+00:00"
},
{
"name": "getkirby/composer-installer",
@@ -645,16 +645,16 @@
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.26.0",
"version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "219aa369ceff116e673852dce47c3a41794c14bd"
"reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
"reference": "219aa369ceff116e673852dce47c3a41794c14bd",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
"reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
"shasum": ""
},
"require": {
@@ -666,7 +666,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.26-dev"
"dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -709,7 +709,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
},
"funding": [
{
@@ -725,7 +725,7 @@
"type": "tidelift"
}
],
"time": "2022-05-24T11:49:31+00:00"
"time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-mbstring",

12
kirby/config/api/routes/auth.php
View File

@@ -70,13 +70,11 @@ return [
$user = $auth->login($email, $password, $long);
}
} else {
if (isset($methods['code']) === true) {
$mode = 'login';
} elseif (isset($methods['password-reset']) === true) {
$mode = 'password-reset';
} else {
throw new InvalidArgumentException('Login without password is not enabled');
}
$mode = match (true) {
isset($methods['code']) => 'login',
isset($methods['password-reset']) => 'password-reset',
default => throw new InvalidArgumentException('Login without password is not enabled')
};
$status = $auth->createChallenge($email, $long, $mode);
}

3
kirby/config/fields/mixins/options.php
View File

@@ -40,7 +40,8 @@ return [
},
'sanitizeOptions' => function ($values) {
$options = array_column($this->options(), 'value');
return array_intersect($values, $options);
$options = array_intersect($values, $options);
return array_values($options);
},
]
];

4
kirby/config/sections/stats.php
View File

@@ -47,10 +47,12 @@ return [
continue;
}
$info = $report['info'] ?? null;
$reports[] = [
'label' => I18n::translate($report['label'], $report['label']),
'value' => $value($report['value'] ?? null),
'info' => $value($report['info'] ?? null),
'info' => $value(I18n::translate($info, $info)),
'link' => $value($report['link'] ?? null),
'theme' => $value($report['theme'] ?? null)
];

2
kirby/dependencies/parsedown-extra/ParsedownExtra.php
View File

@@ -465,7 +465,7 @@ class ParsedownExtra extends Parsedown
),
);
uasort($this->DefinitionData['Footnote'], 'self::sortFootnotes');
uasort($this->DefinitionData['Footnote'], [$this,'sortFootnotes']);
foreach ($this->DefinitionData['Footnote'] as $definitionId => $DefinitionData) {
if (! isset($DefinitionData['number'])) {

4
kirby/i18n/translations/sv_SE.json
View File

@@ -503,7 +503,7 @@
"system.issues.site": "Mappen site verkar vara exponerad",
"system.issues.vulnerability.kirby": "Din installation kan vara påverkad av följande sårbarhet ({ severity } allvarlighetsgrad): { description }",
"system.issues.vulnerability.plugin": "Din installation kan vara påverkad av följande sårbarhet i tillägget { plugin } ({ severity } allvarlighetsgrad): { description }",
"system.updateStatus": "Uppdatera status",
"system.updateStatus": "Uppdateringsstatus",
"system.updateStatus.error": "Det gick inte att söka efter uppdateringar",
"system.updateStatus.not-vulnerable": "Inga kända sårbarheter",
"system.updateStatus.security-update": "Gratis säkerhetsuppdatering { version } tillgänglig",
@@ -579,7 +579,7 @@
"version": "Version",
"version.current": "Aktuell version",
"version.latest": "Senaste versionen",
"version.latest": "Senaste version",
"versionInformation": "Versionsinformation",
"view.account": "Ditt konto",

2
kirby/panel/dist/css/style.css vendored
View File

File diff suppressed because one or more lines are too long

3
kirby/panel/dist/img/icons.svg vendored
View File

@@ -409,6 +409,9 @@
<symbol id="icon-markdown" viewBox="0 0 16 16">
<path d="M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z" />
</symbol>
<symbol id="icon-mastodon" viewBox="0 0 16 16">
<path d="M14.943 3.935c-.215-1.591-1.612-2.845-3.268-3.088-.28-.041-1.338-.19-3.79-.19h-.019c-2.453 0-2.979.148-3.258.19-1.61.236-3.08 1.363-3.437 2.973-.172.793-.19 1.672-.158 2.478.045 1.157.054 2.311.16 3.463.073.765.2 1.524.382 2.27.339 1.38 1.711 2.53 3.056 2.998 1.44.488 2.988.57 4.472.234.163-.038.325-.081.484-.131.36-.114.783-.241 1.093-.465a.036.036 0 0 0 .015-.027v-1.116a.033.033 0 0 0-.041-.031c-.951.225-1.925.338-2.902.336-1.682 0-2.134-.792-2.264-1.122a3.463 3.463 0 0 1-.196-.884.032.032 0 0 1 .04-.033c.935.224 1.893.337 2.855.336.231 0 .461 0 .693-.006.967-.027 1.986-.076 2.938-.26l.067-.015c1.501-.286 2.93-1.184 3.075-3.458.005-.09.018-.938.018-1.03.001-.316.103-2.24-.015-3.422Zm-2.31 5.674h-1.578V5.772c0-.808-.339-1.22-1.028-1.22-.758 0-1.138.488-1.138 1.45v2.1H7.32v-2.1c0-.962-.38-1.45-1.138-1.45-.686 0-1.029.412-1.03 1.22v3.837H3.577V5.656c0-.808.208-1.45.623-1.926.429-.474.991-.718 1.689-.718.808 0 1.418.308 1.825.924l.393.655.393-.655c.407-.616 1.017-.924 1.823-.924.698 0 1.26.244 1.69.718.415.475.623 1.117.623 1.926l-.002 3.953Z"/>
</symbol>
<symbol id="icon-menu" viewBox="0 0 16 16">
<path d="M0 0h16v3H0V0zM0 6h16v3H0V6zM0 12h16v3H0v-3z" />
</symbol>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 61 KiB

2
kirby/panel/dist/js/index.js vendored
View File

File diff suppressed because one or more lines are too long

7
kirby/panel/dist/js/vendor.js vendored
View File

File diff suppressed because one or more lines are too long

4
kirby/src/Cms/App.php
View File

@@ -1603,7 +1603,9 @@ class App
if ($options === false) {
return $text;
} elseif (is_array($options) === false) {
}
if (is_array($options) === false) {
$options = [];
}

8
kirby/src/Cms/Auth.php
View File

@@ -2,8 +2,10 @@
namespace Kirby\Cms;
use Kirby\Cms\Auth\Challenge;
use Kirby\Cms\Auth\Status;
use Kirby\Data\Data;
use Kirby\Exception\Exception;
use Kirby\Exception\InvalidArgumentException;
use Kirby\Exception\LogicException;
use Kirby\Exception\NotFoundException;
@@ -133,7 +135,7 @@ class Auth
if (
$class &&
class_exists($class) === true &&
is_subclass_of($class, 'Kirby\Cms\Auth\Challenge') === true &&
is_subclass_of($class, Challenge::class) === true &&
$class::isAvailable($user, $mode) === true
) {
$challenge = $name;
@@ -543,7 +545,7 @@ class Auth
]
]);
} catch (Throwable $e) {
$details = is_a($e, 'Kirby\Exception\Exception') === true ? $e->getDetails() : [];
$details = $e instanceof Exception ? $e->getDetails() : [];
// log invalid login trial unless the rate limit is already active
if (($details['reason'] ?? null) !== 'rate-limited') {
@@ -848,7 +850,7 @@ class Auth
if (
isset(static::$challenges[$challenge]) === true &&
class_exists(static::$challenges[$challenge]) === true &&
is_subclass_of(static::$challenges[$challenge], 'Kirby\Cms\Auth\Challenge') === true
is_subclass_of(static::$challenges[$challenge], Challenge::class) === true
) {
$class = static::$challenges[$challenge];
if ($class::verify($user, $code) === true) {

2
kirby/src/Cms/Block.php
View File

@@ -22,7 +22,7 @@ class Block extends Item
{
use HasMethods;
public const ITEMS_CLASS = '\Kirby\Cms\Blocks';
public const ITEMS_CLASS = Blocks::class;
/**
* @var \Kirby\Cms\Content

2
kirby/src/Cms/Blocks.php
View File

@@ -20,7 +20,7 @@ use Throwable;
*/
class Blocks extends Items
{
public const ITEM_CLASS = '\Kirby\Cms\Block';
public const ITEM_CLASS = Block::class;
/**
* Return HTML when the collection is

2
kirby/src/Cms/Fieldset.php
View File

@@ -19,7 +19,7 @@ use Kirby\Toolkit\Str;
*/
class Fieldset extends Item
{
public const ITEMS_CLASS = '\Kirby\Cms\Fieldsets';
public const ITEMS_CLASS = Fieldsets::class;
protected $disabled;
protected $editable;

2
kirby/src/Cms/Fieldsets.php
View File

@@ -19,7 +19,7 @@ use Kirby\Toolkit\Str;
*/
class Fieldsets extends Items
{
public const ITEM_CLASS = '\Kirby\Cms\Fieldset';
public const ITEM_CLASS = Fieldset::class;
protected static function createFieldsets($params)
{

13
kirby/src/Cms/FileActions.php
View File

@@ -120,13 +120,12 @@ trait FileActions
$result = $callback(...$argumentValues);
if ($action === 'create') {
$argumentsAfter = ['file' => $result];
} elseif ($action === 'delete') {
$argumentsAfter = ['status' => $result, 'file' => $old];
} else {
$argumentsAfter = ['newFile' => $result, 'oldFile' => $old];
}
$argumentsAfter = match ($action) {
'create' => ['file' => $result],
'delete' => ['status' => $result, 'file' => $old],
default => ['newFile' => $result, 'oldFile' => $old]
};
$kirby->trigger('file.' . $action . ':after', $argumentsAfter);
$kirby->cache('pages')->flush();

29
kirby/src/Cms/FileBlueprint.php
View File

@@ -3,6 +3,7 @@
namespace Kirby\Cms;
use Kirby\Filesystem\F;
use Kirby\Filesystem\Mime;
use Kirby\Toolkit\Str;
/**
@@ -81,7 +82,10 @@ class FileBlueprint extends Blueprint
if (is_array($accept['extension']) === true) {
// determine the main MIME type for each extension
$restrictions[] = array_map(['Kirby\Filesystem\Mime', 'fromExtension'], $accept['extension']);
$restrictions[] = array_map(
[Mime::class, 'fromExtension'],
$accept['extension']
);
}
if (is_array($accept['type']) === true) {
@@ -89,7 +93,10 @@ class FileBlueprint extends Blueprint
$mimes = [];
foreach ($accept['type'] as $type) {
if ($extensions = F::typeToExtensions($type)) {
$mimes[] = array_map(['Kirby\Filesystem\Mime', 'fromExtension'], $extensions);
$mimes[] = array_map(
[Mime::class, 'fromExtension'],
$extensions
);
}
}
@@ -119,19 +126,15 @@ class FileBlueprint extends Blueprint
*/
protected function normalizeAccept($accept = null): array
{
if (is_string($accept) === true) {
$accept = [
'mime' => $accept
];
} elseif ($accept === true) {
$accept = match (true) {
is_string($accept) => ['mime' => $accept],
// explicitly no restrictions at all
$accept = [
'mime' => null
];
} elseif (empty($accept) === true) {
$accept === true => ['mime' => null],
// no custom restrictions
$accept = [];
}
empty($accept) === true => [],
// custom restrictions
default => $accept
};
$accept = array_change_key_case($accept);

15
kirby/src/Cms/FilePicker.php
View File

@@ -41,13 +41,14 @@ class FilePicker extends Picker
$model = $this->options['model'];
// find the right default query
if (empty($this->options['query']) === false) {
$query = $this->options['query'];
} elseif ($model instanceof File) {
$query = 'file.siblings';
} else {
$query = $model::CLASS_ALIAS . '.files';
}
$query = match (true) {
empty($this->options['query']) === false
=> $this->options['query'],
$model instanceof File
=> 'file.siblings',
default
=> $model::CLASS_ALIAS . '.files'
};
// fetch all files for the picker
$files = $model->query($query);

2
kirby/src/Cms/Item.php
View File

@@ -24,7 +24,7 @@ class Item
{
use HasSiblings;
public const ITEMS_CLASS = '\Kirby\Cms\Items';
public const ITEMS_CLASS = Items::class;
/**
* @var string

2
kirby/src/Cms/Items.php
View File

@@ -17,7 +17,7 @@ use Exception;
*/
class Items extends Collection
{
public const ITEM_CLASS = '\Kirby\Cms\Item';
public const ITEM_CLASS = Item::class;
/**
* @var array

43
kirby/src/Cms/Language.php
View File

@@ -212,6 +212,15 @@ class Language extends Model
$language = new static($props);
// trigger before hook
$kirby->trigger(
'language.create:before',
[
'input' => $props,
'language' => $language
]
);
// validate the new language
LanguageRules::create($language);
@@ -222,7 +231,16 @@ class Language extends Model
}
// update the main languages collection in the app instance
App::instance()->languages(false)->append($language->code(), $language);
$kirby->languages(false)->append($language->code(), $language);
// trigger after hook
$kirby->trigger(
'language.create:after',
[
'input' => $props,
'language' => $language
]
);
return $language;
}
@@ -242,6 +260,11 @@ class Language extends Model
$code = $this->code();
$isLast = $languages->count() === 1;
// trigger before hook
$kirby->trigger('language.delete:before', [
'language' => $this
]);
if (F::remove($this->root()) !== true) {
throw new Exception('The language could not be deleted');
}
@@ -255,6 +278,11 @@ class Language extends Model
// get the original language collection and remove the current language
$kirby->languages(false)->remove($code);
// trigger after hook
$kirby->trigger('language.delete:after', [
'language' => $this
]);
return true;
}
@@ -660,6 +688,12 @@ class Language extends Model
// validate the updated language
LanguageRules::update($updated);
// trigger before hook
$kirby->trigger('language.update:before', [
'language' => $this,
'input' => $props
]);
// convert the current default to a non-default language
if ($updated->isDefault() === true) {
$kirby->defaultLanguage()?->clone(['default' => false])->save();
@@ -687,6 +721,13 @@ class Language extends Model
// make sure the language is also updated in the Kirby language collection
App::instance()->languages(false)->set($language->code(), $language);
// trigger after hook
$kirby->trigger('language.update:after', [
'newLanguage' => $language,
'oldLanguage' => $this,
'input' => $props
]);
return $language;
}
}

2
kirby/src/Cms/Layout.php
View File

@@ -17,7 +17,7 @@ class Layout extends Item
{
use HasMethods;
public const ITEMS_CLASS = '\Kirby\Cms\Layouts';
public const ITEMS_CLASS = Layouts::class;
/**
* @var \Kirby\Cms\Content

2
kirby/src/Cms/LayoutColumn.php
View File

@@ -19,7 +19,7 @@ class LayoutColumn extends Item
{
use HasMethods;
public const ITEMS_CLASS = '\Kirby\Cms\LayoutColumns';
public const ITEMS_CLASS = LayoutColumns::class;
/**
* @var \Kirby\Cms\Blocks

2
kirby/src/Cms/LayoutColumns.php
View File

@@ -14,5 +14,5 @@ namespace Kirby\Cms;
*/
class LayoutColumns extends Items
{
public const ITEM_CLASS = '\Kirby\Cms\LayoutColumn';
public const ITEM_CLASS = LayoutColumn::class;
}

2
kirby/src/Cms/Layouts.php
View File

@@ -18,7 +18,7 @@ use Throwable;
*/
class Layouts extends Items
{
public const ITEM_CLASS = '\Kirby\Cms\Layout';
public const ITEM_CLASS = Layout::class;
public static function factory(array $items = null, array $params = [])
{

32
kirby/src/Cms/Media.php
View File

@@ -97,16 +97,17 @@ class Media
{
$kirby = App::instance();
// assets
if (is_string($model) === true) {
$root = $kirby->root('media') . '/assets/' . $model . '/' . $hash;
// parent files for file model that already included hash
} elseif ($model instanceof File) {
$root = dirname($model->mediaRoot());
// model files
} else {
$root = $model->mediaRoot() . '/' . $hash;
}
$root = match (true) {
// assets
is_string($model)
=> $kirby->root('media') . '/assets/' . $model . '/' . $hash,
// parent files for file model that already included hash
$model instanceof File
=> dirname($model->mediaRoot()),
// model files
default
=> $model->mediaRoot() . '/' . $hash
};
try {
$thumb = $root . '/' . $filename;
@@ -117,11 +118,12 @@ class Media
return false;
}
if (is_string($model) === true) {
$source = $kirby->root('index') . '/' . $model . '/' . $options['filename'];
} else {
$source = $model->file($options['filename'])->root();
}
$source = match (true) {
is_string($model) === true
=> $kirby->root('index') . '/' . $model . '/' . $options['filename'],
default
=> $model->file($options['filename'])->root()
};
try {
$kirby->thumb($source, $thumb, $options);

15
kirby/src/Cms/Page.php
View File

@@ -1060,9 +1060,24 @@ class Page extends ModelWithContent
$kirby->data = $this->controller($data, $contentType);
// trigger before hook and apply for `data`
$kirby->data = $kirby->apply('page.render:before', [
'contentType' => $contentType,
'data' => $kirby->data,
'page' => $this
], 'data');
// render the page
$html = $template->render($kirby->data);
// trigger after hook and apply for `html`
$html = $kirby->apply('page.render:after', [
'contentType' => $contentType,
'data' => $kirby->data,
'html' => $html,
'page' => $this
], 'html');
// cache the result
$response = $kirby->response();
if ($cache !== null && $response->cache() === true) {

24
kirby/src/Cms/PageActions.php
View File

@@ -31,7 +31,7 @@ trait PageActions
* Adapts necessary modifications which page uuid, page slug and files uuid
* of copy objects for single or multilang environments
*/
protected function adaptCopy(Page $copy, bool $files = false): Page
protected function adaptCopy(Page $copy, bool $files = false, bool $children = false): Page
{
if ($this->kirby()->multilang() === true) {
foreach ($this->kirby()->languages() as $language) {
@@ -43,11 +43,21 @@ trait PageActions
) {
$copy = $copy->save(['uuid' => Uuid::generate()], $language->code());
// regenerate UUIDs of page files
if ($files !== false) {
foreach ($copy->files() as $file) {
$file->save(['uuid' => Uuid::generate()], $language->code());
}
}
// regenerate UUIDs of all page children
if ($children !== false) {
foreach ($copy->index(true) as $child) {
// always adapt files of subpages as they are currently always copied;
// but don't adapt children because we already operate on the index
$this->adaptCopy($child, true);
}
}
}
// remove all translated slugs
@@ -66,11 +76,21 @@ trait PageActions
if (Uuids::enabled() === true) {
$copy = $copy->save(['uuid' => Uuid::generate()]);
// regenerate UUIDs of page files
if ($files !== false) {
foreach ($copy->files() as $file) {
$file->save(['uuid' => Uuid::generate()]);
}
}
// regenerate UUIDs of all page children
if ($children !== false) {
foreach ($copy->index(true) as $child) {
// always adapt files of subpages as they are currently always copied;
// but don't adapt children because we already operate on the index
$this->adaptCopy($child, true);
}
}
}
return $copy;
@@ -484,7 +504,7 @@ trait PageActions
$copy = $parentModel->clone()->findPageOrDraft($slug);
// normalize copy object
$copy = $this->adaptCopy($copy, $files);
$copy = $this->adaptCopy($copy, $files, $children);
// add copy to siblings
static::updateParentCollections($copy, 'append', $parentModel);

182
kirby/src/Database/Database.php
View File

@@ -3,10 +3,12 @@
namespace Kirby\Database;
use Closure;
use Exception;
use Kirby\Exception\InvalidArgumentException;
use Kirby\Toolkit\A;
use Kirby\Toolkit\Str;
use PDO;
use PDOStatement;
use Throwable;
/**
@@ -22,131 +24,90 @@ class Database
{
/**
* The number of affected rows for the last query
*
* @var int|null
*/
protected $affected;
protected int|null $affected = null;
/**
* Whitelist for column names
*
* @var array
*/
protected $columnWhitelist = [];
protected array $columnWhitelist = [];
/**
* The established connection
*
* @var \PDO|null
*/
protected $connection;
protected PDO|null $connection = null;
/**
* A global array of started connections
*
* @var array
*/
public static $connections = [];
public static array $connections = [];
/**
* Database name
*
* @var string
*/
protected $database;
protected string $database;
/**
* @var string
*/
protected $dsn;
protected string $dsn;
/**
* Set to true to throw exceptions on failed queries
*
* @var bool
*/
protected $fail = false;
protected bool $fail = false;
/**
* The connection id
*
* @var string
*/
protected $id;
protected string $id;
/**
* The last error
*
* @var \Exception|null
*/
protected $lastError;
protected Exception|null $lastError = null;
/**
* The last insert id
*
* @var int|null
*/
protected $lastId;
protected int|null $lastId = null;
/**
* The last query
*
* @var string
*/
protected $lastQuery;
protected string $lastQuery;
/**
* The last result set
*
* @var mixed
*/
protected $lastResult;
/**
* Optional prefix for table names
*
* @var string
*/
protected $prefix;
protected string|null $prefix = null;
/**
* The PDO query statement
*
* @var \PDOStatement|null
*/
protected $statement;
protected PDOStatement|null $statement = null;
/**
* List of existing tables in the database
*
* @var array|null
*/
protected $tables;
protected array|null $tables = null;
/**
* An array with all queries which are being made
*
* @var array
*/
protected $trace = [];
protected array $trace = [];
/**
* The database type (mysql, sqlite)
*
* @var string
*/
protected $type;
protected string $type;
/**
* @var array
*/
public static $types = [];
public static array $types = [];
/**
* Creates a new Database instance
*
* @param array $params
* @return void
*/
public function __construct(array $params = [])
{
@@ -155,19 +116,18 @@ class Database
/**
* Returns one of the started instances
*
* @param string|null $id
* @return static|null
*/
public static function instance(string $id = null)
public static function instance(string|null $id = null): static|null
{
return $id === null ? A::last(static::$connections) : static::$connections[$id] ?? null;
if ($id === null) {
return A::last(static::$connections);
}
return static::$connections[$id] ?? null;
}
/**
* Returns all started instances
*
* @return array
*/
public static function instances(): array
{
@@ -178,10 +138,9 @@ class Database
* Connects to a database
*
* @param array|null $params This can either be a config key or an array of parameters for the connection
* @return \PDO|null
* @throws \Kirby\Exception\InvalidArgumentException
*/
public function connect(array $params = null)
public function connect(array|null $params = null): PDO|null
{
$defaults = [
'database' => null,
@@ -227,10 +186,8 @@ class Database
/**
* Returns the currently active connection
*
* @return \PDO|null
*/
public function connection(): ?PDO
public function connection(): PDO|null
{
return $this->connection;
}
@@ -238,10 +195,9 @@ class Database
/**
* Sets the exception mode
*
* @param bool $fail
* @return \Kirby\Database\Database
* @return $this
*/
public function fail(bool $fail = true)
public function fail(bool $fail = true): static
{
$this->fail = $fail;
return $this;
@@ -249,8 +205,6 @@ class Database
/**
* Returns the used database type
*
* @return string
*/
public function type(): string
{
@@ -259,8 +213,6 @@ class Database
/**
* Returns the used table name prefix
*
* @return string|null
*/
public function prefix(): string|null
{
@@ -270,9 +222,6 @@ class Database
/**
* Escapes a value to be used for a safe query
* NOTE: Prepared statements using bound parameters are more secure and solid
*
* @param string $value
* @return string
*/
public function escape(string $value): string
{
@@ -280,12 +229,10 @@ class Database
}
/**
* Adds a value to the db trace and also returns the entire trace if nothing is specified
*
* @param array|null $data
* @return array
* Adds a value to the db trace and also
* returns the entire trace if nothing is specified
*/
public function trace(array $data = null): array
public function trace(array|null $data = null): array
{
// return the full trace
if ($data === null) {
@@ -300,8 +247,6 @@ class Database
/**
* Returns the number of affected rows for the last query
*
* @return int|null
*/
public function affected(): int|null
{
@@ -310,8 +255,6 @@ class Database
/**
* Returns the last id if available
*
* @return int|null
*/
public function lastId(): int|null
{
@@ -320,8 +263,6 @@ class Database
/**
* Returns the last query
*
* @return string|null
*/
public function lastQuery(): string|null
{
@@ -330,8 +271,6 @@ class Database
/**
* Returns the last set of results
*
* @return mixed
*/
public function lastResult()
{
@@ -340,18 +279,14 @@ class Database
/**
* Returns the last db error
*
* @return \Throwable
*/
public function lastError()
public function lastError(): Throwable
{
return $this->lastError;
}
/**
* Returns the name of the database
*
* @return string|null
*/
public function name(): string|null
{
@@ -361,10 +296,6 @@ class Database
/**
* Private method to execute database queries.
* This is used by the query() and execute() methods
*
* @param string $query
* @param array $bindings
* @return bool
*/
protected function hit(string $query, array $bindings = []): bool
{
@@ -405,11 +336,6 @@ class Database
/**
* Executes a sql query, which is expected to return a set of results
*
* @param string $query
* @param array $bindings
* @param array $params
* @return mixed
*/
public function query(string $query, array $bindings = [], array $params = [])
{
@@ -466,11 +392,8 @@ class Database
}
/**
* Executes a sql query, which is expected to not return a set of results
*
* @param string $query
* @param array $bindings
* @return bool
* Executes a sql query, which is expected
* to not return a set of results
*/
public function execute(string $query, array $bindings = []): bool
{
@@ -480,10 +403,8 @@ class Database
/**
* Returns the correct Sql generator instance
* for the type of database
*
* @return \Kirby\Database\Sql
*/
public function sql()
public function sql(): Sql
{
$className = static::$types[$this->type]['sql'] ?? 'Sql';
return new $className($this);
@@ -493,20 +414,14 @@ class Database
* Sets the current table, which should be queried. Returns a
* Query object, which can be used to build a full query
* for that table
*
* @param string $table
* @return \Kirby\Database\Query
*/
public function table(string $table)
public function table(string $table): Query
{
return new Query($this, $this->prefix() . $table);
}
/**
* Checks if a table exists in the current database
*
* @param string $table
* @return bool
*/
public function validateTable(string $table): bool
{
@@ -527,10 +442,6 @@ class Database
/**
* Checks if a column exists in a specified table
*
* @param string $table
* @param string $column
* @return bool
*/
public function validateColumn(string $table, string $column): bool
{
@@ -556,12 +467,8 @@ class Database
/**
* Creates a new table
*
* @param string $table
* @param array $columns
* @return bool
*/
public function createTable($table, $columns = []): bool
public function createTable(string $table, array $columns = []): bool
{
$sql = $this->sql()->createTable($table, $columns);
$queries = Str::split($sql['query'], ';');
@@ -584,9 +491,6 @@ class Database
/**
* Drops a table
*
* @param string $table
* @return bool
*/
public function dropTable(string $table): bool
{
@@ -608,12 +512,8 @@ class Database
* Magic way to start queries for tables by
* using a method named like the table.
* I.e. $db->users()->all()
*
* @param mixed $method
* @param mixed $arguments
* @return \Kirby\Database\Query
*/
public function __call($method, $arguments = null)
public function __call(string $method, mixed $arguments = null): Query
{
return $this->table($method);
}
@@ -624,7 +524,7 @@ class Database
*/
Database::$types['mysql'] = [
'sql' => 'Kirby\Database\Sql\Mysql',
'dsn' => function (array $params) {
'dsn' => function (array $params): string {
if (isset($params['host']) === false && isset($params['socket']) === false) {
throw new InvalidArgumentException('The mysql connection requires either a "host" or a "socket" parameter');
}
@@ -662,7 +562,7 @@ Database::$types['mysql'] = [
*/
Database::$types['sqlite'] = [
'sql' => 'Kirby\Database\Sql\Sqlite',
'dsn' => function (array $params) {
'dsn' => function (array $params): string {
if (isset($params['database']) === false) {
throw new InvalidArgumentException('The sqlite connection requires a "database" parameter');
}

134
kirby/src/Database/Db.php
View File

@@ -18,26 +18,21 @@ class Db
{
/**
* Query shortcuts
*
* @var array
*/
public static $queries = [];
public static array $queries = [];
/**
* The singleton Database object
*
* @var \Kirby\Database\Database
*/
public static $connection = null;
public static Database|null $connection = null;
/**
* (Re)connect the database
*
* @param array|null $params Pass `[]` to use the default params from the config,
* don't pass any argument to get the current connection
* @return \Kirby\Database\Database
*/
public static function connect(array|null $params = null)
public static function connect(array|null $params = null): Database
{
if ($params === null && static::$connection !== null) {
return static::$connection;
@@ -60,10 +55,8 @@ class Db
/**
* Returns the current database connection
*
* @return \Kirby\Database\Database|null
*/
public static function connection()
public static function connection(): Database|null
{
return static::$connection;
}
@@ -72,11 +65,8 @@ class Db
* Sets the current table which should be queried. Returns a
* Query object, which can be used to build a full query for
* that table.
*
* @param string $table
* @return \Kirby\Database\Query
*/
public static function table(string $table)
public static function table(string $table): Query
{
$db = static::connect();
return $db->table($table);
@@ -84,11 +74,6 @@ class Db
/**
* Executes a raw SQL query which expects a set of results
*
* @param string $query
* @param array $bindings
* @param array $params
* @return mixed
*/
public static function query(string $query, array $bindings = [], array $params = [])
{
@@ -97,11 +82,8 @@ class Db
}
/**
* Executes a raw SQL query which expects no set of results (i.e. update, insert, delete)
*
* @param string $query
* @param array $bindings
* @return bool
* Executes a raw SQL query which expects
* no set of results (i.e. update, insert, delete)
*/
public static function execute(string $query, array $bindings = []): bool
{
@@ -114,9 +96,6 @@ class Db
* redirected to either a predefined query or
* the respective method of the Database object
*
* @param string $method
* @param mixed $arguments
* @return mixed
* @throws \Kirby\Exception\InvalidArgumentException
*/
public static function __callStatic(string $method, $arguments)
@@ -125,7 +104,10 @@ class Db
return (static::$queries[$method])(...$arguments);
}
if (static::$connection !== null && method_exists(static::$connection, $method) === true) {
if (
static::$connection !== null &&
method_exists(static::$connection, $method) === true
) {
return call_user_func_array([static::$connection, $method], $arguments);
}
@@ -141,13 +123,22 @@ class Db
* @param string $table The name of the table which should be queried
* @param mixed $columns Either a string with columns or an array of column names
* @param mixed $where The WHERE clause; can be a string or an array
* @param string $order
* @param int $offset
* @param int $limit
* @return mixed
*/
Db::$queries['select'] = function (string $table, $columns = '*', $where = null, string $order = null, int $offset = 0, int $limit = null) {
return Db::table($table)->select($columns)->where($where)->order($order)->offset($offset)->limit($limit)->all();
Db::$queries['select'] = function (
string $table,
$columns = '*',
$where = null,
string|null $order = null,
int $offset = 0,
int|null $limit = null
) {
return Db::table($table)
->select($columns)
->where($where)
->order($order)
->offset($offset)
->limit($limit)
->all();
};
/**
@@ -156,13 +147,18 @@ Db::$queries['select'] = function (string $table, $columns = '*', $where = null,
* @param string $table The name of the table which should be queried
* @param mixed $columns Either a string with columns or an array of column names
* @param mixed $where The WHERE clause; can be a string or an array
* @param string $order
* @param int $offset
* @param int $limit
* @return mixed
*/
Db::$queries['first'] = Db::$queries['row'] = Db::$queries['one'] = function (string $table, $columns = '*', $where = null, string $order = null) {
return Db::table($table)->select($columns)->where($where)->order($order)->first();
Db::$queries['first'] = Db::$queries['row'] = Db::$queries['one'] = function (
string $table,
$columns = '*',
$where = null,
string|null $order = null
) {
return Db::table($table)
->select($columns)
->where($where)
->order($order)
->first();
};
/**
@@ -171,13 +167,21 @@ Db::$queries['first'] = Db::$queries['row'] = Db::$queries['one'] = function (st
* @param string $table The name of the table which should be queried
* @param string $column The name of the column to select from
* @param mixed $where The WHERE clause; can be a string or an array
* @param string $order
* @param int $offset
* @param int $limit
* @return mixed
*/
Db::$queries['column'] = function (string $table, string $column, $where = null, string $order = null, int $offset = 0, int $limit = null) {
return Db::table($table)->where($where)->order($order)->offset($offset)->limit($limit)->column($column);
Db::$queries['column'] = function (
string $table,
string $column,
$where = null,
string|null $order = null,
int $offset = 0,
int|null $limit = null
) {
return Db::table($table)
->where($where)
->order($order)
->offset($offset)
->limit($limit)
->column($column);
};
/**
@@ -197,9 +201,12 @@ Db::$queries['insert'] = function (string $table, array $values) {
* @param string $table The name of the table which should be queried
* @param array $values An array of values which should be inserted
* @param mixed $where An optional WHERE clause
* @return bool
*/
Db::$queries['update'] = function (string $table, array $values, $where = null): bool {
Db::$queries['update'] = function (
string $table,
array $values,
$where = null
): bool {
return Db::table($table)->where($where)->update($values);
};
@@ -208,7 +215,6 @@ Db::$queries['update'] = function (string $table, array $values, $where = null):
*
* @param string $table The name of the table which should be queried
* @param mixed $where An optional WHERE clause
* @return bool
*/
Db::$queries['delete'] = function (string $table, $where = null): bool {
return Db::table($table)->where($where)->delete();
@@ -231,9 +237,12 @@ Db::$queries['count'] = function (string $table, $where = null): int {
* @param string $table The name of the table which should be queried
* @param string $column The name of the column of which the minimum should be calculated
* @param mixed $where An optional WHERE clause
* @return float
*/
Db::$queries['min'] = function (string $table, string $column, $where = null): float {
Db::$queries['min'] = function (
string $table,
string $column,
$where = null
): float {
return Db::table($table)->where($where)->min($column);
};
@@ -243,9 +252,12 @@ Db::$queries['min'] = function (string $table, string $column, $where = null): f
* @param string $table The name of the table which should be queried
* @param string $column The name of the column of which the maximum should be calculated
* @param mixed $where An optional WHERE clause
* @return float
*/
Db::$queries['max'] = function (string $table, string $column, $where = null): float {
Db::$queries['max'] = function (
string $table,
string $column,
$where = null
): float {
return Db::table($table)->where($where)->max($column);
};
@@ -255,9 +267,12 @@ Db::$queries['max'] = function (string $table, string $column, $where = null): f
* @param string $table The name of the table which should be queried
* @param string $column The name of the column of which the average should be calculated
* @param mixed $where An optional WHERE clause
* @return float
*/
Db::$queries['avg'] = function (string $table, string $column, $where = null): float {
Db::$queries['avg'] = function (
string $table,
string $column,
$where = null
): float {
return Db::table($table)->where($where)->avg($column);
};
@@ -267,9 +282,12 @@ Db::$queries['avg'] = function (string $table, string $column, $where = null): f
* @param string $table The name of the table which should be queried
* @param string $column The name of the column of which the sum should be calculated
* @param mixed $where An optional WHERE clause
* @return float
*/
Db::$queries['sum'] = function (string $table, string $column, $where = null): float {
Db::$queries['sum'] = function (
string $table,
string $column,
$where = null
): float {
return Db::table($table)->where($where)->sum($column);
};

262
kirby/src/Database/Query.php
View File

@@ -2,8 +2,10 @@
namespace Kirby\Database;
use Closure;
use InvalidArgumentException;
use Kirby\Toolkit\A;
use Kirby\Toolkit\Collection;
use Kirby\Toolkit\Obj;
use Kirby\Toolkit\Pagination;
use Kirby\Toolkit\Str;
@@ -23,130 +25,94 @@ class Query
/**
* Parent Database object
*
* @var \Kirby\Database\Database
*/
protected $database = null;
protected Database|null $database = null;
/**
* The object which should be fetched for each row
* or function to call for each row
*
* @var string|\Closure
*/
protected $fetch = 'Kirby\Toolkit\Obj';
protected string|Closure $fetch = Obj::class;
/**
* The iterator class, which should be used for result sets
*
* @var string
*/
protected $iterator = 'Kirby\Toolkit\Collection';
protected string $iterator = Collection::class;
/**
* An array of bindings for the final query
*
* @var array
*/
protected $bindings = [];
protected array $bindings = [];
/**
* The table name
*
* @var string
*/
protected $table;
protected string $table;
/**
* The name of the primary key column
*
* @var string
*/
protected $primaryKeyName = 'id';
protected string $primaryKeyName = 'id';
/**
* An array with additional join parameters
*
* @var array
*/
protected $join;
protected array|null $join = null;
/**
* A list of columns, which should be selected
*
* @var array|string
*/
protected $select;
protected array|string|null $select = null;
/**
* Boolean for distinct select clauses
*
* @var bool
*/
protected $distinct;
protected bool|null $distinct = null;
/**
* Boolean for if exceptions should be thrown on failing queries
*
* @var bool
*/
protected $fail = false;
protected bool $fail = false;
/**
* A list of values for update and insert clauses
*
* @var array
*/
protected $values;
protected array|null $values = null;
/**
* WHERE clause
*
* @var mixed
*/
protected $where;
protected $where = null;
/**
* GROUP BY clause
*
* @var mixed
*/
protected $group;
protected string|null $group = null;
/**
* HAVING clause
*
* @var mixed
*/
protected $having;
protected $having = null;
/**
* ORDER BY clause
*
* @var mixed
*/
protected $order;
protected $order = null;
/**
* The offset, which should be applied to the select query
*
* @var int
*/
protected $offset = 0;
protected int $offset = 0;
/**
* The limit, which should be applied to the select query
*
* @var int
*/
protected $limit;
protected int|null $limit = null;
/**
* Boolean to enable query debugging
*
* @var bool
*/
protected $debug = false;
protected bool $debug = false;
/**
* Constructor
@@ -163,7 +129,7 @@ class Query
/**
* Reset the query class after each db hit
*/
protected function reset()
protected function reset(): void
{
$this->bindings = [];
$this->join = null;
@@ -185,10 +151,9 @@ class Query
* If enabled, the query will return an array with all important info about
* the query instead of actually executing the query and returning results
*
* @param bool $debug
* @return \Kirby\Database\Query
* @return $this
*/
public function debug(bool $debug = true)
public function debug(bool $debug = true): static
{
$this->debug = $debug;
return $this;
@@ -197,10 +162,9 @@ class Query
/**
* Enables distinct select clauses.
*
* @param bool $distinct
* @return \Kirby\Database\Query
* @return $this
*/
public function distinct(bool $distinct = true)
public function distinct(bool $distinct = true): static
{
$this->distinct = $distinct;
return $this;
@@ -210,10 +174,9 @@ class Query
* Enables failing queries.
* If enabled queries will no longer fail silently but throw an exception
*
* @param bool $fail
* @return \Kirby\Database\Query
* @return $this
*/
public function fail(bool $fail = true)
public function fail(bool $fail = true): static
{
$this->fail = $fail;
return $this;
@@ -224,10 +187,9 @@ class Query
* set this to `'array'` to get a simple array instead of an object;
* pass a function that receives the `$data` and the `$key` to generate arbitrary data structures
*
* @param string|\Closure $fetch
* @return \Kirby\Database\Query
* @return $this
*/
public function fetch($fetch)
public function fetch(string|Closure $fetch): static
{
$this->fetch = $fetch;
return $this;
@@ -237,10 +199,9 @@ class Query
* Sets the iterator class, which should be used for multiple results
* Set this to array to get a simple array instead of an iterator object
*
* @param string $iterator
* @return \Kirby\Database\Query
* @return $this
*/
public function iterator(string $iterator)
public function iterator(string $iterator): static
{
$this->iterator = $iterator;
return $this;
@@ -249,11 +210,10 @@ class Query
/**
* Sets the name of the table, which should be queried
*
* @param string $table
* @return \Kirby\Database\Query
* @return $this
* @throws \Kirby\Exception\InvalidArgumentException if the table does not exist
*/
public function table(string $table)
public function table(string $table): static
{
if ($this->database->validateTable($table) === false) {
throw new InvalidArgumentException('Invalid table: ' . $table);
@@ -266,10 +226,9 @@ class Query
/**
* Sets the name of the primary key column
*
* @param string $primaryKeyName
* @return \Kirby\Database\Query
* @return $this
*/
public function primaryKeyName(string $primaryKeyName)
public function primaryKeyName(string $primaryKeyName): static
{
$this->primaryKeyName = $primaryKeyName;
return $this;
@@ -279,10 +238,10 @@ class Query
* Sets the columns, which should be selected from the table
* By default all columns will be selected
*
* @param mixed $select Pass either a string of columns or an array
* @return \Kirby\Database\Query
* @param array|string|null $select Pass either a string of columns or an array
* @return $this
*/
public function select($select)
public function select(array|string|null $select): static
{
$this->select = $select;
return $this;
@@ -296,7 +255,7 @@ class Query
* @param string $type The join type. Uses an inner join by default
* @return $this
*/
public function join(string $table, string $on, string $type = 'JOIN')
public function join(string $table, string $on, string $type = 'JOIN'): static
{
$join = [
'table' => $table,
@@ -313,11 +272,11 @@ class Query
*
* @param string $table Name of the table, which should be joined
* @param string $on The on clause for this join
* @return \Kirby\Database\Query
* @return $this
*/
public function leftJoin(string $table, string $on)
public function leftJoin(string $table, string $on): static
{
return $this->join($table, $on, 'left');
return $this->join($table, $on, 'left join');
}
/**
@@ -325,11 +284,11 @@ class Query
*
* @param string $table Name of the table, which should be joined
* @param string $on The on clause for this join
* @return \Kirby\Database\Query
* @return $this
*/
public function rightJoin(string $table, string $on)
public function rightJoin(string $table, string $on): static
{
return $this->join($table, $on, 'right');
return $this->join($table, $on, 'right join');
}
/**
@@ -337,9 +296,9 @@ class Query
*
* @param string $table Name of the table, which should be joined
* @param string $on The on clause for this join
* @return \Kirby\Database\Query
* @return $this
*/
public function innerJoin($table, $on)
public function innerJoin($table, $on): static
{
return $this->join($table, $on, 'inner join');
}
@@ -348,9 +307,9 @@ class Query
* Sets the values which should be used for the update or insert clause
*
* @param mixed $values Can either be a string or an array of values
* @return \Kirby\Database\Query
* @return $this
*/
public function values($values = [])
public function values($values = []): static
{
if ($values !== null) {
$this->values = $values;
@@ -360,12 +319,13 @@ class Query
/**
* Attaches additional bindings to the query.
* Also can be used as getter for all attached bindings by not passing an argument.
* Also can be used as getter for all attached bindings
* by not passing an argument.
*
* @param mixed $bindings Array of bindings or null to use this method as getter
* @return array|\Kirby\Database\Query
* @return array|$this
* @psalm-return ($bindings is array ? $this : array)
*/
public function bindings(array $bindings = null)
public function bindings(array|null $bindings = null): array|static
{
if (is_array($bindings) === true) {
$this->bindings = array_merge($this->bindings, $bindings);
@@ -386,10 +346,9 @@ class Query
* ->where('username like ?', 'myuser') (args: 2)
* ->where('username', 'like', 'myuser'); (args: 3)
*
* @param mixed ...$args
* @return \Kirby\Database\Query
* @return $this
*/
public function where(...$args)
public function where(...$args): static
{
$this->where = $this->filterQuery($args, $this->where);
return $this;
@@ -399,10 +358,9 @@ class Query
* Shortcut to attach a where clause with an OR operator.
* Check out the where() method docs for additional info.
*
* @param mixed ...$args
* @return \Kirby\Database\Query
* @return $this
*/
public function orWhere(...$args)
public function orWhere(...$args): static
{
$this->where = $this->filterQuery($args, $this->where, 'OR');
return $this;
@@ -412,10 +370,9 @@ class Query
* Shortcut to attach a where clause with an AND operator.
* Check out the where() method docs for additional info.
*
* @param mixed ...$args
* @return \Kirby\Database\Query
* @return $this
*/
public function andWhere(...$args)
public function andWhere(...$args): static
{
$this->where = $this->filterQuery($args, $this->where, 'AND');
return $this;
@@ -424,10 +381,9 @@ class Query
/**
* Attaches a group by clause
*
* @param string|null $group
* @return \Kirby\Database\Query
* @return $this
*/
public function group(string $group = null)
public function group(string|null $group = null): static
{
$this->group = $group;
return $this;
@@ -444,10 +400,9 @@ class Query
* ->having('username like ?', 'myuser') (args: 2)
* ->having('username', 'like', 'myuser'); (args: 3)
*
* @param mixed ...$args
* @return \Kirby\Database\Query
* @return $this
*/
public function having(...$args)
public function having(...$args): static
{
$this->having = $this->filterQuery($args, $this->having);
return $this;
@@ -457,7 +412,7 @@ class Query
* Attaches an order clause
*
* @param string|null $order
* @return \Kirby\Database\Query
* @return $this
*/
public function order(string $order = null)
{
@@ -468,10 +423,9 @@ class Query
/**
* Sets the offset for select clauses
*
* @param int|null $offset
* @return \Kirby\Database\Query
* @return $this
*/
public function offset(int $offset = null)
public function offset(int $offset): static
{
$this->offset = $offset;
return $this;
@@ -480,10 +434,9 @@ class Query
/**
* Sets the limit for select clauses
*
* @param int|null $limit
* @return \Kirby\Database\Query
* @return $this
*/
public function limit(int $limit = null)
public function limit(int|null $limit = null): static
{
$this->limit = $limit;
return $this;
@@ -496,7 +449,7 @@ class Query
* @param string $type (select, update, insert)
* @return array The final query
*/
public function build(string $type)
public function build(string $type): array
{
$sql = $this->database->sql();
@@ -536,8 +489,6 @@ class Query
/**
* Builds a count query
*
* @return int
*/
public function count(): int
{
@@ -546,9 +497,6 @@ class Query
/**
* Builds a max query
*
* @param string $column
* @return float
*/
public function max(string $column): float
{
@@ -557,9 +505,6 @@ class Query
/**
* Builds a min query
*
* @param string $column
* @return float
*/
public function min(string $column): float
{
@@ -568,9 +513,6 @@ class Query
/**
* Builds a sum query
*
* @param string $column
* @return float
*/
public function sum(string $column): float
{
@@ -579,9 +521,6 @@ class Query
/**
* Builds an average query
*
* @param string $column
* @return float
*/
public function avg(string $column): float
{
@@ -592,12 +531,9 @@ class Query
* Builds an aggregation query.
* This is used by all the aggregation methods above
*
* @param string $method
* @param string $column
* @param int $default An optional default value, which should be returned if the query fails
* @return mixed
*/
public function aggregate(string $method, string $column = '*', $default = 0)
public function aggregate(string $method, string $column = '*', int $default = 0)
{
// reset the sorting to avoid counting issues
$this->order = null;
@@ -609,13 +545,13 @@ class Query
}
$fetch = $this->fetch;
$row = $this->select($method . '(' . $column . ') as aggregation')->fetch('Obj')->first();
$row = $this->select($method . '(' . $column . ') as aggregation')->fetch(Obj::class)->first();
if ($this->debug === true) {
return $row;
}
$result = $row ? $row->get('aggregation') : $default;
$result = $row?->get('aggregation') ?? $default;
$this->fetch($fetch);
@@ -624,12 +560,8 @@ class Query
/**
* Used as an internal shortcut for firing a db query
*
* @param string|array $sql
* @param array $params
* @return mixed
*/
protected function query($sql, array $params = [])
protected function query(string|array $sql, array $params = [])
{
if (is_string($sql) === true) {
$sql = [
@@ -659,12 +591,8 @@ class Query
/**
* Used as an internal shortcut for executing a db query
*
* @param string|array $sql
* @param array $params
* @return mixed
*/
protected function execute($sql, array $params = [])
protected function execute(string|array $sql, array $params = [])
{
if (is_string($sql) === true) {
$sql = [
@@ -694,10 +622,8 @@ class Query
/**
* Selects only one row from a table
*
* @return object
*/
public function first()
public function first(): object|array|false
{
return $this->query($this->offset(0)->limit(1)->build('select'), [
'fetch' => $this->fetch,
@@ -708,20 +634,16 @@ class Query
/**
* Selects only one row from a table
*
* @return object
*/
public function row()
public function row(): object|array|false
{
return $this->first();
}
/**
* Selects only one row from a table
*
* @return object
*/
public function one()
public function one(): object|array|false
{
return $this->first();
}
@@ -729,11 +651,10 @@ class Query
/**
* Automatically adds pagination to a query
*
* @param int $page
* @param int $limit The number of rows, which should be returned for each page
* @return object Collection iterator with attached pagination object
*/
public function page(int $page, int $limit)
public function page(int $page, int $limit): object
{
// clone this to create a counter query
$counter = clone $this;
@@ -775,8 +696,6 @@ class Query
/**
* Returns all matching rows from a table
*
* @return mixed
*/
public function all()
{
@@ -788,9 +707,6 @@ class Query
/**
* Returns only values from a single column
*
* @param string $column
* @return mixed
*/
public function column(string $column)
{
@@ -825,10 +741,6 @@ class Query
/**
* Find a single row by column and value
*
* @param string $column
* @param mixed $value
* @return mixed
*/
public function findBy(string $column, $value)
{
@@ -837,9 +749,6 @@ class Query
/**
* Find a single row by its primary key
*
* @param mixed $id
* @return mixed
*/
public function find($id)
{
@@ -868,9 +777,8 @@ class Query
*
* @param mixed $values You can pass values here or set them with ->values() before
* @param mixed $where You can pass a where clause here or set it with ->where() before
* @return bool
*/
public function update($values = null, $where = null)
public function update($values = null, $where = null): bool
{
return $this->execute($this->values($values)->where($where)->build('update'));
}
@@ -879,19 +787,14 @@ class Query
* Fires a delete query
*
* @param mixed $where You can pass a where clause here or set it with ->where() before
* @return bool
*/
public function delete($where = null)
public function delete($where = null): bool
{
return $this->execute($this->where($where)->build('delete'));
}
/**
* Enables magic queries like findByUsername or findByEmail
*
* @param string $method
* @param array $arguments
* @return mixed
*/
public function __call(string $method, array $arguments = [])
{
@@ -907,7 +810,6 @@ class Query
*
* @param array $args Arguments, see where() description
* @param mixed $current Current value (like $this->where)
* @return string
*/
protected function filterQuery(array $args, $current, string $mode = 'AND')
{

173
kirby/src/Database/Sql.php
View File

@@ -19,33 +19,25 @@ abstract class Sql
{
/**
* List of literals which should not be escaped in queries
*
* @var array
*/
public static $literals = ['NOW()', null];
public static array $literals = ['NOW()', null];
/**
* The parent database connection
*
* @var \Kirby\Database\Database
*/
protected $database;
protected Database $database;
/**
* List of used bindings; used to avoid
* duplicate binding names
*
* @var array
*/
protected $bindings = [];
protected array $bindings = [];
/**
* Constructor
* @codeCoverageIgnore
*
* @param \Kirby\Database\Database $database
*/
public function __construct($database)
public function __construct(Database $database)
{
$this->database = $database;
}
@@ -80,7 +72,6 @@ abstract class Sql
* the query needs to return rows with a column `name`
*
* @param string $table Table name
* @return array
*/
abstract public function columns(string $table): array;
@@ -136,8 +127,6 @@ abstract class Sql
* Abstracted column types to simplify table
* creation for multiple database drivers
* @codeCoverageIgnore
*
* @return array
*/
public function columnTypes(): array
{
@@ -154,11 +143,8 @@ abstract class Sql
/**
* Combines an identifier (table and column)
*
* @param $table string
* @param $column string
* @param $values bool Whether the identifier is going to be used for a VALUES clause;
* only relevant for SQLite
* @return string
*/
public function combineIdentifier(string $table, string $column, bool $values = false): string
{
@@ -316,7 +302,6 @@ abstract class Sql
* Builds a DELETE clause
*
* @param array $params List of parameters for the DELETE clause. See defaults for more info.
* @return array
*/
public function delete(array $params = []): array
{
@@ -344,9 +329,6 @@ abstract class Sql
/**
* Creates the sql for dropping a single table
*
* @param string $table
* @return array
*/
public function dropTable(string $table): array
{
@@ -359,13 +341,8 @@ abstract class Sql
/**
* Extends a given query and bindings
* by reference
*
* @param array $query
* @param array $bindings
* @param array $input
* @return void
*/
public function extend(&$query, array &$bindings, $input)
public function extend(array &$query, array &$bindings, array $input): void
{
if (empty($input['query']) === false) {
$query[] = $input['query'];
@@ -375,9 +352,6 @@ abstract class Sql
/**
* Creates the from syntax
*
* @param string $table
* @return array
*/
public function from(string $table): array
{
@@ -389,51 +363,36 @@ abstract class Sql
/**
* Creates the group by syntax
*
* @param string $group
* @return array
*/
public function group(string $group = null): array
public function group(string|null $group = null): array
{
if (empty($group) === true) {
return [
'query' => null,
'bindings' => []
];
if (empty($group) === false) {
$query = 'GROUP BY ' . $group;
}
return [
'query' => 'GROUP BY ' . $group,
'query' => $query ?? null,
'bindings' => []
];
}
/**
* Creates the having syntax
*
* @param string|null $having
* @return array
*/
public function having(string $having = null): array
public function having(string|null $having = null): array
{
if (empty($having) === true) {
return [
'query' => null,
'bindings' => []
];
if (empty($having) === false) {
$query = 'HAVING ' . $having;
}
return [
'query' => 'HAVING ' . $having,
'query' => $query ?? null,
'bindings' => []
];
}
/**
* Creates an insert query
*
* @param array $params
* @return array
*/
public function insert(array $params = []): array
{
@@ -454,10 +413,6 @@ abstract class Sql
/**
* Creates a join query
*
* @param string $table
* @param string $type
* @param string $on
* @return array
* @throws \Kirby\Exception\InvalidArgumentException if an invalid join type is given
*/
public function join(string $type, string $table, string $on): array
@@ -492,11 +447,8 @@ abstract class Sql
/**
* Create the syntax for multiple joins
*
* @param array|null $joins
* @return array
*/
public function joins(array $joins = null): array
public function joins(array|null $joins = null): array
{
$query = [];
$bindings = [];
@@ -513,12 +465,8 @@ abstract class Sql
/**
* Creates a limit and offset query instruction
*
* @param int $offset
* @param int|null $limit
* @return array
*/
public function limit(int $offset = 0, int $limit = null): array
public function limit(int $offset = 0, int|null $limit = null): array
{
// no need to add it to the query
if ($offset === 0 && $limit === null) {
@@ -544,42 +492,29 @@ abstract class Sql
/**
* Creates the order by syntax
*
* @param string $order
* @return array
*/
public function order(string $order = null): array
public function order(string|null $order = null): array
{
if (empty($order) === true) {
return [
'query' => null,
'bindings' => []
];
if (empty($order) === false) {
$query = 'ORDER BY ' . $order;
}
return [
'query' => 'ORDER BY ' . $order,
'query' => $query ?? null,
'bindings' => []
];
}
/**
* Converts a query array into a final string
*
* @param array $query
* @param string $separator
* @return string
*/
public function query(array $query, string $separator = ' ')
public function query(array $query, string $separator = ' '): string
{
return implode($separator, array_filter($query));
}
/**
* Quotes an identifier (table *or* column)
*
* @param $identifier string
* @return string
*/
public function quoteIdentifier(string $identifier): string
{
@@ -658,12 +593,8 @@ abstract class Sql
/**
* Creates a columns definition from string or array
*
* @param string $table
* @param array|string|null $columns
* @return string
*/
public function selected($table, $columns = null): string
public function selected(string $table, array|string|null $columns = null): string
{
// all columns
if (empty($columns) === true) {
@@ -692,12 +623,10 @@ abstract class Sql
/**
* Splits a (qualified) identifier into table and column
*
* @param $table string Default table if the identifier is not qualified
* @param $identifier string
* @return array
* @param string $table Default table if the identifier is not qualified
* @throws \Kirby\Exception\InvalidArgumentException if an invalid identifier is given
*/
public function splitIdentifier($table, $identifier): array
public function splitIdentifier(string $table, string $identifier): array
{
// split by dot, but only outside of quotes
$parts = preg_split('/(?:`[^`]*`|"[^"]*")(*SKIP)(*F)|\./', $identifier);
@@ -720,16 +649,12 @@ abstract class Sql
/**
* Returns a query to list the tables of the current database;
* the query needs to return rows with a column `name`
*
* @return array
*/
abstract public function tables(): array;
/**
* Validates and quotes a table name
*
* @param string $table
* @return string
* @throws \Kirby\Exception\InvalidArgumentException if an invalid table name is given
*/
public function tableName(string $table): string
@@ -744,9 +669,6 @@ abstract class Sql
/**
* Unquotes an identifier (table *or* column)
*
* @param $identifier string
* @return string
*/
public function unquoteIdentifier(string $identifier): string
{
@@ -767,7 +689,6 @@ abstract class Sql
* Builds an update clause
*
* @param array $params List of parameters for the update clause. See defaults for more info.
* @return array
*/
public function update(array $params = []): array
{
@@ -799,9 +720,6 @@ abstract class Sql
/**
* Validates a given column name in a table
*
* @param string $table
* @param string $column
* @return bool
* @throws \Kirby\Exception\InvalidArgumentException If the column is invalid
*/
public function validateColumn(string $table, string $column): bool
@@ -822,8 +740,13 @@ abstract class Sql
* @param bool $set If true builds a set list of values for update clauses
* @param bool $enforceQualified Always use fully qualified column names
*/
public function values(string $table, $values, string $separator = ', ', bool $set = true, bool $enforceQualified = false): array
{
public function values(
string $table,
$values,
string $separator = ', ',
bool $set = true,
bool $enforceQualified = false
): array {
if (is_array($values) === false) {
return [
'query' => $values,
@@ -840,15 +763,13 @@ abstract class Sql
/**
* Creates a list of fields and values
*
* @param string $table
* @param string|array $values
* @param string $separator
* @param bool $enforceQualified
* @param array
*/
public function valueList(string $table, $values, string $separator = ',', bool $enforceQualified = false): array
{
public function valueList(
string $table,
string|array $values,
string $separator = ',',
bool $enforceQualified = false
): array {
$fields = [];
$query = [];
$bindings = [];
@@ -886,16 +807,13 @@ abstract class Sql
/**
* Creates a set of values
*
* @param string $table
* @param string|array $values
* @param string $separator
* @param bool $enforceQualified
* @param array
* @return array
*/
public function valueSet(string $table, $values, string $separator = ',', bool $enforceQualified = false): array
{
public function valueSet(
string $table,
string|array $values,
string $separator = ',',
bool $enforceQualified = false
): array {
$query = [];
$bindings = [];
@@ -928,12 +846,7 @@ abstract class Sql
];
}
/**
* @param string|array|null $where
* @param array $bindings
* @return array
*/
public function where($where, array $bindings = []): array
public function where(string|array|null $where, array $bindings = []): array
{
if (empty($where) === true) {
return [

3
kirby/src/Database/Sql/Mysql.php
View File

@@ -20,7 +20,6 @@ class Mysql extends Sql
* the query needs to return rows with a column `name`
*
* @param string $table Table name
* @return array
*/
public function columns(string $table): array
{
@@ -42,8 +41,6 @@ class Mysql extends Sql
/**
* Returns a query to list the tables of the current database;
* the query needs to return rows with a column `name`
*
* @return array
*/
public function tables(): array
{

16
kirby/src/Database/Sql/Sqlite.php
View File

@@ -20,7 +20,6 @@ class Sqlite extends Sql
* the query needs to return rows with a column `name`
*
* @param string $table Table name
* @return array
*/
public function columns(string $table): array
{
@@ -34,8 +33,6 @@ class Sqlite extends Sql
* Abstracted column types to simplify table
* creation for multiple database drivers
* @codeCoverageIgnore
*
* @return array
*/
public function columnTypes(): array
{
@@ -52,11 +49,9 @@ class Sqlite extends Sql
/**
* Combines an identifier (table and column)
*
* @param $table string
* @param $column string
* @param $values bool Whether the identifier is going to be used for a VALUES clause;
* only relevant for SQLite
* @return string
* @param bool $values Whether the identifier is going to be
* used for a VALUES clause; only relevant
* for SQLite
*/
public function combineIdentifier(string $table, string $column, bool $values = false): string
{
@@ -111,9 +106,6 @@ class Sqlite extends Sql
/**
* Quotes an identifier (table *or* column)
*
* @param $identifier string
* @return string
*/
public function quoteIdentifier(string $identifier): string
{
@@ -132,8 +124,6 @@ class Sqlite extends Sql
/**
* Returns a query to list the tables of the current database;
* the query needs to return rows with a column `name`
*
* @return string
*/
public function tables(): array
{

14
kirby/src/Http/Request/Body.php
View File

@@ -46,15 +46,15 @@ class Body
*/
public function contents(): string|array
{
if ($this->contents === null) {
if (empty($_POST) === false) {
$this->contents = $_POST;
} else {
$this->contents = file_get_contents('php://input');
}
if ($this->contents !== null) {
return $this->contents;
}
return $this->contents;
if (empty($_POST) === false) {
return $this->contents = $_POST;
}
return $this->contents = file_get_contents('php://input');
}
/**

2
kirby/src/Http/Request/Query.php
View File

@@ -33,7 +33,7 @@ class Query
{
if ($data === null) {
$this->data = $_GET;
} elseif (is_array($data)) {
} elseif (is_array($data) === true) {
$this->data = $data;
} else {
parse_str($data, $parsed);

4
kirby/src/Http/Uri.php
View File

@@ -207,7 +207,9 @@ class Uri
}
/**
* Returns the domain without scheme, path or query
* Returns the domain without scheme, path or query.
* Includes auth part when not empty.
* Includes port number when different from 80 or 443.
*/
public function domain(): string|null
{

9
kirby/src/Option/Options.php
View File

@@ -35,11 +35,10 @@ class Options extends Collection
is_array($option) === false ||
array_key_exists('value', $option) === false
) {
if (is_string($key) === true) {
$option = ['value' => $key, 'text' => $option];
} else {
$option = ['value' => $option];
}
$option = match (true) {
is_string($key) => ['value' => $key, 'text' => $option],
default => ['value' => $option]
};
}
$option = Option::factory($option);

5
kirby/src/Panel/Model.php
View File

@@ -138,7 +138,10 @@ abstract class Model
default => [38, 76]
};
if (($settings['cover'] ?? false) === false || $layout === 'cards') {
if (
($settings['cover'] ?? false) === false ||
$layout === 'cards'
) {
$settings['srcset'] = $image->srcset($sizes);
} else {
$settings['srcset'] = $image->srcset([

11
kirby/src/Panel/Panel.php
View File

@@ -522,13 +522,10 @@ class Panel
{
$kirby = App::instance();
if ($user = $kirby->user()) {
// use the user language for the default translation
$translation = $user->language();
} else {
// fall back to the language from the config
$translation = $kirby->panelLanguage();
}
// use the user language for the default translation or
// fall back to the language from the config
$translation = $kirby->user()?->language() ??
$kirby->panelLanguage();
$kirby->setCurrentTranslation($translation);

12
kirby/src/Query/Argument.php
View File

@@ -15,7 +15,7 @@ use Kirby\Toolkit\Str;
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
final class Argument
class Argument
{
public function __construct(
public mixed $value
@@ -23,13 +23,21 @@ final class Argument
}
/**
* Sanitizes argument string into
* Sanitizes argument string into actual
* PHP type/object as new Argument instance
*/
public static function factory(string $argument): static
{
$argument = trim($argument);
// remove grouping parantheses
if (
Str::startsWith($argument, '(') &&
Str::endsWith($argument, ')')
) {
$argument = trim(substr($argument, 1, -1));
}
// string with single or double quotes
if (
(

22
kirby/src/Query/Arguments.php
View File

@@ -15,25 +15,39 @@ use Kirby\Toolkit\Collection;
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
final class Arguments extends Collection
class Arguments extends Collection
{
public const NO_PNTH = '\([^(]+\)(*SKIP)(*FAIL)';
// skip all matches inside of parantheses
public const NO_PNTH = '\([^)]+\)(*SKIP)(*FAIL)';
// skip all matches inside of square brackets
public const NO_SQBR = '\[[^]]+\](*SKIP)(*FAIL)';
// skip all matches inside of double quotes
public const NO_DLQU = '\"(?:[^"\\\\]|\\\\.)*\"(*SKIP)(*FAIL)';
// skip all matches inside of single quotes
public const NO_SLQU = '\'(?:[^\'\\\\]|\\\\.)*\'(*SKIP)(*FAIL)';
// skip all matches inside of any of the above skip groups
public const OUTSIDE = self::NO_PNTH . '|' . self::NO_SQBR . '|' .
self::NO_DLQU . '|' . self::NO_SLQU;
/**
* Splits list of arguments into individual
* Argument instances while respecting skip groups
*/
public static function factory(string $arguments): static
{
$arguments = A::map(
// split by comma, but not inside skip groups
preg_split('!,|' . self::NO_PNTH . '|' . self::NO_SQBR . '|' .
self::NO_DLQU . '|' . self::NO_SLQU . '!', $arguments),
preg_split('!,|' . self::OUTSIDE . '!', $arguments),
fn ($argument) => Argument::factory($argument)
);
return new static($arguments);
}
/**
* Resolve each argument, so that they can
* passed together to the actual method call
*/
public function resolve(array|object $data = []): array
{
return A::map(

116
kirby/src/Query/Expression.php Normal file
View File

@@ -0,0 +1,116 @@
<?php
namespace Kirby\Query;
use Kirby\Exception\LogicException;
use Kirby\Toolkit\A;
/**
* The Expression class adds support for simple shorthand
* comparisons (`a ? b : c`, `a ?: c` and `a ?? b`)
*
* @package Kirby Query
* @author Nico Hoffmann <nico@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class Expression
{
public function __construct(
public array $parts
) {
}
public static function factory(string $expression, Query $parent = null): static|Segments
{
// split into different expression parts and operators
$parts = static::parse($expression);
// shortcut: if expression has only one part, directly
// continue with the segments chain
if (count($parts) === 1) {
return Segments::factory(query: $parts[0], parent: $parent);
}
// turn all non-operator parts into an Argument
// which takes care of converting string, arrays booleans etc.
// into actual types and treats all other parts as their own queries
$parts = A::map(
$parts,
fn ($part) =>
in_array($part, ['?', ':', '?:', '??'])
? $part
: Argument::factory($part)
);
return new static(parts: $parts);
}
/**
* Splits a comparison string into an array
* of expressions and operators
* @internal
*/
public static function parse(string $string): array
{
// split by multiples of `?` and `:`, but not inside skip groups
// (parantheses, quotes etc.)
return preg_split(
'/\s+([\?\:]+)\s+|' . Arguments::OUTSIDE . '/',
trim($string),
flags: PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
);
}
/**
* Resolves the expression by evaluating
* the supported comparisons and consecutively
* resolving the resulting query/argument
*/
public function resolve(array|object $data = []): mixed
{
$base = null;
foreach ($this->parts as $index => $part) {
// `a ?? b`
// if the base/previous (e.g. `a`) isn't null,
// stop the expression chain and return `a`
if ($part === '??') {
if ($base !== null) {
return $base;
}
continue;
}
// `a ?: b`
// if `a` isn't false, return `a`, otherwise `b`
if ($part === '?:') {
if ($base != false) {
return $base;
}
return $this->parts[$index + 1]->resolve($data);
}
// `a ? b : c`
// if `a` isn't false, return `b`, otherwise `c`
if ($part === '?') {
if (($this->parts[$index + 2] ?? null) !== ':') {
throw new LogicException('Query: Incomplete ternary operator (missing matching `? :`)');
}
if ($base != false) {
return $this->parts[$index + 1]->resolve($data);
}
return $this->parts[$index + 3]->resolve($data);
}
$base = $part->resolve($data);
}
return $base;
}
}

15
kirby/src/Query/Query.php
View File

@@ -12,9 +12,16 @@ use Kirby\Cms\User;
use Kirby\Toolkit\I18n;
/**
* The Query class can be used to
* query arrays and objects, including their
* methods with a very simple string-based syntax.
* The Query class can be used to query arrays and objects,
* including their methods with a very simple string-based syntax.
*
* Namespace structure - what handles what:
* - Query Main interface, direct entries
* - Expression Simple comparisons (`a ? b :c`)
* - Segments Chain of method calls (`site.find('notes').url`)
* - Segment Single method call (`find('notes')`)
* - Arguments Method call parameters (`'template', '!=', 'note'`)
* - Argument Single parameter, resolving into actual types
*
* @package Kirby Query
* @author Bastian Allgeier <bastian@getkirby.com>,
@@ -90,7 +97,7 @@ class Query
}
// loop through all segments to resolve query
return Segments::factory($this->query, $this)->resolve($data);
return Expression::factory($this->query, $this)->resolve($data);
}
}

5
kirby/src/Query/Segment.php
View File

@@ -28,6 +28,7 @@ class Segment
/**
* Throws an exception for an access to an invalid method
* @internal
*
* @param mixed $data Variable on which the access was tried
* @param string $name Name of the method/property that was accessed
@@ -45,7 +46,7 @@ class Segment
$nonExisting = in_array($type, ['array', 'object']) ? 'non-existing ' : '';
$error = 'Access to ' . $nonExisting . $label . ' ' . $name . ' on ' . $type;
$error = 'Access to ' . $nonExisting . $label . ' "' . $name . '" on ' . $type;
throw new BadMethodCallException($error);
}
@@ -110,7 +111,7 @@ class Segment
}
if ($args !== []) {
throw new InvalidArgumentException('Cannot access array element ' . $this->method . ' with arguments');
throw new InvalidArgumentException('Cannot access array element "' . $this->method . '" with arguments');
}
return $value;

54
kirby/src/Query/Segments.php
View File

@@ -15,7 +15,7 @@ use Kirby\Toolkit\Collection;
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
final class Segments extends Collection
class Segments extends Collection
{
public function __construct(
array $data = [],
@@ -30,26 +30,62 @@ final class Segments extends Collection
*/
public static function factory(string $query, Query $parent = null): static
{
$segments = preg_split(
'!\.|(\(([^()]+|(?1))*+\))(*SKIP)(*FAIL)!',
trim($query),
-1,
PREG_SPLIT_NO_EMPTY
);
$segments = static::parse($query);
$position = 0;
$segments = A::map(
array_keys($segments),
fn ($index) => Segment::factory($segments[$index], $index)
$segments,
function ($segment) use (&$position) {
// leave connectors as they are
if (in_array($segment, ['.', '?.']) === true) {
return $segment;
}
// turn all other parts into Segment objects
// and pass their position in the chain (ignoring connectors)
$position++;
return Segment::factory($segment, $position - 1);
}
);
return new static($segments, $parent);
}
/**
* Splits the string of a segment chaing into an
* array of segments as well as conenctors (`.` or `?.`)
* @internal
*/
public static function parse(string $string): array
{
return preg_split(
'/(\??\.)|(\(([^()]+|(?2))*+\))(*SKIP)(*FAIL)/',
trim($string),
flags: PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
);
}
/**
* Resolves the segments chain by looping through
* each segment call to be applied to the value of
* all previous segment calls, returning gracefully at
* `?.` when current value is `null`
*/
public function resolve(array|object $data = [])
{
$value = null;
foreach ($this->data as $segment) {
// optional chaining: stop if current value is null
if ($segment === '?.' && $value === null) {
return null;
}
// for regular connectors, just skip
if ($segment === '.') {
continue;
}
// offer possibility to intercept on objects
if ($value !== null) {
$value = $this->parent?->intercept($value) ?? $value;

9
kirby/src/Session/AutoSession.php
View File

@@ -75,11 +75,10 @@ class AutoSession
}
// get the current session
if ($options['detect'] === true) {
$session = $this->sessions->currentDetected();
} else {
$session = $this->sessions->current();
}
$session = match ($options['detect']) {
true => $this->sessions->currentDetected(),
default => $this->sessions->current()
};
// create a new session
if ($session === null) {

5
kirby/src/Text/KirbyTag.php
View File

@@ -2,6 +2,7 @@
namespace Kirby\Text;
use AllowDynamicProperties;
use Closure;
use Kirby\Cms\App;
use Kirby\Cms\File;
@@ -19,7 +20,11 @@ use Kirby\Uuid\Uuid;
* @link https://getkirby.com
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*
* @todo remove the following psalm suppress when PHP >= 8.2 required
* @psalm-suppress UndefinedAttributeClass
*/
#[AllowDynamicProperties]
class KirbyTag
{
public static array $aliases = [];

12
kirby/src/Toolkit/A.php
View File

@@ -521,10 +521,10 @@ class A
is_array($result[$key]) === true &&
is_array($value) === true
) {
$result[$key] = array_replace_recursive($result[$key], $value);
} else {
$result[$key] = $value;
$value = array_replace_recursive($result[$key], $value);
}
$result[$key] = $value;
}
return $result;
@@ -717,10 +717,10 @@ class A
{
foreach ($update as $key => $value) {
if ($value instanceof Closure) {
$array[$key] = call_user_func($value, static::get($array, $key));
} else {
$array[$key] = $value;
$value = call_user_func($value, static::get($array, $key));
}
$array[$key] = $value;
}
return $array;

22
kirby/src/Toolkit/Collection.php
View File

@@ -99,11 +99,11 @@ class Collection extends Iterator implements Countable
*/
public function __set(string $key, $value): void
{
if ($this->caseSensitive === true) {
$this->data[$key] = $value;
} else {
$this->data[strtolower($key)] = $value;
if ($this->caseSensitive !== true) {
$key = strtolower($key);
}
$this->data[$key] = $value;
}
/**
@@ -380,11 +380,11 @@ class Collection extends Iterator implements Countable
public function find(...$keys)
{
if (count($keys) === 1) {
if (is_array($keys[0]) === true) {
$keys = $keys[0];
} else {
if (is_array($keys[0]) === false) {
return $this->findByKey($keys[0]);
}
$keys = $keys[0];
}
$result = [];
@@ -551,12 +551,14 @@ class Collection extends Iterator implements Countable
// make sure we have a proper key for each group
if (is_array($value) === true) {
throw new Exception('You cannot group by arrays or objects');
} elseif (is_object($value) === true) {
}
if (is_object($value) === true) {
if (method_exists($value, '__toString') === false) {
throw new Exception('You cannot group by arrays or objects');
} else {
$value = (string)$value;
}
$value = (string)$value;
}
if (isset($groups[$value]) === false) {

5
kirby/src/Toolkit/Component.php
View File

@@ -2,6 +2,7 @@
namespace Kirby\Toolkit;
use AllowDynamicProperties;
use ArgumentCountError;
use Closure;
use Kirby\Exception\Exception;
@@ -17,7 +18,11 @@ use TypeError;
* @link https://getkirby.com
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*
* @todo remove the following psalm suppress when PHP >= 8.2 required
* @psalm-suppress UndefinedAttributeClass
*/
#[AllowDynamicProperties]
class Component
{
/**

12
kirby/src/Toolkit/I18n.php
View File

@@ -290,13 +290,11 @@ class I18n
return $translation($count);
}
if (is_string($translation) === true) {
$message = $translation;
} elseif (isset($translation[$count]) === true) {
$message = $translation[$count];
} else {
$message = end($translation);
}
$message = match (true) {
is_string($translation) => $translation,
isset($translation[$count]) => $translation[$count],
default => end($translation)
};
if ($formatNumber === true) {
$count = static::formatNumber($count, $locale);

4
kirby/src/Toolkit/Iterator.php
View File

@@ -15,6 +15,10 @@ use IteratorAggregate;
* @link https://getkirby.com
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*
* @psalm-suppress MissingTemplateParam Implementing template params in this class would
* require implementing them throughout the code base
* https://github.com/getkirby/kirby/pull/4886#pullrequestreview-1203577545
*/
class Iterator implements IteratorAggregate
{

5
kirby/src/Toolkit/Obj.php
View File

@@ -101,7 +101,10 @@ class Obj extends stdClass
$result = [];
foreach ((array)$this as $key => $value) {
if (is_object($value) === true && method_exists($value, 'toArray')) {
if (
is_object($value) === true &&
method_exists($value, 'toArray')
) {
$result[$key] = $value->toArray();
} else {
$result[$key] = $value;

4
kirby/src/Toolkit/Pagination.php
View File

@@ -406,9 +406,9 @@ class Pagination
if ($this->page < $min || $this->page > $max) {
if (static::$validate === true) {
throw new ErrorPageException('Pagination page ' . $this->page . ' does not exist, expected ' . $min . '-' . $max);
} else {
$this->page = max(min($this->page, $max), $min);
}
$this->page = max(min($this->page, $max), $min);
}
return $this;

6
kirby/src/Toolkit/Query.php
View File

@@ -165,8 +165,8 @@ class Query
// the args are everything inside the *outer* parentheses
$args = Str::substr($part, Str::position($part, '(') + 1, -1);
$args = preg_split(self::PARAMETERS, $args);
$args = array_map('self::parameter', $args);
$args = preg_split(static::PARAMETERS, $args);
$args = array_map([$this, 'parameter'], $args);
return compact('method', 'args');
}
@@ -217,7 +217,7 @@ class Query
if (substr($arg, 0, 1) === '[' && substr($arg, -1) === ']') {
$arg = substr($arg, 1, -1);
$arg = preg_split(self::PARAMETERS, $arg);
return array_map('self::parameter', $arg);
return array_map([$this, 'parameter'], $arg);
}
// resolve parameter for objects and methods itself

2
kirby/src/Toolkit/Str.php
View File

@@ -450,7 +450,7 @@ class Str
*/
public static function esc(string $string, string $context = 'html'): string
{
if (method_exists('Kirby\Toolkit\Escape', $context) === true) {
if (method_exists(Escape::class, $context) === true) {
return Escape::$context($string);
}

5
kirby/src/Uuid/Uuid.php
View File

@@ -4,6 +4,7 @@ namespace Kirby\Uuid;
use Closure;
use Generator;
use Kirby\Cms\App;
use Kirby\Cms\Collection;
use Kirby\Cms\File;
use Kirby\Cms\Page;
@@ -198,6 +199,10 @@ class Uuid
return (static::$generator)($length);
}
if (App::instance()->option('content.uuid') === 'uuid-v4') {
return Str::uuid();
}
return Str::random($length, 'alphaNum');
}

1
kirby/vendor/composer/autoload_classmap.php vendored
View File

@@ -254,6 +254,7 @@ return array(
'Kirby\\Parsley\\Schema\\Plain' => $baseDir . '/src/Parsley/Schema/Plain.php',
'Kirby\\Query\\Argument' => $baseDir . '/src/Query/Argument.php',
'Kirby\\Query\\Arguments' => $baseDir . '/src/Query/Arguments.php',
'Kirby\\Query\\Expression' => $baseDir . '/src/Query/Expression.php',
'Kirby\\Query\\Query' => $baseDir . '/src/Query/Query.php',
'Kirby\\Query\\Segment' => $baseDir . '/src/Query/Segment.php',
'Kirby\\Query\\Segments' => $baseDir . '/src/Query/Segments.php',

1
kirby/vendor/composer/autoload_static.php vendored
View File

@@ -354,6 +354,7 @@ class ComposerStaticInita8011b477bb239488e5d139cdeb7b31e
'Kirby\\Parsley\\Schema\\Plain' => __DIR__ . '/../..' . '/src/Parsley/Schema/Plain.php',
'Kirby\\Query\\Argument' => __DIR__ . '/../..' . '/src/Query/Argument.php',
'Kirby\\Query\\Arguments' => __DIR__ . '/../..' . '/src/Query/Arguments.php',
'Kirby\\Query\\Expression' => __DIR__ . '/../..' . '/src/Query/Expression.php',
'Kirby\\Query\\Query' => __DIR__ . '/../..' . '/src/Query/Query.php',
'Kirby\\Query\\Segment' => __DIR__ . '/../..' . '/src/Query/Segment.php',
'Kirby\\Query\\Segments' => __DIR__ . '/../..' . '/src/Query/Segments.php',

30
kirby/vendor/composer/installed.json vendored
View File

@@ -138,17 +138,17 @@
},
{
"name": "filp/whoops",
"version": "2.14.5",
"version_normalized": "2.14.5.0",
"version": "2.14.6",
"version_normalized": "2.14.6.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"
"reference": "f7948baaa0330277c729714910336383286305da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
"reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
"url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da",
"reference": "f7948baaa0330277c729714910336383286305da",
"shasum": ""
},
"require": {
@@ -164,7 +164,7 @@
"symfony/var-dumper": "Pretty print complex values better with var-dumper available",
"whoops/soap": "Formats errors as SOAP responses"
},
"time": "2022-01-07T12:00:00+00:00",
"time": "2022-11-02T16:23:29+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -200,7 +200,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.14.5"
"source": "https://github.com/filp/whoops/tree/2.14.6"
},
"funding": [
{
@@ -669,17 +669,17 @@
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.26.0",
"version_normalized": "1.26.0.0",
"version": "v1.27.0",
"version_normalized": "1.27.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "219aa369ceff116e673852dce47c3a41794c14bd"
"reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
"reference": "219aa369ceff116e673852dce47c3a41794c14bd",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
"reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
"shasum": ""
},
"require": {
@@ -688,11 +688,11 @@
"suggest": {
"ext-intl": "For best performance"
},
"time": "2022-05-24T11:49:31+00:00",
"time": "2022-11-03T14:55:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.26-dev"
"dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -736,7 +736,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
},
"funding": [
{

20
kirby/vendor/composer/installed.php vendored
View File

@@ -1,8 +1,8 @@
<?php return array(
'root' => array(
'name' => 'getkirby/cms',
'pretty_version' => '3.8.2',
'version' => '3.8.2.0',
'pretty_version' => '3.8.3',
'version' => '3.8.3.0',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
@@ -29,17 +29,17 @@
'dev_requirement' => false,
),
'filp/whoops' => array(
'pretty_version' => '2.14.5',
'version' => '2.14.5.0',
'reference' => 'a63e5e8f26ebbebf8ed3c5c691637325512eb0dc',
'pretty_version' => '2.14.6',
'version' => '2.14.6.0',
'reference' => 'f7948baaa0330277c729714910336383286305da',
'type' => 'library',
'install_path' => __DIR__ . '/../filp/whoops',
'aliases' => array(),
'dev_requirement' => false,
),
'getkirby/cms' => array(
'pretty_version' => '3.8.2',
'version' => '3.8.2.0',
'pretty_version' => '3.8.3',
'version' => '3.8.3.0',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
@@ -116,9 +116,9 @@
'dev_requirement' => false,
),
'symfony/polyfill-intl-normalizer' => array(
'pretty_version' => 'v1.26.0',
'version' => '1.26.0.0',
'reference' => '219aa369ceff116e673852dce47c3a41794c14bd',
'pretty_version' => 'v1.27.0',
'version' => '1.27.0.0',
'reference' => '19bd1e4fcd5b91116f14d8533c57831ed00571b6',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
'aliases' => array(),

240
kirby/vendor/filp/whoops/src/Whoops/Resources/css/prism.css vendored
View File

@@ -1,237 +1,5 @@
/* PrismJS 1.24.1
/* PrismJS 1.29.0
https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+markup-templating+php&plugins=line-highlight+line-numbers */
/**
* prism.js tomorrow night eighties for JavaScript, CoffeeScript, CSS and HTML
* Based on https://github.com/chriskempson/tomorrow-theme
* @author Rose Pritchard
*/
code[class*="language-"],
pre[class*="language-"] {
color: #ccc;
background: none;
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
font-size: 1em;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
}
:not(pre) > code[class*="language-"],
pre[class*="language-"] {
background: #2d2d2d;
}
/* Inline code */
:not(pre) > code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}
.token.comment,
.token.block-comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: #999;
}
.token.punctuation {
color: #ccc;
}
.token.tag,
.token.attr-name,
.token.namespace,
.token.deleted {
color: #e2777a;
}
.token.function-name {
color: #6196cc;
}
.token.boolean,
.token.number,
.token.function {
color: #f08d49;
}
.token.property,
.token.class-name,
.token.constant,
.token.symbol {
color: #f8c555;
}
.token.selector,
.token.important,
.token.atrule,
.token.keyword,
.token.builtin {
color: #cc99cd;
}
.token.string,
.token.char,
.token.attr-value,
.token.regex,
.token.variable {
color: #7ec699;
}
.token.operator,
.token.entity,
.token.url {
color: #67cdcc;
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}
.token.inserted {
color: green;
}
pre[data-line] {
position: relative;
padding: 1em 0 1em 3em;
}
.line-highlight {
position: absolute;
left: 0;
right: 0;
padding: inherit 0;
margin-top: 1em; /* Same as .prism’s padding-top */
background: hsla(24, 20%, 50%,.08);
background: linear-gradient(to right, hsla(24, 20%, 50%,.1) 70%, hsla(24, 20%, 50%,0));
pointer-events: none;
line-height: inherit;
white-space: pre;
}
@media print {
.line-highlight {
/*
* This will prevent browsers from replacing the background color with white.
* It's necessary because the element is layered on top of the displayed code.
*/
-webkit-print-color-adjust: exact;
color-adjust: exact;
}
}
.line-highlight:before,
.line-highlight[data-end]:after {
content: attr(data-start);
position: absolute;
top: .4em;
left: .6em;
min-width: 1em;
padding: 0 .5em;
background-color: hsla(24, 20%, 50%,.4);
color: hsl(24, 20%, 95%);
font: bold 65%/1.5 sans-serif;
text-align: center;
vertical-align: .3em;
border-radius: 999px;
text-shadow: none;
box-shadow: 0 1px white;
}
.line-highlight[data-end]:after {
content: attr(data-end);
top: auto;
bottom: .4em;
}
.line-numbers .line-highlight:before,
.line-numbers .line-highlight:after {
content: none;
}
pre[id].linkable-line-numbers span.line-numbers-rows {
pointer-events: all;
}
pre[id].linkable-line-numbers span.line-numbers-rows > span:before {
cursor: pointer;
}
pre[id].linkable-line-numbers span.line-numbers-rows > span:hover:before {
background-color: rgba(128, 128, 128, .2);
}
pre[class*="language-"].line-numbers {
position: relative;
padding-left: 3.8em;
counter-reset: linenumber;
}
pre[class*="language-"].line-numbers > code {
position: relative;
white-space: inherit;
}
.line-numbers .line-numbers-rows {
position: absolute;
pointer-events: none;
top: 0;
font-size: 100%;
left: -3.8em;
width: 3em; /* works for line-numbers below 1000 lines */
letter-spacing: -1px;
border-right: 1px solid #999;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.line-numbers-rows > span {
display: block;
counter-increment: linenumber;
}
.line-numbers-rows > span:before {
content: counter(linenumber);
color: #999;
display: block;
padding-right: 0.8em;
text-align: right;
}
code[class*=language-],pre[class*=language-]{color:#ccc;background:0 0;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#2d2d2d}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.block-comment,.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#999}.token.punctuation{color:#ccc}.token.attr-name,.token.deleted,.token.namespace,.token.tag{color:#e2777a}.token.function-name{color:#6196cc}.token.boolean,.token.function,.token.number{color:#f08d49}.token.class-name,.token.constant,.token.property,.token.symbol{color:#f8c555}.token.atrule,.token.builtin,.token.important,.token.keyword,.token.selector{color:#cc99cd}.token.attr-value,.token.char,.token.regex,.token.string,.token.variable{color:#7ec699}.token.entity,.token.operator,.token.url{color:#67cdcc}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.token.inserted{color:green}
pre[data-line]{position:relative;padding:1em 0 1em 3em}.line-highlight{position:absolute;left:0;right:0;padding:inherit 0;margin-top:1em;background:hsla(24,20%,50%,.08);background:linear-gradient(to right,hsla(24,20%,50%,.1) 70%,hsla(24,20%,50%,0));pointer-events:none;line-height:inherit;white-space:pre}@media print{.line-highlight{-webkit-print-color-adjust:exact;color-adjust:exact}}.line-highlight:before,.line-highlight[data-end]:after{content:attr(data-start);position:absolute;top:.4em;left:.6em;min-width:1em;padding:0 .5em;background-color:hsla(24,20%,50%,.4);color:#f4f1ef;font:bold 65%/1.5 sans-serif;text-align:center;vertical-align:.3em;border-radius:999px;text-shadow:none;box-shadow:0 1px #fff}.line-highlight[data-end]:after{content:attr(data-end);top:auto;bottom:.4em}.line-numbers .line-highlight:after,.line-numbers .line-highlight:before{content:none}pre[id].linkable-line-numbers span.line-numbers-rows{pointer-events:all}pre[id].linkable-line-numbers span.line-numbers-rows>span:before{cursor:pointer}pre[id].linkable-line-numbers span.line-numbers-rows>span:hover:before{background-color:rgba(128,128,128,.2)}
pre[class*=language-].line-numbers{position:relative;padding-left:3.8em;counter-reset:linenumber}pre[class*=language-].line-numbers>code{position:relative;white-space:inherit}.line-numbers .line-numbers-rows{position:absolute;pointer-events:none;top:0;font-size:100%;left:-3.8em;width:3em;letter-spacing:-1px;border-right:1px solid #999;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.line-numbers-rows>span{display:block;counter-increment:linenumber}.line-numbers-rows>span:before{content:counter(linenumber);color:#999;display:block;padding-right:.8em;text-align:right}

14
kirby/vendor/filp/whoops/src/Whoops/Resources/js/prism.js vendored
View File

File diff suppressed because one or more lines are too long

2
kirby/vendor/symfony/polyfill-intl-normalizer/Normalizer.php vendored
View File

@@ -90,7 +90,7 @@ class Normalizer
self::$cC = self::getData('combiningClass');
}
if (null !== $mbEncoding = (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) ? mb_internal_encoding() : null) {
if (null !== $mbEncoding = (2 /* MB_OVERLOAD_STRING */ & (int) \ini_get('mbstring.func_overload')) ? mb_internal_encoding() : null) {
mb_internal_encoding('8bit');
}

2
kirby/vendor/symfony/polyfill-intl-normalizer/composer.json vendored
View File

@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-main": "1.26-dev"
"dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",