Merge pull request #748 from claudiu-cristea/array_merge-permissions

ISSUE-742: Non-node permissions overrides one each other

Author: MPParsley

src/EventSubscriber/OgEventSubscriber.php

@@ -280,7 +280,7 @@ protected function getDefaultEntityOperationPermissions(array $group_content_bun
 
     foreach ($group_content_bundle_ids as $group_content_entity_type_id => $bundle_ids) {
       foreach ($bundle_ids as $bundle_id) {
-        $permissions += $this->generateEntityOperationPermissionList($group_content_entity_type_id, $bundle_id);
+        $permissions = array_merge($permissions, $this->generateEntityOperationPermissionList($group_content_entity_type_id, $bundle_id));
       }
     }
 

tests/src/Kernel/PermissionEventTest.php

@@ -26,6 +26,7 @@ class PermissionEventTest extends KernelTestBase {
    * {@inheritdoc}
    */
   public static $modules = [
+    'entity_test',
     'field',
     'node',
     'og',
@@ -61,6 +62,9 @@ protected function setUp(): void {
       'type' => 'test_group_content',
       'name' => 'Test Group Content',
     ])->save();
+    // Create two entity_test bundles to test a mixed entity type case.
+    entity_test_create_bundle('a_bundle', 'A bundle');
+    entity_test_create_bundle('other_bundle', 'Other bundle');
   }
 
   /**
@@ -200,6 +204,37 @@ public function permissionEventDataProvider() {
           $group_content_operation_permission,
         ],
       ],
+      // Test a combination of bundles coming from different entity types.
+      [
+        [
+          'node' => ['test_group_content'],
+          'entity_test' => ['a_bundle', 'other_bundle'],
+        ],
+        array_merge($default_permissions, [
+          // node:test_group_content.
+          'create test_group_content content',
+          'delete any test_group_content content',
+          'delete own test_group_content content',
+          'edit any test_group_content content',
+          'edit own test_group_content content',
+          // entity_test:a_bundle.
+          'create a_bundle entity_test',
+          'delete any a_bundle entity_test',
+          'delete own a_bundle entity_test',
+          'update any a_bundle entity_test',
+          'update own a_bundle entity_test',
+          // entity_test:other_bundle.
+          'create other_bundle entity_test',
+          'delete any other_bundle entity_test',
+          'delete own other_bundle entity_test',
+          'update any other_bundle entity_test',
+          'update own other_bundle entity_test',
+        ]),
+        [
+          $group_level_permission,
+          $group_content_operation_permission,
+        ],
+      ],
     ];
   }