Merge pull request #49 from splorp/k5

K5

Author: splorp

content/04_changes/changes.txt

@@ -18,6 +18,17 @@ Incremental changes are listed in the project’s [commit history](https://githu
 
 Recently added terms and sources can be found on the (link: /latest text: Latest Additions) page.
 
+### _$r
+
+Terms: _$t
+Sources: _$s
+
+#### Summary of changes:
+
++ Updated [Kirby](https://getkirby.com/) to version [5.0.0](https://github.com/getkirby/kirby/releases/tag/5.0.0)
++ Updated [Kirby Paperback Export](https://github.com/splorp/kirby-paperback-export) plugin to version [2.0.7](https://github.com/splorp/kirby-paperback-export/releases/tag/2.0.7)
++ Updated [Kirby Redirects](https://github.com/bnomei/kirby3-redirects) plugin to version [5.0.0](https://github.com/bnomei/kirby3-redirects/releases/tag/v5.0.0)
+
 ### 4.6.0
 
 25 June 2025

content/site.txt

@@ -161,4 +161,4 @@ Powered by (link: https://getkirby.com/ text: Kirby title: The CMS that adapts t
 
 ----
 
-Version: 4.6.0
+Release: 5.0.0

kirby/bootstrap.php

@@ -5,7 +5,7 @@
  * stop at older or too recent versions
  */
 if (
-	version_compare(PHP_VERSION, '8.1.0', '>=') === false ||
+	version_compare(PHP_VERSION, '8.2.0', '>=') === false ||
 	version_compare(PHP_VERSION, '8.5.0', '<')  === false
 ) {
 	die(include __DIR__ . '/views/php.php');
@@ -27,10 +27,9 @@
 	 * @psalm-suppress MissingFile
 	 */
 	include $autoloader;
-} else {
-	/**
-	 * If neither one exists, don't bother searching;
-	 * it's a custom directory setup and the users need to
-	 * load the autoloader themselves
-	 */
 }
+/**
+ * If neither one exists, don't bother searching;
+ * it's a custom directory setup and the users need to
+ * load the autoloader themselves
+ */

kirby/composer.json

@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "4.8.0",
+	"version": "5.0.0",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -24,7 +24,7 @@
 		"source": "https://github.com/getkirby/kirby"
 	},
 	"require": {
-		"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+		"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
 		"ext-SimpleXML": "*",
 		"ext-ctype": "*",
 		"ext-curl": "*",
@@ -39,14 +39,14 @@
 		"christian-riesen/base32": "1.6.0",
 		"claviska/simpleimage": "4.2.1",
 		"composer/semver": "3.4.3",
-		"filp/whoops": "2.18.0",
+		"filp/whoops": "2.18.3",
 		"getkirby/composer-installer": "^1.2.1",
 		"laminas/laminas-escaper": "2.17.0",
 		"michelf/php-smartypants": "1.8.1",
 		"phpmailer/phpmailer": "6.10.0",
 		"symfony/polyfill-intl-idn": "1.32.0",
 		"symfony/polyfill-mbstring": "1.32.0",
-		"symfony/yaml": "6.4.21"
+		"symfony/yaml": "7.3.0"
 	},
 	"replace": {
 		"symfony/polyfill-php72": "*"
@@ -58,6 +58,7 @@
 		"ext-fileinfo": "Improved mime type detection for files",
 		"ext-intl": "Improved i18n number formatting",
 		"ext-memcached": "Support for the Memcached cache driver",
+		"ext-redis": "Support for the Redis cache driver",
 		"ext-sodium": "Support for the crypto class and more robust session handling",
 		"ext-zip": "Support for ZIP archive file functions",
 		"ext-zlib": "Sanitization and validation for svgz files"
@@ -80,7 +81,7 @@
 		},
 		"optimize-autoloader": true,
 		"platform": {
-			"php": "8.1.0"
+			"php": "8.2.0"
 		},
 		"platform-check": false
 	},

kirby/composer.lock

@@ -75,14 +75,16 @@
 	// Any of these might be removed at any point in the future
 	'kirby\cms\asset'              => 'Kirby\Filesystem\Asset',
 	'kirby\cms\content'            => 'Kirby\Content\Content',
-	'kirby\cms\contenttranslation' => 'Kirby\Content\ContentTranslation',
 	'kirby\cms\dir'                => 'Kirby\Filesystem\Dir',
 	'kirby\cms\filename'           => 'Kirby\Filesystem\Filename',
 	'kirby\cms\filefoundation'     => 'Kirby\Filesystem\IsFile',
 	'kirby\cms\field'              => 'Kirby\Content\Field',
 	'kirby\cms\form'               => 'Kirby\Form\Form',
 	'kirby\cms\kirbytag'           => 'Kirby\Text\KirbyTag',
 	'kirby\cms\kirbytags'          => 'Kirby\Text\KirbyTags',
+	'kirby\cms\plugin'             => 'Kirby\Plugin\Plugin',
+	'kirby\cms\pluginasset'        => 'Kirby\Plugin\Asset',
+	'kirby\cms\pluginassets'       => 'Kirby\Plugin\Assets',
 	'kirby\cms\template'           => 'Kirby\Template\Template',
 	'kirby\form\options'           => 'Kirby\Option\Options',
 	'kirby\form\optionsapi'        => 'Kirby\Option\OptionsApi',

kirby/config/aliases.php

@@ -11,17 +11,17 @@
 		$auth->type($allowImpersonation) === 'session' &&
 		$auth->csrf() === false
 	) {
-		throw new AuthException('Unauthenticated');
+		throw new AuthException(message: 'Unauthenticated');
 	}
 
 	// get user from session or basic auth
 	if ($user = $auth->user(null, $allowImpersonation)) {
 		if ($user->role()->permissions()->for('access', 'panel') === false) {
-			throw new AuthException(['key' => 'access.panel']);
+			throw new AuthException(key: 'access.panel');
 		}
 
 		return $user;
 	}
 
-	throw new AuthException('Unauthenticated');
+	throw new AuthException(message: 'Unauthenticated');
 };

kirby/config/api/authentication.php

@@ -4,25 +4,25 @@
  * Api Routes Definitions
  */
 return function ($kirby) {
-	$routes = array_merge(
-		include __DIR__ . '/routes/auth.php',
-		include __DIR__ . '/routes/pages.php',
-		include __DIR__ . '/routes/roles.php',
-		include __DIR__ . '/routes/site.php',
-		include __DIR__ . '/routes/users.php',
-		include __DIR__ . '/routes/files.php',
-		include __DIR__ . '/routes/lock.php',
-		include __DIR__ . '/routes/system.php',
-		include __DIR__ . '/routes/translations.php'
-	);
+	$routes = [
+		...include __DIR__ . '/routes/auth.php',
+		...include __DIR__ . '/routes/changes.php',
+		...include __DIR__ . '/routes/pages.php',
+		...include __DIR__ . '/routes/roles.php',
+		...include __DIR__ . '/routes/site.php',
+		...include __DIR__ . '/routes/users.php',
+		...include __DIR__ . '/routes/files.php',
+		...include __DIR__ . '/routes/system.php',
+		...include __DIR__ . '/routes/translations.php'
+	];
 
 	// only add the language routes if the
 	// multi language setup is activated
 	if ($kirby->option('languages', false) !== false) {
-		$routes = array_merge(
-			$routes,
-			include __DIR__ . '/routes/languages.php'
-		);
+		$routes = [
+			...$routes,
+			...include __DIR__ . '/routes/languages.php'
+		];
 	}
 
 	return $routes;

kirby/config/api/routes.php

@@ -15,7 +15,9 @@
 				return $this->resolve($user)->view('auth');
 			}
 
-			throw new NotFoundException('The user cannot be found');
+			throw new NotFoundException(
+				message: 'The user cannot be found'
+			);
 		}
 	],
 	[
@@ -27,7 +29,9 @@
 
 			// csrf token check
 			if ($auth->type() === 'session' && $auth->csrf() === false) {
-				throw new InvalidArgumentException('Invalid CSRF token');
+				throw new InvalidArgumentException(
+					message: 'Invalid CSRF token'
+				);
 			}
 
 			$user = $auth->verifyChallenge($this->requestBody('code'));
@@ -49,7 +53,9 @@
 
 			// csrf token check
 			if ($auth->type() === 'session' && $auth->csrf() === false) {
-				throw new InvalidArgumentException('Invalid CSRF token');
+				throw new InvalidArgumentException(
+					message: 'Invalid CSRF token'
+				);
 			}
 
 			$email    = $this->requestBody('email');
@@ -58,7 +64,9 @@
 
 			if ($password) {
 				if (isset($methods['password']) !== true) {
-					throw new InvalidArgumentException('Login with password is not enabled');
+					throw new InvalidArgumentException(
+						message: 'Login with password is not enabled'
+					);
 				}
 
 				if (
@@ -73,7 +81,9 @@
 				$mode = match (true) {
 					isset($methods['code']) 		  => 'login',
 					isset($methods['password-reset']) => 'password-reset',
-					default => throw new InvalidArgumentException('Login without password is not enabled')
+					default => throw new InvalidArgumentException(
+						message: 'Login without password is not enabled'
+					)
 				};
 
 				$status = $auth->createChallenge($email, $long, $mode);

kirby/config/api/routes/auth.php

@@ -0,0 +1,37 @@
+<?php
+
+use Kirby\Api\Controller\Changes;
+use Kirby\Cms\App;
+use Kirby\Cms\Find;
+
+return [
+	[
+		'pattern' => '(:all)/changes/discard',
+		'method'  => 'POST',
+		'action'  => function (string $path) {
+			return Changes::discard(
+				model: Find::parent($path),
+			);
+		}
+	],
+	[
+		'pattern' => '(:all)/changes/publish',
+		'method'  => 'POST',
+		'action'  => function (string $path) {
+			return Changes::publish(
+				model: Find::parent($path),
+				input: App::instance()->request()->get()
+			);
+		}
+	],
+	[
+		'pattern' => '(:all)/changes/save',
+		'method'  => 'POST',
+		'action'  => function (string $path) {
+			return Changes::save(
+				model: Find::parent($path),
+				input: App::instance()->request()->get()
+			);
+		}
+	],
+];