Upgrade to 3.8.0

kirby/src/Cms/Event.php

@@ -120,7 +120,7 @@ class Event
 	 *
 	 * @return string|null
 	 */
-	public function action(): ?string
+	public function action(): string|null
 	{
 		return $this->action;
 	}
@@ -133,11 +133,7 @@ class Event
 	 */
 	public function argument(string $name)
 	{
-		if (isset($this->arguments[$name]) === true) {
-			return $this->arguments[$name];
-		}
-
-		return null;
+		return $this->arguments[$name] ?? null;
 	}
 
 	/**
@@ -158,7 +154,7 @@ class Event
 	 * @param \Closure $hook
 	 * @return mixed
 	 */
-	public function call(?object $bind, Closure $hook)
+	public function call(object|null $bind, Closure $hook)
 	{
 		// collect the list of possible hook arguments
 		$data = $this->arguments();
@@ -204,7 +200,9 @@ class Event
 				'*:' . $this->state,
 				'*'
 			];
-		} elseif ($this->state !== null) {
+		}
+
+		if ($this->state !== null) {
 			// event without action: $type:$state
 
 			return [
@@ -212,7 +210,9 @@ class Event
 				'*:' . $this->state,
 				'*'
 			];
-		} elseif ($this->action !== null) {
+		}
+
+		if ($this->action !== null) {
 			// event without state: $type.$action
 
 			return [
@@ -220,11 +220,10 @@ class Event
 				'*.' . $this->action,
 				'*'
 			];
-		} else {
-			// event with a simple name
-
-			return ['*'];
 		}
+
+		// event with a simple name
+		return ['*'];
 	}
 
 	/**
@@ -232,7 +231,7 @@ class Event
 	 *
 	 * @return string|null
 	 */
-	public function state(): ?string
+	public function state(): string|null
 	{
 		return $this->state;
 	}