Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Convert variable names to camel case

Browse Source 
[MAILPOET-1796]
This commit is contained in:
Jan Jakeš
2020-01-09 15:02:58 +01:00
committed by Jan Jakeš
parent f5da704106
commit 54549ff037
687 changed files with 15890 additions and 15887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Subscribers/RequiredCustomFieldValidator.php
View File

@@ -16,24 +16,24 @@ class RequiredCustomFieldValidator {
* @throws Exception
*/
public function validate(array $data, Form $form = null) {
$all_custom_fields = $this->getCustomFields($form);
foreach ($all_custom_fields as $custom_field_id => $custom_field_name) {
if ($this->isCustomFieldMissing($custom_field_id, $data)) {
$allCustomFields = $this->getCustomFields($form);
foreach ($allCustomFields as $customFieldId => $customFieldName) {
if ($this->isCustomFieldMissing($customFieldId, $data)) {
throw new Exception(
WPFunctions::get()->__(sprintf('Missing value for custom field "%s"', $custom_field_name), 'mailpoet')
WPFunctions::get()->__(sprintf('Missing value for custom field "%s"', $customFieldName), 'mailpoet')
);
}
}
}
private function isCustomFieldMissing($custom_field_id, $data) {
if (!array_key_exists($custom_field_id, $data) && !array_key_exists('cf_' . $custom_field_id, $data)) {
private function isCustomFieldMissing($customFieldId, $data) {
if (!array_key_exists($customFieldId, $data) && !array_key_exists('cf_' . $customFieldId, $data)) {
return true;
}
if (isset($data[$custom_field_id]) && !$data[$custom_field_id]) {
if (isset($data[$customFieldId]) && !$data[$customFieldId]) {
return true;
}
if (isset($data['cf_' . $custom_field_id]) && !$data['cf_' . $custom_field_id]) {
if (isset($data['cf_' . $customFieldId]) && !$data['cf_' . $customFieldId]) {
return true;
}
return false;
@@ -47,16 +47,16 @@ class RequiredCustomFieldValidator {
if (!$ids) {
return [];
}
$required_custom_fields = CustomField::whereIn('id', $ids)->findMany();
$requiredCustomFields = CustomField::whereIn('id', $ids)->findMany();
} else {
$required_custom_fields = CustomField::findMany();
$requiredCustomFields = CustomField::findMany();
}
foreach ($required_custom_fields as $custom_field) {
if (is_serialized($custom_field->params)) {
$params = unserialize($custom_field->params);
foreach ($requiredCustomFields as $customField) {
if (is_serialized($customField->params)) {
$params = unserialize($customField->params);
if (is_array($params) && isset($params['required']) && $params['required']) {
$result[$custom_field->id] = $custom_field->name;
$result[$customField->id] = $customField->name;
}
}
}
@@ -65,14 +65,14 @@ class RequiredCustomFieldValidator {
}
private function getFormCustomFieldIds(Form $form) {
$form_fields = $form->getFieldList();
$custom_field_ids = [];
foreach ($form_fields as $field_name) {
if (strpos($field_name, 'cf_') === 0) {
$custom_field_ids[] = (int)substr($field_name, 3);
$formFields = $form->getFieldList();
$customFieldIds = [];
foreach ($formFields as $fieldName) {
if (strpos($fieldName, 'cf_') === 0) {
$customFieldIds[] = (int)substr($fieldName, 3);
}
}
return $custom_field_ids;
return $customFieldIds;
}
}