+
diff --git a/panel/src/components/Views/Files/FileView.vue b/panel/src/components/Views/Files/FileView.vue index 6aea0e57d3..0408ce9efd 100644 --- a/panel/src/components/Views/Files/FileView.vue +++ b/panel/src/components/Views/Files/FileView.vue @@ -1,6 +1,5 @@ diff --git a/panel/src/components/Views/ModelView.vue b/panel/src/components/Views/ModelView.vue index 41382ad621..62536b4d24 100644 --- a/panel/src/components/Views/ModelView.vue +++ b/panel/src/components/Views/ModelView.vue @@ -55,9 +55,6 @@ export default { hasChanges() { return length(this.changes) > 0; }, - hasTabs() { - return this.tabs.length > 1; - }, isLocked() { return this.lock.isLocked; }, diff --git a/panel/src/components/Views/Pages/PageView.vue b/panel/src/components/Views/Pages/PageView.vue index 2cac65cd24..829a3cebac 100644 --- a/panel/src/components/Views/Pages/PageView.vue +++ b/panel/src/components/Views/Pages/PageView.vue @@ -1,6 +1,5 @@ diff --git a/panel/src/components/Views/System/TableLicenseStatusCell.vue b/panel/src/components/Views/System/TableLicenseStatusCell.vue new file mode 100644 index 0000000000..d6a3eb7ea6 --- /dev/null +++ b/panel/src/components/Views/System/TableLicenseStatusCell.vue @@ -0,0 +1,45 @@ + + + + {{ value.label }} + + + + + + + diff --git a/panel/src/components/Views/System/index.js b/panel/src/components/Views/System/index.js index 557d3ac448..f770ed0588 100644 --- a/panel/src/components/Views/System/index.js +++ b/panel/src/components/Views/System/index.js @@ -1,11 +1,13 @@ import SystemView from "./SystemView.vue"; import TableLicenseCell from "./TableLicenseCell.vue"; +import TableLicenseStatusCell from "./TableLicenseStatusCell.vue"; import TableUpdateStatusCell from "./TableUpdateStatusCell.vue"; export default { install(app) { app.component("k-system-view", SystemView); app.component("k-table-license-cell", TableLicenseCell); + app.component("k-table-license-status-cell", TableLicenseStatusCell); app.component("k-table-update-status-cell", TableUpdateStatusCell); } }; diff --git a/panel/src/components/Views/Users/UserView.vue b/panel/src/components/Views/Users/UserView.vue index 4d13ae2c76..4e73501830 100644 --- a/panel/src/components/Views/Users/UserView.vue +++ b/panel/src/components/Views/Users/UserView.vue @@ -1,6 +1,5 @@ { panel.view.props.content = { ...panel.view.props.originals, + ...panel.view.props.content, ...values }; diff --git a/panel/src/styles/reset.css b/panel/src/styles/reset.css index 50595f99fd..96af9a6d31 100644 --- a/panel/src/styles/reset.css +++ b/panel/src/styles/reset.css @@ -50,15 +50,10 @@ } :where( - textarea, - select, - input:not( - [type="checkbox"], - [type="radio"], - [type="reset"], - [type="submit"] - ) - ) { + textarea, + select, + input:not([type="checkbox"], [type="radio"], [type="reset"], [type="submit"]) +) { width: 100%; font-variant-numeric: tabular-nums; } @@ -103,9 +98,9 @@ opacity: 1; } -/* TODO: :where(label:has(> input:disabled), label:has(+ input:disabled)) { +:where(label:has(> input:disabled), label:has(+ input:disabled)) { cursor: not-allowed; -} */ +} :where(a) { color: currentColor; diff --git a/src/Cms/File.php b/src/Cms/File.php index 4e6b75ce3f..1322b482d5 100644 --- a/src/Cms/File.php +++ b/src/Cms/File.php @@ -318,12 +318,7 @@ public function isAccessible(): bool return false; } - static $accessible = []; - $role = $this->kirby()->role()?->id() ?? '__none__'; - $template = $this->template() ?? '__none__'; - $accessible[$role] ??= []; - - return $accessible[$role][$template] ??= $this->permissions()->can('access'); + return FilePermissions::canFromCache($this, 'access'); } /** @@ -342,12 +337,7 @@ public function isListable(): bool return false; } - static $listable = []; - $role = $this->kirby()->role()?->id() ?? '__none__'; - $template = $this->template() ?? '__none__'; - $listable[$role] ??= []; - - return $listable[$role][$template] ??= $this->permissions()->can('list'); + return FilePermissions::canFromCache($this, 'list'); } /** diff --git a/src/Cms/FilePermissions.php b/src/Cms/FilePermissions.php index 2f8b777237..6c7eee8fe5 100644 --- a/src/Cms/FilePermissions.php +++ b/src/Cms/FilePermissions.php @@ -13,7 +13,15 @@ */ class FilePermissions extends ModelPermissions { - protected string $category = 'files'; + protected const CATEGORY = 'files'; + + /** + * Used to cache once determined permissions in memory + */ + protected static function cacheKey(ModelWithContent|Language $model): string + { + return $model->template() ?? '__none__'; + } protected function canChangeTemplate(): bool { diff --git a/src/Cms/FileRules.php b/src/Cms/FileRules.php index 403fd3fe7a..72149f5441 100644 --- a/src/Cms/FileRules.php +++ b/src/Cms/FileRules.php @@ -29,7 +29,7 @@ class FileRules */ public static function changeName(File $file, string $name): void { - if ($file->permissions()->changeName() !== true) { + if ($file->permissions()->can('changeName') !== true) { throw new PermissionException( key: 'file.changeName.permission', data: ['filename' => $file->filename()] @@ -58,7 +58,7 @@ public static function changeName(File $file, string $name): void */ public static function changeSort(File $file, int $sort): void { - if ($file->permissions()->sort() !== true) { + if ($file->permissions()->can('sort') !== true) { throw new PermissionException( key: 'file.sort.permission', data: ['filename' => $file->filename()] @@ -74,7 +74,7 @@ public static function changeSort(File $file, int $sort): void */ public static function changeTemplate(File $file, string $template): void { - if ($file->permissions()->changeTemplate() !== true) { + if ($file->permissions()->can('changeTemplate') !== true) { throw new PermissionException( key: 'file.changeTemplate.permission', data: ['id' => $file->id()] @@ -134,7 +134,7 @@ public static function create(File $file, BaseFile $upload): void ); } - if ($file->permissions()->create() !== true) { + if ($file->permissions()->can('create') !== true) { throw new PermissionException( message: 'The file cannot be created' ); @@ -153,7 +153,7 @@ public static function create(File $file, BaseFile $upload): void */ public static function delete(File $file): void { - if ($file->permissions()->delete() !== true) { + if ($file->permissions()->can('delete') !== true) { throw new PermissionException( message: 'The file cannot be deleted' ); @@ -168,7 +168,7 @@ public static function delete(File $file): void */ public static function replace(File $file, BaseFile $upload): void { - if ($file->permissions()->replace() !== true) { + if ($file->permissions()->can('replace') !== true) { throw new PermissionException( message: 'The file cannot be replaced' ); @@ -197,7 +197,7 @@ public static function replace(File $file, BaseFile $upload): void */ public static function update(File $file, array $content = []): void { - if ($file->permissions()->update() !== true) { + if ($file->permissions()->can('update') !== true) { throw new PermissionException( message: 'The file cannot be updated' ); diff --git a/src/Cms/LanguagePermissions.php b/src/Cms/LanguagePermissions.php index d1e27cbd00..b73871e550 100644 --- a/src/Cms/LanguagePermissions.php +++ b/src/Cms/LanguagePermissions.php @@ -13,7 +13,7 @@ */ class LanguagePermissions extends ModelPermissions { - protected string $category = 'languages'; + protected const CATEGORY = 'languages'; protected function canDelete(): bool { diff --git a/src/Cms/LanguageRules.php b/src/Cms/LanguageRules.php index d0f65e5147..5a1f45ef1b 100644 --- a/src/Cms/LanguageRules.php +++ b/src/Cms/LanguageRules.php @@ -37,7 +37,7 @@ public static function create(Language $language): void ); } - if ($language->permissions()->create() !== true) { + if ($language->permissions()->can('create') !== true) { throw new PermissionException( key: 'language.create.permission' ); @@ -52,7 +52,7 @@ public static function create(Language $language): void */ public static function delete(Language $language): void { - if ($language->permissions()->delete() !== true) { + if ($language->permissions()->can('delete') !== true) { throw new PermissionException( key: 'language.delete.permission' ); @@ -83,7 +83,7 @@ public static function update( ); } - if ($newLanguage->permissions()->update() !== true) { + if ($newLanguage->permissions()->can('update') !== true) { throw new PermissionException( key: 'language.update.permission' ); diff --git a/src/Cms/ModelPermissions.php b/src/Cms/ModelPermissions.php index ba9b0010ba..798623bf35 100644 --- a/src/Cms/ModelPermissions.php +++ b/src/Cms/ModelPermissions.php @@ -2,6 +2,7 @@ namespace Kirby\Cms; +use Kirby\Exception\LogicException; use Kirby\Toolkit\A; /** @@ -15,18 +16,13 @@ */ abstract class ModelPermissions { - protected string $category; - protected ModelWithContent|Language $model; + protected const CATEGORY = 'model'; protected array $options; - protected Permissions $permissions; - protected User $user; - public function __construct(ModelWithContent|Language $model) - { - $this->model = $model; - $this->user = $model->kirby()->user() ?? User::nobody(); - $this->permissions = $this->user->role()->permissions(); + protected static array $cache = []; + public function __construct(protected ModelWithContent|Language $model) + { $this->options = match (true) { $model instanceof ModelWithContent => $model->blueprint()->options(), default => [] @@ -47,6 +43,17 @@ public function __debugInfo(): array return $this->toArray(); } + /** + * Can be overridden by specific child classes + * to return a model-specific value used to + * cache a once determined permission in memory + * @codeCoverageIgnore + */ + protected static function cacheKey(ModelWithContent|Language $model): string + { + return ''; + } + /** * Returns whether the current user is allowed to do * a certain action on the model @@ -57,8 +64,9 @@ public function can( string $action, bool $default = false ): bool { - $user = $this->user->id(); - $role = $this->user->role()->id(); + $user = static::user(); + $userId = $user->id(); + $role = $user->role()->id(); // users with the `nobody` role can do nothing // that needs a permission check @@ -77,7 +85,7 @@ public function can( } // the almighty `kirby` user can do anything - if ($user === 'kirby' && $role === 'admin') { + if ($userId === 'kirby' && $role === 'admin') { return true; } @@ -107,7 +115,32 @@ public function can( } } - return $this->permissions->for($this->category, $action, $default); + $permissions = $user->role()->permissions(); + return $permissions->for(static::category($this->model), $action, $default); + } + + /** + * Quickly determines a permission for the current user role + * and model blueprint unless dynamic checking is required + */ + public static function canFromCache( + ModelWithContent|Language $model, + string $action, + bool $default = false + ): bool { + $role = $model->kirby()->role()?->id() ?? '__none__'; + $category = static::category($model); + $cacheKey = $category . '.' . $action . '/' . static::cacheKey($model) . '/' . $role; + + if (isset(static::$cache[$cacheKey]) === true) { + return static::$cache[$cacheKey]; + } + + if (method_exists(static::class, 'can' . $action) === true) { + throw new LogicException('Cannot use permission cache for dynamically-determined permission'); + } + + return static::$cache[$cacheKey] = $model->permissions()->can($action, $role, $default); } /** @@ -123,6 +156,15 @@ public function cannot( return $this->can($action, !$default) === false; } + /** + * Can be overridden by specific child classes + * if the permission category needs to be dynamic + */ + protected static function category(ModelWithContent|Language $model): string + { + return static::CATEGORY; + } + public function toArray(): array { $array = []; @@ -133,4 +175,12 @@ public function toArray(): array return $array; } + + /** + * Returns the currently logged in user + */ + protected static function user(): User + { + return App::instance()->user() ?? User::nobody(); + } } diff --git a/src/Cms/Page.php b/src/Cms/Page.php index 766369c81e..ce60b171bf 100644 --- a/src/Cms/Page.php +++ b/src/Cms/Page.php @@ -522,12 +522,7 @@ public function isAccessible(): bool return false; } - static $accessible = []; - $role = $this->kirby()->role()?->id() ?? '__none__'; - $template = $this->intendedTemplate()->name(); - $accessible[$role] ??= []; - - return $accessible[$role][$template] ??= $this->permissions()->can('access'); + return PagePermissions::canFromCache($this, 'access'); } /** @@ -694,12 +689,7 @@ public function isListable(): bool return false; } - static $listable = []; - $role = $this->kirby()->role()?->id() ?? '__none__'; - $template = $this->intendedTemplate()->name(); - $listable[$role] ??= []; - - return $listable[$role][$template] ??= $this->permissions()->can('list'); + return PagePermissions::canFromCache($this, 'list'); } /** diff --git a/src/Cms/PagePermissions.php b/src/Cms/PagePermissions.php index b4ca11840d..01610796e9 100644 --- a/src/Cms/PagePermissions.php +++ b/src/Cms/PagePermissions.php @@ -13,7 +13,15 @@ */ class PagePermissions extends ModelPermissions { - protected string $category = 'pages'; + protected const CATEGORY = 'pages'; + + /** + * Used to cache once determined permissions in memory + */ + protected static function cacheKey(ModelWithContent|Language $model): string + { + return $model->intendedTemplate()->name(); + } protected function canChangeSlug(): bool { diff --git a/src/Cms/PageRules.php b/src/Cms/PageRules.php index 551d7f4584..b31fd75f3a 100644 --- a/src/Cms/PageRules.php +++ b/src/Cms/PageRules.php @@ -40,7 +40,7 @@ public static function changeNum(Page $page, int|null $num = null): void */ public static function changeSlug(Page $page, string $slug): void { - if ($page->permissions()->changeSlug() !== true) { + if ($page->permissions()->can('changeSlug') !== true) { throw new PermissionException( key: 'page.changeSlug.permission', data: ['slug' => $page->slug()] @@ -99,7 +99,7 @@ public static function changeStatus( */ public static function changeStatusToDraft(Page $page): void { - if ($page->permissions()->changeStatus() !== true) { + if ($page->permissions()->can('changeStatus') !== true) { throw new PermissionException( key: 'page.changeStatus.permission', data: ['slug' => $page->slug()] @@ -160,7 +160,7 @@ public static function changeStatusToUnlisted(Page $page) */ public static function changeTemplate(Page $page, string $template): void { - if ($page->permissions()->changeTemplate() !== true) { + if ($page->permissions()->can('changeTemplate') !== true) { throw new PermissionException( key: 'page.changeTemplate.permission', data: ['slug' => $page->slug()] @@ -188,7 +188,7 @@ public static function changeTemplate(Page $page, string $template): void */ public static function changeTitle(Page $page, string $title): void { - if ($page->permissions()->changeTitle() !== true) { + if ($page->permissions()->can('changeTitle') !== true) { throw new PermissionException( key: 'page.changeTitle.permission', data: ['slug' => $page->slug()] @@ -207,7 +207,7 @@ public static function changeTitle(Page $page, string $title): void */ public static function create(Page $page): void { - if ($page->permissions()->create() !== true) { + if ($page->permissions()->can('create') !== true) { throw new PermissionException( key: 'page.create.permission', data: ['slug' => $page->slug()] @@ -251,7 +251,7 @@ public static function create(Page $page): void */ public static function delete(Page $page, bool $force = false): void { - if ($page->permissions()->delete() !== true) { + if ($page->permissions()->can('delete') !== true) { throw new PermissionException( key: 'page.delete.permission', data: ['slug' => $page->slug()] @@ -273,7 +273,7 @@ public static function duplicate( string $slug, array $options = [] ): void { - if ($page->permissions()->duplicate() !== true) { + if ($page->permissions()->can('duplicate') !== true) { throw new PermissionException( key: 'page.duplicate.permission', data: ['slug' => $page->slug()] @@ -294,7 +294,7 @@ public static function move(Page $page, Site|Page $parent): void return; } - if ($page->permissions()->move() !== true) { + if ($page->permissions()->can('move') !== true) { throw new PermissionException( key: 'page.move.permission', data: ['slug' => $page->slug()] @@ -373,7 +373,7 @@ public static function move(Page $page, Site|Page $parent): void */ public static function publish(Page $page): void { - if ($page->permissions()->changeStatus() !== true) { + if ($page->permissions()->can('changeStatus') !== true) { throw new PermissionException( key: 'page.changeStatus.permission', data: [ @@ -397,7 +397,7 @@ public static function publish(Page $page): void */ public static function update(Page $page, array $content = []): void { - if ($page->permissions()->update() !== true) { + if ($page->permissions()->can('update') !== true) { throw new PermissionException( key: 'page.update.permission', data: ['slug' => $page->slug()] diff --git a/src/Cms/Role.php b/src/Cms/Role.php index 39f4ca39e7..d5f8485361 100644 --- a/src/Cms/Role.php +++ b/src/Cms/Role.php @@ -83,7 +83,11 @@ public function description(): string|null public static function factory(array $props, array $inject = []): static { - return new static($props + $inject); + // ensure to properly extend the blueprint + $props = $props + $inject; + $props = Blueprint::extend($props); + + return new static($props); } public function id(): string diff --git a/src/Cms/SitePermissions.php b/src/Cms/SitePermissions.php index 8e58415fd0..fe641342ae 100644 --- a/src/Cms/SitePermissions.php +++ b/src/Cms/SitePermissions.php @@ -13,5 +13,5 @@ */ class SitePermissions extends ModelPermissions { - protected string $category = 'site'; + protected const CATEGORY = 'site'; } diff --git a/src/Cms/SiteRules.php b/src/Cms/SiteRules.php index 299e716147..609c88010a 100644 --- a/src/Cms/SiteRules.php +++ b/src/Cms/SiteRules.php @@ -25,7 +25,7 @@ class SiteRules */ public static function changeTitle(Site $site, string $title): void { - if ($site->permissions()->changeTitle() !== true) { + if ($site->permissions()->can('changeTitle') !== true) { throw new PermissionException( key: 'site.changeTitle.permission' ); @@ -45,7 +45,7 @@ public static function changeTitle(Site $site, string $title): void */ public static function update(Site $site, array $content = []): void { - if ($site->permissions()->update() !== true) { + if ($site->permissions()->can('update') !== true) { throw new PermissionException( key: 'site.update.permission' ); diff --git a/src/Cms/System.php b/src/Cms/System.php index 4b8693ad32..1bbfbf3aed 100644 --- a/src/Cms/System.php +++ b/src/Cms/System.php @@ -411,6 +411,16 @@ public function serverSoftware(): string return $this->app->environment()->get('SERVER_SOFTWARE', '–'); } + /** + * Returns the short version of the detected server software + * @since 4.6.0 + */ + public function serverSoftwareShort(): string + { + $software = $this->serverSoftware(); + return strtok($software, ' '); + } + /** * Check for a writable sessions folder */ diff --git a/src/Cms/System/UpdateStatus.php b/src/Cms/System/UpdateStatus.php index 3af55c25ff..51e70e00e1 100644 --- a/src/Cms/System/UpdateStatus.php +++ b/src/Cms/System/UpdateStatus.php @@ -102,15 +102,15 @@ public function exceptionMessages(): array /** * Returns the Panel icon for the status value * - * @return string 'check'|'alert'|'info' + * @return string 'check'|'alert'|'info'|'question' */ public function icon(): string { return match ($this->status()) { - 'up-to-date', 'not-vulnerable' => 'check', + 'up-to-date', 'not-vulnerable' => 'check', 'security-update', 'security-upgrade' => 'alert', - 'update', 'upgrade' => 'info', - default => 'question' + 'update', 'upgrade' => 'info', + default => 'question' }; } @@ -252,10 +252,10 @@ public function targetVersion(): string|null public function theme(): string { return match ($this->status()) { - 'up-to-date', 'not-vulnerable' => 'positive', + 'up-to-date', 'not-vulnerable' => 'positive', 'security-update', 'security-upgrade' => 'negative', - 'update', 'upgrade' => 'info', - default => 'notice' + 'update', 'upgrade' => 'info', + default => 'passive' }; } diff --git a/src/Cms/UserPermissions.php b/src/Cms/UserPermissions.php index cab3776551..4103fca808 100644 --- a/src/Cms/UserPermissions.php +++ b/src/Cms/UserPermissions.php @@ -13,15 +13,12 @@ */ class UserPermissions extends ModelPermissions { - protected string $category = 'users'; - - public function __construct(User $model) + /** + * Used to cache once determined permissions in memory + */ + protected static function cacheKey(ModelWithContent|Language $model): string { - parent::__construct($model); - - // change the scope of the permissions, - // when the current user is this user - $this->category = $this->user?->is($model) ? 'user' : 'users'; + return $model->role()->id(); } protected function canChangeRole(): bool @@ -29,7 +26,7 @@ protected function canChangeRole(): bool // protect admin from role changes by non-admin if ( $this->model->isAdmin() === true && - $this->user->isAdmin() !== true + static::user()->isAdmin() !== true ) { return false; } @@ -45,7 +42,7 @@ protected function canChangeRole(): bool protected function canCreate(): bool { // the admin can always create new users - if ($this->user->isAdmin() === true) { + if (static::user()->isAdmin() === true) { return true; } @@ -61,4 +58,11 @@ protected function canDelete(): bool { return $this->model->isLastAdmin() !== true; } + + protected static function category(ModelWithContent|Language $model): string + { + // change the scope of the permissions, + // when the current user is this user + return static::user()->is($model) ? 'user' : 'users'; + } } diff --git a/src/Cms/UserRules.php b/src/Cms/UserRules.php index 3701d61d90..67cb4f17f8 100644 --- a/src/Cms/UserRules.php +++ b/src/Cms/UserRules.php @@ -29,7 +29,7 @@ class UserRules */ public static function changeEmail(User $user, string $email): void { - if ($user->permissions()->changeEmail() !== true) { + if ($user->permissions()->can('changeEmail') !== true) { throw new PermissionException( key: 'user.changeEmail.permission', data: ['name' => $user->username()] @@ -46,7 +46,7 @@ public static function changeEmail(User $user, string $email): void */ public static function changeLanguage(User $user, string $language): void { - if ($user->permissions()->changeLanguage() !== true) { + if ($user->permissions()->can('changeLanguage') !== true) { throw new PermissionException( key: 'user.changeLanguage.permission', data: ['name' => $user->username()] @@ -63,7 +63,7 @@ public static function changeLanguage(User $user, string $language): void */ public static function changeName(User $user, string $name): void { - if ($user->permissions()->changeName() !== true) { + if ($user->permissions()->can('changeName') !== true) { throw new PermissionException( key: 'user.changeName.permission', data: ['name' => $user->username()] @@ -81,7 +81,7 @@ public static function changePassword( #[SensitiveParameter] string $password ): void { - if ($user->permissions()->changePassword() !== true) { + if ($user->permissions()->can('changePassword') !== true) { throw new PermissionException( key: 'user.changePassword.permission', data: ['name' => $user->username()] @@ -118,7 +118,7 @@ public static function changeRole(User $user, string $role): void } // check permissions - if ($user->permissions()->changeRole() !== true) { + if ($user->permissions()->can('changeRole') !== true) { throw new PermissionException( key: 'user.changeRole.permission', data: ['name' => $user->username()] @@ -197,7 +197,7 @@ public static function create(User $user, array $props = []): void } // check user permissions - if ($user->permissions()->create() !== true) { + if ($user->permissions()->can('create') !== true) { throw new PermissionException([ 'key' => 'user.create.permission' ]); @@ -236,7 +236,7 @@ public static function delete(User $user): void ); } - if ($user->permissions()->delete() !== true) { + if ($user->permissions()->can('delete') !== true) { throw new PermissionException( key: 'user.delete.permission', data: ['name' => $user->username()] @@ -254,7 +254,7 @@ public static function update( array $values = [], array $strings = [] ): void { - if ($user->permissions()->update() !== true) { + if ($user->permissions()->can('update') !== true) { throw new PermissionException( key: 'user.update.permission', data: ['name' => $user->username()] diff --git a/src/Panel/Assets.php b/src/Panel/Assets.php index 958075feba..908fc1bc9f 100644 --- a/src/Panel/Assets.php +++ b/src/Panel/Assets.php @@ -3,6 +3,7 @@ namespace Kirby\Panel; use Kirby\Cms\App; +use Kirby\Cms\Helpers; use Kirby\Cms\Url; use Kirby\Exception\Exception; use Kirby\Exception\InvalidArgumentException; @@ -118,11 +119,7 @@ public function external(): array } /** - * Returns array of favicon icons - * based on config option - * - * @todo Deprecate `url` option in v5, use `href` option instead - * @todo Deprecate `rel` usage as array key in v5, use `rel` option instead + * Returns array of favicon icons based on config option * * @throws \Kirby\Exception\InvalidArgumentException */ @@ -163,12 +160,16 @@ public function favicons(): array foreach ($icons as $rel => &$icon) { // TODO: remove this backward compatibility check in v6 if (isset($icon['url']) === true) { + Helpers::deprecated('`panel.favicon` option: use `href` instead of `url` attribute'); + $icon['href'] = $icon['url']; unset($icon['url']); } // TODO: remove this backward compatibility check in v6 if (is_string($rel) === true && isset($icon['rel']) === false) { + Helpers::deprecated('`panel.favicon` option: use `rel` attribute instead of passing string as key'); + $icon['rel'] = $rel; } diff --git a/src/Panel/Model.php b/src/Panel/Model.php index 6206d4cf76..947c9298f1 100644 --- a/src/Panel/Model.php +++ b/src/Panel/Model.php @@ -134,12 +134,19 @@ public function image( $blueprint = null; } + // convert string blueprint settings to proper array + if (is_string($blueprint) === true) { + $blueprint = ['query' => $blueprint]; + } + // skip image thumbnail if option // is explicitly set to show the icon if ($settings === 'icon') { $settings = ['query' => false]; - } elseif (is_string($settings) === true) { - // convert string settings to proper array + } + + // convert string settings to proper array + if (is_string($settings) === true) { $settings = ['query' => $settings]; } diff --git a/src/Panel/Ui/Buttons/PageStatusButton.php b/src/Panel/Ui/Buttons/PageStatusButton.php index 44a2f7a3b2..7db809dc0c 100644 --- a/src/Panel/Ui/Buttons/PageStatusButton.php +++ b/src/Panel/Ui/Buttons/PageStatusButton.php @@ -24,7 +24,8 @@ public function __construct( $status = $page->status(); $blueprint = $page->blueprint()->status()[$status] ?? null; $disabled = $page->permissions()->cannot('changeStatus'); - $title = I18n::translate('page.status') . ': ' . I18n::translate('page.status.' . $status); + $text = $blueprint['label'] ?? I18n::translate('page.status.' . $status); + $title = I18n::translate('page.status') . ': ' . $text; if ($disabled === true) { $title .= ' (' . I18n::translate('disabled') . ')'; @@ -37,7 +38,7 @@ class: 'k-status-view-button k-page-status-button', disabled: $disabled, icon: 'status-' . $status, style: '--icon-size: 15px', - text: $blueprint['label'] ?? $status, + text: $text, title: $title, theme: match($status) { 'draft' => 'negative-icon', diff --git a/src/Panel/Ui/Buttons/ViewButtons.php b/src/Panel/Ui/Buttons/ViewButtons.php index 3c03724d59..35a2914ba5 100644 --- a/src/Panel/Ui/Buttons/ViewButtons.php +++ b/src/Panel/Ui/Buttons/ViewButtons.php @@ -78,7 +78,7 @@ public function render(): array )?->render(); } - return array_filter($buttons); + return array_values(array_filter($buttons)); } /** diff --git a/src/Plugin/LicenseStatus.php b/src/Plugin/LicenseStatus.php index 1a75e7c544..e47c233490 100644 --- a/src/Plugin/LicenseStatus.php +++ b/src/Plugin/LicenseStatus.php @@ -20,6 +20,9 @@ public function __construct( protected string $value, protected string $icon, protected string $label, + protected string|null $link = null, + protected string|null $dialog = null, + protected string|null $drawer = null, protected string|null $theme = null ) { } @@ -32,6 +35,22 @@ public function __toString(): string return $this->label(); } + /** + * Returns the status dialog + */ + public function dialog(): string|null + { + return $this->dialog; + } + + /** + * Returns the status drawer + */ + public function drawer(): string|null + { + return $this->drawer; + } + /** * Returns a status by its name */ @@ -72,6 +91,14 @@ public function label(): string return $this->label; } + /** + * Returns the status link + */ + public function link(): string|null + { + return $this->link; + } + /** * Returns the theme */ @@ -86,10 +113,13 @@ public function theme(): string|null public function toArray(): array { return [ - 'icon' => $this->icon(), - 'label' => $this->label(), - 'theme' => $this->theme(), - 'value' => $this->value(), + 'dialog' => $this->dialog(), + 'drawer' => $this->drawer(), + 'icon' => $this->icon(), + 'label' => $this->label(), + 'link' => $this->link(), + 'theme' => $this->theme(), + 'value' => $this->value(), ]; } diff --git a/src/Plugin/Plugin.php b/src/Plugin/Plugin.php index de9b0a2240..ab3ee6e63f 100644 --- a/src/Plugin/Plugin.php +++ b/src/Plugin/Plugin.php @@ -4,7 +4,6 @@ use Closure; use Composer\InstalledVersions; -use Exception; use Kirby\Cms\App; use Kirby\Cms\Helpers; use Kirby\Cms\System\UpdateStatus; diff --git a/tests/Cms/Files/FilePermissionsTest.php b/tests/Cms/Files/FilePermissionsTest.php index ec1cfac989..a83ec809cd 100644 --- a/tests/Cms/Files/FilePermissionsTest.php +++ b/tests/Cms/Files/FilePermissionsTest.php @@ -2,6 +2,7 @@ namespace Kirby\Cms; +use Kirby\Exception\LogicException; use Kirby\TestCase; /** @@ -14,6 +15,9 @@ public function setUp(): void $this->app = new App([ 'roots' => [ 'index' => '/dev/null' + ], + 'users' => [ + ['id' => 'bastian', 'role' => 'admin'] ] ]); } @@ -21,10 +25,14 @@ public function setUp(): void public static function actionProvider(): array { return [ + ['access'], ['changeName'], + // ['changeTemplate'], Tested separately because of the needed blueprints ['create'], ['delete'], + ['list'], ['replace'], + ['sort'], ['update'] ]; } @@ -60,6 +68,51 @@ public function testWithNobody($action) $this->assertFalse($perms->can($action)); } + /** + * @covers \Kirby\Cms\ModelPermissions::canFromCache + */ + public function testCanFromCache() + { + $this->app->impersonate('bastian'); + + $page = new Page(['slug' => 'test']); + $file = new File([ + 'filename' => 'test.jpg', + 'parent' => $page, + 'template' => 'some-template', + 'blueprint' => [ + 'name' => 'files/some-template', + 'options' => [ + 'access' => false, + 'list' => false + ] + ] + ]); + + $this->assertFalse(FilePermissions::canFromCache($file, 'access')); + $this->assertFalse(FilePermissions::canFromCache($file, 'access')); + $this->assertFalse(FilePermissions::canFromCache($file, 'list')); + $this->assertFalse(FilePermissions::canFromCache($file, 'list')); + } + + /** + * @covers \Kirby\Cms\ModelPermissions::canFromCache + */ + public function testCanFromCacheDynamic() + { + $this->expectException(LogicException::class); + $this->expectExceptionMessage('Cannot use permission cache for dynamically-determined permission'); + + $page = new Page(['slug' => 'test']); + $file = new File([ + 'filename' => 'test.jpg', + 'parent' => $page, + 'template' => 'some-template', + ]); + + FilePermissions::canFromCache($file, 'changeTemplate'); + } + /** * @covers ::canChangeTemplate */ diff --git a/tests/Cms/Files/FileRulesTest.php b/tests/Cms/Files/FileRulesTest.php index 6e19f23de0..88415ece80 100644 --- a/tests/Cms/Files/FileRulesTest.php +++ b/tests/Cms/Files/FileRulesTest.php @@ -62,7 +62,7 @@ public function testChangeNameWithEmptyInput() public function testChangeNameWithoutPermissions() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('changeName')->willReturn(false); + $permissions->method('can')->with('changeName')->willReturn(false); $file = $this->createMock(File::class); $file->method('permissions')->willReturn($permissions); @@ -93,7 +93,7 @@ public function testChangeSort() public function testChangeSortWithoutPermissions() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('sort')->willReturn(false); + $permissions->method('can')->with('sort')->willReturn(false); $file = $this->createMock(File::class); $file->method('permissions')->willReturn($permissions); @@ -180,7 +180,7 @@ public function testChangeTemplate() public function testChangeTemplateWithoutPermissions() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('changeTemplate')->willReturn(false); + $permissions->method('can')->with('changeTemplate')->willReturn(false); $file = $this->createMock(File::class); $file->method('id')->willReturn('test'); @@ -195,7 +195,7 @@ public function testChangeTemplateWithoutPermissions() public function testChangeTemplateTooFewTemplates() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('changeTemplate')->willReturn(true); + $permissions->method('can')->with('changeTemplate')->willReturn(true); $file = $this->createMock(File::class); $file->method('blueprints')->willReturn([[]]); @@ -211,7 +211,7 @@ public function testChangeTemplateTooFewTemplates() public function testChangeTemplateWithInvalidTemplateName() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('changeTemplate')->willReturn(true); + $permissions->method('can')->with('changeTemplate')->willReturn(true); $file = $this->createMock(File::class); $file->method('blueprints')->willReturn([ @@ -370,7 +370,7 @@ public function testCreateHarmfulContents() $blueprint = $this->createMock(FileBlueprint::class); $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('create')->willReturn(true); + $permissions->method('can')->with('create')->willReturn(true); $file = $this->getMockBuilder(File::class) ->disableOriginalConstructor() @@ -393,7 +393,7 @@ public function testCreateHarmfulContents() public function testCreateWithoutPermissions() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('create')->willReturn(false); + $permissions->method('can')->with('create')->willReturn(false); $file = $this->createMock(File::class); $file->method('permissions')->willReturn($permissions); @@ -410,7 +410,7 @@ public function testCreateWithoutPermissions() public function testDeleteWithoutPermissions() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('delete')->willReturn(false); + $permissions->method('can')->with('delete')->willReturn(false); $file = $this->createMock(File::class); $file->method('permissions')->willReturn($permissions); @@ -424,7 +424,7 @@ public function testDeleteWithoutPermissions() public function testReplaceWithoutPermissions() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('replace')->willReturn(false); + $permissions->method('can')->with('replace')->willReturn(false); $file = $this->createMock(File::class); $file->method('permissions')->willReturn($permissions); @@ -440,7 +440,7 @@ public function testReplaceWithoutPermissions() public function testReplaceInvalidMimeExtension() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('replace')->willReturn(true); + $permissions->method('can')->with('replace')->willReturn(true); $file = $this->getMockBuilder(File::class) ->disableOriginalConstructor() @@ -466,7 +466,7 @@ public function testReplaceHarmfulContents() $blueprint = $this->createMock(FileBlueprint::class); $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('replace')->willReturn(true); + $permissions->method('can')->with('replace')->willReturn(true); $file = $this->getMockBuilder(File::class) ->disableOriginalConstructor() @@ -490,7 +490,7 @@ public function testReplaceHarmfulContents() public function testUpdateWithoutPermissions() { $permissions = $this->createMock(FilePermissions::class); - $permissions->method('__call')->with('update')->willReturn(false); + $permissions->method('can')->with('update')->willReturn(false); $file = $this->createMock(File::class); $file->method('permissions')->willReturn($permissions); diff --git a/tests/Cms/Pages/PagePermissionsTest.php b/tests/Cms/Pages/PagePermissionsTest.php index 2d8ff56de4..64fe4abeca 100644 --- a/tests/Cms/Pages/PagePermissionsTest.php +++ b/tests/Cms/Pages/PagePermissionsTest.php @@ -2,7 +2,9 @@ namespace Kirby\Cms; +use Kirby\Exception\LogicException; use Kirby\TestCase; +use ReflectionProperty; /** * @coversDefaultClass \Kirby\Cms\PagePermissions @@ -21,16 +23,25 @@ public function setUp(): void ]); } + public function tearDown(): void + { + $prop = new ReflectionProperty(PagePermissions::class, 'cache'); + $prop->setValue(null, []); + } + public static function actionProvider(): array { return [ + ['access'], ['changeSlug'], ['changeStatus'], - // ['changeTemplate'], Returns false because of only one blueprint + // ['changeTemplate'], Tested separately because of the needed blueprints ['changeTitle'], ['create'], ['delete'], ['duplicate'], + ['list'], + ['move'], ['preview'], ['sort'], ['update'], @@ -270,6 +281,49 @@ public function testWithNobody($action) $this->assertFalse($perms->can($action)); } + /** + * @covers \Kirby\Cms\ModelPermissions::canFromCache + */ + public function testCanFromCache() + { + $this->app->impersonate('bastian'); + + $page = new Page([ + 'slug' => 'test', + 'num' => 1, + 'template' => 'some-template', + 'blueprint' => [ + 'name' => 'some-template', + 'options' => [ + 'access' => false, + 'list' => false + ] + ] + ]); + + $this->assertFalse(PagePermissions::canFromCache($page, 'access')); + $this->assertFalse(PagePermissions::canFromCache($page, 'access')); + $this->assertFalse(PagePermissions::canFromCache($page, 'list')); + $this->assertFalse(PagePermissions::canFromCache($page, 'list')); + } + + /** + * @covers \Kirby\Cms\ModelPermissions::canFromCache + */ + public function testCanFromCacheDynamic() + { + $this->expectException(LogicException::class); + $this->expectExceptionMessage('Cannot use permission cache for dynamically-determined permission'); + + $page = new Page([ + 'slug' => 'test', + 'num' => 1, + 'template' => 'some-template', + ]); + + PagePermissions::canFromCache($page, 'changeTemplate'); + } + /** * @covers ::canChangeTemplate */ diff --git a/tests/Cms/Pages/PageRulesTest.php b/tests/Cms/Pages/PageRulesTest.php index ca89066916..fff5336ddb 100644 --- a/tests/Cms/Pages/PageRulesTest.php +++ b/tests/Cms/Pages/PageRulesTest.php @@ -94,7 +94,7 @@ public function testChangeSlug() public function testChangeSlugWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('changeSlug')->willReturn(false); + $permissions->method('can')->with('changeSlug')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -198,7 +198,7 @@ public static function statusActionProvider(): array public function testChangeStatusWithoutPermission($status, $args = []) { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('changeStatus')->willReturn(false); + $permissions->method('can')->with('changeStatus')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -217,7 +217,7 @@ public function testChangeStatusWithoutPermission($status, $args = []) public function testChangeStatusToListedWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('changeStatus')->willReturn(false); + $permissions->method('can')->with('changeStatus')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -325,7 +325,7 @@ public function testChangeTemplate() public function testChangeTemplateWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('changeTemplate')->willReturn(false); + $permissions->method('can')->with('changeTemplate')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -343,7 +343,7 @@ public function testChangeTemplateWithoutPermissions() public function testChangeTemplateTooFewTemplates() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('changeTemplate')->willReturn(true); + $permissions->method('can')->with('changeTemplate')->willReturn(true); $page = $this->createMock(Page::class); $page->method('blueprints')->willReturn([[]]); @@ -362,7 +362,7 @@ public function testChangeTemplateTooFewTemplates() public function testChangeTemplateWithInvalidTemplateName() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('changeTemplate')->willReturn(true); + $permissions->method('can')->with('changeTemplate')->willReturn(true); $page = $this->createMock(Page::class); $page->method('blueprints')->willReturn([ @@ -399,7 +399,7 @@ public function testChangeTitleWithEmptyValue() public function testChangeTitleWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('changeTitle')->willReturn(false); + $permissions->method('can')->with('changeTitle')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -417,7 +417,7 @@ public function testChangeTitleWithoutPermissions() public function testCreateWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('create')->willReturn(false); + $permissions->method('can')->with('create')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -435,7 +435,7 @@ public function testCreateWithoutPermissions() public function testCreateInvalidSlug() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('create')->willReturn(true); + $permissions->method('can')->with('create')->willReturn(true); $page = $this->createMock(Page::class); $page->method('slug')->willReturn(''); @@ -487,7 +487,7 @@ public function testCreateSlugReservedPath() ]); $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('create')->willReturn(true); + $permissions->method('can')->with('create')->willReturn(true); $page = $this->createMock(Page::class); $page->method('kirby')->willReturn($app); @@ -518,7 +518,7 @@ public function testDelete() public function testDeleteWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('delete')->willReturn(false); + $permissions->method('can')->with('delete')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -669,7 +669,7 @@ public function testDuplicateInvalid() public function testDuplicateWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('duplicate')->willReturn(false); + $permissions->method('can')->with('duplicate')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -704,7 +704,7 @@ public function testUpdate() public function testUpdateWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('update')->willReturn(false); + $permissions->method('can')->with('update')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); @@ -833,7 +833,7 @@ public function testMove() public function testMoveWithoutPermissions() { $permissions = $this->createMock(PagePermissions::class); - $permissions->method('__call')->with('move')->willReturn(false); + $permissions->method('can')->with('move')->willReturn(false); $page = $this->createMock(Page::class); $page->method('slug')->willReturn('test'); diff --git a/tests/Cms/Roles/RoleTest.php b/tests/Cms/Roles/RoleTest.php index 96d1ca9962..6e0d98d9b4 100644 --- a/tests/Cms/Roles/RoleTest.php +++ b/tests/Cms/Roles/RoleTest.php @@ -37,6 +37,7 @@ public function testFactory() $this->assertSame('editor', $role->name()); $this->assertSame('Editor', $role->title()); + $this->assertSame('This should be inherited', $role->description()); } public function testMissingRole() diff --git a/tests/Cms/Roles/RolesTest.php b/tests/Cms/Roles/RolesTest.php index ef619cb37c..f51ec9856b 100644 --- a/tests/Cms/Roles/RolesTest.php +++ b/tests/Cms/Roles/RolesTest.php @@ -32,8 +32,9 @@ public function testLoad() $this->assertInstanceOf(Roles::class, $roles); - // should contain the editor role from fixtures and the default admin role - $this->assertCount(2, $roles); + // should contain the base and editor role from fixtures + // and the default admin role + $this->assertCount(3, $roles); $this->assertSame('admin', $roles->first()->name()); $this->assertSame('editor', $roles->last()->name()); } diff --git a/tests/Cms/Roles/fixtures/blueprints/users/base.yml b/tests/Cms/Roles/fixtures/blueprints/users/base.yml new file mode 100644 index 0000000000..4998517c5e --- /dev/null +++ b/tests/Cms/Roles/fixtures/blueprints/users/base.yml @@ -0,0 +1 @@ +description: This should be inherited diff --git a/tests/Cms/Roles/fixtures/blueprints/users/editor.yml b/tests/Cms/Roles/fixtures/blueprints/users/editor.yml index 8f9d8bd616..a9dcb6ec9e 100644 --- a/tests/Cms/Roles/fixtures/blueprints/users/editor.yml +++ b/tests/Cms/Roles/fixtures/blueprints/users/editor.yml @@ -1 +1,3 @@ title: Editor + +extends: users/base diff --git a/tests/Cms/Site/SiteRulesTest.php b/tests/Cms/Site/SiteRulesTest.php index ca822e4db2..1c4831b474 100644 --- a/tests/Cms/Site/SiteRulesTest.php +++ b/tests/Cms/Site/SiteRulesTest.php @@ -9,7 +9,7 @@ class SiteRulesTest extends TestCase public function testChangeTitleWithoutPermissions() { $permissions = $this->createMock(SitePermissions::class); - $permissions->method('__call')->with('changeTitle')->willReturn(false); + $permissions->method('can')->with('changeTitle')->willReturn(false); $site = $this->createMock(Site::class); $site->method('permissions')->willReturn($permissions); @@ -34,7 +34,7 @@ public function testUpdate() public function testUpdateWithoutPermissions() { $permissions = $this->createMock(SitePermissions::class); - $permissions->method('__call')->with('update')->willReturn(false); + $permissions->method('can')->with('update')->willReturn(false); $site = $this->createMock(Site::class); $site->method('permissions')->willReturn($permissions); diff --git a/tests/Cms/System/SystemTest.php b/tests/Cms/System/SystemTest.php index ddd0fe268e..677e63dc97 100644 --- a/tests/Cms/System/SystemTest.php +++ b/tests/Cms/System/SystemTest.php @@ -661,6 +661,30 @@ public function testServerSoftwareInvalid() $this->assertSame('–', $system->serverSoftware()); } + /** + * @covers ::serverSoftwareShort + */ + public function testServerSoftwareShort() + { + $app = $this->app->clone([ + 'server' => [ + 'SERVER_SOFTWARE' => $software = 'nginx/1.25.4' + ] + ]); + + $system = new System($app); + $this->assertSame($software, $system->serverSoftwareShort()); + + $app = $this->app->clone([ + 'server' => [ + 'SERVER_SOFTWARE' => $software = 'Apache/2.4.7 (Ubuntu)' + ] + ]); + + $system = new System($app); + $this->assertSame('Apache/2.4.7', $system->serverSoftwareShort()); + } + /** * @covers ::accounts * @covers ::content diff --git a/tests/Cms/System/UpdateStatusTest.php b/tests/Cms/System/UpdateStatusTest.php index 9899b9dc27..4998abb6ba 100644 --- a/tests/Cms/System/UpdateStatusTest.php +++ b/tests/Cms/System/UpdateStatusTest.php @@ -412,7 +412,7 @@ public static function logicProvider(): array 'messages' => [], 'status' => 'unreleased', 'targetVersion' => null, - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null, 'vulnerabilities' => [], 'exceptionMessages' => [] @@ -675,7 +675,7 @@ public static function logicProvider(): array 'label' => 'Unreleased version', 'latestVersion' => '88888.8.8', 'pluginName' => 'getkirby/test', - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null ], 'vulnerabilities' => [], @@ -841,7 +841,7 @@ public static function logicProvider(): array 'label' => 'Could not check for updates', 'latestVersion' => '88888.8.8', 'pluginName' => 'getkirby/test', - 'theme' => 'notice', + 'theme' => 'passive', 'url' => 'https://getkirby.com/releases/88888.8.8', ], 'vulnerabilities' => null, @@ -863,7 +863,7 @@ public static function logicProvider(): array 'label' => 'Could not check for updates', 'latestVersion' => '88888.8.8', 'pluginName' => 'getkirby/test', - 'theme' => 'notice', + 'theme' => 'passive', 'url' => 'https://getkirby.com/releases/88888.8.8', ], 'vulnerabilities' => null, @@ -1235,7 +1235,7 @@ public static function logicProvider(): array 'messages' => null, 'status' => 'error', 'targetVersion' => null, - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null, 'vulnerabilities' => null, 'exceptionMessages' => [ @@ -1257,7 +1257,7 @@ public static function logicProvider(): array 'messages' => [], 'status' => 'error', 'targetVersion' => null, - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null, 'vulnerabilities' => [], 'exceptionMessages' => [ @@ -1317,7 +1317,7 @@ public static function logicProvider(): array 'messages' => [], 'status' => 'error', 'targetVersion' => null, - 'theme' => 'notice', + 'theme' => 'passive', 'url' => 'https://getkirby.com/releases/77777.7.7', 'vulnerabilities' => [], 'exceptionMessages' => [ @@ -1458,7 +1458,7 @@ public static function logicProvider(): array 'messages' => [], 'status' => 'error', 'targetVersion' => null, - 'theme' => 'notice', + 'theme' => 'passive', 'url' => 'https://getkirby.com/releases/77777.7.7', 'vulnerabilities' => [], 'exceptionMessages' => [ @@ -1485,7 +1485,7 @@ public static function logicProvider(): array ], 'status' => 'error', 'targetVersion' => null, - 'theme' => 'notice', + 'theme' => 'passive', 'url' => 'https://getkirby.com/releases/77777.4.3', 'vulnerabilities' => [ [ diff --git a/tests/Cms/Users/UserPermissionsTest.php b/tests/Cms/Users/UserPermissionsTest.php index e8d72b20d5..0b4a06f058 100644 --- a/tests/Cms/Users/UserPermissionsTest.php +++ b/tests/Cms/Users/UserPermissionsTest.php @@ -74,7 +74,6 @@ public function testWithNoAdmin($action) 'index' => '/dev/null' ], 'roles' => [ - ['name' => 'admin'], [ 'name' => 'editor', 'permissions' => [ @@ -88,36 +87,41 @@ public function testWithNoAdmin($action) 'update' => false ], 'users' => [ - 'changeEmail' => false, - 'changeLanguage' => false, - 'changeName' => false, - 'changePassword' => false, - 'changeRole' => false, - 'create' => false, - 'delete' => false, - 'update' => false + 'changeEmail' => true, + 'changeLanguage' => true, + 'changeName' => true, + 'changePassword' => true, + 'changeRole' => true, + 'create' => true, + 'delete' => true, + 'update' => true ] ] ] ], - 'user' => 'editor@getkirby.com', + 'user' => 'editor1@getkirby.com', 'users' => [ [ - 'email' => 'admin@getkirby.com', - 'role' => 'admin' + 'email' => 'editor1@getkirby.com', + 'role' => 'editor' ], [ - 'email' => 'editor@getkirby.com', + 'email' => 'editor2@getkirby.com', 'role' => 'editor' ] ], ]); - $user = $app->user(); - $perms = $user->permissions(); + // `user` permissions are disabled + $user1 = $app->user(); + $perms1 = $user1->permissions(); + $this->assertSame('editor', $user1->role()->name()); + $this->assertFalse($perms1->can($action)); - $this->assertSame('editor', $user->role()->name()); - $this->assertFalse($perms->can($action)); + // `users` permissions are enabled + $user2 = $app->user('editor2@getkirby.com'); + $perms2 = $user2->permissions(); + $this->assertTrue($perms2->can($action)); } public function testChangeSingleRole() diff --git a/tests/Cms/Users/UserRulesTest.php b/tests/Cms/Users/UserRulesTest.php index 28ef830dde..6754a16514 100644 --- a/tests/Cms/Users/UserRulesTest.php +++ b/tests/Cms/Users/UserRulesTest.php @@ -96,7 +96,7 @@ public static function missingPermissionProvider(): array public function testChangeWithoutPermission($key, $value, $message) { $permissions = $this->createMock(UserPermissions::class); - $permissions->method('__call')->with('change' . $key)->willReturn(false); + $permissions->method('can')->with('change' . $key)->willReturn(false); $user = $this->createMock(User::class); $user->method('permissions')->willReturn($permissions); @@ -134,7 +134,7 @@ public function testChangeRoleWithoutPermissions() $kirby->impersonate('admin@domain.com'); $permissions = $this->createMock(UserPermissions::class); - $permissions->method('__call')->with('changeRole')->willReturn(false); + $permissions->method('can')->with('changeRole')->willReturn(false); $user = $this->createMock(User::class); $user->method('kirby')->willReturn($kirby); @@ -372,7 +372,7 @@ public function testCreatePermissions() $app->impersonate('editor@getkirby.com'); $permissions = $this->createMock(UserPermissions::class); - $permissions->method('__call')->with('create')->willReturn(false); + $permissions->method('can')->with('create')->willReturn(false); $user = $this->createMock(User::class); $user->method('kirby')->willReturn($app); @@ -401,7 +401,7 @@ public function testCreateInvalidRole() $app->impersonate('editor@getkirby.com'); $permissions = $this->createMock(UserPermissions::class); - $permissions->method('__call')->with('create')->willReturn(true); + $permissions->method('can')->with('create')->willReturn(true); $user = $this->createMock(User::class); $user->method('kirby')->willReturn($app); @@ -481,7 +481,7 @@ public function testDeleteLastUser() public function testDeletePermissions() { $permissions = $this->createMock(UserPermissions::class); - $permissions->method('__call')->with('delete')->willReturn(false); + $permissions->method('can')->with('delete')->willReturn(false); $user = $this->createMock(User::class); $user->method('permissions')->willReturn($permissions); diff --git a/tests/Form/Fields/LinkFieldTest.php b/tests/Form/Fields/LinkFieldTest.php index ea99a9abe2..f2351165bd 100644 --- a/tests/Form/Fields/LinkFieldTest.php +++ b/tests/Form/Fields/LinkFieldTest.php @@ -2,6 +2,7 @@ namespace Form\Fields; +use Kirby\Exception\InvalidArgumentException; use Kirby\Form\Fields\TestCase; class LinkFieldTest extends TestCase @@ -29,4 +30,14 @@ public function testDefaultProps() 'anchor' ], $field->options()); } + + public function testOptionsInvalid() + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('Invalid options: foo, bar'); + + $this->field('link', [ + 'options' => ['page', 'foo', 'bar'] + ]); + } } diff --git a/tests/Panel/Areas/SystemTest.php b/tests/Panel/Areas/SystemTest.php index 9f5bbd7c40..e49febe6a4 100644 --- a/tests/Panel/Areas/SystemTest.php +++ b/tests/Panel/Areas/SystemTest.php @@ -37,14 +37,22 @@ public function setUp(): void public function unknownLicense(): array { return [ - 'link' => null, - 'name' => '-', - 'status' => [ - 'icon' => 'question', - 'label' => 'Unknown license', - 'theme' => 'passive', - 'value' => 'unknown', - ] + 'link' => null, + 'name' => '-', + 'status' => $this->unknownLicenseStatus() + ]; + } + + public function unknownLicenseStatus(): array + { + return [ + 'dialog' => null, + 'drawer' => null, + 'icon' => 'question', + 'label' => 'Unknown', + 'link' => null, + 'theme' => 'passive', + 'value' => 'unknown', ]; } @@ -199,13 +207,14 @@ public function testViewWithPlugins(): void 'text' => 'getkirby/private', 'href' => null ], + 'status' => $this->unknownLicenseStatus(), 'version' => [ 'currentVersion' => '?', 'icon' => 'question', 'label' => 'Could not check for updates', 'latestVersion' => '?', 'pluginName' => 'getkirby/private', - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null ] ], @@ -216,6 +225,7 @@ public function testViewWithPlugins(): void 'text' => 'getkirby/public', 'href' => 'https://getkirby.com' ], + 'status' => $this->unknownLicenseStatus(), 'version' => [ 'currentVersion' => '1.0.0', 'icon' => 'info', @@ -233,13 +243,14 @@ public function testViewWithPlugins(): void 'text' => 'getkirby/unknown', 'href' => null ], + 'status' => $this->unknownLicenseStatus(), 'version' => [ 'currentVersion' => '1.0.0', 'icon' => 'question', 'label' => 'Could not check for updates', 'latestVersion' => '?', 'pluginName' => 'getkirby/unknown', - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null ] ] @@ -293,13 +304,14 @@ public function testViewWithPluginsDebug(): void 'text' => 'getkirby/private', 'href' => null ], + 'status' => $this->unknownLicenseStatus(), 'version' => [ 'currentVersion' => '?', 'icon' => 'question', 'label' => 'Could not check for updates', 'latestVersion' => '?', 'pluginName' => 'getkirby/private', - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null ] ], @@ -310,6 +322,7 @@ public function testViewWithPluginsDebug(): void 'text' => 'getkirby/public', 'href' => 'https://getkirby.com' ], + 'status' => $this->unknownLicenseStatus(), 'version' => [ 'currentVersion' => '1.0.0', 'icon' => 'info', @@ -327,13 +340,14 @@ public function testViewWithPluginsDebug(): void 'text' => 'getkirby/unknown', 'href' => null ], + 'status' => $this->unknownLicenseStatus(), 'version' => [ 'currentVersion' => '1.0.0', 'icon' => 'question', 'label' => 'Could not check for updates', 'latestVersion' => '?', 'pluginName' => 'getkirby/unknown', - 'theme' => 'notice', + 'theme' => 'passive', 'url' => null ] ] @@ -411,6 +425,7 @@ public function testViewWithoutUpdateCheck(): void 'text' => 'getkirby/public', 'href' => 'https://getkirby.com' ], + 'status' => $this->unknownLicenseStatus(), 'version' => '1.0.0' ] ], $props['plugins']); diff --git a/tests/Panel/AssetsTest.php b/tests/Panel/AssetsTest.php index 1457e164ef..203bf2ba4e 100644 --- a/tests/Panel/AssetsTest.php +++ b/tests/Panel/AssetsTest.php @@ -335,74 +335,6 @@ public function testFaviconsWithCustomUrl(): void $this->assertSame($base . '/favicon.svg', $favicons[2]['href']); } - /** - * @todo Remove backward compatibility part test in v5 - */ - public function testFaviconsWithRelIndex(): void - { - // array - $this->app->clone([ - 'options' => [ - 'panel' => [ - 'favicon' => [ - 'shortcut icon' => [ - 'type' => 'image/svg+xml', - 'url' => 'assets/my-favicon.svg', - ], - 'alternate icon' => [ - 'type' => 'image/png', - 'url' => 'assets/my-favicon.png', - ] - ] - ] - ] - ]); - - // default asset setup - $assets = new Assets(); - $favicons = $assets->favicons(); - - // icons - $this->assertSame('shortcut icon', $favicons[0]['rel']); - $this->assertSame('/assets/my-favicon.svg', $favicons[0]['href']); - $this->assertSame('alternate icon', $favicons[1]['rel']); - $this->assertSame('/assets/my-favicon.png', $favicons[1]['href']); - } - - /** - * @todo Remove backward compatibility part test in v5 - */ - public function testFaviconsWithUrlOption(): void - { - // array - $this->app->clone([ - 'options' => [ - 'panel' => [ - 'favicon' => [ - [ - 'rel' => 'shortcut icon', - 'type' => 'image/svg+xml', - 'url' => 'assets/my-favicon.svg', - ], - [ - 'rel' => 'alternate icon', - 'type' => 'image/png', - 'url' => 'assets/my-favicon.png', - ] - ] - ] - ] - ]); - - // default asset setup - $assets = new Assets(); - $favicons = $assets->favicons(); - - // icons - $this->assertSame('/assets/my-favicon.svg', $favicons[0]['href']); - $this->assertSame('/assets/my-favicon.png', $favicons[1]['href']); - } - /** * @covers ::icons */ diff --git a/tests/Panel/ModelTest.php b/tests/Panel/ModelTest.php index 71c6846aa2..bc2fdc0307 100644 --- a/tests/Panel/ModelTest.php +++ b/tests/Panel/ModelTest.php @@ -390,6 +390,35 @@ public function testImageWithBlueprintFalse() $this->assertNull($image); } + /** + * @covers ::image + */ + public function testImageWithBlueprintString() + { + $app = $this->app->clone([ + 'blueprints' => [ + 'pages/fox' => [ + 'image' => 'site.page("test").image' + ] + ], + 'site' => [ + 'children' => [ + [ + 'slug' => 'test', + 'template' => 'fox', + 'files' => [ + ['filename' => 'test.jpg'] + ] + ] + ] + ] + ]); + + $panel = $app->page('test')->panel(); + $image = $panel->image([]); + $this->assertStringEndsWith('test.jpg', $image['url']); + } + /** * @covers ::image */ diff --git a/tests/Plugin/LicenseStatusTest.php b/tests/Plugin/LicenseStatusTest.php index aa028cf0d7..6f32b34b65 100644 --- a/tests/Plugin/LicenseStatusTest.php +++ b/tests/Plugin/LicenseStatusTest.php @@ -33,6 +33,36 @@ public function testFromArray(): void $this->assertSame('active', $status->value()); } + /** + * @covers ::dialog + */ + public function testDialog(): void + { + $status = new LicenseStatus( + value: 'missing', + icon: 'alert', + label: 'Enter license', + dialog: $dialog = 'my/dialog' + ); + + $this->assertSame($dialog, $status->dialog()); + } + + /** + * @covers ::drawer + */ + public function testDrawer(): void + { + $status = new LicenseStatus( + value: 'missing', + icon: 'alert', + label: 'Enter license', + drawer: $drawer = 'my/drawer' + ); + + $this->assertSame($drawer, $status->drawer()); + } + /** * @covers ::from */ @@ -112,6 +142,21 @@ public function testLabel(): void $this->assertSame('Valid license', $status->label()); } + /** + * @covers ::link + */ + public function testLink(): void + { + $status = new LicenseStatus( + value: 'missing', + icon: 'alert', + label: 'Buy license', + link: $url = 'https://getkirby.com/buy' + ); + + $this->assertSame($url, $status->link()); + } + /** * @covers ::theme */ @@ -139,10 +184,13 @@ public function testToArray(): void ); $this->assertSame([ - 'icon' => 'check', - 'label' => 'Valid license', - 'theme' => null, - 'value' => 'active' + 'dialog' => null, + 'drawer' => null, + 'icon' => 'check', + 'label' => 'Valid license', + 'link' => null, + 'theme' => null, + 'value' => 'active' ], $status->toArray()); } diff --git a/tests/Plugin/LicenseTest.php b/tests/Plugin/LicenseTest.php index 9ff84d5f95..2d0faec716 100644 --- a/tests/Plugin/LicenseTest.php +++ b/tests/Plugin/LicenseTest.php @@ -137,10 +137,13 @@ public function testToArray(): void 'link' => null, 'name' => 'Custom license', 'status' => [ - 'icon' => 'question', - 'label' => 'Unknown license', - 'theme' => 'passive', - 'value' => 'unknown', + 'dialog' => null, + 'drawer' => null, + 'icon' => 'question', + 'label' => 'Unknown', + 'link' => null, + 'theme' => 'passive', + 'value' => 'unknown', ] ], $license->toArray()); } diff --git a/tests/Plugin/PluginTest.php b/tests/Plugin/PluginTest.php index c96df32f15..2cd4fca882 100644 --- a/tests/Plugin/PluginTest.php +++ b/tests/Plugin/PluginTest.php @@ -211,11 +211,22 @@ public function testInfoFromProps() $plugin = new Plugin( name: 'getkirby/test-plugin', info: [ - 'license' => 'MIT' + 'license' => 'MIT', + 'authors' => [ + [ + 'name' => 'A', + 'email' => 'a@getkirby.com' + ], + [ + 'name' => 'B', + 'email' => 'b@getkirby.com' + ] + ] ] ); $this->assertSame('MIT', $plugin->info()['license']); + $this->assertSame('A, B', $plugin->authorsNames()); } /** @@ -473,10 +484,13 @@ public function testToArray() 'link' => null, 'name' => 'MIT', 'status' => [ - 'icon' => 'check', - 'label' => 'Valid license', - 'theme' => 'positive', - 'value' => 'active', + 'dialog' => null, + 'drawer' => null, + 'icon' => 'check', + 'label' => 'Valid license', + 'link' => null, + 'theme' => 'positive', + 'value' => 'active', ] ], 'link' => 'https://getkirby.com', diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 3e3705a72b..57a6de736d 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -62,7 +62,6 @@ 'Kirby\\Cms\\Blueprint' => $baseDir . '/src/Cms/Blueprint.php', 'Kirby\\Cms\\Collection' => $baseDir . '/src/Cms/Collection.php', 'Kirby\\Cms\\Collections' => $baseDir . '/src/Cms/Collections.php', - 'Kirby\\Cms\\ContentLocks' => $baseDir . '/src/Cms/ContentLocks.php', 'Kirby\\Cms\\Core' => $baseDir . '/src/Cms/Core.php', 'Kirby\\Cms\\Email' => $baseDir . '/src/Cms/Email.php', 'Kirby\\Cms\\Event' => $baseDir . '/src/Cms/Event.php', @@ -88,6 +87,7 @@ 'Kirby\\Cms\\Item' => $baseDir . '/src/Cms/Item.php', 'Kirby\\Cms\\Items' => $baseDir . '/src/Cms/Items.php', 'Kirby\\Cms\\Language' => $baseDir . '/src/Cms/Language.php', + 'Kirby\\Cms\\LanguagePermissions' => $baseDir . '/src/Cms/LanguagePermissions.php', 'Kirby\\Cms\\LanguageRouter' => $baseDir . '/src/Cms/LanguageRouter.php', 'Kirby\\Cms\\LanguageRoutes' => $baseDir . '/src/Cms/LanguageRoutes.php', 'Kirby\\Cms\\LanguageRules' => $baseDir . '/src/Cms/LanguageRules.php', @@ -102,7 +102,6 @@ 'Kirby\\Cms\\LicenseType' => $baseDir . '/src/Cms/LicenseType.php', 'Kirby\\Cms\\Loader' => $baseDir . '/src/Cms/Loader.php', 'Kirby\\Cms\\Media' => $baseDir . '/src/Cms/Media.php', - 'Kirby\\Cms\\Model' => $baseDir . '/src/Cms/Model.php', 'Kirby\\Cms\\ModelPermissions' => $baseDir . '/src/Cms/ModelPermissions.php', 'Kirby\\Cms\\ModelWithContent' => $baseDir . '/src/Cms/ModelWithContent.php', 'Kirby\\Cms\\Nest' => $baseDir . '/src/Cms/Nest.php', @@ -359,7 +358,6 @@ 'Kirby\\Toolkit\\Locale' => $baseDir . '/src/Toolkit/Locale.php', 'Kirby\\Toolkit\\Obj' => $baseDir . '/src/Toolkit/Obj.php', 'Kirby\\Toolkit\\Pagination' => $baseDir . '/src/Toolkit/Pagination.php', - 'Kirby\\Toolkit\\Properties' => $baseDir . '/src/Toolkit/Properties.php', 'Kirby\\Toolkit\\Silo' => $baseDir . '/src/Toolkit/Silo.php', 'Kirby\\Toolkit\\Str' => $baseDir . '/src/Toolkit/Str.php', 'Kirby\\Toolkit\\SymmetricCrypto' => $baseDir . '/src/Toolkit/SymmetricCrypto.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b7d89a1959..d8487410a8 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -183,7 +183,6 @@ class ComposerStaticInit0bf5c8a9cfa251a218fc581ac888fe35 'Kirby\\Cms\\Blueprint' => __DIR__ . '/../..' . '/src/Cms/Blueprint.php', 'Kirby\\Cms\\Collection' => __DIR__ . '/../..' . '/src/Cms/Collection.php', 'Kirby\\Cms\\Collections' => __DIR__ . '/../..' . '/src/Cms/Collections.php', - 'Kirby\\Cms\\ContentLocks' => __DIR__ . '/../..' . '/src/Cms/ContentLocks.php', 'Kirby\\Cms\\Core' => __DIR__ . '/../..' . '/src/Cms/Core.php', 'Kirby\\Cms\\Email' => __DIR__ . '/../..' . '/src/Cms/Email.php', 'Kirby\\Cms\\Event' => __DIR__ . '/../..' . '/src/Cms/Event.php', @@ -209,6 +208,7 @@ class ComposerStaticInit0bf5c8a9cfa251a218fc581ac888fe35 'Kirby\\Cms\\Item' => __DIR__ . '/../..' . '/src/Cms/Item.php', 'Kirby\\Cms\\Items' => __DIR__ . '/../..' . '/src/Cms/Items.php', 'Kirby\\Cms\\Language' => __DIR__ . '/../..' . '/src/Cms/Language.php', + 'Kirby\\Cms\\LanguagePermissions' => __DIR__ . '/../..' . '/src/Cms/LanguagePermissions.php', 'Kirby\\Cms\\LanguageRouter' => __DIR__ . '/../..' . '/src/Cms/LanguageRouter.php', 'Kirby\\Cms\\LanguageRoutes' => __DIR__ . '/../..' . '/src/Cms/LanguageRoutes.php', 'Kirby\\Cms\\LanguageRules' => __DIR__ . '/../..' . '/src/Cms/LanguageRules.php', @@ -223,7 +223,6 @@ class ComposerStaticInit0bf5c8a9cfa251a218fc581ac888fe35 'Kirby\\Cms\\LicenseType' => __DIR__ . '/../..' . '/src/Cms/LicenseType.php', 'Kirby\\Cms\\Loader' => __DIR__ . '/../..' . '/src/Cms/Loader.php', 'Kirby\\Cms\\Media' => __DIR__ . '/../..' . '/src/Cms/Media.php', - 'Kirby\\Cms\\Model' => __DIR__ . '/../..' . '/src/Cms/Model.php', 'Kirby\\Cms\\ModelPermissions' => __DIR__ . '/../..' . '/src/Cms/ModelPermissions.php', 'Kirby\\Cms\\ModelWithContent' => __DIR__ . '/../..' . '/src/Cms/ModelWithContent.php', 'Kirby\\Cms\\Nest' => __DIR__ . '/../..' . '/src/Cms/Nest.php', @@ -480,7 +479,6 @@ class ComposerStaticInit0bf5c8a9cfa251a218fc581ac888fe35 'Kirby\\Toolkit\\Locale' => __DIR__ . '/../..' . '/src/Toolkit/Locale.php', 'Kirby\\Toolkit\\Obj' => __DIR__ . '/../..' . '/src/Toolkit/Obj.php', 'Kirby\\Toolkit\\Pagination' => __DIR__ . '/../..' . '/src/Toolkit/Pagination.php', - 'Kirby\\Toolkit\\Properties' => __DIR__ . '/../..' . '/src/Toolkit/Properties.php', 'Kirby\\Toolkit\\Silo' => __DIR__ . '/../..' . '/src/Toolkit/Silo.php', 'Kirby\\Toolkit\\Str' => __DIR__ . '/../..' . '/src/Toolkit/Str.php', 'Kirby\\Toolkit\\SymmetricCrypto' => __DIR__ . '/../..' . '/src/Toolkit/SymmetricCrypto.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 48a89fc4bf..aef3f184c7 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -328,17 +328,17 @@ }, { "name": "laminas/laminas-escaper", - "version": "2.14.0", - "version_normalized": "2.14.0.0", + "version": "2.15.0", + "version_normalized": "2.15.0.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "0f7cb975f4443cf22f33408925c231225cfba8cb" + "reference": "c612b0488ae486284c39885efca494c180f16351" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/0f7cb975f4443cf22f33408925c231225cfba8cb", - "reference": "0f7cb975f4443cf22f33408925c231225cfba8cb", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/c612b0488ae486284c39885efca494c180f16351", + "reference": "c612b0488ae486284c39885efca494c180f16351", "shasum": "" }, "require": { @@ -350,14 +350,14 @@ "zendframework/zend-escaper": "*" }, "require-dev": { - "infection/infection": "^0.27.9", - "laminas/laminas-coding-standard": "~3.0.0", + "infection/infection": "^0.27.11", + "laminas/laminas-coding-standard": "~3.0.1", "maglnet/composer-require-checker": "^3.8.0", - "phpunit/phpunit": "^9.6.16", + "phpunit/phpunit": "^9.6.22", "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.21.1" + "vimeo/psalm": "^5.26.1" }, - "time": "2024-10-24T10:12:53+00:00", + "time": "2024-12-17T19:39:54+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 07455de25b..ebf3e7e503 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'getkirby/cms', - 'pretty_version' => '5.0.0-beta.1', - 'version' => '5.0.0.0-beta1', - 'reference' => null, + 'pretty_version' => '5.0.0-beta.2', + 'version' => '5.0.0.0-beta2', + 'reference' => NULL, 'type' => 'kirby-cms', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -47,9 +47,9 @@ 'dev_requirement' => false, ), 'getkirby/cms' => array( - 'pretty_version' => '5.0.0-beta.1', - 'version' => '5.0.0.0-beta1', - 'reference' => null, + 'pretty_version' => '5.0.0-beta.2', + 'version' => '5.0.0.0-beta2', + 'reference' => NULL, 'type' => 'kirby-cms', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -65,9 +65,9 @@ 'dev_requirement' => false, ), 'laminas/laminas-escaper' => array( - 'pretty_version' => '2.14.0', - 'version' => '2.14.0.0', - 'reference' => '0f7cb975f4443cf22f33408925c231225cfba8cb', + 'pretty_version' => '2.15.0', + 'version' => '2.15.0.0', + 'reference' => 'c612b0488ae486284c39885efca494c180f16351', 'type' => 'library', 'install_path' => __DIR__ . '/../laminas/laminas-escaper', 'aliases' => array(), diff --git a/vendor/laminas/laminas-escaper/composer.json b/vendor/laminas/laminas-escaper/composer.json index 38f386956a..c9e65710ea 100644 --- a/vendor/laminas/laminas-escaper/composer.json +++ b/vendor/laminas/laminas-escaper/composer.json @@ -34,12 +34,12 @@ "ext-mbstring": "*" }, "require-dev": { - "infection/infection": "^0.27.9", - "laminas/laminas-coding-standard": "~3.0.0", + "infection/infection": "^0.27.11", + "laminas/laminas-coding-standard": "~3.0.1", "maglnet/composer-require-checker": "^3.8.0", - "phpunit/phpunit": "^9.6.16", + "phpunit/phpunit": "^9.6.22", "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.21.1" + "vimeo/psalm": "^5.26.1" }, "autoload": { "psr-4": { diff --git a/vendor/laminas/laminas-escaper/src/Escaper.php b/vendor/laminas/laminas-escaper/src/Escaper.php index c4964cb55e..1e5bc7f9fa 100644 --- a/vendor/laminas/laminas-escaper/src/Escaper.php +++ b/vendor/laminas/laminas-escaper/src/Escaper.php @@ -25,6 +25,8 @@ /** * Context specific methods for use in secure output escaping + * + * @final */ class Escaper { @@ -49,7 +51,7 @@ class Escaper * Current encoding for escaping. If not UTF-8, we convert strings from this encoding * pre-escaping and back to this encoding post-escaping. * - * @var string + * @var non-empty-string */ protected $encoding = 'utf-8'; @@ -88,7 +90,7 @@ class Escaper /** * List of all encoding supported by this class * - * @var array + * @var list */ protected $supportedEncodings = [ 'iso-8859-1', @@ -131,6 +133,7 @@ class Escaper * Constructor: Single parameter allows setting of global encoding for use by * the current object. * + * @param non-empty-string|null $encoding * @throws Exception\InvalidArgumentException */ public function __construct(?string $encoding = null) @@ -159,25 +162,19 @@ public function __construct(?string $encoding = null) // set matcher callbacks $this->htmlAttrMatcher = /** @param array $matches */ - function (array $matches): string { - return $this->htmlAttrMatcher($matches); - }; + fn(array $matches): string => $this->htmlAttrMatcher($matches); $this->jsMatcher = /** @param array $matches */ - function (array $matches): string { - return $this->jsMatcher($matches); - }; + fn(array $matches): string => $this->jsMatcher($matches); $this->cssMatcher = /** @param array $matches */ - function (array $matches): string { - return $this->cssMatcher($matches); - }; + fn(array $matches): string => $this->cssMatcher($matches); } /** * Return the encoding that all output/input is expected to be encoded in. * - * @return string + * @return non-empty-string */ public function getEncoding() { @@ -188,7 +185,7 @@ public function getEncoding() * Escape a string for the HTML Body context where there are very few characters * of special meaning. Internally this will use htmlspecialchars(). * - * @return string + * @return ($string is non-empty-string ? non-empty-string : string) */ public function escapeHtml(string $string) { @@ -200,7 +197,7 @@ public function escapeHtml(string $string) * to escape that are not covered by htmlspecialchars() to cover cases where an attribute * might be unquoted or quoted illegally (e.g. backticks are valid quotes for IE). * - * @return string + * @return ($string is non-empty-string ? non-empty-string : string) */ public function escapeHtmlAttr(string $string) { @@ -222,7 +219,7 @@ public function escapeHtmlAttr(string $string) * Backslash escaping is not used as it still leaves the escaped character as-is and so * is not useful in a HTML context. * - * @return string + * @return ($string is non-empty-string ? non-empty-string : string) */ public function escapeJs(string $string) { @@ -240,7 +237,7 @@ public function escapeJs(string $string) * an entire URI - only a subcomponent being inserted. The function is a simple proxy * to rawurlencode() which now implements RFC 3986 since PHP 5.3 completely. * - * @return string + * @return ($string is non-empty-string ? non-empty-string : string) */ public function escapeUrl(string $string) { @@ -251,7 +248,7 @@ public function escapeUrl(string $string) * Escape a string for the CSS context. CSS escaping can be applied to any string being * inserted into CSS and escapes everything except alphanumerics. * - * @return string + * @return ($string is non-empty-string ? non-empty-string : string) */ public function escapeCss(string $string) {