Merge remote-tracking branch 'origin/10.3' into 11.0

# Conflicts: # src/Website/LinkGenerator/CategoryLinkGenerator.php # src/Website/LinkGenerator/NewsLinkGenerator.php # src/Website/LinkGenerator/ProductLinkGenerator.php # var/classes/definition_Customer.php
pimcore · Jul 20, 2023 · 70ba7a9 · 70ba7a9
2 parents ddefe8e + 9573b1e
commit 70ba7a9
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 54 deletions.
diff --git a/dump/data-0-bootstrap.sql b/dump/data-0-bootstrap.sql
@@ -1632,6 +1632,7 @@ CREATE TABLE `object_query_CU` (
   `passwordRecoveryTokenDate` bigint(20) DEFAULT NULL,
   `customerLanguage` varchar(190) DEFAULT NULL,
   `newsletter` tinyint(1) DEFAULT NULL,
+  `newsletterActive` tinyint(1) DEFAULT NULL,
   `newsletterConfirmed` tinyint(1) DEFAULT NULL,
   `profiling` tinyint(1) DEFAULT NULL,
   `newsletterConfirmToken` varchar(190) DEFAULT NULL,
@@ -2526,6 +2527,7 @@ CREATE TABLE `object_store_CU` (
   `customerLanguage` varchar(190) DEFAULT NULL,
   `newsletter__consent` tinyint(1) DEFAULT NULL,
   `newsletter__note` int(11) DEFAULT NULL,
+  `newsletterActive` tinyint(1) DEFAULT NULL,
   `newsletterConfirmed` tinyint(1) DEFAULT NULL,
   `profiling__consent` tinyint(1) DEFAULT NULL,
   `profiling__note` int(11) DEFAULT NULL,

diff --git a/dump/data-1-object_query_CU.sql b/dump/data-1-object_query_CU.sql
diff --git a/dump/data-1-object_store_CU.sql b/dump/data-1-object_store_CU.sql
diff --git a/src/Twig/Extension/LanguageSwitcherExtension.php b/src/Twig/Extension/LanguageSwitcherExtension.php
@@ -17,13 +17,18 @@
 
 namespace App\Twig\Extension;
 
+use App\Website\LinkGenerator\AbstractProductLinkGenerator;
+use App\Website\LinkGenerator\CategoryLinkGenerator;
+use App\Website\LinkGenerator\NewsLinkGenerator;
+use App\Website\LinkGenerator\ProductLinkGenerator;
 use Pimcore\Model\Document;
 use Pimcore\Model\Document\Service;
 use Pimcore\Tool;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
+use Pimcore\Model\DataObject;
 
 class LanguageSwitcherExtension extends AbstractExtension
 {
@@ -32,25 +37,39 @@ class LanguageSwitcherExtension extends AbstractExtension
      */
     private $documentService;
 
-    /**
-     * @var UrlGeneratorInterface $urlGenerator
-     */
     private UrlGeneratorInterface $urlGenerator;
-
-    /**
-     * @var RequestStack $requestStack
-     */
     private RequestStack $requestStack;
+    private CategoryLinkGenerator $categoryLinkGenerator;
+    private NewsLinkGenerator $newsLinkGenerator;
+    private ProductLinkGenerator $productLinkGenerator;
 
-    public function __construct(Service $documentService, UrlGeneratorInterface $urlGenerator, RequestStack $requestStack)
+    public function __construct(Service $documentService, UrlGeneratorInterface $urlGenerator, RequestStack $requestStack, CategoryLinkGenerator $categoryLinkGenerator, NewsLinkGenerator $newsLinkGenerator, ProductLinkGenerator $productLinkGenerator)
     {
         $this->documentService = $documentService;
         $this->urlGenerator = $urlGenerator;
         $this->requestStack = $requestStack;
+        $this->categoryLinkGenerator = $categoryLinkGenerator;
+        $this->newsLinkGenerator = $newsLinkGenerator;
+        $this->productLinkGenerator = $productLinkGenerator;
     }
 
     public function getLocalizedLinks(Document $document): array
     {
+        $dynamicRoutesMapping = [
+            'shop-detail' => [
+                'generator' => 'productLinkGenerator',
+                'requiredField' => 'product'
+            ],
+            'shop-category' => [
+                'generator' => 'categoryLinkGenerator',
+                'requiredField' => 'category'
+            ],
+            'news-detail' => [
+                'generator' => 'newsLinkGenerator',
+                'requiredField' => 'news'
+            ]
+        ];
+
         $translations = $this->documentService->getTranslations($document);
         $request = $this->requestStack->getCurrentRequest();
 
@@ -71,12 +90,26 @@ public function getLocalizedLinks(Document $document): array
             }
 
             $route = $request->get('_route');
-            $routeParams = $request->get('_route_params');
 
-            if ($route && $routeParams) {
-                $routeParams['_locale'] = \Locale::getPrimaryLanguage($language);
-                $route = $this->urlGenerator->generate($route, $routeParams);
-                $target = $route;
+            if ($route && array_key_exists($route, $dynamicRoutesMapping)) {
+                $routeParams = $request->get('_route_params', []);
+                $requiredField = $dynamicRoutesMapping[$route]['requiredField'];
+
+                if (!array_key_exists($requiredField, $routeParams)){
+                    continue;
+                }
+
+                $generator = $dynamicRoutesMapping[$route]['generator'];
+                $object = $request->get($requiredField);
+
+                if (!is_object($object)) {
+                    $object = DataObject::getById($object);
+                }
+
+                $linkGeneratorService = $this->$generator;
+                if ($linkGeneratorService instanceof AbstractProductLinkGenerator) {
+                    $target = $linkGeneratorService->generate($object, ['locale' => \Locale::getPrimaryLanguage($language)]);
+                }
             }
 
             $links[$language] = [

diff --git a/src/Website/LinkGenerator/AbstractProductLinkGenerator.php b/src/Website/LinkGenerator/AbstractProductLinkGenerator.php
@@ -59,7 +59,7 @@ public function __construct(DocumentResolver $documentResolver, RequestStack $re
      * @param Category|null $rootCategory
      * @return string
      */
-    public function getNavigationPath(?Category $category, ?Category $rootCategory = null)
+    public function getNavigationPath(?Category $category, ?Category $rootCategory = null, $locale = null)
     {
         if (empty($rootCategory)) {
             if (!$this->document) {
@@ -83,7 +83,7 @@ public function getNavigationPath(?Category $category, ?Category $rootCategory =
         }
 
         foreach ($categories as $categoryInPath) {
-            $path .= Text::toUrl($categoryInPath->getName()).'/';
+            $path .= Text::toUrl($categoryInPath->getName($locale)).'/';
         }
 
         return $path;

diff --git a/src/Website/LinkGenerator/CategoryLinkGenerator.php b/src/Website/LinkGenerator/CategoryLinkGenerator.php
@@ -31,13 +31,15 @@ public function generate(object $object, array $params = [], bool $reset = false
             $this->document = $params['document'];
         }
 
+        $locale = $params['locale'] ?? null;
+
         return $this->pimcoreUrl->__invoke(
             [
-                'categoryname' => Text::toUrl($object->getName() ? $object->getName() : 'elements'),
+                'categoryname' => Text::toUrl($object->getName($locale) ? $object->getName($locale) : 'elements'),
                 'category' => $object->getId(),
-                'path' => $this->getNavigationPath($object, $params['rootCategory'] ?? null),
+                'path' => $this->getNavigationPath($object, $params['rootCategory'] ?? null, $locale),
                 'page' => null,
-                '_locale' => $params['locale'] ?? null,
+                '_locale' => $locale,
             ],
             'shop-category',
             $reset

diff --git a/src/Website/LinkGenerator/NewsLinkGenerator.php b/src/Website/LinkGenerator/NewsLinkGenerator.php
@@ -87,12 +87,14 @@ public function generate(object $object, array $params = []): string
                 $fullPath = $document->getProperty('news_default_document') ? substr($document->getProperty('news_default_document')->getFullPath(), strlen($localeUrlPart)) : '';
             }
 
+            $locale = $params['locale'] ?? null;
+
             return $this->pimcoreUrl->__invoke(
                 [
-                'newstitle' => Text::toUrl($object->getTitle() ? $object->getTitle() : 'news'),
+                'newstitle' => Text::toUrl($object->getTitle($locale) ? $object->getTitle($locale) : 'news'),
                 'news' => $object->getId(),
                 'path' => $fullPath,
-                '_locale' => $params['locale'] ?? null,
+                '_locale' => $locale,
             ],
                 'news-detail',
                 true

diff --git a/src/Website/LinkGenerator/ProductLinkGenerator.php b/src/Website/LinkGenerator/ProductLinkGenerator.php
@@ -61,13 +61,15 @@ protected function doGenerate($object, $params): string
                 return current($object->getUrlSlug())->getSlug();
             }
 
+            $locale = $params['locale'] ?? null;
+
             return $this->pimcoreUrl->__invoke(
                 [
                     'productname' => Text::toUrl($object->getOSName() ?? 'product'),
                     'product' => $object->getId(),
-                    'path' => $this->getNavigationPath($object->getMainCategory(), $params['rootCategory'] ?? null),
+                    'path' => $this->getNavigationPath($object->getMainCategory(), $params['rootCategory'] ?? null, $locale),
                     'page' => null,
-                    '_locale' => $params['locale'] ?? null,
+                    '_locale' => $locale,
                 ],
                 'shop-detail',
                 true

diff --git a/src/Website/Tool/PimcoreUrl.php b/src/Website/Tool/PimcoreUrl.php
@@ -30,7 +30,7 @@ public function __invoke(array $urlOptions = [], $name = null, $reset = false, $
     {
         // merge all parameters from request to parameters
         if (!$reset && $this->requestHelper->hasMainRequest()) {
-            $urlOptions = array_replace($this->requestHelper->getMainRequest()->attributes->get('_route_params'), $urlOptions);
+            $urlOptions = array_replace($this->requestHelper->getMainRequest()->attributes->get('_route_params', []), $urlOptions);
         }
 
         return parent::__invoke($urlOptions, $name, $reset, $encode, $relative);

diff --git a/var/classes/definition_Customer.php b/var/classes/definition_Customer.php
@@ -19,6 +19,7 @@
  * - idEncoded [input]
  * - customerLanguage [language]
  * - newsletter [consent]
+ * - newsletterActive [newsletterActive]
  * - newsletterConfirmed [newsletterConfirmed]
  * - newsletterConfirmToken [input]
  * - profiling [consent]
@@ -36,9 +37,9 @@
    'name' => 'Customer',
    'description' => '',
    'creationDate' => 0,
-   'modificationDate' => 1683551625,
+   'modificationDate' => 1685007611,
    'userOwner' => 2,
-   'userModification' => 1,
+   'userModification' => 2,
    'parentClass' => '\\CustomerManagementFrameworkBundle\\Model\\AbstractCustomer\\DefaultAbstractUserawareCustomer',
    'implementsInterfaces' => '',
    'listingParentClass' => '',
@@ -142,6 +143,7 @@
                  'blockedVarsForExport' =>
                 array (
                 ),
+                 'options' => NULL,
                  'width' => '',
                  'defaultValue' => NULL,
                  'optionsProviderClass' => NULL,
@@ -478,6 +480,7 @@
                  'blockedVarsForExport' =>
                 array (
                 ),
+                 'options' => NULL,
                  'width' => '',
                  'defaultValue' => NULL,
                  'optionsProviderClass' => NULL,
@@ -526,6 +529,29 @@
                      'width' => NULL,
                   )),
                   1 =>
+                  Pimcore\Model\DataObject\ClassDefinition\Data\NewsletterActive::__set_state(array(
+                     'name' => 'newsletterActive',
+                     'title' => 'Newsletter Active',
+                     'tooltip' => '',
+                     'mandatory' => false,
+                     'noteditable' => true,
+                     'index' => false,
+                     'locked' => false,
+                     'style' => '',
+                     'permissions' => NULL,
+                     'datatype' => 'data',
+                     'fieldtype' => 'newsletterActive',
+                     'relationType' => false,
+                     'invisible' => false,
+                     'visibleGridView' => false,
+                     'visibleSearch' => false,
+                     'blockedVarsForExport' =>
+                    array (
+                    ),
+                     'defaultValue' => NULL,
+                     'defaultValueGenerator' => '',
+                  )),
+                  2 =>
                   Pimcore\Model\DataObject\ClassDefinition\Data\NewsletterConfirmed::__set_state(array(
                      'name' => 'newsletterConfirmed',
                      'title' => 'Newsletter Confirmed',
@@ -548,7 +574,7 @@
                      'defaultValue' => NULL,
                      'defaultValueGenerator' => '',
                   )),
-                  2 =>
+                  3 =>
                   Pimcore\Model\DataObject\ClassDefinition\Data\Input::__set_state(array(
                      'name' => 'newsletterConfirmToken',
                      'title' => 'Newsletter Confirm Token',
@@ -579,7 +605,7 @@
                      'showCharCount' => false,
                      'defaultValueGenerator' => '',
                   )),
-                  3 =>
+                  4 =>
                   Pimcore\Model\DataObject\ClassDefinition\Data\Consent::__set_state(array(
                      'name' => 'profiling',
                      'title' => 'Profiling',
@@ -962,7 +988,7 @@
    'group' => 'CustomerManagement',
    'showAppLoggerTab' => false,
    'linkGeneratorReference' => '',
-   'previewGeneratorReference' => NULL,
+   'previewGeneratorReference' => '',
    'compositeIndices' =>
   array (
   ),