Update to Kirby 4.7.0

kirby/config/api/authentication.php

@@ -1,6 +1,6 @@
 <?php
 
-use Kirby\Exception\PermissionException;
+use Kirby\Exception\AuthException;
 
 return function () {
 	$auth               = $this->kirby()->auth();
@@ -11,17 +11,17 @@ return function () {
 		$auth->type($allowImpersonation) === 'session' &&
 		$auth->csrf() === false
 	) {
-		throw new PermissionException('Unauthenticated');
+		throw new AuthException('Unauthenticated');
 	}
 
 	// get user from session or basic auth
 	if ($user = $auth->user(null, $allowImpersonation)) {
 		if ($user->role()->permissions()->for('access', 'panel') === false) {
-			throw new PermissionException(['key' => 'access.panel']);
+			throw new AuthException(['key' => 'access.panel']);
 		}
 
 		return $user;
 	}
 
-	throw new PermissionException('Unauthenticated');
+	throw new AuthException('Unauthenticated');
 };

kirby/config/api/collections.php

@@ -3,6 +3,14 @@
 /**
  * Api Collection Definitions
  */
+
+use Kirby\Cms\Files;
+use Kirby\Cms\Languages;
+use Kirby\Cms\Pages;
+use Kirby\Cms\Roles;
+use Kirby\Cms\Translations;
+use Kirby\Cms\Users;
+
 return [
 
 	/**
@@ -10,7 +18,7 @@ return [
 	 */
 	'children' => [
 		'model' => 'page',
-		'type'  => 'Kirby\Cms\Pages',
+		'type'  => Pages::class,
 		'view'  => 'compact'
 	],
 
@@ -19,7 +27,7 @@ return [
 	 */
 	'files' => [
 		'model' => 'file',
-		'type'  => 'Kirby\Cms\Files'
+		'type'  => Files::class,
 	],
 
 	/**
@@ -27,7 +35,7 @@ return [
 	 */
 	'languages' => [
 		'model' => 'language',
-		'type'  => 'Kirby\Cms\Languages'
+		'type'  => Languages::class,
 	],
 
 	/**
@@ -35,7 +43,7 @@ return [
 	 */
 	'pages' => [
 		'model' => 'page',
-		'type'  => 'Kirby\Cms\Pages',
+		'type'  => Pages::class,
 		'view'  => 'compact'
 	],
 
@@ -44,7 +52,7 @@ return [
 	 */
 	'roles' => [
 		'model' => 'role',
-		'type'  => 'Kirby\Cms\Roles',
+		'type'  => Roles::class,
 		'view'  => 'compact'
 	],
 
@@ -53,7 +61,7 @@ return [
 	 */
 	'translations' => [
 		'model' => 'translation',
-		'type'  => 'Kirby\Cms\Translations',
+		'type'  => Translations::class,
 		'view'  => 'compact'
 	],
 
@@ -63,7 +71,7 @@ return [
 	'users' => [
 		'default' => fn () => $this->users(),
 		'model'   => 'user',
-		'type'    => 'Kirby\Cms\Users',
+		'type'    => Users::class,
 		'view'    => 'compact'
 	]
 

kirby/config/api/models.php

@@ -8,6 +8,7 @@ return [
 	'FileBlueprint' => include __DIR__ . '/models/FileBlueprint.php',
 	'FileVersion'   => include __DIR__ . '/models/FileVersion.php',
 	'Language'      => include __DIR__ . '/models/Language.php',
+	'License'       => include __DIR__ . '/models/License.php',
 	'Page'          => include __DIR__ . '/models/Page.php',
 	'PageBlueprint' => include __DIR__ . '/models/PageBlueprint.php',
 	'Role'          => include __DIR__ . '/models/Role.php',

kirby/config/api/models/File.php

@@ -59,7 +59,7 @@ return [
 		'url'        => fn (File $file) => $file->url(),
 		'uuid'       => fn (File $file) => $file->uuid()?->toString()
 	],
-	'type'  => 'Kirby\Cms\File',
+	'type'  => File::class,
 	'views' => [
 		'default' => [
 			'content',

kirby/config/api/models/FileBlueprint.php

@@ -12,7 +12,6 @@ return [
 		'tabs'    => fn (FileBlueprint $blueprint) => $blueprint->tabs(),
 		'title'   => fn (FileBlueprint $blueprint) => $blueprint->title(),
 	],
-	'type' => 'Kirby\Cms\FileBlueprint',
-	'views' => [
-	],
+	'type'  => FileBlueprint::class,
+	'views' => [],
 ];

kirby/config/api/models/FileVersion.php

@@ -20,7 +20,7 @@ return [
 		'type'       => fn (FileVersion $file) => $file->type(),
 		'url'        => fn (FileVersion $file) => $file->url(),
 	],
-	'type'  => 'Kirby\Cms\FileVersion',
+	'type'  => FileVersion::class,
 	'views' => [
 		'default' => [
 			'dimensions',

kirby/config/api/models/Language.php

@@ -15,7 +15,7 @@ return [
 		'rules'     => fn (Language $language) => $language->rules(),
 		'url'       => fn (Language $language) => $language->url(),
 	],
-	'type'  => 'Kirby\Cms\Language',
+	'type'  => Language::class,
 	'views' => [
 		'default' => [
 			'code',

kirby/config/api/models/License.php

@@ -0,0 +1,17 @@
+<?php
+
+use Kirby\Cms\License;
+
+/**
+ * Page
+ */
+return [
+	'fields' => [
+		'status' => fn (License $license) => $license->status()->value(),
+		'code'   => function (License $license) {
+			return $this->kirby()->user()->isAdmin() ? $license->code() : $license->code(true);
+		},
+		'type' => fn (License $license) => $license->type()->label(),
+	],
+	'type' => License::class,
+];

kirby/config/api/models/Page.php

@@ -40,7 +40,7 @@ return [
 		'url'      => fn (Page $page) => $page->url(),
 		'uuid'     => fn (Page $page) => $page->uuid()?->toString()
 	],
-	'type' => 'Kirby\Cms\Page',
+	'type' => Page::class,
 	'views' => [
 		'compact' => [
 			'id',

kirby/config/api/models/PageBlueprint.php

@@ -15,7 +15,6 @@ return [
 		'tabs'    => fn (PageBlueprint $blueprint) => $blueprint->tabs(),
 		'title'   => fn (PageBlueprint $blueprint) => $blueprint->title(),
 	],
-	'type' => 'Kirby\Cms\PageBlueprint',
-	'views' => [
-	],
+	'type'  => PageBlueprint::class,
+	'views' => [],
 ];

kirby/config/api/models/Role.php

@@ -12,7 +12,7 @@ return [
 		'permissions' => fn (Role $role) => $role->permissions()->toArray(),
 		'title'       => fn (Role $role) => $role->title(),
 	],
-	'type'  => 'Kirby\Cms\Role',
+	'type'  => Role::class,
 	'views' => [
 		'compact' => [
 			'description',

kirby/config/api/models/Site.php

@@ -19,7 +19,7 @@ return [
 		'title'      => fn (Site $site) => $site->title()->value(),
 		'url'        => fn (Site $site) => $site->url(),
 	],
-	'type' => 'Kirby\Cms\Site',
+	'type' =>  Site::class,
 	'views' => [
 		'compact' => [
 			'title',

kirby/config/api/models/SiteBlueprint.php

@@ -12,6 +12,6 @@ return [
 		'tabs'    => fn (SiteBlueprint $blueprint) => $blueprint->tabs(),
 		'title'   => fn (SiteBlueprint $blueprint) => $blueprint->title(),
 	],
-	'type'  => 'Kirby\Cms\SiteBlueprint',
+	'type'  => SiteBlueprint::class,
 	'views' => [],
 ];

kirby/config/api/models/System.php

@@ -49,7 +49,7 @@ return [
 			return null;
 		}
 	],
-	'type'   => 'Kirby\Cms\System',
+	'type'   => System::class,
 	'views'  => [
 		'login' => [
 			'authStatus',

kirby/config/api/models/Translation.php

@@ -13,7 +13,7 @@ return [
 		'id'        => fn (Translation $translation) => $translation->id(),
 		'name'      => fn (Translation $translation) => $translation->name(),
 	],
-	'type'  => 'Kirby\Cms\Translation',
+	'type'  => Translation::class,
 	'views' => [
 		'compact' => [
 			'direction',

kirby/config/api/models/User.php

@@ -27,7 +27,7 @@ return [
 		'username'    => fn (User $user) => $user->username(),
 		'uuid'        => fn (User $user) => $user->uuid()?->toString()
 	],
-	'type'  => 'Kirby\Cms\User',
+	'type'  => User::class,
 	'views' => [
 		'default' => [
 			'avatar',

kirby/config/api/models/UserBlueprint.php

@@ -12,7 +12,6 @@ return [
 		'tabs'    => fn (UserBlueprint $blueprint) => $blueprint->tabs(),
 		'title'   => fn (UserBlueprint $blueprint) => $blueprint->title(),
 	],
-	'type' => 'Kirby\Cms\UserBlueprint',
-	'views' => [
-	],
+	'type'  => UserBlueprint::class,
+	'views' => [],
 ];

kirby/config/api/routes.php

@@ -19,7 +19,10 @@ return function ($kirby) {
 	// 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 = array_merge(
+			$routes,
+			include __DIR__ . '/routes/languages.php'
+		);
 	}
 
 	return $routes;

kirby/config/api/routes/files.php

@@ -1,63 +1,70 @@
 <?php
 
 // routing pattern to match all models with files
-$pattern = '(account|pages/[^/]+|site|users/[^/]+)';
+$filePattern   = '(account/|pages/[^/]+/|site/|users/[^/]+/|)files/(:any)';
+$parentPattern = '(account|pages/[^/]+|site|users/[^/]+)/files';
 
 /**
  * Files Routes
  */
 return [
-
 	[
-		'pattern' => $pattern . '/files/(:any)/sections/(:any)',
-		'method'  => 'GET',
-		'action'  => function (string $path, string $filename, string $sectionName) {
-			return $this->file($path, $filename)->blueprint()->section($sectionName)?->toResponse();
-		}
-	],
-	[
-		'pattern' => $pattern . '/files/(:any)/fields/(:any)/(:all?)',
+		'pattern' => $filePattern . '/fields/(:any)/(:all?)',
 		'method'  => 'ALL',
-		'action'  => function (string $parent, string $filename, string $fieldName, string $path = null) {
+		'action'  => function (string $parent, string $filename, string $fieldName, string|null $path = null) {
 			if ($file = $this->file($parent, $filename)) {
 				return $this->fieldApi($file, $fieldName, $path);
 			}
 		}
 	],
 	[
-		'pattern' => $pattern . '/files',
+		'pattern' => $filePattern . '/sections/(:any)',
 		'method'  => 'GET',
-		'action'  => function (string $path) {
-			return $this->parent($path)->files()->sorted();
+		'action'  => function (string $path, string $filename, string $sectionName) {
+			return $this->file($path, $filename)->blueprint()->section($sectionName)?->toResponse();
 		}
 	],
 	[
-		'pattern' => $pattern . '/files',
+		'pattern' => $filePattern . '/sections/(:any)/(:all?)',
+		'method'  => 'ALL',
+		'action'  => function (string $parent, string $filename, string $sectionName, string|null $path = null) {
+			if ($file = $this->file($parent, $filename)) {
+				return $this->sectionApi($file, $sectionName, $path);
+			}
+		}
+	],
+	[
+		'pattern' => $parentPattern,
+		'method'  => 'GET',
+		'action'  => function (string $path) {
+			return $this->files($path)->sorted();
+		}
+	],
+	[
+		'pattern' => $parentPattern,
 		'method'  => 'POST',
 		'action'  => function (string $path) {
 			// move_uploaded_file() not working with unit test
 			// @codeCoverageIgnoreStart
 			return $this->upload(function ($source, $filename) use ($path) {
-				$props = [
+				// move the source file from the temp dir
+				return $this->parent($path)->createFile([
 					'content' => [
 						'sort' => $this->requestBody('sort')
 					],
 					'source'   => $source,
 					'template' => $this->requestBody('template'),
 					'filename' => $filename
-				];
-
-				// move the source file from the temp dir
-				return $this->parent($path)->createFile($props, true);
+				], true);
 			});
 			// @codeCoverageIgnoreEnd
 		}
 	],
 	[
-		'pattern' => $pattern . '/files/search',
+		'pattern' => $parentPattern . '/search',
 		'method'  => 'GET|POST',
 		'action'  => function (string $path) {
-			$files = $this->parent($path)->files();
+			$files = $this->files($path);
 
 			if ($this->requestMethod() === 'GET') {
 				return $files->search($this->requestQuery('q'));
@@ -67,24 +74,24 @@ return [
 		}
 	],
 	[
-		'pattern' => $pattern . '/files/sort',
+		'pattern' => $parentPattern . '/sort',
 		'method'  => 'PATCH',
 		'action'  => function (string $path) {
-			return $this->parent($path)->files()->changeSort(
+			return $this->files($path)->changeSort(
 				$this->requestBody('files'),
 				$this->requestBody('index')
 			);
 		}
 	],
 	[
-		'pattern' => $pattern . '/files/(:any)',
+		'pattern' => $filePattern,
 		'method'  => 'GET',
 		'action'  => function (string $path, string $filename) {
 			return $this->file($path, $filename);
 		}
 	],
 	[
-		'pattern' => $pattern . '/files/(:any)',
+		'pattern' => $filePattern,
 		'method'  => 'PATCH',
 		'action'  => function (string $path, string $filename) {
 			return $this->file($path, $filename)->update(
@@ -95,7 +102,7 @@ return [
 		}
 	],
 	[
-		'pattern' => $pattern . '/files/(:any)',
+		'pattern' => $filePattern,
 		'method'  => 'POST',
 		'action'  => function (string $path, string $filename) {
 			// move the source file from the temp dir
@@ -105,28 +112,29 @@ return [
 		}
 	],
 	[
-		'pattern' => $pattern . '/files/(:any)',
+		'pattern' => $filePattern,
 		'method'  => 'DELETE',
 		'action'  => function (string $path, string $filename) {
 			return $this->file($path, $filename)->delete();
 		}
 	],
 	[
-		'pattern' => $pattern . '/files/(:any)/name',
+		'pattern' => $filePattern . '/name',
 		'method'  => 'PATCH',
 		'action'  => function (string $path, string $filename) {
 			return $this->file($path, $filename)->changeName($this->requestBody('name'));
 		}
 	],
 	[
-		'pattern' => 'files/search',
+		'pattern' => $parentPattern . '/search',
 		'method'  => 'GET|POST',
 		'action'  => function () {
 			$files = $this
 				->site()
 				->index(true)
-				->filter('isReadable', true)
-				->files();
+				->filter('isListable', true)
+				->files()
+				->filter('isListable', true);
 
 			if ($this->requestMethod() === 'GET') {
 				return $files->search($this->requestQuery('q'));

kirby/config/api/routes/kql.php

@@ -0,0 +1,35 @@
+<?php
+
+// @codeCoverageIgnoreStart
+return [
+	'routes' => function ($kirby) {
+		return [
+			[
+				'pattern' => 'query',
+				'method'  => 'POST|GET',
+				'auth'    => $kirby->option('kql.auth') !== false,
+				'action'  => function () use ($kirby) {
+					$kql = '\Kirby\Kql\Kql';
+
+					if (class_exists($kql) === false) {
+						return [
+							'code'    => 500,
+							'status'  => 'error',
+							'message' => 'KQL plugin is not installed',
+						];
+					}
+
+					$input  = $kirby->request()->get();
+					$result = $kql::run($input);
+
+					return [
+						'code'   => 200,
+						'result' => $result,
+						'status' => 'ok',
+					];
+				}
+			]
+		];
+	}
+];
+// @codeCoverageIgnoreEnd

kirby/config/api/routes/pages.php

@@ -5,7 +5,7 @@
  * Page Routes
  */
 return [
-
+	// @codeCoverageIgnoreStart
 	[
 		'pattern' => 'pages/(:any)',
 		'method'  => 'GET',
@@ -100,6 +100,15 @@ return [
 			return $this->page($id)->changeTitle($this->requestBody('title'));
 		}
 	],
+	[
+		'pattern' => 'pages/(:any)/fields/(:any)/(:all?)',
+		'method'  => 'ALL',
+		'action'  => function (string $id, string $fieldName, string|null $path = null) {
+			if ($page = $this->page($id)) {
+				return $this->fieldApi($page, $fieldName, $path);
+			}
+		}
+	],
 	[
 		'pattern' => 'pages/(:any)/sections/(:any)',
 		'method'  => 'GET',
@@ -108,12 +117,13 @@ return [
 		}
 	],
 	[
-		'pattern' => 'pages/(:any)/fields/(:any)/(:all?)',
+		'pattern' => 'pages/(:any)/sections/(:any)/(:all?)',
 		'method'  => 'ALL',
-		'action'  => function (string $id, string $fieldName, string $path = null) {
+		'action'  => function (string $id, string $sectionName, string|null $path = null) {
 			if ($page = $this->page($id)) {
-				return $this->fieldApi($page, $fieldName, $path);
+				return $this->sectionApi($page, $sectionName, $path);
 			}
 		}
 	],
+	// @codeCoverageIgnoreEnd
 ];

kirby/config/api/routes/site.php

@@ -5,7 +5,7 @@
  * Site Routes
  */
 return [
-
+	// @codeCoverageIgnoreStart
 	[
 		'pattern' => 'site',
 		'action'  => function () {
@@ -75,7 +75,7 @@ return [
 			$pages = $this
 				->site()
 				->index(true)
-				->filter('isReadable', true);
+				->filter('isListable', true);
 
 			if ($this->requestMethod() === 'GET') {
 				return $pages->search($this->requestQuery('q'));
@@ -84,6 +84,13 @@ return [
 			return $pages->query($this->requestBody());
 		}
 	],
+	[
+		'pattern' => 'site/fields/(:any)/(:all?)',
+		'method'  => 'ALL',
+		'action'  => function (string $fieldName, string|null $path = null) {
+			return $this->fieldApi($this->site(), $fieldName, $path);
+		}
+	],
 	[
 		'pattern' => 'site/sections/(:any)',
 		'method'  => 'GET',
@@ -92,11 +99,11 @@ return [
 		}
 	],
 	[
-		'pattern' => 'site/fields/(:any)/(:all?)',
+		'pattern' => 'site/sections/(:any)/(:all?)',
 		'method'  => 'ALL',
-		'action'  => function (string $fieldName, string $path = null) {
-			return $this->fieldApi($this->site(), $fieldName, $path);
+		'action'  => function (string $sectionName, string|null $path = null) {
+			return $this->sectionApi($this->site(), $sectionName, $path);
 		}
-	]
-
+	],
+	// @codeCoverageIgnoreEnd
 ];

kirby/config/api/routes/system.php

@@ -31,6 +31,18 @@ return [
 			];
 		}
 	],
+	[
+		'pattern' => 'system/method-test',
+		'method'  => 'PATCH',
+		'action'  => function () {
+			return [
+				'status' => match ($this->kirby()->request()->method()) {
+					'PATCH' => 'ok',
+					default => 'fail'
+				}
+			];
+		}
+	],
 	[
 		'pattern' => 'system/register',
 		'method'  => 'POST',

kirby/config/api/routes/users.php

@@ -8,6 +8,7 @@ use Kirby\Toolkit\Str;
  * User Routes
  */
 return [
+	// @codeCoverageIgnoreStart
 	[
 		'pattern' => 'users',
 		'method'  => 'GET',
@@ -202,7 +203,19 @@ return [
 			'users/(:any)/roles',
 		],
 		'action'  => function (string $id) {
-			return $this->user($id)->roles();
+			$kirby   = $this->kirby();
+			$purpose = $kirby->request()->get('purpose');
+			return $this->user($id)->roles($purpose);
+		}
+	],
+	[
+		'pattern' => [
+			'(account)/fields/(:any)/(:all?)',
+			'users/(:any)/fields/(:any)/(:all?)',
+		],
+		'method'  => 'ALL',
+		'action'  => function (string $id, string $fieldName, string|null $path = null) {
+			return $this->fieldApi($this->user($id), $fieldName, $path);
 		}
 	],
 	[
@@ -219,12 +232,13 @@ return [
 	],
 	[
 		'pattern' => [
-			'(account)/fields/(:any)/(:all?)',
-			'users/(:any)/fields/(:any)/(:all?)',
+			'(account)/sections/(:any)/(:all?)',
+			'users/(:any)/sections/(:any)/(:all?)',
 		],
 		'method'  => 'ALL',
-		'action'  => function (string $id, string $fieldName, string $path = null) {
-			return $this->fieldApi($this->user($id), $fieldName, $path);
+		'action'  => function (string $id, string $sectionName, string|null $path = null) {
+			return $this->sectionApi($this->user($id), $sectionName, $path);
 		}
 	],
+	// @codeCoverageIgnoreEnd
 ];