Commit a876091c authored by catch's avatar catch
Browse files

fix: #3557153 \Drupal\language\LanguageNegotiator::negotiateLanguage() causes... 

fix: #3557153 \Drupal\language\LanguageNegotiator::negotiateLanguage() causes deprecation on PHP 8.5

By: @alexpott
By: @smustgrave
parent 62000897

core/modules/language/src/LanguageNegotiator.php

+7 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ protected function getEnabledNegotiators($type) { 
   *   language.

   *

   * @return \Drupal\Core\Language\LanguageInterface|null

   *   Negotiated language object for given type and method, FALSE otherwise.

   *   Negotiated language object for given type and method, NULL otherwise.

   */

  protected function negotiateLanguage($type, $method_id) {

    $langcode = NULL;
@@ -197,10 +197,14 @@ protected function negotiateLanguage($type, $method_id) { 
      $langcode = $this->getNegotiationMethodInstance($method_id)->getLangcode($this->requestStack->getCurrentRequest());

    }



    if ($langcode !== NULL) {

      $languages = $this->languageManager->getLanguages();

      return $languages[$langcode] ?? NULL;

    }



    return NULL;

  }



  /**

   * {@inheritdoc}

   */