From 7c9ac84fab9fa8c018cffaef55494c50599fd6fa Mon Sep 17 00:00:00 2001 From: Sebastian Zoglowek <55794780+zoglo@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:40:53 +0100 Subject: [PATCH 1/2] Remove hard dependency on product installer --- .../Import/AddRecommendationValidatorListener.php | 5 ++++- src/Import/Validator/RecommendationValidator.php | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/EventListener/Import/AddRecommendationValidatorListener.php b/src/EventListener/Import/AddRecommendationValidatorListener.php index 2b5e82f..6c80643 100644 --- a/src/EventListener/Import/AddRecommendationValidatorListener.php +++ b/src/EventListener/Import/AddRecommendationValidatorListener.php @@ -23,7 +23,10 @@ class AddRecommendationValidatorListener public function addValidators(): void { // Connects jumpTo pages - Validator::addValidatorCollection([RecommendationArchiveValidator::class], ['setJumpToPageConnection']); + if (method_exists('Validator', 'addValidatorCollection')) + { + Validator::addValidatorCollection([RecommendationArchiveValidator::class], ['setJumpToPageConnection']); + } } public function setModuleArchiveConnections(array $row): array diff --git a/src/Import/Validator/RecommendationValidator.php b/src/Import/Validator/RecommendationValidator.php index 918b4ba..d80a11a 100644 --- a/src/Import/Validator/RecommendationValidator.php +++ b/src/Import/Validator/RecommendationValidator.php @@ -3,14 +3,13 @@ namespace Oveleon\ContaoRecommendationBundle\Import\Validator; use Oveleon\ContaoRecommendationBundle\Model\RecommendationModel; -use Oveleon\ProductInstaller\Import\Validator\ValidatorInterface; /** * Validator class for validating the recommendation item records during and after import. * * @author Daniele Sciannimanica */ -class RecommendationValidator implements ValidatorInterface +class RecommendationValidator { static public function getTrigger(): string { From b3ade29bff0a2c8ed6ce161635321139106f56cf Mon Sep 17 00:00:00 2001 From: Sebastian Zoglowek <55794780+zoglo@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:15:43 +0100 Subject: [PATCH 2/2] Revert method_exists clause --- .../Import/AddRecommendationValidatorListener.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/EventListener/Import/AddRecommendationValidatorListener.php b/src/EventListener/Import/AddRecommendationValidatorListener.php index 6c80643..2b5e82f 100644 --- a/src/EventListener/Import/AddRecommendationValidatorListener.php +++ b/src/EventListener/Import/AddRecommendationValidatorListener.php @@ -23,10 +23,7 @@ class AddRecommendationValidatorListener public function addValidators(): void { // Connects jumpTo pages - if (method_exists('Validator', 'addValidatorCollection')) - { - Validator::addValidatorCollection([RecommendationArchiveValidator::class], ['setJumpToPageConnection']); - } + Validator::addValidatorCollection([RecommendationArchiveValidator::class], ['setJumpToPageConnection']); } public function setModuleArchiveConnections(array $row): array