Update Composer packages

kirby/config/api/models/File.php

@@ -57,6 +57,7 @@ return [
 		},
 		'type'       => fn (File $file) => $file->type(),
 		'url'        => fn (File $file) => $file->url(),
+		'uuid'       => fn (File $file) => $file->uuid()?->toString()
 	],
 	'type'  => 'Kirby\Cms\File',
 	'views' => [
@@ -79,7 +80,8 @@ return [
 			'size',
 			'template',
 			'type',
-			'url'
+			'url',
+			'uuid'
 		],
 		'compact' => [
 			'filename',
@@ -87,6 +89,7 @@ return [
 			'link',
 			'type',
 			'url',
+			'uuid'
 		],
 		'panel' => [
 			'blueprint',
@@ -109,7 +112,8 @@ return [
 			'prevWithTemplate' => 'compact',
 			'template',
 			'type',
-			'url'
+			'url',
+			'uuid'
 		]
 	],
 ];

kirby/config/api/models/Page.php

@@ -1,6 +1,5 @@
 <?php
 
-use Kirby\Cms\Helpers;
 use Kirby\Cms\Page;
 use Kirby\Form\Form;
 
@@ -21,54 +20,25 @@ return [
 		'hasFiles'    => fn (Page $page) => $page->hasFiles(),
 		'id'          => fn (Page $page) => $page->id(),
 		'isSortable'  => fn (Page $page) => $page->isSortable(),
-		/**
-		 * @deprecated 3.6.0
-		 * @todo Remove in 3.8.0
-		 * @codeCoverageIgnore
-		 */
-		'next' => function (Page $page) {
-			Helpers::deprecated('The API field page.next has been deprecated and will be removed in 3.8.0.');
-
-			return $page
-				->nextAll()
-				->filter('intendedTemplate', $page->intendedTemplate())
-				->filter('status', $page->status())
-				->filter('isReadable', true)
-				->first();
-		},
-		'num'     => fn (Page $page) => $page->num(),
-		'options' => fn (Page $page) => $page->panel()->options(['preview']),
-		'panelImage' => fn (Page $page) => $page->panel()->image(),
-		'parent'     => fn (Page $page) => $page->parent(),
-		'parents'    => fn (Page $page) => $page->parents()->flip(),
-		/**
-		 * @deprecated 3.6.0
-		 * @todo Remove in 3.8.0
-		 * @codeCoverageIgnore
-		 */
-		'prev' => function (Page $page) {
-			Helpers::deprecated('The API field page.prev has been deprecated and will be removed in 3.8.0.');
-
-			return $page
-				->prevAll()
-				->filter('intendedTemplate', $page->intendedTemplate())
-				->filter('status', $page->status())
-				->filter('isReadable', true)
-				->last();
-		},
-		'previewUrl' => fn (Page $page) => $page->previewUrl(),
-		'siblings'   => function (Page $page) {
+		'num'     	  => fn (Page $page) => $page->num(),
+		'options' 	  => fn (Page $page) => $page->panel()->options(['preview']),
+		'panelImage'  => fn (Page $page) => $page->panel()->image(),
+		'parent'      => fn (Page $page) => $page->parent(),
+		'parents'     => fn (Page $page) => $page->parents()->flip(),
+		'previewUrl'  => fn (Page $page) => $page->previewUrl(),
+		'siblings'    => function (Page $page) {
 			if ($page->isDraft() === true) {
 				return $page->parentModel()->children()->not($page);
-			} else {
-				return $page->siblings();
 			}
+
+			return $page->siblings();
 		},
 		'slug'     => fn (Page $page) => $page->slug(),
 		'status'   => fn (Page $page) => $page->status(),
 		'template' => fn (Page $page) => $page->intendedTemplate()->name(),
 		'title'    => fn (Page $page) => $page->title()->value(),
 		'url'      => fn (Page $page) => $page->url(),
+		'uuid'     => fn (Page $page) => $page->uuid()?->toString()
 	],
 	'type' => 'Kirby\Cms\Page',
 	'views' => [
@@ -76,7 +46,8 @@ return [
 			'id',
 			'title',
 			'url',
-			'num'
+			'num',
+			'uuid'
 		],
 		'default' => [
 			'content',
@@ -88,7 +59,8 @@ return [
 			'slug',
 			'template',
 			'title',
-			'url'
+			'url',
+			'uuid'
 		],
 		'panel' => [
 			'id',
@@ -102,7 +74,8 @@ return [
 			'previewUrl',
 			'slug',
 			'title',
-			'url'
+			'url',
+			'uuid'
 		],
 		'selector' => [
 			'id',

kirby/config/api/models/System.php

@@ -32,28 +32,20 @@ return [
 		'slugs'        => fn () => Str::$language,
 		'title'        => fn () => $this->site()->title()->value(),
 		'translation' => function () {
-			if ($user = $this->user()) {
-				$translationCode = $user->language();
-			} else {
-				$translationCode = $this->kirby()->panelLanguage();
-			}
+			$code = $this->user()?->language() ??
+					$this->kirby()->panelLanguage();
 
-			if ($translation = $this->kirby()->translation($translationCode)) {
-				return $translation;
-			} else {
-				return $this->kirby()->translation('en');
-			}
+			return $this->kirby()->translation($code) ??
+				   $this->kirby()->translation('en');
 		},
 		'kirbytext' => fn () => $this->kirby()->option('panel.kirbytext') ?? true,
 		'user' => fn () => $this->user(),
 		'version' => function () {
-			$user = $this->user();
-
-			if ($user && $user->role()->permissions()->for('access', 'system') === true) {
+			if ($this->user()?->role()->permissions()->for('access', 'system') === true) {
 				return $this->kirby()->version();
-			} else {
-				return null;
 			}
+
+			return null;
 		}
 	],
 	'type'   => 'Kirby\Cms\System',

kirby/config/api/models/User.php

@@ -24,7 +24,8 @@ return [
 		'prev'        => fn (User $user) => $user->prev(),
 		'role'        => fn (User $user) => $user->role(),
 		'roles'       => fn (User $user) => $user->roles(),
-		'username'    => fn (User $user) => $user->username()
+		'username'    => fn (User $user) => $user->username(),
+		'uuid'        => fn (User $user) => $user->uuid()?->toString()
 	],
 	'type'  => 'Kirby\Cms\User',
 	'views' => [
@@ -39,7 +40,8 @@ return [
 			'options',
 			'prev' => 'compact',
 			'role',
-			'username'
+			'username',
+			'uuid'
 		],
 		'compact' => [
 			'avatar' => 'compact',
@@ -48,7 +50,8 @@ return [
 			'language',
 			'name',
 			'role' => 'compact',
-			'username'
+			'username',
+			'uuid'
 		],
 		'auth' => [
 			'avatar' => 'compact',
@@ -72,6 +75,7 @@ return [
 			'prev' => ['id', 'name'],
 			'role',
 			'username',
+			'uuid'
 		],
 	]
 ];