Verified Commit 4b3b0b42 authored by godotislate's avatar godotislate
Browse files

fix: #3560719 Add [#NoDiscard] to AccessResult methods or make them chainable 

By: catch
By: andypost
By: longwave
By: benjifisher
(cherry picked from commit 5c02b602)
parent aa94b81c

core/modules/media/src/MediaAccessControlHandler.php

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter 
          $entity_access = $entity->access('view', $account, TRUE);

          if (!$entity->isDefaultRevision()) {

            $media_storage = $this->entityTypeManager->getStorage($entity->getEntityTypeId());

            $entity_access->andIf($this->access($media_storage->load($entity->id()), 'view', $account, TRUE));

            $entity_access = $entity_access->andIf($this->access($media_storage->load($entity->id()), 'view', $account, TRUE));

          }



          return AccessResult::allowed()->cachePerPermissions()->andIf($entity_access);

core/modules/media/tests/src/Functional/MediaAccessTest.php

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public function testMediaAccess(): void { 
    $this->assertCacheContext('user');

    $assert_session->statusCodeEquals(200);

    $this->drupalGet('media/' . $user_media->id() . '/revisions/' . $previous_revision . '/view');

    $this->assertCacheContext('user.permissions');

    $this->assertCacheContext('user');

    $assert_session->statusCodeEquals(200);

    $role->revokePermission('view own unpublished media')->save();

    $this->drupalGet('media/' . $user_media->id() . '/revisions/' . $user_media->getRevisionId() . '/view');