Skip to content
Snippets Groups Projects
Verified Commit f0b4a245 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3490964 by nexusnovaz, mstrelan: Add array return to all... 

Issue #3490964 by nexusnovaz, mstrelan: Add array return to all hook_jsonapi_ENTITY_TYPE_filter_access hook implementations
parent 0dc7ae45
No related branches found
No related tags found
9 merge requests!11197Issue #3506427 by eduardo morales alberti: Remove responsive_image.ajax from hook,!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!10786Issue #3490579 by shalini_jha, mstrelan: Add void return to all views...,!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2062Issue #3246454: Add weekly granularity to views date sort,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!617Issue #3043725: Provide a Entity Handler for user cancelation
Pipeline #373138 passed with warnings
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#373147

    Pipeline: drupal

    #373142

      Pipeline: drupal

      #373140

        Hide whitespace changes
        Inline Side-by-side
        core/.phpstan-baseline.php
        + 0
        − 66
        View file @ f0b4a245
        ...@@ -21736,72 +21736,6 @@ ...@@ -21736,72 +21736,6 @@
        'count' => 1, 'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php', 'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ]; ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiBlockContentFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiCommentFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiEntityFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiEntityTestFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiFileFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiMediaFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiNodeFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiShortcutFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiTaxonomyTermFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiUserFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [
        // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:jsonapiWorkspaceFilterAccess\\(\\) has no return type specified\\.$#',
        'count' => 1,
        'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
        ];
        $ignoreErrors[] = [ $ignoreErrors[] = [
        // identifier: missingType.return // identifier: missingType.return
        'message' => '#^Method Drupal\\\\jsonapi\\\\JsonApiResource\\\\Data\\:\\:getTotalCount\\(\\) has no return type specified\\.$#', 'message' => '#^Method Drupal\\\\jsonapi\\\\JsonApiResource\\\\Data\\:\\:getTotalCount\\(\\) has no return type specified\\.$#',
        core/modules/jsonapi/jsonapi.api.php
        + 1
        − 1
        View file @ f0b4a245
        ...@@ -303,7 +303,7 @@ function hook_jsonapi_entity_filter_access(EntityTypeInterface $entity_type, Acc ...@@ -303,7 +303,7 @@ function hook_jsonapi_entity_filter_access(EntityTypeInterface $entity_type, Acc
        * *
        * @see hook_jsonapi_entity_filter_access() * @see hook_jsonapi_entity_filter_access()
        */ */
        function hook_jsonapi_ENTITY_TYPE_filter_access(EntityTypeInterface $entity_type, AccountInterface $account) { function hook_jsonapi_ENTITY_TYPE_filter_access(EntityTypeInterface $entity_type, AccountInterface $account): array {
        return ([ return ([
        JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'administer llamas'), JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'administer llamas'),
        JSONAPI_FILTER_AMONG_PUBLISHED => AccessResult::allowedIfHasPermission($account, 'view all published llamas'), JSONAPI_FILTER_AMONG_PUBLISHED => AccessResult::allowedIfHasPermission($account, 'view all published llamas'),
        ......
        core/modules/jsonapi/src/Hook/JsonapiHooks.php
        + 12
        − 11
        View file @ f0b4a245
        ...@@ -96,7 +96,7 @@ public function entityDelete(EntityInterface $entity) { ...@@ -96,7 +96,7 @@ public function entityDelete(EntityInterface $entity) {
        * Implements hook_jsonapi_entity_filter_access(). * Implements hook_jsonapi_entity_filter_access().
        */ */
        #[Hook('jsonapi_entity_filter_access')] #[Hook('jsonapi_entity_filter_access')]
        public function jsonapiEntityFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiEntityFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // All core entity types and most or all contrib entity types allow users // All core entity types and most or all contrib entity types allow users
        // with the entity type's administrative permission to view all of the // with the entity type's administrative permission to view all of the
        // entities, so enable similarly permissive filtering to those users as well. // entities, so enable similarly permissive filtering to those users as well.
        ...@@ -107,13 +107,14 @@ public function jsonapiEntityFilterAccess(EntityTypeInterface $entity_type, Acco ...@@ -107,13 +107,14 @@ public function jsonapiEntityFilterAccess(EntityTypeInterface $entity_type, Acco
        JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, $admin_permission), JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, $admin_permission),
        ]; ];
        } }
        return [];
        } }
        /** /**
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'block_content'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'block_content'.
        */ */
        #[Hook('jsonapi_block_content_filter_access')] #[Hook('jsonapi_block_content_filter_access')]
        public function jsonapiBlockContentFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiBlockContentFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\block_content\BlockContentAccessControlHandler::checkAccess() // @see \Drupal\block_content\BlockContentAccessControlHandler::checkAccess()
        // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for
        // (isReusable()), so this does not have to. // (isReusable()), so this does not have to.
        ...@@ -127,7 +128,7 @@ public function jsonapiBlockContentFilterAccess(EntityTypeInterface $entity_type ...@@ -127,7 +128,7 @@ public function jsonapiBlockContentFilterAccess(EntityTypeInterface $entity_type
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'comment'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'comment'.
        */ */
        #[Hook('jsonapi_comment_filter_access')] #[Hook('jsonapi_comment_filter_access')]
        public function jsonapiCommentFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiCommentFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\comment\CommentAccessControlHandler::checkAccess() // @see \Drupal\comment\CommentAccessControlHandler::checkAccess()
        // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for
        // (access to the commented entity), so this does not have to. // (access to the commented entity), so this does not have to.
        ...@@ -141,7 +142,7 @@ public function jsonapiCommentFilterAccess(EntityTypeInterface $entity_type, Acc ...@@ -141,7 +142,7 @@ public function jsonapiCommentFilterAccess(EntityTypeInterface $entity_type, Acc
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'entity_test'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'entity_test'.
        */ */
        #[Hook('jsonapi_entity_test_filter_access')] #[Hook('jsonapi_entity_test_filter_access')]
        public function jsonapiEntityTestFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiEntityTestFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\entity_test\EntityTestAccessControlHandler::checkAccess() // @see \Drupal\entity_test\EntityTestAccessControlHandler::checkAccess()
        return [ return [
        JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'view test entity'), JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'view test entity'),
        ...@@ -152,7 +153,7 @@ public function jsonapiEntityTestFilterAccess(EntityTypeInterface $entity_type, ...@@ -152,7 +153,7 @@ public function jsonapiEntityTestFilterAccess(EntityTypeInterface $entity_type,
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'file'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'file'.
        */ */
        #[Hook('jsonapi_file_filter_access')] #[Hook('jsonapi_file_filter_access')]
        public function jsonapiFileFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiFileFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\file\FileAccessControlHandler::checkAccess() // @see \Drupal\file\FileAccessControlHandler::checkAccess()
        // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for
        // (public OR owner), so this does not have to. // (public OR owner), so this does not have to.
        ...@@ -165,7 +166,7 @@ public function jsonapiFileFilterAccess(EntityTypeInterface $entity_type, Accoun ...@@ -165,7 +166,7 @@ public function jsonapiFileFilterAccess(EntityTypeInterface $entity_type, Accoun
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'media'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'media'.
        */ */
        #[Hook('jsonapi_media_filter_access')] #[Hook('jsonapi_media_filter_access')]
        public function jsonapiMediaFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiMediaFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\media\MediaAccessControlHandler::checkAccess() // @see \Drupal\media\MediaAccessControlHandler::checkAccess()
        return [ return [
        JSONAPI_FILTER_AMONG_PUBLISHED => AccessResult::allowedIfHasPermission($account, 'view media'), JSONAPI_FILTER_AMONG_PUBLISHED => AccessResult::allowedIfHasPermission($account, 'view media'),
        ...@@ -176,7 +177,7 @@ public function jsonapiMediaFilterAccess(EntityTypeInterface $entity_type, Accou ...@@ -176,7 +177,7 @@ public function jsonapiMediaFilterAccess(EntityTypeInterface $entity_type, Accou
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'node'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'node'.
        */ */
        #[Hook('jsonapi_node_filter_access')] #[Hook('jsonapi_node_filter_access')]
        public function jsonapiNodeFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiNodeFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\node\NodeAccessControlHandler::access() // @see \Drupal\node\NodeAccessControlHandler::access()
        if ($account->hasPermission('bypass node access')) { if ($account->hasPermission('bypass node access')) {
        return [ return [
        ...@@ -211,7 +212,7 @@ public function jsonapiNodeFilterAccess(EntityTypeInterface $entity_type, Accoun ...@@ -211,7 +212,7 @@ public function jsonapiNodeFilterAccess(EntityTypeInterface $entity_type, Accoun
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'shortcut'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'shortcut'.
        */ */
        #[Hook('jsonapi_shortcut_filter_access')] #[Hook('jsonapi_shortcut_filter_access')]
        public function jsonapiShortcutFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiShortcutFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\shortcut\ShortcutAccessControlHandler::checkAccess() // @see \Drupal\shortcut\ShortcutAccessControlHandler::checkAccess()
        // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for
        // (shortcut_set = $shortcut_set_storage->getDisplayedToUser($current_user)), // (shortcut_set = $shortcut_set_storage->getDisplayedToUser($current_user)),
        ...@@ -228,7 +229,7 @@ public function jsonapiShortcutFilterAccess(EntityTypeInterface $entity_type, Ac ...@@ -228,7 +229,7 @@ public function jsonapiShortcutFilterAccess(EntityTypeInterface $entity_type, Ac
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'taxonomy_term'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'taxonomy_term'.
        */ */
        #[Hook('jsonapi_taxonomy_term_filter_access')] #[Hook('jsonapi_taxonomy_term_filter_access')]
        public function jsonapiTaxonomyTermFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiTaxonomyTermFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\taxonomy\TermAccessControlHandler::checkAccess() // @see \Drupal\taxonomy\TermAccessControlHandler::checkAccess()
        return [ return [
        JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'administer taxonomy'), JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'administer taxonomy'),
        ...@@ -240,7 +241,7 @@ public function jsonapiTaxonomyTermFilterAccess(EntityTypeInterface $entity_type ...@@ -240,7 +241,7 @@ public function jsonapiTaxonomyTermFilterAccess(EntityTypeInterface $entity_type
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'user'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'user'.
        */ */
        #[Hook('jsonapi_user_filter_access')] #[Hook('jsonapi_user_filter_access')]
        public function jsonapiUserFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiUserFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\user\UserAccessControlHandler::checkAccess() // @see \Drupal\user\UserAccessControlHandler::checkAccess()
        // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for // \Drupal\jsonapi\Access\TemporaryQueryGuard adds the condition for
        // (!isAnonymous()), so this does not have to. // (!isAnonymous()), so this does not have to.
        ...@@ -254,7 +255,7 @@ public function jsonapiUserFilterAccess(EntityTypeInterface $entity_type, Accoun ...@@ -254,7 +255,7 @@ public function jsonapiUserFilterAccess(EntityTypeInterface $entity_type, Accoun
        * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'workspace'. * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'workspace'.
        */ */
        #[Hook('jsonapi_workspace_filter_access')] #[Hook('jsonapi_workspace_filter_access')]
        public function jsonapiWorkspaceFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account) { public function jsonapiWorkspaceFilterAccess(EntityTypeInterface $entity_type, AccountInterface $account): array {
        // @see \Drupal\workspaces\WorkspaceAccessControlHandler::checkAccess() // @see \Drupal\workspaces\WorkspaceAccessControlHandler::checkAccess()
        return [ return [
        JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'view any workspace'), JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'view any workspace'),
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment