Skip to content

Commit e538c07

Browse files
committed
Updated webforms plugins creation functions. Changes intriduced in Webforms 6. See more https://www.drupal.org/project/webform/issues/3067546
1 parent 2c56221 commit e538c07

File tree

2 files changed

+8
-46
lines changed

2 files changed

+8
-46
lines changed

modules/os2forms_sbsys/src/Plugin/WebformElement/WebformAttachmentSbsysXml.php

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,13 @@ class WebformAttachmentSbsysXml extends WebformAttachmentXml {
3434
*/
3535
protected $elementManager;
3636

37-
/**
38-
* {@inheritdoc}
39-
*/
40-
public function __construct(array $configuration, $plugin_id, $plugin_definition, LoggerInterface $logger, ConfigFactoryInterface $config_factory, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, ElementInfoManagerInterface $element_info, WebformElementManagerInterface $element_manager, WebformTokenManagerInterface $token_manager, WebformLibrariesManagerInterface $libraries_manager) {
41-
parent::__construct($configuration, $plugin_id, $plugin_definition, $logger, $config_factory, $current_user, $entity_type_manager, $element_info, $element_manager, $token_manager, $libraries_manager, $element_manager);
42-
$this->elementManager = $element_manager;
43-
}
44-
4537
/**
4638
* {@inheritdoc}
4739
*/
4840
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
49-
return new static(
50-
$configuration,
51-
$plugin_id,
52-
$plugin_definition,
53-
$container->get('logger.factory')->get('webform'),
54-
$container->get('config.factory'),
55-
$container->get('current_user'),
56-
$container->get('entity_type.manager'),
57-
$container->get('plugin.manager.element_info'),
58-
$container->get('plugin.manager.webform.element'),
59-
$container->get('webform.token_manager'),
60-
$container->get('webform.libraries_manager'),
61-
$container->get('plugin.manager.webform.element')
62-
);
41+
$instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
42+
$instance->elementManager = $container->get('plugin.manager.webform.element');
43+
return $instance;
6344
}
6445

6546
/**

src/Plugin/WebformHandler/SaveToFileWebformHandler.php

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -97,34 +97,15 @@ class SaveToFileWebformHandler extends WebformHandlerBase {
9797
'metatag',
9898
];
9999

100-
/**
101-
* {@inheritdoc}
102-
*/
103-
public function __construct(array $configuration, $plugin_id, $plugin_definition, LoggerChannelFactoryInterface $logger_factory, ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, WebformSubmissionConditionsValidatorInterface $conditions_validator, ModuleHandlerInterface $module_handler, WebformTokenManagerInterface $token_manager, WebformMessageManagerInterface $message_manager, WebformElementManagerInterface $element_manager) {
104-
parent::__construct($configuration, $plugin_id, $plugin_definition, $logger_factory, $config_factory, $entity_type_manager, $conditions_validator);
105-
$this->moduleHandler = $module_handler;
106-
$this->tokenManager = $token_manager;
107-
$this->messageManager = $message_manager;
108-
$this->elementManager = $element_manager;
109-
}
110-
111100
/**
112101
* {@inheritdoc}
113102
*/
114103
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
115-
$instance = new static(
116-
$configuration,
117-
$plugin_id,
118-
$plugin_definition,
119-
$container->get('logger.factory'),
120-
$container->get('config.factory'),
121-
$container->get('entity_type.manager'),
122-
$container->get('webform_submission.conditions_validator'),
123-
$container->get('module_handler'),
124-
$container->get('webform.token_manager'),
125-
$container->get('webform.message_manager'),
126-
$container->get('plugin.manager.webform.element')
127-
);
104+
$instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
105+
$instance->moduleHandler = $container->get('module_handler');
106+
$instance->tokenManager = $container->get('webform.token_manager');
107+
$instance->messageManager = $container->get('webform.message_manager');
108+
$instance->elementManager = $container->get('plugin.manager.webform.element');
128109

129110
$instance->request = $container->get('request_stack')->getCurrentRequest();
130111
$instance->kernel = $container->get('kernel');

0 commit comments

Comments
 (0)