Upgrade to 4.0.0

kirby/config/api/routes/files.php

@@ -1,7 +1,8 @@
 <?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
@@ -9,14 +10,14 @@ $pattern = '(account|pages/[^/]+|site|users/[^/]+)';
 return [
 
 	[
-		'pattern' => $pattern . '/files/(:any)/sections/(:any)',
+		'pattern' => $filePattern . '/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) {
 			if ($file = $this->file($parent, $filename)) {
@@ -25,14 +26,14 @@ return [
 		}
 	],
 	[
-		'pattern' => $pattern . '/files',
+		'pattern' => $parentPattern,
 		'method'  => 'GET',
 		'action'  => function (string $path) {
-			return $this->parent($path)->files()->sorted();
+			return $this->files($path)->sorted();
 		}
 	],
 	[
-		'pattern' => $pattern . '/files',
+		'pattern' => $parentPattern,
 		'method'  => 'POST',
 		'action'  => function (string $path) {
 			// move_uploaded_file() not working with unit test
@@ -54,10 +55,10 @@ return [
 		}
 	],
 	[
-		'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 +68,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 +96,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 +106,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

@@ -4,8 +4,9 @@
 /**
  * Page Routes
  */
-return [
 
+
+return [
 	[
 		'pattern' => 'pages/(:any)',
 		'method'  => 'GET',

kirby/config/api/routes/site.php

@@ -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'));