Upgrade to 3.9.7

kirby/src/Cms/Api.php

@@ -67,10 +67,10 @@ class Api extends BaseApi
 	 * Returns the file object for the given
 	 * parent path and filename
 	 *
-	 * @param string|null $path Path to file's parent model
+	 * @param string $path Path to file's parent model
 	 * @throws \Kirby\Exception\NotFoundException if the file cannot be found
 	 */
-	public function file(string|null $path = null, string $filename): File|null
+	public function file(string $path, string $filename): File|null
 	{
 		return Find::file($path, $filename);
 	}

kirby/src/Cms/App.php

@@ -203,7 +203,6 @@ class App
 	/**
 	 * Applies a hook to the given value
 	 *
-	 * @internal
 	 * @param string $name Full event name
 	 * @param array $args Associative array of named event arguments
 	 * @param string $modify Key in $args that is modified by the hooks
@@ -1675,7 +1674,6 @@ class App
 	/**
 	 * Trigger a hook by name
 	 *
-	 * @internal
 	 * @param string $name Full event name
 	 * @param array $args Associative array of named event arguments
 	 * @param \Kirby\Cms\Event|null $originalEvent Event object (internal use)

kirby/src/Cms/AppErrors.php

@@ -73,7 +73,7 @@ trait AppErrors
 		$handler = null;
 
 		if ($this->option('debug') === true) {
-			if ($this->option('whoops', true) === true) {
+			if ($this->option('whoops', true) !== false) {
 				$handler = new PrettyPageHandler();
 				$handler->setPageTitle('Kirby CMS Debugger');
 				$handler->setResourcesPath(dirname(__DIR__, 2) . '/assets');
@@ -82,6 +82,14 @@ trait AppErrors
 				if ($editor = $this->option('editor')) {
 					$handler->setEditor($editor);
 				}
+
+				if ($blocklist = $this->option('whoops.blocklist')) {
+					foreach ($blocklist as $superglobal => $vars) {
+						foreach ($vars as $var) {
+							$handler->blacklist($superglobal, $var);
+						}
+					}
+				}
 			}
 		} else {
 			$handler = new CallbackHandler(function ($exception, $inspector, $run) {

kirby/src/Cms/Collection.php

@@ -168,9 +168,7 @@ class Collection extends BaseCollection
 				}
 
 				// ignore upper/lowercase for group names
-				if ($i) {
-					$value = Str::lower($value);
-				}
+				$value = $i === true ? Str::lower($value) : (string)$value;
 
 				if (isset($groups->data[$value]) === false) {
 					// create a new entry for the group if it does not exist yet

kirby/src/Cms/Find.php

@@ -23,12 +23,12 @@ class Find
 	 * Returns the file object for the given
 	 * parent path and filename
 	 *
-	 * @param string|null $path Path to file's parent model
+	 * @param string $path Path to file's parent model
 	 * @param string $filename Filename
 	 * @return \Kirby\Cms\File|null
 	 * @throws \Kirby\Exception\NotFoundException if the file cannot be found
 	 */
-	public static function file(string $path = null, string $filename)
+	public static function file(string $path, string $filename)
 	{
 		$filename = urldecode($filename);
 		$file     = static::parent($path)->file($filename);

kirby/src/Cms/Page.php

@@ -733,7 +733,7 @@ class Page extends ModelWithContent
 	 */
 	public function isListed(): bool
 	{
-		return $this->num() !== null;
+		return $this->isPublished() && $this->num() !== null;
 	}
 
 	/**
@@ -797,7 +797,7 @@ class Page extends ModelWithContent
 	 */
 	public function isUnlisted(): bool
 	{
-		return $this->isListed() === false;
+		return $this->isPublished() && $this->num() === null;
 	}
 
 	/**
@@ -811,7 +811,7 @@ class Page extends ModelWithContent
 	public function isVerified(string $token = null)
 	{
 		if (
-			$this->isDraft() === false &&
+			$this->isPublished() === true &&
 			$this->parents()->findBy('status', 'draft') === null
 		) {
 			return true;

kirby/src/Cms/User.php

@@ -352,7 +352,7 @@ class User extends ModelWithContent
 	 */
 	public function isKirby(): bool
 	{
-		return $this->email() === 'kirby@getkirby.com';
+		return $this->isAdmin() && $this->id() === 'kirby';
 	}
 
 	/**
@@ -396,7 +396,7 @@ class User extends ModelWithContent
 	 */
 	public function isNobody(): bool
 	{
-		return $this->email() === 'nobody@getkirby.com';
+		return $this->role()->id() === 'nobody' && $this->id() === 'nobody';
 	}
 
 	/**
@@ -406,7 +406,9 @@ class User extends ModelWithContent
 	 */
 	public function language(): string
 	{
-		return $this->language ??= $this->credentials()['language'] ?? $this->kirby()->panelLanguage();
+		return $this->language ??=
+			$this->credentials()['language'] ??
+			$this->kirby()->panelLanguage();
 	}
 
 	/**

kirby/src/Cms/UserRules.php

@@ -301,8 +301,8 @@ class UserRules
 	 */
 	public static function validId(User $user, string $id): bool
 	{
-		if ($id === 'account') {
-			throw new InvalidArgumentException('"account" is a reserved word and cannot be used as user id');
+		if (in_array($id, ['account', 'kirby', 'nobody']) === true) {
+			throw new InvalidArgumentException('"' . $id . '" is a reserved word and cannot be used as user id');
 		}
 
 		if ($user->kirby()->users()->find($id)) {