downgrade to kirby v3

kirby/config/api/models/File.php

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

kirby/config/api/models/FileBlueprint.php

@@ -12,6 +12,7 @@ return [
 		'tabs'    => fn (FileBlueprint $blueprint) => $blueprint->tabs(),
 		'title'   => fn (FileBlueprint $blueprint) => $blueprint->title(),
 	],
-	'type'  => FileBlueprint::class,
-	'views' => [],
+	'type' => 'Kirby\Cms\FileBlueprint',
+	'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'  => FileVersion::class,
+	'type'  => 'Kirby\Cms\FileVersion',
 	'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'  => Language::class,
+	'type'  => 'Kirby\Cms\Language',
 	'views' => [
 		'default' => [
 			'code',

kirby/config/api/models/License.php

@@ -1,17 +0,0 @@
-<?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

@@ -1,5 +1,6 @@
 <?php
 
+use Kirby\Cms\Helpers;
 use Kirby\Cms\Page;
 use Kirby\Form\Form;
 
@@ -20,34 +21,62 @@ return [
 		'hasFiles'    => fn (Page $page) => $page->hasFiles(),
 		'id'          => fn (Page $page) => $page->id(),
 		'isSortable'  => fn (Page $page) => $page->isSortable(),
-		'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) {
+		/**
+		 * @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) {
 			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' => Page::class,
+	'type' => 'Kirby\Cms\Page',
 	'views' => [
 		'compact' => [
 			'id',
 			'title',
 			'url',
-			'num',
-			'uuid'
+			'num'
 		],
 		'default' => [
 			'content',
@@ -59,8 +88,7 @@ return [
 			'slug',
 			'template',
 			'title',
-			'url',
-			'uuid'
+			'url'
 		],
 		'panel' => [
 			'id',
@@ -74,8 +102,7 @@ return [
 			'previewUrl',
 			'slug',
 			'title',
-			'url',
-			'uuid'
+			'url'
 		],
 		'selector' => [
 			'id',

kirby/config/api/models/PageBlueprint.php

@@ -15,6 +15,7 @@ return [
 		'tabs'    => fn (PageBlueprint $blueprint) => $blueprint->tabs(),
 		'title'   => fn (PageBlueprint $blueprint) => $blueprint->title(),
 	],
-	'type'  => PageBlueprint::class,
-	'views' => [],
+	'type' => 'Kirby\Cms\PageBlueprint',
+	'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'  => Role::class,
+	'type'  => 'Kirby\Cms\Role',
 	'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' =>  Site::class,
+	'type' => 'Kirby\Cms\Site',
 	'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'  => SiteBlueprint::class,
+	'type'  => 'Kirby\Cms\SiteBlueprint',
 	'views' => [],
 ];

kirby/config/api/models/System.php

@@ -32,24 +32,31 @@ return [
 		'slugs'        => fn () => Str::$language,
 		'title'        => fn () => $this->site()->title()->value(),
 		'translation' => function () {
-			$code = $this->user()?->language() ??
-					$this->kirby()->panelLanguage();
+			if ($user = $this->user()) {
+				$translationCode = $user->language();
+			} else {
+				$translationCode = $this->kirby()->panelLanguage();
+			}
 
-			return
-				$this->kirby()->translation($code) ??
-				$this->kirby()->translation('en');
+			if ($translation = $this->kirby()->translation($translationCode)) {
+				return $translation;
+			} else {
+				return $this->kirby()->translation('en');
+			}
 		},
 		'kirbytext' => fn () => $this->kirby()->option('panel.kirbytext') ?? true,
 		'user' => fn () => $this->user(),
 		'version' => function () {
-			if ($this->user()?->role()->permissions()->for('access', 'system') === true) {
-				return $this->kirby()->version();
-			}
+			$user = $this->user();
 
-			return null;
+			if ($user && $user->role()->permissions()->for('access', 'system') === true) {
+				return $this->kirby()->version();
+			} else {
+				return null;
+			}
 		}
 	],
-	'type'   => System::class,
+	'type'   => 'Kirby\Cms\System',
 	'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'  => Translation::class,
+	'type'  => 'Kirby\Cms\Translation',
 	'views' => [
 		'compact' => [
 			'direction',

kirby/config/api/models/User.php

@@ -9,7 +9,7 @@ use Kirby\Form\Form;
 return [
 	'default' => fn () => $this->user(),
 	'fields' => [
-		'avatar'      => fn (User $user) => $user->avatar()?->crop(512),
+		'avatar'      => fn (User $user) => $user->avatar() ? $user->avatar()->crop(512) : null,
 		'blueprint'   => fn (User $user) => $user->blueprint(),
 		'content'     => fn (User $user) => Form::for($user)->values(),
 		'email'       => fn (User $user) => $user->email(),
@@ -24,10 +24,9 @@ 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(),
-		'uuid'        => fn (User $user) => $user->uuid()?->toString()
+		'username'    => fn (User $user) => $user->username()
 	],
-	'type'  => User::class,
+	'type'  => 'Kirby\Cms\User',
 	'views' => [
 		'default' => [
 			'avatar',
@@ -40,8 +39,7 @@ return [
 			'options',
 			'prev' => 'compact',
 			'role',
-			'username',
-			'uuid'
+			'username'
 		],
 		'compact' => [
 			'avatar' => 'compact',
@@ -50,8 +48,7 @@ return [
 			'language',
 			'name',
 			'role' => 'compact',
-			'username',
-			'uuid'
+			'username'
 		],
 		'auth' => [
 			'avatar' => 'compact',
@@ -75,7 +72,6 @@ return [
 			'prev' => ['id', 'name'],
 			'role',
 			'username',
-			'uuid'
 		],
 	]
 ];

kirby/config/api/models/UserBlueprint.php

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