Commit 8f60f80b authored by Jeroen Tubex's avatar Jeroen Tubex
Browse files

Issue #3271076 by JeroenT: Fix mb_strtolower on PHP 8

parent 9dcb3aad

src/FieldFallbackService.php

+3 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ namespace Drupal\field_fallback; 
use Drupal\Core\Entity\EntityInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\Core\Entity\FieldableEntityInterface;

use Drupal\Core\Entity\TranslatableInterface;

use Drupal\Core\Language\LanguageManagerInterface;

use Drupal\field\FieldConfigInterface;

use Drupal\field_fallback\Plugin\FieldFallbackConverterManagerInterface;
@@ -92,7 +91,7 @@ class FieldFallbackService { 


    // Get the translated entity, when available.

    $language_id = $this->languageManager->getCurrentLanguage()->getId();

    if ($entity instanceof TranslatableInterface && $entity->hasTranslation($language_id)) {

    if ($entity->hasTranslation($language_id)) {

      $entity = $entity->getTranslation($language_id);

    }
@@ -102,7 +101,6 @@ class FieldFallbackService { 
      }



      if ($this->fieldFallbackConverterManager->hasDefinition($fallback_field['converter'])) {

        /** @var \Drupal\field_fallback\Plugin\FieldFallbackConverterInterface $converter */

        $converter = $this->fieldFallbackConverterManager->createInstance($fallback_field['converter'], $fallback_field['configuration'] ?? []);

        $converter->setEntity($entity);

        $converter->setTargetField($entity->get($field)->getFieldDefinition());
@@ -179,7 +177,7 @@ class FieldFallbackService { 
  public function cleanupConfigFields(FieldConfigInterface $deleted_field_config): void {

    $field_config_ids = $this->getFieldConfigIdsWithFallback(

      $deleted_field_config->getTargetEntityTypeId(),

      $deleted_field_config->getTargetBundle() ?? $deleted_field_config->getTargetEntityTypeId()

      $deleted_field_config->getTargetBundle()

    );



    if (empty($field_config_ids)) {
@@ -213,7 +211,7 @@ class FieldFallbackService { 
    return $this->fieldConfigStorage->getQuery()

      ->condition('entity_type', $entity_type_id)

      ->condition('bundle', $bundle)

      ->condition('third_party_settings.field_fallback.field', NULL, '<>')

      ->condition('third_party_settings.field_fallback.field', NULL, 'IS NOT NULL')

      ->execute();

  }