Fixed role entity permissions ignoring inheritance

Added additional scnenario tests to cover

Author: ssddanbrown

app/Auth/Permissions/EntityPermissionEvaluator.php

@@ -66,6 +66,10 @@ protected function collapseAndCategorisePermissions(array $typeIdChain, array $p
                     $permitsByType[$type][$roleId] = $permission->{$this->action};
                 }
             }
+
+            if (isset($permitsByType['fallback'][0])) {
+                break;
+            }
         }
 
         return $permitsByType;

dev/docs/permission-scenario-testing.md

@@ -317,4 +317,27 @@ User granted page permission.
 - Role B has no entity chapter permissions.
 - User has Role A & B.
 
+User denied page permission.
+
+#### test_90_fallback_overrides_parent_entity_role_deny
+
+- Chapter permissions have inherit disabled.
+- Page permissions have inherit disabled.
+- Chapter fallback has entity deny permission.
+- Page fallback has entity deny permission.
+- Role A has entity allow chapter permission.
+- User has Role A.
+
+User denied page permission.
+
+#### test_91_fallback_overrides_parent_entity_role_inherit
+
+- Book permissions have inherit disabled.
+- Chapter permissions have inherit disabled. 
+- Page permissions have inherit enabled.
+- Book fallback has entity deny permission.
+- Chapter fallback has entity deny permission.
+- Role A has entity allow book permission.
+- User has Role A.
+
 User denied page permission.

tests/Permissions/Scenarios/EntityRolePermissionsTest.php

@@ -293,4 +293,31 @@ public function test_89_fallback_override_deny_multi_role_inherit()
 
         $this->assertNotVisibleToUser($page, $user);
     }
+
+    public function test_90_fallback_overrides_parent_entity_role_deny()
+    {
+        [$user, $roleA] = $this->users->newUserWithRole();
+        $page = $this->entities->page();
+        $chapter = $page->chapter;
+
+        $this->permissions->setFallbackPermissions($chapter, []);
+        $this->permissions->setFallbackPermissions($page, []);
+        $this->permissions->addEntityPermission($chapter, ['view'], $roleA);
+
+        $this->assertNotVisibleToUser($page, $user);
+    }
+
+    public function test_91_fallback_overrides_parent_entity_role_inherit()
+    {
+        [$user, $roleA] = $this->users->newUserWithRole();
+        $page = $this->entities->page();
+        $chapter = $page->chapter;
+        $book = $page->book;
+
+        $this->permissions->setFallbackPermissions($book, []);
+        $this->permissions->setFallbackPermissions($chapter, []);
+        $this->permissions->addEntityPermission($book, ['view'], $roleA);
+
+        $this->assertNotVisibleToUser($page, $user);
+    }
 }