Force url as routePath

sulu · Jul 25, 2024 · 8ff222b · 8ff222b
1 parent 82eeaa8
commit 8ff222b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/PhpcrMigration/Application/Persister/AbstractPersister.php b/PhpcrMigration/Application/Persister/AbstractPersister.php
@@ -312,7 +312,7 @@ protected function createOrUpdateRoute(array $document): void
                         'locale' => $locale,
                     ]
                 );
-            } catch (\Exception $e) {
+            } catch (\Exception $e) { // @phpstan-ignore-line
                 echo \PHP_EOL;
                 echo \PHP_EOL;
                 echo $e->getMessage();

diff --git a/PhpcrMigration/Application/Persister/ArticlePersister.php b/PhpcrMigration/Application/Persister/ArticlePersister.php
@@ -60,9 +60,11 @@ protected function mapData(array $document, ?string $locale, array $data, bool $
         if (isset($document['localizations'][$locale]['routePathName']) && isset($document['localizations'][$locale]['routePath'])) {
             $routePathName = $document['localizations'][$locale]['routePathName'];
             $routePathName = \str_starts_with($routePathName, 'i18n:') ? \explode('-', $routePathName, 2)[1] : $routePathName;
-            $routePath = $document['localizations'][$locale]['routePath'];
+            // check routePathName property and fallback to routePath
+            $routePath = $document['localizations'][$locale][$routePathName] ?? $document['localizations'][$locale]['routePath'];
 
-            $data['templateData'][$routePathName] = $routePath;
+            // content bundle is only compatible with "url"
+            $data['templateData']['url'] = $routePath;
         }
 
         return $data;