From 5e6aa9b33af27e6eb79f058702b5393eb1cdd5c4 Mon Sep 17 00:00:00 2001 From: Sync Common Files Bot Date: Tue, 27 May 2025 11:00:07 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=94=84=20synced=20file(s)=20with=20pi?= =?UTF-8?q?mcore/sync-common-files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ci/files/config/bundles.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/ci/files/config/bundles.php b/.github/ci/files/config/bundles.php index e33e786b..98df028b 100644 --- a/.github/ci/files/config/bundles.php +++ b/.github/ci/files/config/bundles.php @@ -1,7 +1,6 @@ ['all' => false], - CustomerManagementFrameworkBundle\PimcoreCustomerManagementFrameworkBundle::class => ['all' => true], - Pimcore\Bundle\AdminBundle\PimcoreAdminBundle::class => ['all' => true], + 'Pimcore\\Bundle\\AdminBundle\\PimcoreAdminBundle' => ['all' => true], + 'Pimcore\\Bundle\\SeoBundle\\PimcoreSeoBundle' => ['all' => true], ]; From 666eb2e963c5a741f6b088f3718dcd7b8f7a8b38 Mon Sep 17 00:00:00 2001 From: mcop1 <89011527+mcop1@users.noreply.github.com> Date: Tue, 27 May 2025 14:16:22 +0200 Subject: [PATCH 2/6] Update bundles.php --- .github/ci/files/config/bundles.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/ci/files/config/bundles.php b/.github/ci/files/config/bundles.php index 98df028b..9dd0e166 100644 --- a/.github/ci/files/config/bundles.php +++ b/.github/ci/files/config/bundles.php @@ -1,6 +1,8 @@ ['all' => true], - 'Pimcore\\Bundle\\SeoBundle\\PimcoreSeoBundle' => ['all' => true], + Pimcore\Bundle\EcommerceFrameworkBundle\PimcoreEcommerceFrameworkBundle::class => ['all' => false], + CustomerManagementFrameworkBundle\PimcoreCustomerManagementFrameworkBundle::class => ['all' => true], + Pimcore\Bundle\AdminBundle\PimcoreAdminBundle::class => ['all' => true], + Pimcore\Bundle\SeoBundle\PimcoreSeoBundle::class => ['all' => true], ]; From 7f03f64b641f43a897192e778e4e7eafc9cedd9c Mon Sep 17 00:00:00 2001 From: mcop1 <89011527+mcop1@users.noreply.github.com> Date: Tue, 27 May 2025 14:22:48 +0200 Subject: [PATCH 3/6] Update phpstan-baseline.neon --- phpstan-baseline.neon | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 308a2078..9c81e5f2 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -17,11 +17,6 @@ parameters: count: 1 path: src/CustomerView/DefaultCustomerView.php - - - message: "#^Result of && is always false\\.$#" - count: 1 - path: src/Factory.php - - message: "#^Unsafe usage of new static\\(\\)\\.$#" count: 1 From 142d7f3617d31456949aaa95966b9b1fff600d66 Mon Sep 17 00:00:00 2001 From: mcop1 <89011527+mcop1@users.noreply.github.com> Date: Tue, 27 May 2025 14:28:37 +0200 Subject: [PATCH 4/6] Update phpstan-baseline.neon --- phpstan-baseline.neon | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 9c81e5f2..5ea30cb3 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -131,3 +131,8 @@ parameters: message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MariaDbDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" count: 1 path: src/Model/ActivityList/DefaultMariaDbActivityList/MariaDbDao.php + + - + message: "#^Result of && is always false\\.$#" + count: 1 + path: src/Factory.php From 74744dc12272208083a95388cc13dc034bf0646b Mon Sep 17 00:00:00 2001 From: mcop1 <89011527+mcop1@users.noreply.github.com> Date: Tue, 27 May 2025 14:34:17 +0200 Subject: [PATCH 5/6] Update phpstan-baseline.neon --- phpstan-baseline.neon | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 5ea30cb3..5af67ba7 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1,14 +1,7 @@ parameters: ignoreErrors: - - - message: "#^Parameter \\#1 \\$segments of class CustomerManagementFrameworkBundle\\\\CustomerList\\\\Filter\\\\CustomerSegment constructor expects array\\, array\\, CustomerManagementFrameworkBundle\\\\Model\\\\CustomerSegmentInterface\\> given\\.$#" - reportUnmatched: false - count: 2 - path: src/CustomerList/SearchHelper.php - - message: "#^Parameter \\#1 \\$segments of class CustomerManagementFrameworkBundle\\\\CustomerList\\\\Filter\\\\CustomerSegment constructor expects array\\, array\\ given\\.$#" - reportUnmatched: false count: 2 path: src/CustomerList/SearchHelper.php @@ -17,6 +10,11 @@ parameters: count: 1 path: src/CustomerView/DefaultCustomerView.php + - + message: "#^Result of && is always false\\.$#" + count: 1 + path: src/Factory.php + - message: "#^Unsafe usage of new static\\(\\)\\.$#" count: 1 @@ -62,6 +60,16 @@ parameters: count: 1 path: src/Model/ActivityList/DefaultMariaDbActivityList.php + - + message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MariaDbDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" + count: 1 + path: src/Model/ActivityList/DefaultMariaDbActivityList/MariaDbDao.php + + - + message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MySqlDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\MySqlActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" + count: 1 + path: src/Model/ActivityList/DefaultMariaDbActivityList/MySqlDao.php + - message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\:\\:\\$dao \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MariaDbDao\\) does not accept CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MySqlDao\\.$#" count: 1 @@ -121,18 +129,3 @@ parameters: message: "#^Call to an undefined method Pimcore\\\\Model\\\\DataObject\\\\Data\\\\ObjectMetadata\\:\\:getApplication_counter\\(\\)\\.$#" count: 2 path: src/Targeting/ActionHandler/ApplyTargetGroupsFromSegments.php - - - - message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MySqlDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\MySqlActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" - count: 1 - path: src/Model/ActivityList/DefaultMariaDbActivityList/MySqlDao.php - - - - message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MariaDbDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" - count: 1 - path: src/Model/ActivityList/DefaultMariaDbActivityList/MariaDbDao.php - - - - message: "#^Result of && is always false\\.$#" - count: 1 - path: src/Factory.php From b7ef4725bf0abf4541e7c0cd4bc8cd5345a4e724 Mon Sep 17 00:00:00 2001 From: mcop1 <89011527+mcop1@users.noreply.github.com> Date: Tue, 27 May 2025 14:38:37 +0200 Subject: [PATCH 6/6] Update phpstan-baseline.neon --- phpstan-baseline.neon | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 5af67ba7..8e4d6d68 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1,7 +1,14 @@ parameters: ignoreErrors: + - + message: "#^Parameter \\#1 \\$segments of class CustomerManagementFrameworkBundle\\\\CustomerList\\\\Filter\\\\CustomerSegment constructor expects array\\, array\\, CustomerManagementFrameworkBundle\\\\Model\\\\CustomerSegmentInterface\\> given\\.$#" + reportUnmatched: false + count: 2 + path: src/CustomerList/SearchHelper.php + - message: "#^Parameter \\#1 \\$segments of class CustomerManagementFrameworkBundle\\\\CustomerList\\\\Filter\\\\CustomerSegment constructor expects array\\, array\\ given\\.$#" + reportUnmatched: false count: 2 path: src/CustomerList/SearchHelper.php @@ -12,6 +19,7 @@ parameters: - message: "#^Result of && is always false\\.$#" + reportUnmatched: false count: 1 path: src/Factory.php @@ -60,16 +68,6 @@ parameters: count: 1 path: src/Model/ActivityList/DefaultMariaDbActivityList.php - - - message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MariaDbDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" - count: 1 - path: src/Model/ActivityList/DefaultMariaDbActivityList/MariaDbDao.php - - - - message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MySqlDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\MySqlActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" - count: 1 - path: src/Model/ActivityList/DefaultMariaDbActivityList/MySqlDao.php - - message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\:\\:\\$dao \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MariaDbDao\\) does not accept CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MySqlDao\\.$#" count: 1 @@ -129,3 +127,13 @@ parameters: message: "#^Call to an undefined method Pimcore\\\\Model\\\\DataObject\\\\Data\\\\ObjectMetadata\\:\\:getApplication_counter\\(\\)\\.$#" count: 2 path: src/Targeting/ActionHandler/ApplyTargetGroupsFromSegments.php + + - + message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MySqlDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\MySqlActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" + count: 1 + path: src/Model/ActivityList/DefaultMariaDbActivityList/MySqlDao.php + + - + message: "#^Property CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\\\MariaDbDao\\:\\:\\$model \\(CustomerManagementFrameworkBundle\\\\Model\\\\ActivityList\\\\DefaultMariaDbActivityList\\) does not accept Pimcore\\\\Model\\\\AbstractModel\\.$#" + count: 1 + path: src/Model/ActivityList/DefaultMariaDbActivityList/MariaDbDao.php