diff --git a/src/Plugin/facets/processor/BooleanItemProcessor.php b/src/Plugin/facets/processor/BooleanItemProcessor.php index 0a35ffb..52f07a2 100644 --- a/src/Plugin/facets/processor/BooleanItemProcessor.php +++ b/src/Plugin/facets/processor/BooleanItemProcessor.php @@ -2,11 +2,11 @@ namespace Drupal\facets\Plugin\facets\processor; +use Drupal\Core\TypedData\ComplexDataDefinitionInterface; use Drupal\facets\FacetInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\facets\Processor\BuildProcessorInterface; use Drupal\facets\Processor\ProcessorPluginBase; -use Drupal\search_api\Processor\ProcessorPropertyInterface; /** * Provides a processor for boolean labels. @@ -90,7 +90,10 @@ public function defaultConfiguration() { */ public function supportsFacet(FacetInterface $facet) { $data_definition = $facet->getDataDefinition(); - if ($data_definition instanceof ProcessorPropertyInterface) { + if ($data_definition->getDataType() == "boolean") { + return TRUE; + } + if (!($data_definition instanceof ComplexDataDefinitionInterface)) { return FALSE; } diff --git a/src/Plugin/facets/processor/TranslateEntityProcessor.php b/src/Plugin/facets/processor/TranslateEntityProcessor.php index 771c75a..ce33a97 100644 --- a/src/Plugin/facets/processor/TranslateEntityProcessor.php +++ b/src/Plugin/facets/processor/TranslateEntityProcessor.php @@ -5,13 +5,13 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; +use Drupal\Core\TypedData\ComplexDataDefinitionInterface; use Drupal\Core\TypedData\DataReferenceDefinitionInterface; use Drupal\Core\TypedData\TranslatableInterface; use Drupal\facets\Exception\InvalidProcessorException; use Drupal\facets\FacetInterface; use Drupal\facets\Processor\BuildProcessorInterface; use Drupal\facets\Processor\ProcessorPluginBase; -use Drupal\search_api\Processor\ProcessorPropertyInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -142,7 +142,10 @@ public function build(FacetInterface $facet, array $results) { */ public function supportsFacet(FacetInterface $facet) { $data_definition = $facet->getDataDefinition(); - if ($data_definition instanceof ProcessorPropertyInterface) { + if ($data_definition->getDataType() == "boolean") { + return TRUE; + } + if (!($data_definition instanceof ComplexDataDefinitionInterface)) { return FALSE; } diff --git a/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php b/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php index 490f9f9..76ab37d 100644 --- a/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php +++ b/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php @@ -2,11 +2,10 @@ namespace Drupal\facets\Plugin\facets\processor; -use Drupal\Core\TypedData\DataReferenceDefinitionInterface; -use Drupal\facets\FacetInterface; +use Drupal\Core\TypedData\ComplexDataDefinitionInterface; +use Drupal\Core\TypedData\DataReferenceDefinitionInterface;use Drupal\facets\FacetInterface; use Drupal\facets\Processor\BuildProcessorInterface; use Drupal\facets\Processor\ProcessorPluginBase; -use Drupal\search_api\Processor\ProcessorPropertyInterface; use Drupal\user\Entity\User; /** @@ -46,7 +45,10 @@ public function build(FacetInterface $facet, array $results) { */ public function supportsFacet(FacetInterface $facet) { $data_definition = $facet->getDataDefinition(); - if ($data_definition instanceof ProcessorPropertyInterface) { + if ($data_definition->getDataType() == "boolean") { + return TRUE; + } + if (!($data_definition instanceof ComplexDataDefinitionInterface)) { return FALSE; }