Upgrade to rc5

kirby/config/api/models/File.php

@@ -48,7 +48,7 @@ return [
             return $file->next();
         },
         'nextWithTemplate' => function (File $file) {
-            $files = $file->templateSiblings()->sortBy('sort', 'asc', 'filename', 'asc');
+            $files = $file->templateSiblings()->sort('sort', 'asc', 'filename', 'asc');
             $index = $files->indexOf($file);
 
             return $files->nth($index + 1);
@@ -72,7 +72,7 @@ return [
             return $file->prev();
         },
         'prevWithTemplate' => function (File $file) {
-            $files = $file->templateSiblings()->sortBy('sort', 'asc', 'filename', 'asc');
+            $files = $file->templateSiblings()->sort('sort', 'asc', 'filename', 'asc');
             $index = $files->indexOf($file);
 
             return $files->nth($index - 1);

kirby/config/api/models/Page.php

@@ -27,7 +27,7 @@ return [
             return $page->errors();
         },
         'files' => function (Page $page) {
-            return $page->files()->sortBy('sort', 'asc', 'filename', 'asc');
+            return $page->files()->sort('sort', 'asc', 'filename', 'asc');
         },
         'hasChildren' => function (Page $page) {
             return $page->hasChildren();
@@ -47,9 +47,9 @@ return [
         'next' => function (Page $page) {
             return $page
                 ->nextAll()
-                ->filterBy('intendedTemplate', $page->intendedTemplate())
-                ->filterBy('status', $page->status())
-                ->filterBy('isReadable', true)
+                ->filter('intendedTemplate', $page->intendedTemplate())
+                ->filter('status', $page->status())
+                ->filter('isReadable', true)
                 ->first();
         },
         'num' => function (Page $page) {
@@ -73,9 +73,9 @@ return [
         'prev' => function (Page $page) {
             return $page
                 ->prevAll()
-                ->filterBy('intendedTemplate', $page->intendedTemplate())
-                ->filterBy('status', $page->status())
-                ->filterBy('isReadable', true)
+                ->filter('intendedTemplate', $page->intendedTemplate())
+                ->filter('status', $page->status())
+                ->filter('isReadable', true)
                 ->last();
         },
         'previewUrl' => function (Page $page) {

kirby/config/api/models/Site.php

@@ -24,7 +24,7 @@ return [
             return $site->drafts();
         },
         'files' => function (Site $site) {
-            return $site->files()->sortBy('sort', 'asc', 'filename', 'asc');
+            return $site->files()->sort('sort', 'asc', 'filename', 'asc');
         },
         'options' => function (Site $site) {
             return $site->permissions()->toArray();

kirby/config/api/models/System.php

@@ -35,6 +35,21 @@ return [
         'license' => function (System $system) {
             return $system->license();
         },
+        'loginMethods' => function (System $system) {
+            return array_keys($system->loginMethods());
+        },
+        'pendingChallenge' => function () {
+            if ($this->session()->get('kirby.challenge.email') === null) {
+                return null;
+            }
+
+            // fake the email challenge if no challenge was created
+            // to avoid leaking whether the user exists
+            return $this->session()->get('kirby.challenge.type', 'email');
+        },
+        'pendingEmail' => function () {
+            return $this->session()->get('kirby.challenge.email');
+        },
         'requirements' => function (System $system) {
             return $system->toArray();
         },
@@ -86,6 +101,9 @@ return [
             'isOk',
             'isInstallable',
             'isInstalled',
+            'loginMethods',
+            'pendingChallenge',
+            'pendingEmail',
             'title',
             'translation'
         ],

kirby/config/api/models/User.php

@@ -24,7 +24,7 @@ return [
             return $user->email();
         },
         'files' => function (User $user) {
-            return $user->files()->sortBy('sort', 'asc', 'filename', 'asc');
+            return $user->files()->sort('sort', 'asc', 'filename', 'asc');
         },
         'id' => function (User $user) {
             return $user->id();