bastianallgeier · Oct 14, 2026 · Oct 14, 2026 · Oct 15, 2026 · Oct 15, 2026 · Oct 26, 2026
diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
     "source": "https://github.com/getkirby/plainkit"
   },
   "require": {
-    "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
-    "getkirby/cms": "^5.2"
+    "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
+    "getkirby/cms": "^6.0.0-beta.1"
   },
   "config": {
     "allow-plugins": {

diff --git a/content/error/error.txt b/content/error/error.txt
@@ -1 +1,5 @@
-Title: Error
+Title: Error
+
+----
+
+Uuid: dqiognp770t85fkb
diff --git a/content/home/home.txt b/content/home/home.txt
@@ -1 +1,5 @@
-Title: Home
+Title: Home
+
+----
+
+Uuid: nmr3oz1rok707lxb
diff --git a/kirby/.php-cs-fixer.types.php b/kirby/.php-cs-fixer.types.php
@@ -0,0 +1,30 @@
+<?php
+
+use PhpCsFixer\Finder;
+
+/**
+ * Shortens fully qualified class names in type declarations and docblocks
+ * to the imported or same-namespace name.
+ *
+ * This runs as a second pass on top of `.php-cs-fixer.dist.php`, because
+ * PHP CS Fixer applies one rule set per run and the rule must not reach
+ * templates, snippets and fixtures: those run in the global namespace,
+ * where the fixer would inject a `use` statement into the middle of the
+ * script instead of adding it to a header.
+ */
+
+$config = require __DIR__ . '/.php-cs-fixer.dist.php';
+
+$finder = Finder::create()
+	->in([__DIR__ . '/src', __DIR__ . '/tests'])
+	->filter(
+		fn ($file) => preg_match('/^namespace\s/m', $file->getContents()) === 1
+	);
+
+return $config
+	->setRules([
+		...$config->getRules(),
+		'fully_qualified_strict_types' => ['import_symbols' => true]
+	])
+	->setCacheFile('.php-cs-fixer.types.cache')
+	->setFinder($finder);
diff --git a/kirby/CHANGELOG.md b/kirby/CHANGELOG.md
diff --git a/kirby/CONTRIBUTING.md b/kirby/CONTRIBUTING.md
@@ -100,9 +100,9 @@ We use an [`.editorconfig`](https://editorconfig.org) file to enforce basic form
 
 We use [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to ensure a consistent style for our PHP code. It is mainly based on [PSR-12](https://www.php-fig.org/psr/psr-12/). Run `composer fix` in the `kirby` folder to check for inconsistencies and fix them (this runs PHP CS Fixer through [`cpx`](#development-setup), no separate installation needed). Our automated PR checks will fail if there are code style issues with your code.
 
-#### Frontend/Panel (JavaScript, Vue)
+#### Frontend/Panel (JavaScript, TypeScript, Vue)
 
-We use [Prettier](https://prettier.io) to ensure a consistent style for our JavaScript and Vue code. After running `npm install` in the `kirby/panel` folder, you can run `npm run format` to check for inconsistencies and fix them. We also use [ESLint](https://eslint.org) which you can use by running `npm run lint` and/or `npm run lint:fix`.
+We use [Oxfmt](https://oxc.rs/docs/guide/usage/formatter) to ensure a consistent style for our JavaScript, TypeScript and Vue code. After running `npm install` in the `kirby/panel` folder, you can run `npm run format` to check for inconsistencies and `npm run format:fix` to fix them. We also use [ESLint](https://eslint.org) which you can use by running `npm run lint` and/or `npm run lint:fix`.
 
 ### Documentation
 

diff --git a/kirby/bootstrap.php b/kirby/bootstrap.php
@@ -19,7 +19,7 @@
 		defined('KIRBY_PHP_VERSION_CHECK') !== true ||
 		KIRBY_PHP_VERSION_CHECK !== false
 	) && (
-		version_compare(PHP_VERSION, '8.2.0', '>=') === false ||
+		version_compare(PHP_VERSION, '8.3.0', '>=') === false ||
 		version_compare(PHP_VERSION, '8.6.0', '<')  === false
 	)
 ) {

diff --git a/kirby/cacert.pem b/kirby/cacert.pem
diff --git a/kirby/composer.json b/kirby/composer.json
@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "5.6.1",
+	"version": "6.0.0-beta.2",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -24,7 +24,7 @@
 		"source": "https://github.com/getkirby/kirby"
 	},
 	"require": {
-		"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+		"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
 		"ext-ctype": "*",
 		"ext-curl": "*",
 		"ext-dom": "*",
@@ -36,22 +36,20 @@
 		"ext-mbstring": "*",
 		"ext-openssl": "*",
 		"ext-simplexml": "*",
-		"christian-riesen/base32": "1.6.0",
-		"claviska/simpleimage": "4.4.0",
-		"composer/semver": "3.5.1",
+		"christian-riesen/base32": "2.0.1",
+		"claviska/simpleimage": "4.4.2",
+		"composer/semver": "3.5.2",
 		"erusev/parsedown": "1.8.0",
 		"erusev/parsedown-extra": "0.9.0",
-		"filp/whoops": "2.18.6",
+		"filp/whoops": "2.18.7",
 		"getkirby/composer-installer": "^1.2.1",
 		"laminas/laminas-escaper": "2.18.0",
+		"lbuchs/webauthn": "^2.2",
 		"michelf/php-smartypants": "1.8.1",
 		"phpmailer/phpmailer": "7.1.1",
 		"symfony/polyfill-intl-idn": "1.43.0",
 		"symfony/polyfill-mbstring": "1.43.0",
-		"symfony/yaml": "7.4.20"
-	},
-	"replace": {
-		"symfony/polyfill-php72": "*"
+		"symfony/yaml": "7.4.21"
 	},
 	"suggest": {
 		"ext-apcu": "Support for the Apcu cache driver",
@@ -96,16 +94,20 @@
 			"@analyze:psalm"
 		],
 		"analyze:composer": "composer validate --strict --no-check-version --no-check-all",
-		"analyze:composer:unused": "./scripts/cpx icanhazstring/composer-unused:0.9.6 --no-progress",
-		"analyze:psalm": "./scripts/cpx vimeo/psalm:6.16.1",
-		"build": "./scripts/build",
+		"analyze:composer:unused": "cpx icanhazstring/composer-unused:0.9.6 --no-progress",
+		"analyze:psalm": "cpx vimeo/psalm:6.16.1",
 		"ci": [
 			"@fix",
 			"@analyze",
 			"@test"
 		],
-		"fix": "./scripts/cpx friendsofphp/php-cs-fixer:3.95.1 fix",
-		"test": "./scripts/cpx phpunit/phpunit:11.5.55",
+		"fix": [
+			"@fix:style",
+			"@fix:types"
+		],
+		"fix:style": "cpx friendsofphp/php-cs-fixer:3.95.3 fix",
+		"fix:types": "cpx friendsofphp/php-cs-fixer:3.95.3 fix --config=.php-cs-fixer.types.php",
+		"test": "cpx brianium/paratest:7.20.0",
 		"test:coverage": [
 			"@putenv XDEBUG_MODE=coverage",
 			"@test --coverage-html=tests/coverage"