HasModels trait

src/Cms/HasModels.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Kirby\Cms;
+
+/**
+ * HasModels
+ *
+ * @package   Kirby Cms
+ * @author    Bastian Allgeier <[email protected]>
+ * @link      https://getkirby.com
+ * @copyright Bastian Allgeier
+ * @license   https://getkirby.com/license
+ */
+trait HasModels
+{
+	/**
+	 * Registry with all custom models
+	 */
+	public static array $models = [];
+
+	/**
+	 * Creates a page model if it has been registered
+	 * @internal
+	 */
+	public static function model(string $name, array $props = []): static
+	{
+		$name    = strtolower($name);
+		$class   = static::$models[$name] ?? null;
+		$class ??= static::$models['default'] ?? null;
+
+		if ($class !== null) {
+			$object = new $class($props);
+
+			if ($object instanceof self) {
+				return $object;
+			}
+		}
+
+		return new static($props);
+	}
+}

src/Cms/Page.php

@@ -34,6 +34,7 @@ class Page extends ModelWithContent
 	use HasChildren;
 	use HasFiles;
 	use HasMethods;
+	use HasModels;
 	/**
 	 * @use \Kirby\Cms\HasSiblings<\Kirby\Cms\Pages>
 	 */
@@ -49,11 +50,6 @@ class Page extends ModelWithContent
 	 */
 	public static array $methods = [];
 
-	/**
-	 * Registry with all Page models
-	 */
-	public static array $models = [];
-
 	/**
 	 * The PageBlueprint object
 	 */
@@ -790,27 +786,6 @@ public function mediaUrl(): string
 		return $this->kirby()->url('media') . '/pages/' . $this->id();
 	}
 
-	/**
-	 * Creates a page model if it has been registered
-	 * @internal
-	 */
-	public static function model(string $name, array $props = []): static
-	{
-		$name    = strtolower($name);
-		$class   = static::$models[$name] ?? null;
-		$class ??= static::$models['default'] ?? null;
-
-		if ($class !== null) {
-			$object = new $class($props);
-
-			if ($object instanceof self) {
-				return $object;
-			}
-		}
-
-		return new static($props);
-	}
-
 	/**
 	 * Returns the last modification date of the page
 	 */

src/Cms/User.php

@@ -30,6 +30,7 @@ class User extends ModelWithContent
 {
 	use HasFiles;
 	use HasMethods;
+	use HasModels;
 	/**
 	 * @use \Kirby\Cms\HasSiblings<\Kirby\Cms\Users>
 	 */
@@ -44,11 +45,6 @@ class User extends ModelWithContent
 	 */
 	public static array $methods = [];
 
-	/**
-	 * Registry with all User models
-	 */
-	public static array $models = [];
-
 	protected UserBlueprint|null $blueprint = null;
 	protected array $credentials;
 	protected string|null $email;
@@ -224,11 +220,7 @@ public function exists(): bool
 	 */
 	public static function factory(mixed $props): static
 	{
-		if (empty($props['model']) === false) {
-			return static::model($props['model'], $props);
-		}
-
-		return new static($props);
+		return static::model($props['model'] ?? $props['role'] ?? 'default', $props);
 	}
 
 	/**
@@ -453,23 +445,6 @@ public function mediaUrl(): string
 		return $this->kirby()->url('media') . '/users/' . $this->id();
 	}
 
-	/**
-	 * Creates a user model if it has been registered
-	 * @internal
-	 */
-	public static function model(string $name, array $props = []): static
-	{
-		if ($class = (static::$models[$name] ?? null)) {
-			$object = new $class($props);
-
-			if ($object instanceof self) {
-				return $object;
-			}
-		}
-
-		return new static($props);
-	}
-
 	/**
 	 * Returns the last modification date of the user
 	 */