Merge pull request #6072 from getkirby/fix/6061-serializable-objects

Don’t pass kirby as property to models
getkirby · Dec 30, 2023 · a130e4a · a130e4a
2 parents 2ff14ab + e028d89
commit a130e4a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/src/Cms/App.php b/src/Cms/App.php
@@ -1466,9 +1466,7 @@ protected function setRequest(array $request = null): static
 	protected function setRoles(array $roles = null): static
 	{
 		if ($roles !== null) {
-			$this->roles = Roles::factory($roles, [
-				'kirby' => $this
-			]);
+			$this->roles = Roles::factory($roles);
 		}
 
 		return $this;
@@ -1482,9 +1480,7 @@ protected function setRoles(array $roles = null): static
 	protected function setSite(Site|array $site = null): static
 	{
 		if (is_array($site) === true) {
-			$site = new Site($site + [
-				'kirby' => $this
-			]);
+			$site = new Site($site);
 		}
 
 		$this->site = $site;
@@ -1499,7 +1495,6 @@ public function site(): Site
 		return $this->site ??= new Site([
 			'errorPageId' => $this->options['error'] ?? 'error',
 			'homePageId'  => $this->options['home']  ?? 'home',
-			'kirby'       => $this,
 			'url'         => $this->url('index'),
 		]);
 	}

diff --git a/src/Cms/AppUsers.php b/src/Cms/AppUsers.php
@@ -86,9 +86,7 @@ protected function setUser(User|string $user = null): static
 	protected function setUsers(array $users = null): static
 	{
 		if ($users !== null) {
-			$this->users = Users::factory($users, [
-				'kirby' => $this
-			]);
+			$this->users = Users::factory($users);
 		}
 
 		return $this;
@@ -128,7 +126,6 @@ public function users(): Users
 	{
 		return $this->users ??= Users::load(
 			$this->root('accounts'),
-			['kirby' => $this]
 		);
 	}
 }
diff --git a/src/Cms/Files.php b/src/Cms/Files.php
@@ -90,11 +90,9 @@ public function changeSort(array $files, int $offset = 0): static
 	public static function factory(array $files, Page|Site|User $parent): static
 	{
 		$collection = new static([], $parent);
-		$kirby      = $parent->kirby();
 
 		foreach ($files as $props) {
 			$props['collection'] = $collection;
-			$props['kirby']      = $kirby;
 			$props['parent']     = $parent;
 
 			$file = File::factory($props);

diff --git a/src/Cms/Pages.php b/src/Cms/Pages.php
@@ -147,7 +147,6 @@ public static function factory(
 	): static {
 		$model  ??= App::instance()->site();
 		$children = new static([], $model);
-		$kirby    = $model->kirby();
 
 		if ($model instanceof Page) {
 			$parent = $model;
@@ -158,7 +157,6 @@ public static function factory(
 		}
 
 		foreach ($pages as $props) {
-			$props['kirby']   = $kirby;
 			$props['parent']  = $parent;
 			$props['site']    = $site;
 			$props['isDraft'] = $draft ?? $props['isDraft'] ?? $props['draft'] ?? false;