Skip to content

Commit 6cd0a40

Browse files
author
René Hrdina
committed
feat: fix auto_responder action
1 parent 52b9532 commit 6cd0a40

3 files changed

Lines changed: 23 additions & 21 deletions

File tree

lib/Core/Factory/AutoResponderDataFactory.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
namespace Netgen\InformationCollection\Core\Factory;
66

7+
use eZ\Publish\Core\Helper\FieldHelper;
8+
use eZ\Publish\Core\Helper\TranslationHelper;
9+
use eZ\Publish\Core\MVC\ConfigResolverInterface;
10+
use Netgen\InformationCollection\Core\Action\AutoResponderAction;
11+
use Netgen\InformationCollection\Core\Action\EmailAction;
12+
use Twig\Environment;
713
use function array_key_exists;
814
use eZ\Publish\API\Repository\Values\Content\Field;
915
use Netgen\InformationCollection\API\Constants;
@@ -16,6 +22,12 @@
1622

1723
class AutoResponderDataFactory extends EmailDataFactory
1824
{
25+
public function __construct(ConfigResolverInterface $configResolver, TranslationHelper $translationHelper, FieldHelper $fieldHelper, Environment $twig)
26+
{
27+
parent::__construct($configResolver, $translationHelper, $fieldHelper, $twig);
28+
$this->config = $this->configResolver->getParameter('action_config', 'netgen_information_collection')[AutoResponderAction::$defaultName];
29+
}
30+
1931
/**
2032
* Factory method.
2133
*
@@ -85,7 +97,7 @@ protected function resolveRecipient(TemplateContent $data)
8597
}
8698

8799
if (array_key_exists($field, $fields)) {
88-
return [$fields[$field]->email];
100+
return [$fields[$field]->value->email];
89101
}
90102

91103
throw new MissingValueException($field);

lib/Resources/config/actions.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@ services:
33
class: Netgen\InformationCollection\Core\Action\ActionRegistry
44
arguments:
55
- !tagged_iterator netgen_information_collection.action
6-
- "@netgen_information_collection.action.config_utility"
6+
- '@Netgen\InformationCollection\Core\Action\ConfigurationUtility'
77
- "@logger"
88
- "@event_dispatcher"
99
calls:
1010
- [setDebug, ['%kernel.debug%']]
1111

12-
netgen_information_collection.action.config_utility:
13-
class: Netgen\InformationCollection\Core\Action\ConfigurationUtility
12+
Netgen\InformationCollection\Core\Action\ConfigurationUtility:
1413
arguments:
1514
- "@ezpublish.config.resolver"
1615

17-
netgen_information_collection.action.db:
18-
class: Netgen\InformationCollection\Core\Action\DatabaseAction
16+
Netgen\InformationCollection\Core\Action\DatabaseAction:
1917
arguments:
2018
- '@netgen_information_collection.api.service'
2119
tags:
@@ -28,10 +26,9 @@ services:
2826
tags:
2927
- { name: netgen_information_collection.action }
3028

31-
# netgen_information_collection.action.auto_responder:
32-
# class: Netgen\InformationCollection\Core\Action\AutoResponderAction
33-
# arguments:
34-
# - '@netgen_information_collection.factory.auto_responder_data'
35-
# - '@netgen_information_collection.mailer'
36-
# tags:
37-
# - { name: netgen_information_collection.action, alias: auto_responder }
29+
Netgen\InformationCollection\Core\Action\AutoResponderAction:
30+
arguments:
31+
- '@Netgen\InformationCollection\API\MailerInterface'
32+
- '@Netgen\InformationCollection\Core\EmailDataProvider\AutoResponderProvider'
33+
tags:
34+
- { name: netgen_information_collection.action }

lib/Resources/config/factories.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
services:
2-
netgen_information_collection.factory.email_data:
3-
alias: Netgen\InformationCollection\Core\Factory\EmailDataFactory
4-
52
Netgen\InformationCollection\Core\Factory\EmailDataFactory:
63
arguments:
74
- '@ezpublish.config.resolver'
85
- '@ezpublish.translation_helper'
96
- '@ezpublish.field_helper'
107
- '@twig'
118

12-
13-
netgen_information_collection.factory.auto_responder_data:
14-
alias: Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory
15-
169
Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory:
1710
arguments:
18-
- "$action_config.auto_responder;netgen_information_collection$"
11+
- '@ezpublish.config.resolver'
1912
- '@ezpublish.translation_helper'
2013
- '@ezpublish.field_helper'
2114
- '@twig'

0 commit comments

Comments
 (0)