From 0d574a55f47e3e19ab92ec9814b3f274459c6dc7 Mon Sep 17 00:00:00 2001
From: David Hasell <49118-qdoscc@users.noreply.drupalcode.org>
Date: Thu, 1 Jun 2023 01:36:32 +0000
Subject: [PATCH] Issue #3297233: Add ::accessCheck() call to every entityQuery
---
src/Entity/FillPdfForm.php | 1 +
tests/src/Functional/FillPdfFormDeleteFormTest.php | 2 +-
tests/src/Functional/FillPdfFormDuplicateFormTest.php | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/Entity/FillPdfForm.php b/src/Entity/FillPdfForm.php
index 7215aef..6e01daa 100644
--- a/src/Entity/FillPdfForm.php
+++ b/src/Entity/FillPdfForm.php
@@ -236,6 +236,7 @@ class FillPdfForm extends ContentEntityBase implements FillPdfFormInterface {
public function getFormFields() {
$field_ids = \Drupal::entityQuery('fillpdf_form_field')
->condition('fillpdf_form', $this->id())
+ ->accessCheck(TRUE)
->execute();
$field_storage = \Drupal::entityTypeManager()->getStorage('fillpdf_form_field');
$fields = $field_storage->loadMultiple($field_ids);
diff --git a/tests/src/Functional/FillPdfFormDeleteFormTest.php b/tests/src/Functional/FillPdfFormDeleteFormTest.php
index e9d8fcc..af2a9bf 100644
--- a/tests/src/Functional/FillPdfFormDeleteFormTest.php
+++ b/tests/src/Functional/FillPdfFormDeleteFormTest.php
@@ -83,7 +83,7 @@ class FillPdfFormDeleteFormTest extends BrowserTestBase {
$form_id = $this->getLatestFillPdfForm();
// Verify the FillPdfForm's fields are stored.
- $field_ids = \Drupal::entityQuery('fillpdf_form_field')->condition('fillpdf_form', $form_id)->execute();
+ $field_ids = \Drupal::entityQuery('fillpdf_form_field')->condition('fillpdf_form', $form_id)->accessCheck(TRUE)->execute();
$this->assertCount(4, $field_ids, "4 FillPdfFormFields have been created.");
// We're on the edit form. Click 'Delete' and confirm deletion.
diff --git a/tests/src/Functional/FillPdfFormDuplicateFormTest.php b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
index d81d739..9863531 100644
--- a/tests/src/Functional/FillPdfFormDuplicateFormTest.php
+++ b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
@@ -45,7 +45,7 @@ class FillPdfFormDuplicateFormTest extends BrowserTestBase {
$template_fid = FillPdfForm::load($form_id)->fid->value;
// Verify the FillPdfForm's fields are stored.
- $field_ids = \Drupal::entityQuery('fillpdf_form_field')->condition('fillpdf_form', $form_id)->execute();
+ $field_ids = \Drupal::entityQuery('fillpdf_form_field')->condition('fillpdf_form', $form_id)->accessCheck(TRUE)->execute();
$this->assertCount(4, $field_ids, "4 FillPdfFormFields have been created.");
// We're now on the edit form. Add an admin title.
@@ -73,7 +73,7 @@ class FillPdfFormDuplicateFormTest extends BrowserTestBase {
// but are using the same template file.
$new_form_id = $this->getLatestFillPdfForm();
$this->assertNotEquals($new_form_id, $form_id);
- $field_ids = \Drupal::entityQuery('fillpdf_form_field')->condition('fillpdf_form', $new_form_id)->execute();
+ $field_ids = \Drupal::entityQuery('fillpdf_form_field')->condition('fillpdf_form', $new_form_id)->accessCheck(TRUE)->execute();
foreach ($field_ids as $id) {
$this->assertNotNull(FillPdfFormField::load($id), "The FillPdfFormField #{$id} has ben duplicated.");
}
--
GitLab