Merge pull request #13 from antistatique/1.0.x--support-drupal-10

Author: WengerK

.github/workflows/ci.yml

@@ -5,14 +5,15 @@ on:
     - cron: '0 0 * * THU'
 
 jobs:
+
   tests:
     name: Tests
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        drupal_version: ['9.3', '9.4', '9.5']
+        drupal_version: ['9.3', '9.4', '9.5', '10.0']
         module: ['home_redirect_lang']
         experimental: [ false ]
 
@@ -32,7 +33,7 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.3', '9.4', '9.5']
+        drupal_version: ['9.3', '9.4', '9.5', '10.0']
         module: ['home_redirect_lang']
         experimental: [ false ]
 

CHANGELOG.md

@@ -7,13 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Fixed
 - fix Issue #3320300: Avoid "Uncaught ReferenceError: Drupal is not defined" for anonymous users
+- fix parse_url(): passing null to parameter #1 () of type string is deprecated
+- fix Drupal 10 (Symfony 6) Kernel Event Priorities
 
 ### Removed
 - remove satackey/action-docker-layer-caching on Github Actions
+- drop support of drupal below 9.3.x
 
 ### Added
 - add coverage for Drupal 9.3, 9.4 & 9.5
-- drop support of drupal below 9.3.x
+- add official support of drupal 9.5 & 10.0
+
+### Changed
+- re-enable PHPUnit Symfony Deprecation notice
 
 ## [1.0.0-alpha1] - 2022-09-22
 ### Added

CONTRIBUTING.md

@@ -23,7 +23,7 @@ First, you will need to have the following tools installed
 globally on your environment:
 
   * drush
-  * Latest dev release of Drupal 9.x.
+  * Latest dev release of Drupal 9.x/10.x.
   * docker
   * docker-compose
 

Dockerfile

@@ -5,7 +5,7 @@ ARG BASE_IMAGE_TAG
 ENV BASE_IMAGE_TAG=${BASE_IMAGE_TAG}
 
 # Disable deprecation notice.
-ENV SYMFONY_DEPRECATIONS_HELPER=disabled
+# ENV SYMFONY_DEPRECATIONS_HELPER=disabled
 
 # Register the Drupal and DrupalPractice Standard with PHPCS.
 #RUN ./vendor/bin/phpcs --config-set installed_paths \

src/EventSubscriber/HomepageBrowserLanguageRedirection.php

@@ -25,6 +25,21 @@
  */
 class HomepageBrowserLanguageRedirection implements EventSubscriberInterface {
 
+  /**
+   * The Browser Redirection must be triggered before the Cookie redirection.
+   *
+   * The value here must be higher than
+   * {@HomepageCookieLanguageRedirection::PRIORITY}.
+   *
+   * This needs to run after \Symfony\Component\HttpKernel\EventListener\RouterListener::onKernelRequest(),
+   * which has a priority of 32.
+   * This needs to run before \Drupal\home_redirect_lang\EventSubscriber\HomepageCookieLanguageRedirection::redirectPreferredLanguage(),
+   * which has a priority of 30.
+   *
+   * @var int
+   */
+  private const PRIORITY = 31;
+
   /**
    * Symfony\Component\HttpFoundation\RequestStack definition.
    *
@@ -66,9 +81,9 @@ public function __construct(RequestStack $request_stack, PathMatcher $path_match
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
-      KernelEvents::REQUEST => ['redirectPreferredLanguage'],
+      KernelEvents::REQUEST => ['redirectPreferredLanguage', self::PRIORITY],
     ];
   }
 
@@ -78,7 +93,7 @@ public static function getSubscribedEvents() {
    * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event
    *   The event.
    */
-  public function redirectPreferredLanguage(RequestEvent $event) {
+  public function redirectPreferredLanguage(RequestEvent $event): void {
     if (!$this->pathMatcher->isFrontPage()) {
       return;
     }
@@ -97,14 +112,14 @@ public function redirectPreferredLanguage(RequestEvent $event) {
       return;
     }
 
-    // Whether or not preventing redirection when Referer Header is given.
+    // Whether preventing redirection when Referer Header is given.
     $referer_bypass_enabled = (bool) $this->configFactory->get('home_redirect_lang.browser_fallback')->get('enable_referer_bypass');
 
     /** @var \Drupal\Core\Language\Language $current_language */
     $current_language = $this->languageManager->getCurrentLanguage();
     $http_referer = $this->request->server->get('HTTP_REFERER');
     $current_host = $this->request->getHost();
-    $referer_host = parse_url($http_referer, \PHP_URL_HOST);
+    $referer_host = parse_url((string) $http_referer, \PHP_URL_HOST);
 
     // Ensure the REFERER is external to disable redirection.
     if ($referer_bypass_enabled && !empty($referer_host) && !empty($current_host) && $current_host !== $referer_host) {
@@ -113,7 +128,7 @@ public function redirectPreferredLanguage(RequestEvent $event) {
 
     // When the preferred language cookie exists, then use it instead of the
     // browser fallback.
-    if ($this->request->cookies->has(HomeRedirectLangInterface::COOKIE_PREFERRED_LANGCODE)) {
+    if ($this->request->cookies->has(HomeRedirectLangInterface::COOKIE_PREFERRED_LANGCODE) && $this->request->cookies->get(HomeRedirectLangInterface::COOKIE_PREFERRED_LANGCODE) !== '') {
       return;
     }
 
@@ -126,7 +141,7 @@ public function redirectPreferredLanguage(RequestEvent $event) {
       return;
     }
 
-    // Ensure the stored langcode on the cookie is supported by Drupal.
+    // Ensure the stored langcode on the browser is supported by Drupal.
     /** @var \Drupal\Core\Language\Language|null $destination_language */
     $destination_language = $this->languageManager->getLanguage($destination_langcode);
 

src/EventSubscriber/HomepageCookieLanguageRedirection.php

@@ -22,6 +22,20 @@
  */
 class HomepageCookieLanguageRedirection implements EventSubscriberInterface {
 
+  /**
+   * The Cookie Redirection must be triggered after the Browser redirection.
+   *
+   * The value here must be lower than
+   * {@HomepageBrowserLanguageRedirection::PRIORITY}.
+   * This needs to run after \Symfony\Component\HttpKernel\EventListener\RouterListener::onKernelRequest(),
+   * which has a priority of 32.
+   * This needs to run after \Drupal\home_redirect_lang\EventSubscriber\HomepageBrowserLanguageRedirection::redirectPreferredLanguage(),
+   * which has a priority of 31.
+   *
+   * @var int
+   */
+  private const PRIORITY = 30;
+
   /**
    * Symfony\Component\HttpFoundation\RequestStack definition.
    *
@@ -63,9 +77,9 @@ public function __construct(RequestStack $request_stack, PathMatcher $path_match
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
-      KernelEvents::REQUEST => ['redirectPreferredLanguage'],
+      KernelEvents::REQUEST => ['redirectPreferredLanguage', self::PRIORITY],
     ];
   }
 
@@ -75,18 +89,18 @@ public static function getSubscribedEvents() {
    * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event
    *   The event.
    */
-  public function redirectPreferredLanguage(RequestEvent $event) {
+  public function redirectPreferredLanguage(RequestEvent $event): void {
     if (!$this->pathMatcher->isFrontPage()) {
       return;
     }
 
-    // Whether or not preventing redirection when Referer Header is given.
+    // Whether preventing redirection when Referer Header is given.
     $referer_bypass_enabled = (bool) $this->configFactory->get('home_redirect_lang.cookie')->get('enable_referer_bypass');
 
     $current_language = $this->languageManager->getCurrentLanguage();
     $http_referer = $this->request->server->get('HTTP_REFERER');
     $current_host = $this->request->getHost();
-    $referer_host = parse_url($http_referer, \PHP_URL_HOST);
+    $referer_host = parse_url((string) $http_referer, \PHP_URL_HOST);
 
     // Ensure the REFERER is external to disable redirection.
     if ($referer_bypass_enabled && !empty($referer_host) && !empty($current_host) && $current_host !== $referer_host) {

tests/src/Functional/AssertRedirectTrait.php

@@ -43,7 +43,7 @@ public function assertRedirect($path, $expected_destination, $status_code = 301)
    *
    * @throws \Behat\Mink\Exception\ExpectationException
    */
-  protected function assertNoRedirect($path, $status_code = 200): void {
+  protected function assertNoRedirect(string $path, int $status_code = 200): void {
     $url = $this->getAbsoluteUrl($path);
     $this->getSession()->visit($url);
 

tests/src/Functional/CookieOverrideBrowserLanguageRedirectionFunctionalTest.php

@@ -57,7 +57,7 @@ public function testCookieMustRedirectOverBrowserPreferredRedirection(string $co
   }
 
   /**
-   * Provides test data for the cookie redirection overrode browser.
+   * Provides test data for the cookie redirection override browser.
    */
   public function providerCookieMustRedirectOverBrowserPreferredRedirection(): iterable {
     yield ['en', 'en', 'fr', '/'];