From 7f21a89a986eff684fa9eea64c75bdaa2b7e91f9 Mon Sep 17 00:00:00 2001 From: xjm Date: Sat, 30 Sep 2023 13:31:31 -0500 Subject: [PATCH] Issue #3387560 by Spokje, smustgrave: Returntype incorrect for \Drupal\Core\Entity\EntityDeleteMultipleAccessCheck::$tempStore --- .../Drupal/Core/Entity/EntityDeleteMultipleAccessCheck.php | 4 ++-- core/phpstan-baseline.neon | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/lib/Drupal/Core/Entity/EntityDeleteMultipleAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityDeleteMultipleAccessCheck.php index cdb70747ef5..dc5007a3b52 100644 --- a/core/lib/Drupal/Core/Entity/EntityDeleteMultipleAccessCheck.php +++ b/core/lib/Drupal/Core/Entity/EntityDeleteMultipleAccessCheck.php @@ -23,7 +23,7 @@ class EntityDeleteMultipleAccessCheck implements AccessInterface { /** * The tempstore service. * - * @var \Drupal\Core\TempStore\PrivateTempStoreFactory + * @var \Drupal\Core\TempStore\PrivateTempStore */ protected $tempStore; @@ -40,7 +40,7 @@ class EntityDeleteMultipleAccessCheck implements AccessInterface { * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager * The entity type manager. * @param \Drupal\Core\TempStore\PrivateTempStoreFactory $temp_store_factory - * The tempstore service. + * The tempstore factory service. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack service. */ diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon index ef99f98ca43..5d65ab6c6d2 100644 --- a/core/phpstan-baseline.neon +++ b/core/phpstan-baseline.neon @@ -522,11 +522,6 @@ parameters: count: 1 path: lib/Drupal/Core/Entity/EntityConfirmFormBase.php - - - message: "#^Variable \\$selection in empty\\(\\) always exists and is not falsy\\.$#" - count: 1 - path: lib/Drupal/Core/Entity/EntityDeleteMultipleAccessCheck.php - - message: "#^Access to an undefined property Drupal\\\\Core\\\\Entity\\\\EntityDisplayBase\\:\\:\\$_serializedKeys\\.$#" count: 2