CC-13273: Display numbers in Zed based on the current user locale. (#…

…8889) CC-13273: Display numbers in Zed for users.
spryker · Sep 19, 2022 · c6feae7 · c6feae7
1 parent dc76442
commit c6feae7
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 21 deletions.
diff --git a/architecture-baseline.json b/architecture-baseline.json
@@ -6,13 +6,6 @@
         "ruleset": "Spryker",
         "priority": "2"
     },
-    {
-        "fileName": "src/Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToLocaleInterface.php",
-        "description": "Bridges: The bridge interface has incorrect method signature for `getCurrentLocale()`. Missed return type. That violates the rule \"All bridge interface methods must have exactly the same or more strict signature as their parent\"",
-        "rule": "BridgeMethodsInterfaceRule",
-        "ruleset": "Spryker",
-        "priority": "2"
-    },
     {
         "fileName": "src/Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToProductImageBridge.php",
         "description": "Bridges: Type should be defined for param `idProductAbstract` in method `Spryker\\Zed\\ContentProductGui\\Dependency\\Facade\\ContentProductGuiToProductImageBridge::getProductImagesSetCollectionByProductAbstractId()`.",
@@ -26,12 +19,5 @@
         "rule": "BridgeFacadeMethodsRule",
         "ruleset": "Spryker",
         "priority": "2"
-    },
-    {
-        "fileName": "src/Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToProductImageInterface.php",
-        "description": "Bridges: The bridge interface has incorrect method signature for `getProductImagesSetCollectionByProductAbstractId()`. Missed return type. That violates the rule \"All bridge interface methods must have exactly the same or more strict signature as their parent\"",
-        "rule": "BridgeMethodsInterfaceRule",
-        "ruleset": "Spryker",
-        "priority": "2"
     }
 ]
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "php": ">=7.4",
         "spryker/content-gui-extension": "^1.1.0",
         "spryker/content-product": "^1.0.0",
-        "spryker/gui": "^3.17.0",
+        "spryker/gui": "^3.45.0",
         "spryker/kernel": "^3.30.0",
         "spryker/locale": "^3.0.0",
         "spryker/product": "^6.0.0",

diff --git a/src/Spryker/Zed/ContentProductGui/Communication/Table/ProductAbstractSelectedTable.php b/src/Spryker/Zed/ContentProductGui/Communication/Table/ProductAbstractSelectedTable.php
@@ -152,7 +152,7 @@ protected function formatRow(SpyProductAbstract $productAbstractEntity): array
         $idProductAbstract = $productAbstractEntity->getIdProductAbstract();
 
         return [
-            static::COL_ID_PRODUCT_ABSTRACT => $idProductAbstract,
+            static::COL_ID_PRODUCT_ABSTRACT => $this->formatInt($idProductAbstract),
             static::COL_SKU => $productAbstractEntity->getSku(),
             static::COL_IMAGE => $this->getProductPreview($this->getProductPreviewUrl($productAbstractEntity)),
             static::COL_NAME => $productAbstractEntity->getSpyProductAbstractLocalizedAttributess()->getFirst()->getName(),

diff --git a/src/Spryker/Zed/ContentProductGui/Communication/Table/ProductAbstractViewTable.php b/src/Spryker/Zed/ContentProductGui/Communication/Table/ProductAbstractViewTable.php
@@ -114,7 +114,7 @@ protected function formatRow(SpyProductAbstract $productAbstractEntity): array
         $idProductAbstract = $productAbstractEntity->getIdProductAbstract();
 
         return [
-            static::COL_ID_PRODUCT_ABSTRACT => $idProductAbstract,
+            static::COL_ID_PRODUCT_ABSTRACT => $this->formatInt($idProductAbstract),
             static::COL_SKU => $productAbstractEntity->getSku(),
             static::COL_IMAGE => $this->getProductPreview($this->getProductPreviewUrl($productAbstractEntity)),
             static::COL_NAME => $productAbstractEntity->getSpyProductAbstractLocalizedAttributess()->getFirst()->getName(),

diff --git a/src/Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToLocaleBridge.php b/src/Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToLocaleBridge.php
@@ -7,6 +7,8 @@
 
 namespace Spryker\Zed\ContentProductGui\Dependency\Facade;
 
+use Generated\Shared\Transfer\LocaleTransfer;
+
 class ContentProductGuiToLocaleBridge implements ContentProductGuiToLocaleInterface
 {
     /**
@@ -25,7 +27,7 @@ public function __construct($localeFacade)
     /**
      * @return \Generated\Shared\Transfer\LocaleTransfer
      */
-    public function getCurrentLocale()
+    public function getCurrentLocale(): LocaleTransfer
     {
         return $this->localeFacade->getCurrentLocale();
     }

diff --git a/src/Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToLocaleInterface.php b/src/Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToLocaleInterface.php
@@ -7,10 +7,12 @@
 
 namespace Spryker\Zed\ContentProductGui\Dependency\Facade;
 
+use Generated\Shared\Transfer\LocaleTransfer;
+
 interface ContentProductGuiToLocaleInterface
 {
     /**
      * @return \Generated\Shared\Transfer\LocaleTransfer
      */
-    public function getCurrentLocale();
+    public function getCurrentLocale(): LocaleTransfer;
 }
diff --git a/...Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToProductImageBridge.php b/...Spryker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToProductImageBridge.php
@@ -27,7 +27,7 @@ public function __construct($productImageFacade)
      *
      * @return array<\Generated\Shared\Transfer\ProductImageSetTransfer>
      */
-    public function getProductImagesSetCollectionByProductAbstractId($idProductAbstract)
+    public function getProductImagesSetCollectionByProductAbstractId($idProductAbstract): array
     {
         return $this->productImageFacade->getProductImagesSetCollectionByProductAbstractId($idProductAbstract);
     }

diff --git a/...yker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToProductImageInterface.php b/...yker/Zed/ContentProductGui/Dependency/Facade/ContentProductGuiToProductImageInterface.php
@@ -14,5 +14,5 @@ interface ContentProductGuiToProductImageInterface
      *
      * @return array<\Generated\Shared\Transfer\ProductImageSetTransfer>
      */
-    public function getProductImagesSetCollectionByProductAbstractId($idProductAbstract);
+    public function getProductImagesSetCollectionByProductAbstractId($idProductAbstract): array;
 }