D10 fixes

composer.json

@@ -13,7 +13,15 @@
         "ext-dom": "*"
     },
     "conflict": {
-        "drupal/helfi_tunnistamo": "<=2.2.1"
+        "drupal/helfi_tunnistamo": "<=2.2.1",
+        "drupal/core": "<10.1"
+    },
+    "extra": {
+        "patches": {
+            "drupal/core": {
+                "[#3385550] Language negotiation breaks updating Drupal 9 to 10": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-proxy/ffbde3654e0011e237a17ea1cb3a7291685e0c30/patches/3385550.patch"
+            }
+        }
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",

patches/3385550.patch

@@ -0,0 +1,16 @@
+diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
+index 133604df1b314ef54d054fbddaf81b2fe0e4b220..917e591171fb61076e8b3236bbb77855b54ebe31 100644
+--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
++++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
+@@ -130,10 +130,7 @@ public function processOutbound($path, &$options = [], Request $request = NULL,
+     }
+     $languages = array_flip(array_keys($this->languageManager->getLanguages()));
+     // Language can be passed as an option, or we go for current URL language.
+-    if (!isset($options['language']) || ($options['language'] instanceof LanguageInterface && in_array($options['language']->getId(), [
+-      LanguageInterface::LANGCODE_NOT_SPECIFIED,
+-      LanguageInterface::LANGCODE_NOT_APPLICABLE,
+-    ]))) {
++    if (!isset($options['language']) || ($options['language'] instanceof LanguageInterface && $options['language']->getId() == LanguageInterface::LANGCODE_NOT_SPECIFIED)) {
+       $language_url = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_URL);
+       $options['language'] = $language_url;
+     }

tests/src/Kernel/ActiveSitePrefixTest.php

@@ -11,7 +11,6 @@
 /**
  * Tests Active site prefix service.
  *
- * @coversDefaultClass \Drupal\helfi_proxy\ActiveSitePrefix
  * @group helfi_proxy
  */
 class ActiveSitePrefixTest extends KernelTestBase {
@@ -38,9 +37,6 @@ private function getSut() : ActiveSitePrefix {
 
   /**
    * Tests ::getPrefix() without proxy paths.
-   *
-   * @covers ::getPrefix
-   * @covers ::getPrefixes
    */
   public function testEmptyPrefix() : void {
     $this->assertEquals(NULL, $this->getSut()->getPrefix());
@@ -49,9 +45,6 @@ public function testEmptyPrefix() : void {
 
   /**
    * Tests ::getPrefix with proxy paths.
-   *
-   * @covers ::getPrefix
-   * @covers ::getPrefixes
    */
   public function testPrefix() : void {
     $prefixes = [

tests/src/Kernel/CorsResponseSubscriberTest.php

@@ -10,7 +10,6 @@
 /**
  * Tests CORS response subscriber.
  *
- * @coversDefaultClass \Drupal\helfi_proxy\EventSubscriber\CorsResponseSubscriber
  * @group helfi_proxy
  */
 class CorsResponseSubscriberTest extends KernelTestBase {

tests/src/Kernel/ProxyManagerTest.php

@@ -11,7 +11,6 @@
 /**
  * Tests Proxy manager.
  *
- * @coversDefaultClass \Drupal\helfi_proxy\ProxyManager
  * @group helfi_proxy
  */
 class ProxyManagerTest extends KernelTestBase {
@@ -37,10 +36,6 @@ private function proxyManager() : ProxyManager {
 
   /**
    * Tests instance prefixes.
-   *
-   * @covers ::getConfig
-   * @covers ::isConfigured
-   * @covers ::__construct
    */
   public function testPrefixes() : void {
     $this->assertFalse($this->proxyManager()->isConfigured(ProxyManagerInterface::PREFIXES));
@@ -75,10 +70,6 @@ private function setAssetPath(string $path) : void {
 
   /**
    * Tests tunnistamo return url.
-   *
-   * @covers ::getConfig
-   * @covers ::isConfigured
-   * @covers ::__construct
    */
   public function testTunnistamoReturnUrl() : void {
     $this->assertFalse($this->proxyManager()->isConfigured(ProxyManagerInterface::TUNNISTAMO_RETURN_URL));
@@ -94,10 +85,6 @@ public function testTunnistamoReturnUrl() : void {
 
   /**
    * Tests asset path.
-   *
-   * @covers ::getConfig
-   * @covers ::isConfigured
-   * @covers ::__construct
    */
   public function testAssetPath() : void {
     $this->assertFalse($this->proxyManager()->isConfigured(ProxyManagerInterface::ASSET_PATH));
@@ -109,10 +96,6 @@ public function testAssetPath() : void {
 
   /**
    * Tests process path.
-   *
-   * @covers ::isLocalAsset
-   * @covers ::getConfig
-   * @covers ::processPath
    */
   public function testProcessPath() : void {
     // Make sure nothing is done if asset path is not configured.

tests/src/Kernel/RobotsResponseSubscriberTest.php

@@ -15,7 +15,6 @@
 /**
  * Tests robots response headers.
  *
- * @coversDefaultClass \Drupal\helfi_proxy\EventSubscriber\RobotsResponseSubscriber
  * @group helfi_proxy
  */
 class RobotsResponseSubscriberTest extends KernelTestBase {
@@ -86,11 +85,6 @@ private function assertResponseEventNoHeader(ResponseEvent $event) : void {
 
   /**
    * Tests that robots header is present when configuration is set.
-   *
-   * @covers ::robotsHeaderEnabled
-   * @covers ::onResponse
-   * @covers ::__construct
-   * @covers ::addRobotHeader
    */
   public function testConfig() : void {
     $this->config('helfi_proxy.settings')
@@ -111,10 +105,6 @@ public function testConfig() : void {
 
   /**
    * Tests that robots header is not present when no env variable is set.
-   *
-   * @covers ::robotsHeaderEnabled
-   * @covers ::onResponse
-   * @covers ::__construct
    */
   public function testNoEnvVariable() : void {
     $event = $this->getResponseEvent();
@@ -133,11 +123,6 @@ public function testNoEnvVariable() : void {
 
   /**
    * Tests that robots header is added when env variable is present.
-   *
-   * @covers ::robotsHeaderEnabled
-   * @covers ::onResponse
-   * @covers ::__construct
-   * @covers ::addRobotHeader
    */
   public function testEnvVariable() : void {
     putenv(RobotsResponseSubscriber::X_ROBOTS_TAG_HEADER_NAME . '=1');
@@ -148,11 +133,6 @@ public function testEnvVariable() : void {
 
   /**
    * Tests robots path handler.
-   *
-   * @covers ::robotsHeaderEnabled
-   * @covers ::onResponse
-   * @covers ::__construct
-   * @covers ::addRobotHeader
    */
   public function testRobotsPaths() : void {
     $this->config('helfi_proxy.settings')

tests/src/Kernel/SessionConfigurationTest.php

@@ -13,7 +13,6 @@
 /**
  * Tests session configuration.
  *
- * @coversDefaultClass \Drupal\helfi_proxy\SessionConfiguration
  * @group helfi_proxy
  */
 class SessionConfigurationTest extends KernelTestBase {
@@ -51,11 +50,6 @@ public function setUp() : void {
 
   /**
    * Tests session suffix from configuration.
-   *
-   * @covers ::getOptions
-   * @covers ::getName
-   * @covers ::getSuffix
-   * @covers ::__construct
    */
   public function testSessionNameConfig() : void {
     $this->config('helfi_proxy.settings')
@@ -68,11 +62,6 @@ public function testSessionNameConfig() : void {
 
   /**
    * Tests session suffix from DRUPAL_SESSION_SUFFIX env variable.
-   *
-   * @covers ::getOptions
-   * @covers ::getName
-   * @covers ::getSuffix
-   * @covers ::__construct
    */
   public function testSessionNameEnvVariable() : void {
     putenv('DRUPAL_SESSION_SUFFIX=testlocal');
@@ -83,12 +72,6 @@ public function testSessionNameEnvVariable() : void {
 
   /**
    * Tests session suffix fallback.
-   *
-   * @covers ::getCleanHostname
-   * @covers ::getOptions
-   * @covers ::getName
-   * @covers ::getSuffix
-   * @covers ::__construct
    */
   public function testSessionNameFallback() : void {
     $options = $this->configuration->getOptions($this->requestStack->getCurrentRequest());

tests/src/Kernel/SitePrefixPathProcessorTest.php

@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\helfi_proxy\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\remote_entity_test\Entity\RemoteEntityTest;
+use Drupal\Tests\helfi_api_base\Traits\LanguageManagerTrait;
+
+/**
+ * Tests Active site prefix service.
+ *
+ * @group helfi_proxy
+ */
+class SitePrefixPathProcessorTest extends KernelTestBase {
+
+  use LanguageManagerTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'language',
+    'system',
+    'path_alias',
+    'content_translation',
+    'menu_link_content',
+    'user',
+    'helfi_language_negotiator_test',
+    'remote_entity_test',
+    'helfi_proxy',
+  ];
+
+  /**
+   * The proxy prefixes.
+   *
+   * @var array
+   */
+  protected array $prefixes = [
+    'sv' => 'prefix-sv',
+    'en' => 'prefix-en',
+    'fi' => 'prefix-fi',
+    'zxx' => 'prefix-zxx',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->setupLanguages();
+    $this->installEntitySchema('remote_entity_test');
+    $this->config('helfi_proxy.settings')
+      ->set('prefixes', $this->prefixes)
+      ->save();
+    $this->container->get('kernel')->rebuildContainer();
+  }
+
+  /**
+   * Tests prefixes with entity URL generation.
+   */
+  public function testToUrl(): void {
+    $entity = RemoteEntityTest::create([
+      'id' => '1',
+      'title' => 'Test en',
+      'langcode' => 'en',
+    ]);
+    $entity->save();
+
+    $entity->addTranslation('fi', [
+      'title' => 'Test fi',
+    ])->addTranslation('sv', [
+      'title' => 'Test sv',
+    ])->save();
+
+    foreach ($this->prefixes as $langcode => $prefix) {
+      $language = \Drupal::languageManager()->getLanguage($langcode);
+      $url = $entity->toUrl(options: ['language' => $language]);
+      $this->assertEquals(sprintf('/%s/rmt/1', $prefix), $url->toString());
+    }
+  }
+
+}

tests/src/Kernel/TunnistamoRedirectUrlSubscriberTest.php

@@ -17,7 +17,6 @@
 /**
  * Tests Tunnistamo redirect url subscriber.
  *
- * @coversDefaultClass \Drupal\helfi_proxy\EventSubscriber\TunnistamoRedirectUrlSubscriber
  * @group helfi_proxy
  */
 class TunnistamoRedirectUrlSubscriberTest extends KernelTestBase {