Skip to content

Commit b1b3f44

Browse files
Merge pull request #6696 from getkirby/release/5.0.0-alpha.3
5.0.0-alpha.3
2 parents af1da17 + 920373e commit b1b3f44

35 files changed

+229
-128
lines changed

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "The Kirby core",
44
"license": "proprietary",
55
"type": "kirby-cms",
6-
"version": "5.0.0-alpha.2",
6+
"version": "5.0.0-alpha.3",
77
"keywords": [
88
"kirby",
99
"cms",
@@ -38,15 +38,15 @@
3838
"ext-openssl": "*",
3939
"christian-riesen/base32": "1.6.0",
4040
"claviska/simpleimage": "4.2.0",
41-
"composer/semver": "3.4.2",
41+
"composer/semver": "3.4.3",
4242
"filp/whoops": "2.15.4",
4343
"getkirby/composer-installer": "^1.2.1",
4444
"laminas/laminas-escaper": "2.13.0",
4545
"michelf/php-smartypants": "1.8.1",
4646
"phpmailer/phpmailer": "6.9.1",
47-
"symfony/polyfill-intl-idn": "1.30.0",
48-
"symfony/polyfill-mbstring": "1.30.0",
49-
"symfony/yaml": "7.1.4"
47+
"symfony/polyfill-intl-idn": "1.31.0",
48+
"symfony/polyfill-mbstring": "1.31.0",
49+
"symfony/yaml": "7.1.5"
5050
},
5151
"replace": {
5252
"symfony/polyfill-php72": "*"

composer.lock

+30-31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

i18n/translations/ko.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@
126126
"error.form.notSaved": "항목을 저장할 수 없습니다.",
127127

128128
"error.language.code": "올바른 언어 코드를 입력하세요.",
129-
"error.language.create.permission": "You are not allowed to create a language",
130-
"error.language.delete.permission": "You are not allowed to delete the language",
129+
"error.language.create.permission": "언어를 등록할 권한이 없습니다.",
130+
"error.language.delete.permission": "언어를 삭제할 권한이 없습니다.",
131131
"error.language.duplicate": "이미 등록한 언어입니다.",
132132
"error.language.name": "올바른 언어명을 입력하세요.",
133133
"error.language.notFound": "언어를 찾을 수 없습니다.",
134-
"error.language.update.permission": "You are not allowed to update the language",
134+
"error.language.update.permission": "언어를 변경할 권한이 없습니다.",
135135

136136
"error.layout.validation.block": "레이아웃({layoutIndex})의 특정 블록 유형({fieldset})을 사용하는 블록({blockIndex})의 특정 필드({field})에 오류가 있습니다.",
137137
"error.layout.validation.settings": "레이아웃({index}) 옵션을 확인하세요.",
@@ -620,8 +620,8 @@
620620
"stats.empty": "관련 기록이 없습니다.",
621621
"status": "상태",
622622

623-
"system.info.copy": "Copy info",
624-
"system.info.copied": "System info copied",
623+
"system.info.copy": "정보 복사",
624+
"system.info.copied": "시스템 정보가 복사되었습니다.",
625625
"system.issues.content": "<code>/content</code> 폴더의 권한을 확인하세요.",
626626
"system.issues.eol.kirby": "설치된 Kirby 버전이 만료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.",
627627
"system.issues.eol.plugin": "설치된 플러그인({plugin}의 지원이 종료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.",

panel/dist/css/style.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

panel/dist/img/icons.svg

+3
Loading

panel/dist/js/index.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

panel/dist/js/vendor.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

panel/dist/ui/AudioFilePreview.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"description":"File view preview for audio files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"AudioFilePreview","props":[{"name":"details","type":{"name":"array"}},{"name":"url","type":{"name":"string"}}],"component":"k-audio-file-preview","sourceFile":"src/components/Views/Files/AudioFilePreview.vue"}

panel/dist/ui/DefaultFilePreview.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"description":"General file view preview for files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"DefaultFilePreview","props":[{"name":"details","type":{"name":"array"}},{"name":"image","type":{"name":"object"},"defaultValue":{"value":"{}"}}],"component":"k-default-file-preview","sourceFile":"src/components/Views/Files/DefaultFilePreview.vue"}

panel/dist/ui/FieldsSection.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"displayName":"FieldsSection","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"help","type":{"name":"string"}},{"name":"name","type":{"name":"string"}},{"name":"parent","type":{"name":"string"}},{"name":"timestamp","type":{"name":"number"}}],"component":"k-fields-section","sourceFile":"src/components/Sections/FieldsSection.vue"}
1+
{"displayName":"FieldsSection","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"help","type":{"name":"string"}},{"name":"name","type":{"name":"string"}},{"name":"parent","type":{"name":"string"}},{"name":"timestamp","type":{"name":"number"}},{"name":"content","type":{"name":"object"}}],"events":[{"name":"input"},{"name":"submit"}],"component":"k-fields-section","sourceFile":"src/components/Sections/FieldsSection.vue"}

panel/dist/ui/FilePreview.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"displayName":"FilePreview","description":"","tags":{},"props":[{"name":"details","type":{"name":"array"},"defaultValue":{"value":"[]"}},{"name":"focus","type":{"name":"object"}},{"name":"focusable","type":{"name":"boolean"}},{"name":"image","type":{"name":"object"},"defaultValue":{"value":"{}"}},{"name":"url","type":{"name":"string"}}],"events":[{"name":"focus","type":{"names":["undefined"]}}],"component":"k-file-preview","sourceFile":"src/components/Views/Files/FilePreview.vue"}
1+
{"description":"Wrapper for file view previews","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"FilePreview","props":[{"name":"component","type":{"name":"string"}},{"name":"content","type":{"name":"object"}},{"name":"props","type":{"name":"object"}}],"events":[{"name":"input"},{"name":"submit"}],"component":"k-file-preview","sourceFile":"src/components/Views/Files/FilePreview.vue"}

panel/dist/ui/FilePreviewDetails.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"description":"","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"FilePreviewDetails","props":[{"name":"details","type":{"name":"array"},"defaultValue":{"value":"[]"}}],"slots":[{"name":"default"}],"component":"k-file-preview-details","sourceFile":"src/components/Views/Files/FilePreviewDetails.vue"}

panel/dist/ui/FilePreviewFrame.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"description":"","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"FilePreviewFrame","props":[{"name":"options","type":{"name":"array"},"defaultValue":{"value":"[]"}}],"events":[{"name":"action"}],"slots":[{"name":"default"}],"component":"k-file-preview-frame","sourceFile":"src/components/Views/Files/FilePreviewFrame.vue"}

panel/dist/ui/FormButtons.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"displayName":"FormButtons","description":"","tags":{},"component":"k-form-buttons","sourceFile":"src/components/Forms/FormButtons.vue"}
1+
{"displayName":"FormButtons","description":"","tags":{},"events":[{"name":"discard"},{"name":"submit"}],"component":"k-form-buttons","sourceFile":"src/components/Forms/FormButtons.vue"}

panel/dist/ui/ImageFilePreview.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"description":"File view preview for image files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"ImageFilePreview","props":[{"name":"content","type":{"name":"object"}},{"name":"details","type":{"name":"array"}},{"name":"focusable","type":{"name":"boolean"}},{"name":"image","type":{"name":"object"},"defaultValue":{"value":"{}"}},{"name":"url","type":{"name":"string"}}],"events":[{"name":"focus"},{"name":"input","type":{"names":["undefined"]}}],"component":"k-image-file-preview","sourceFile":"src/components/Views/Files/ImageFilePreview.vue"}

panel/dist/ui/Sections.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"displayName":"Sections","description":"","tags":{},"props":[{"name":"empty","type":{"name":"string"}},{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"parent","type":{"name":"string"}},{"name":"tab","type":{"name":"object"}}],"events":[{"name":"submit"}],"component":"k-sections","sourceFile":"src/components/Sections/Sections.vue"}
1+
{"displayName":"Sections","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"content","type":{"name":"object"}},{"name":"empty","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"parent","type":{"name":"string"}},{"name":"tab","type":{"name":"object"}}],"events":[{"name":"input"},{"name":"submit"}],"component":"k-sections","sourceFile":"src/components/Sections/Sections.vue"}

panel/dist/ui/VideoFilePreview.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"description":"File view preview for video files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"VideoFilePreview","props":[{"name":"details","type":{"name":"array"}},{"name":"url","type":{"name":"string"}}],"component":"k-video-file-preview","sourceFile":"src/components/Views/Files/VideoFilePreview.vue"}

panel/src/components/Misc/OfflineWarning.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div v-if="$panel.isOffline" class="k-offline-warning">
2+
<div v-if="!$panel.system.isLocal && $panel.isOffline" class="k-offline-warning">
33
<p><k-icon type="bolt" /> {{ $t("error.offline") }}</p>
44
</div>
55
</template>

src/Cms/Auth.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public function impersonate(string|null $who = null): User|null
343343
'id' => 'nobody',
344344
'role' => 'nobody',
345345
]),
346-
default => $this->kirby->users()->find($who) ?? throw new NotFoundException(message: 'The user "' . $who . '" cannot be found')
346+
default => $this->kirby->users()->find($who) ?? throw new NotFoundException(message: 'The user "' . $who . '" cannot be found'),
347347
};
348348
}
349349

src/Content/PlainTextContentStorageHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function exists(VersionId $versionId, Language $language): bool
202202
// @codeCoverageIgnoreStart
203203
default => throw new LogicException(
204204
message: 'Cannot determine existence for model type "' . $this->model::CLASS_ALIAS . '"'
205-
)
205+
)
206206
// @codeCoverageIgnoreEnd
207207
};
208208
}

tests/Filesystem/FilenameTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ public function testGrayscale($prop, $value, $expected)
290290

291291
/**
292292
* @covers ::name
293+
* @covers ::sanitizeName
293294
*/
294295
public function testName()
295296
{
@@ -299,6 +300,7 @@ public function testName()
299300

300301
/**
301302
* @covers ::name
303+
* @covers ::sanitizeName
302304
*/
303305
public function testNameSanitization()
304306
{
@@ -308,6 +310,7 @@ public function testNameSanitization()
308310

309311
/**
310312
* @covers ::name
313+
* @covers ::sanitizeName
311314
*/
312315
public function testNameSanitizationWithLanguageRules()
313316
{

tests/Text/KirbyTagsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function testParseWithExceptionDebug3()
166166
'undefined' => [
167167
'html' => fn () => throw new InvalidArgumentException(
168168
message: 'Undefined tag type: undefined'
169-
)
169+
)
170170
]
171171
];
172172

0 commit comments

Comments
 (0)