From bc44bce2215d615dfab1413a265b1f998b4af93d Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Wed, 8 Jan 2020 11:49:38 +0100
Subject: [PATCH] fixed notices
---
Civi/FormProcessor/API/FormProcessor.php | 8 +++++---
Civi/FormProcessor/API/FormProcessorDefaults.php | 6 ++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Civi/FormProcessor/API/FormProcessor.php b/Civi/FormProcessor/API/FormProcessor.php
index fb0d4ba..be00d46 100644
--- a/Civi/FormProcessor/API/FormProcessor.php
+++ b/Civi/FormProcessor/API/FormProcessor.php
@@ -220,6 +220,8 @@
// Validate the parameters.
foreach($formProcessor['inputs'] as $input) {
+ $inputType = $input['type'];
+ unset($input['type']);
$objInput = new \CRM_FormProcessor_BAO_FormProcessorInput();
$objInput->copyValues($input);
@@ -231,7 +233,7 @@
if ($input['is_required'] && !isset($params[$input['name']])) {
throw new \API_Exception('Parameter '.$input['name'].' is required');
}
- if (isset($params[$input['name']]) && !empty($params[$input['name']]) && !$input['type']->validateValue($params[$input['name']], $params)) {
+ if (isset($params[$input['name']]) && !empty($params[$input['name']]) && !$inputType->validateValue($params[$input['name']], $params)) {
throw new \API_Exception('Parameter '.$input['name'].' is invalid');
}
// Check the validations on the input.
@@ -243,7 +245,7 @@
}
}
- $dataBag->setInputData($objInput, $input['type']->normalizeValue($params[$objInput->name]));
+ $dataBag->setInputData($objInput, $inputType->normalizeValue($params[$objInput->name]));
}
// Execute the actions
@@ -272,7 +274,7 @@
$actionClass->setCondition($condition);
// Check whether the action should be delayed
- if ($action['delay']) {
+ if (isset($action['delay']) && $action['delay']) {
$delayClass = $delayedActionFactory->getHandlerByName($action['delay']);
$configuration = $delayClass->getDefaultConfiguration();
if (is_array($action['delay_configuration'])) {
diff --git a/Civi/FormProcessor/API/FormProcessorDefaults.php b/Civi/FormProcessor/API/FormProcessorDefaults.php
index 73dad0b..82ab93d 100644
--- a/Civi/FormProcessor/API/FormProcessorDefaults.php
+++ b/Civi/FormProcessor/API/FormProcessorDefaults.php
@@ -119,6 +119,8 @@ class FormProcessorDefaults extends FormProcessor implements API_ProviderInterfa
// Validate the parameters.
foreach ($formProcessor['default_data_inputs'] as $input) {
+ $inputType = $input['type'];
+ unset($input['type']);
$objInput = new \CRM_FormProcessor_BAO_FormProcessorDefaultDataInput();
$objInput->copyValues($input);
@@ -130,7 +132,7 @@ class FormProcessorDefaults extends FormProcessor implements API_ProviderInterfa
if ($input['is_required'] && !isset($params[$input['name']])) {
throw new \API_Exception('Parameter ' . $input['name'] . ' is required');
}
- if (isset($params[$input['name']]) && !empty($params[$input['name']]) && !$input['type']->validateValue($params[$input['name']], $params)) {
+ if (isset($params[$input['name']]) && !empty($params[$input['name']]) && !$inputType->validateValue($params[$input['name']], $params)) {
throw new \API_Exception('Parameter ' . $input['name'] . ' is invalid');
}
// Check the validations on the input.
@@ -142,7 +144,7 @@ class FormProcessorDefaults extends FormProcessor implements API_ProviderInterfa
}
}
- $dataBag->setInputData($objInput, $input['type']->normalizeValue($params[$objInput->name]));
+ $dataBag->setInputData($objInput, $inputType->normalizeValue($params[$objInput->name]));
}
// Execute the actions
--
GitLab