From 45abcb54d79cf810a14d435d64262c47bdcc0979 Mon Sep 17 00:00:00 2001 From: AstonVictor <victor93g@gmail.com> Date: Fri, 8 Mar 2024 09:14:45 +0200 Subject: [PATCH] Issue #3426550 - Fix validation --- entity_body_class.module | 2 +- src/EntityBodyClassPermissions.php | 3 ++- src/Form/EntityBodyClassForm.php | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/entity_body_class.module b/entity_body_class.module index f31f319..68b7d73 100644 --- a/entity_body_class.module +++ b/entity_body_class.module @@ -33,7 +33,7 @@ function entity_body_class_help($route_name, RouteMatchInterface $route_match) { function entity_body_class_entity_base_field_info(EntityTypeInterface $entity_type) { $fields = []; - if (in_array('Drupal\Core\Entity\ContentEntityInterface', class_implements($entity_type->getOriginalClass())) && + if (in_array(ContentEntityInterface::class, class_implements($entity_type->getOriginalClass())) && $entity_type->getLinkTemplate('canonical') ) { $fields['entity_body_class'] = BaseFieldDefinition::create('string') diff --git a/src/EntityBodyClassPermissions.php b/src/EntityBodyClassPermissions.php index 5d4a35c..b00dde1 100644 --- a/src/EntityBodyClassPermissions.php +++ b/src/EntityBodyClassPermissions.php @@ -3,6 +3,7 @@ namespace Drupal\entity_body_class; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -48,7 +49,7 @@ class EntityBodyClassPermissions implements ContainerInjectionInterface { $permissions = []; foreach ($this->entityTypeManager->getDefinitions() as $definition) { - if (in_array('Drupal\Core\Entity\ContentEntityInterface', class_implements($definition->getOriginalClass())) && + if (in_array(ContentEntityInterface::class, class_implements($definition->getOriginalClass())) && $definition->getLinkTemplate('canonical') ) { $permissions["access {$definition->id()} body class field"] = [ diff --git a/src/Form/EntityBodyClassForm.php b/src/Form/EntityBodyClassForm.php index e38b1c1..9963196 100644 --- a/src/Form/EntityBodyClassForm.php +++ b/src/Form/EntityBodyClassForm.php @@ -3,6 +3,7 @@ namespace Drupal\entity_body_class\Form; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; @@ -73,7 +74,7 @@ class EntityBodyClassForm extends ConfigFormBase { ]; foreach ($this->entityTypeManager->getDefinitions() as $definition) { - if (in_array('Drupal\Core\Entity\ContentEntityInterface', class_implements($definition->getOriginalClass())) && + if (in_array(ContentEntityInterface::class, class_implements($definition->getOriginalClass())) && $definition->getLinkTemplate('canonical') ) { $id = $definition->id(); -- GitLab