Fix merge 8.x.4.x

Author: jcapote1x

src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php

@@ -3,6 +3,8 @@
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Routing;
 
 use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Path\PathValidatorInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
@@ -44,6 +46,13 @@ class RouteLoad extends DataProducerPluginBase implements ContainerFactoryPlugin
    */
   protected $redirectRepository;
 
+  /**
+   * Language manager for retrieving the default langcode.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
   /**
    * {@inheritdoc}
    *
@@ -55,6 +64,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $container->get('path.validator'),
+      $container->get('language_manager'),
       $container->get('redirect.repository', ContainerInterface::NULL_ON_INVALID_REFERENCE)
     );
   }
@@ -70,6 +80,8 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The plugin definition.
    * @param \Drupal\Core\Path\PathValidatorInterface $pathValidator
    *   The path validator service.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $languageManager
+   *   The language manager.
    * @param \Drupal\redirect\RedirectRepository|null $redirectRepository
    *
    * @codeCoverageIgnore
@@ -79,10 +91,12 @@ public function __construct(
     $pluginId,
     $pluginDefinition,
     PathValidatorInterface $pathValidator,
+    LanguageManagerInterface $languageManager,
     ?RedirectRepository $redirectRepository = NULL
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->pathValidator = $pathValidator;
+    $this->languageManager = $languageManager;
     $this->redirectRepository = $redirectRepository;
   }
 
@@ -95,7 +109,8 @@ public function __construct(
    * @return \Drupal\Core\Url|null
    */
   public function resolve($path, RefinableCacheableDependencyInterface $metadata) {
-    $redirect = $this->redirectRepository ? $this->redirectRepository->findMatchingRedirect($path, []) : NULL;
+    $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_URL)->getId();
+    $redirect = $this->redirectRepository ? $this->redirectRepository->findMatchingRedirect($path, [], $langcode) : NULL;
     if ($redirect !== NULL) {
       $url = $redirect->getRedirectUrl();
     }