Commit 45a96186 authored by Thomas Seidl's avatar Thomas Seidl
Browse files

Issue #3394738 by drunken monkey: Fixed fatal error after upgrade to 1.30.

parent 47ccf060
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
Search API 1.x, dev (xxxx-xx-xx):
---------------------------------
- #3394738 by drunken monkey: Fixed fatal error after upgrade to 1.30.
- #3308184 by drunken monkey, admirlju: Fixed handling of incomplete field
  definitions when generating Views data.
- #3392465 by drunken monkey: Fixed use of location filter together with AND
+8 −3
Original line number Diff line number Diff line
@@ -81,16 +81,21 @@ class FieldsHelper implements FieldsHelperInterface {
   *   The entity type bundle info service.
   * @param \Drupal\search_api\Utility\DataTypeHelperInterface $dataTypeHelper
   *   The data type helper service.
   * @param \Drupal\search_api\Utility\ThemeSwitcherInterface $themeSwitcher
   *   The theme switcher service.
   * @param \Drupal\search_api\Utility\ThemeSwitcherInterface|null $themeSwitcher
   *   (optional) The theme switcher service.
   */
  public function __construct(
    EntityTypeManagerInterface $entityTypeManager,
    EntityFieldManagerInterface $entityFieldManager,
    EntityTypeBundleInfoInterface $entityBundleInfo,
    DataTypeHelperInterface $dataTypeHelper,
    ThemeSwitcherInterface $themeSwitcher
    ?ThemeSwitcherInterface $themeSwitcher = NULL,
  ) {
    if (!$themeSwitcher) {
      @trigger_error('Constructing \Drupal\search_api\Utility\FieldsHelper without the $themeSwitcher parameter is deprecated in search_api:8.x-1.31 and it will be required in search_api:2.0.0. See https://www.drupal.org/node/3320841',
        E_USER_DEPRECATED);
      $themeSwitcher = \Drupal::service('search_api.theme_switcher');
    }
    $this->entityTypeManager = $entityTypeManager;
    $this->entityFieldManager = $entityFieldManager;
    $this->entityBundleInfo = $entityBundleInfo;