Added language mapping. Fixed tests

ibexa · Aug 17, 2023 · 0bc36a4 · 0bc36a4
1 parent c13ee03
commit 0bc36a4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php b/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php
@@ -14,6 +14,7 @@
 use Ibexa\Contracts\Core\Event\NameSchema\ResolveNameSchemaEvent;
 use Ibexa\Contracts\Core\Event\NameSchema\ResolveUrlAliasSchemaEvent;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Core\FieldType\FieldTypeRegistry;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -64,7 +65,12 @@ public function onResolveUrlAliasSchema(ResolveUrlAliasSchemaEvent $event): void
         $content = $event->getContent();
         $contentType = $content->getContentType();
         $tokenValues = $this->processEvent(
-            $event->getContent()->getVersionInfo()->getLanguages(),
+            array_map(
+                static function (Language $language) {
+                    return $language->getLanguageCode();
+                },
+                $event->getContent()->getVersionInfo()->getLanguages()
+            ),
             $event->getSchemaIdentifiers()['field'],
             $contentType,
             $content,
@@ -97,6 +103,11 @@ private function processNameSchemaEvent(AbstractNameSchemaEvent $event): void
         $event->setTokenValues($tokenValues);
     }
 
+    /**
+     * @param array<string> $languages
+     * @param array<string<array<string>> $identifiers
+     * @param array<string<array<string>> $tokenValues
+     */
     private function processEvent(
         array $languages,
         array $identifiers,
@@ -105,9 +116,9 @@ private function processEvent(
         array $tokenValues,
         ?array $fieldMap = null
     ): array {
-        foreach ($languages as $language) {
-            $languageCode = is_string($language) ? $language : $language->getLanguageCode();
+        foreach ($languages as $languageCode) {
             foreach ($identifiers as $identifier) {
+                $tokenValues[$languageCode] = [];
                 $fieldDefinition = $contentType->getFieldDefinition($identifier);
                 if (null === $fieldDefinition) {
                     continue;

diff --git a/src/lib/Repository/NameSchema/NameSchemaService.php b/src/lib/Repository/NameSchema/NameSchemaService.php
@@ -274,6 +274,10 @@ protected function filterNameSchema(string $nameSchema): array
      */
     public function buildNames(array $tokenValues, string $nameSchema): array
     {
+        if (empty($tokenValues)) {
+            throw new UnresolvedTokenNamesException();
+        }
+
         [$filteredNameSchema, $groupLookupTable] = $this->filterNameSchema($nameSchema);
         $tokens = $this->extractTokens($filteredNameSchema);
 

diff --git a/src/lib/Repository/NameSchema/UnresolvedTokenNamesException.php b/src/lib/Repository/NameSchema/UnresolvedTokenNamesException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Core\Repository\NameSchema;
+
+use LogicException;
+
+final class UnresolvedTokenNamesException extends LogicException
+{
+}