Upgrade to 3.8.1

2022-10-18 14:11:15 +02:00
parent 94b2a32baf
commit 9c93e01c3a
71 changed files with 633 additions and 5705 deletions
--- a/kirby/src/Database/Query.php
+++ b/kirby/src/Database/Query.php
@@ -898,9 +898,8 @@ class Query
 		if (preg_match('!^findBy([a-z]+)!i', $method, $match)) {
 			$column = Str::lower($match[1]);
 			return $this->findBy($column, $arguments[0]);
-		} else {
-			throw new InvalidArgumentException('Invalid query method: ' . $method, static::ERROR_INVALID_QUERY_METHOD);
 		}
+		throw new InvalidArgumentException('Invalid query method: ' . $method, static::ERROR_INVALID_QUERY_METHOD);
 	}

 	/**
@@ -1027,8 +1026,8 @@ class Query
 		// attach the where clause
 		if (empty($current) === false) {
 			return $current . ' ' . $mode . ' ' . $result;
-		} else {
-			return $result;
 		}
+
+		return $result;
 	}
 }