From cf00d701d3353f02cc6749fcd698c82050735e59 Mon Sep 17 00:00:00 2001 From: Bartosz Gorski Date: Sun, 20 Sep 2020 13:26:05 +0200 Subject: [PATCH 1/7] Added a dedicated modifier pool for categories --- app/code/Magento/Catalog/etc/adminhtml/di.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml index 7d74ab38a8560..4e15c06d66d36 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/di.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml @@ -235,6 +235,12 @@ + + + + Magento\Catalog\Ui\DataProvider\Category\Form\Modifier\Pool + + web/default_layouts/default_category_layout From 1ac2ab87684bd9df9f8dc208afb4d42416892367 Mon Sep 17 00:00:00 2001 From: Bartosz Gorski Date: Wed, 23 Sep 2020 00:10:51 +0200 Subject: [PATCH 2/7] Removed the possibility of instantiating \Magento\Catalog\Model\Category\DataProvider with null as the modifier pool --- app/code/Magento/Catalog/Model/Category/DataProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index 0a562a9a80c89..f7c39fa3fb05d 100644 --- a/app/code/Magento/Catalog/Model/Category/DataProvider.php +++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php @@ -217,7 +217,7 @@ public function __construct( CategoryFactory $categoryFactory, array $meta = [], array $data = [], - PoolInterface $pool = null, + PoolInterface $pool, ?AuthorizationInterface $auth = null, ?ArrayUtils $arrayUtils = null, ScopeOverriddenValue $scopeOverriddenValue = null, From 4da8b8dbbaa83d30280ffeeda43ee737c3757e8b Mon Sep 17 00:00:00 2001 From: Bartosz Gorski Date: Wed, 23 Sep 2020 01:31:06 +0200 Subject: [PATCH 3/7] Fixed failing tests for \Magento\Catalog\Model\Category\DataProvider --- app/code/Magento/Catalog/Model/Category/DataProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index f7c39fa3fb05d..53cb173a78b04 100644 --- a/app/code/Magento/Catalog/Model/Category/DataProvider.php +++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php @@ -193,9 +193,9 @@ class DataProvider extends ModifierPoolDataProvider * @param Config $eavConfig * @param RequestInterface $request * @param CategoryFactory $categoryFactory + * @param PoolInterface|null $pool * @param array $meta * @param array $data - * @param PoolInterface|null $pool * @param AuthorizationInterface|null $auth * @param ArrayUtils|null $arrayUtils * @param ScopeOverriddenValue|null $scopeOverriddenValue @@ -215,9 +215,9 @@ public function __construct( Config $eavConfig, RequestInterface $request, CategoryFactory $categoryFactory, + PoolInterface $pool, array $meta = [], array $data = [], - PoolInterface $pool, ?AuthorizationInterface $auth = null, ?ArrayUtils $arrayUtils = null, ScopeOverriddenValue $scopeOverriddenValue = null, From 51f7bfaa49e35c1638e3a7e259b3ce382f384e53 Mon Sep 17 00:00:00 2001 From: Bartosz Gorski Date: Wed, 23 Sep 2020 03:38:15 +0200 Subject: [PATCH 4/7] Revert "Fixed failing tests for \Magento\Catalog\Model\Category\DataProvider" This reverts commit 4da8b8dbbaa83d30280ffeeda43ee737c3757e8b. --- app/code/Magento/Catalog/Model/Category/DataProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index 53cb173a78b04..f7c39fa3fb05d 100644 --- a/app/code/Magento/Catalog/Model/Category/DataProvider.php +++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php @@ -193,9 +193,9 @@ class DataProvider extends ModifierPoolDataProvider * @param Config $eavConfig * @param RequestInterface $request * @param CategoryFactory $categoryFactory - * @param PoolInterface|null $pool * @param array $meta * @param array $data + * @param PoolInterface|null $pool * @param AuthorizationInterface|null $auth * @param ArrayUtils|null $arrayUtils * @param ScopeOverriddenValue|null $scopeOverriddenValue @@ -215,9 +215,9 @@ public function __construct( Config $eavConfig, RequestInterface $request, CategoryFactory $categoryFactory, - PoolInterface $pool, array $meta = [], array $data = [], + PoolInterface $pool, ?AuthorizationInterface $auth = null, ?ArrayUtils $arrayUtils = null, ScopeOverriddenValue $scopeOverriddenValue = null, From a1afb88c5e4ce4a9f1dc02bcb68309a25aa09415 Mon Sep 17 00:00:00 2001 From: Bartosz Gorski Date: Wed, 23 Sep 2020 03:38:28 +0200 Subject: [PATCH 5/7] Revert "Removed the possibility of instantiating \Magento\Catalog\Model\Category\DataProvider with null as the modifier pool" This reverts commit 1ac2ab87684bd9df9f8dc208afb4d42416892367. --- app/code/Magento/Catalog/Model/Category/DataProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index f7c39fa3fb05d..0a562a9a80c89 100644 --- a/app/code/Magento/Catalog/Model/Category/DataProvider.php +++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php @@ -217,7 +217,7 @@ public function __construct( CategoryFactory $categoryFactory, array $meta = [], array $data = [], - PoolInterface $pool, + PoolInterface $pool = null, ?AuthorizationInterface $auth = null, ?ArrayUtils $arrayUtils = null, ScopeOverriddenValue $scopeOverriddenValue = null, From 33cc02219fa285dc0b3a2db6d7ed148669b1ded3 Mon Sep 17 00:00:00 2001 From: engcom-Dash Date: Wed, 23 Oct 2024 13:03:54 +0530 Subject: [PATCH 6/7] 30119: Fix static failure related to copyright tag --- app/code/Magento/Catalog/etc/di.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml index 4b4e0b17fe25c..fe5ac74aa7502 100644 --- a/app/code/Magento/Catalog/etc/di.xml +++ b/app/code/Magento/Catalog/etc/di.xml @@ -1,8 +1,8 @@ From 27bf7ffc4dff5d6aac994a76208f444dc32c0474 Mon Sep 17 00:00:00 2001 From: engcom-Dash Date: Wed, 23 Oct 2024 13:06:18 +0530 Subject: [PATCH 7/7] 30119: Fix static failure related to copyright tag --- app/code/Magento/Catalog/etc/adminhtml/di.xml | 4 ++-- app/code/Magento/Catalog/etc/di.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml index 796ec5a3b8ce0..2f788ad43fc71 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/di.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml @@ -1,8 +1,8 @@ diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml index fe5ac74aa7502..4b4e0b17fe25c 100644 --- a/app/code/Magento/Catalog/etc/di.xml +++ b/app/code/Magento/Catalog/etc/di.xml @@ -1,8 +1,8 @@