Merge pull request #6918 from getkirby/fix/6167-roles-blueprint-extend

Roles: fix extending blueprint

src/Cms/Role.php

@@ -82,7 +82,11 @@ public function description(): string|null
 
 	public static function factory(array $props, array $inject = []): static
 	{
-		return new static($props + $inject);
+		// ensure to properly extend the blueprint
+		$props = $props + $inject;
+		$props = Blueprint::extend($props);
+
+		return new static($props);
 	}
 
 	public function id(): string

tests/Cms/Roles/RoleTest.php

@@ -35,6 +35,7 @@ public function testFactory()
 
 		$this->assertSame('editor', $role->name());
 		$this->assertSame('Editor', $role->title());
+		$this->assertSame('This should be inherited', $role->description());
 	}
 
 	public function testMissingRole()

tests/Cms/Roles/RolesTest.php

@@ -32,8 +32,9 @@ public function testLoad()
 
 		$this->assertInstanceOf(Roles::class, $roles);
 
-		// should contain the editor role from fixtures and the default admin role
-		$this->assertCount(2, $roles);
+		// should contain the base and editor role from fixtures
+		// and the default admin role
+		$this->assertCount(3, $roles);
 		$this->assertSame('admin', $roles->first()->name());
 		$this->assertSame('editor', $roles->last()->name());
 	}

tests/Cms/Roles/fixtures/blueprints/users/base.yml

@@ -0,0 +1 @@
+description: This should be inherited

tests/Cms/Roles/fixtures/blueprints/users/editor.yml

@@ -1 +1,3 @@
 title: Editor
+
+extends: users/base