diff --git a/includes/webform.translation.inc b/includes/webform.translation.inc index 159d9ea..57af2fb 100644 --- a/includes/webform.translation.inc +++ b/includes/webform.translation.inc @@ -38,7 +38,6 @@ function webform_form_config_translation_add_form_alter(&$form, FormStateInterfa _webform_form_config_translate_add_form_alter_yaml_element($config_element['elements'], $source_value, $translation_value); - $form['inputs'] = [ '#type' => 'textarea', '#parents' => ["translation", "config_names", "webform.webform.test_translation", "description"], diff --git a/js/webform.admin.js b/js/webform.admin.js index 41389f4..61c2d5a 100644 --- a/js/webform.admin.js +++ b/js/webform.admin.js @@ -24,7 +24,7 @@ // From: http://stackoverflow.com/questions/5366068/jquery-ui-autocomplete-submit-onclick-result $(this).bind('autocompleteselect', function (event, ui) { - if(ui.item){ + if (ui.item) { $(this).val(ui.item.value); this.form.submit(); } diff --git a/js/webform.dialog.js b/js/webform.dialog.js index 3ef94e2..57f28c2 100644 --- a/js/webform.dialog.js +++ b/js/webform.dialog.js @@ -9,7 +9,7 @@ // @see http://stackoverflow.com/questions/20533487/how-to-ensure-that-ckeditor-has-focus-when-displayed-inside-of-jquery-ui-dialog var _allowInteraction = $.ui.dialog.prototype._allowInteraction; - $.ui.dialog.prototype._allowInteraction = function(event) { + $.ui.dialog.prototype._allowInteraction = function (event) { if ($(event.target).closest('.cke_dialog').length) { return true; } diff --git a/js/webform.element.buttons.js b/js/webform.element.buttons.js index 0b4180e..bd311ae 100644 --- a/js/webform.element.buttons.js +++ b/js/webform.element.buttons.js @@ -14,7 +14,7 @@ */ Drupal.behaviors.webformButtons = { attach: function (context) { - $(context).find('fieldset.js-webform-buttons div.fieldset-wrapper').once('webform-buttons').each(function() { + $(context).find('fieldset.js-webform-buttons div.fieldset-wrapper').once('webform-buttons').each(function () { var $input = $(this); // Remove all div and classes around radios and labels. $input.html($input.find('input[type="radio"], label').removeClass()); diff --git a/js/webform.element.codemirror.js b/js/webform.element.codemirror.js index d9eb4ed..908cfae 100644 --- a/js/webform.element.codemirror.js +++ b/js/webform.element.codemirror.js @@ -46,7 +46,7 @@ // Issue #2764443: CodeMirror is not setting submitted value when // rendered within a webform UI dialog. - editor.on('blur', function (event){ + editor.on('blur', function (event) { editor.save(); }); @@ -79,7 +79,7 @@ // Delay refreshing CodeMirror for 10 millisecond while the dialog is // still being rendered. // @see http://stackoverflow.com/questions/8349571/codemirror-editor-is-not-loading-content-until-clicked - setTimeout(function() { + setTimeout(function () { $('.CodeMirror').each(function (index, $element) { var $details = $(this).parents('details:not([open])'); $details.attr('open', 'open'); @@ -91,7 +91,7 @@ }); // On state:visible refresh CodeMirror elements. - $(document).on('state:visible', function(event) { + $(document).on('state:visible', function (event) { var $element = $(event.target); if ($element.hasClass('js-webform-codemirror')) { $element.parent().find('.CodeMirror').each(function (index, $element) { diff --git a/js/webform.element.date.js b/js/webform.element.date.js index dbb7640..69a0078 100644 --- a/js/webform.element.date.js +++ b/js/webform.element.date.js @@ -34,13 +34,13 @@ // datepicker. // @see http://stackoverflow.com/questions/16702398/convert-a-php-date-format-to-a-jqueryui-datepicker-date-format datepickerSettings.dateFormat = dateFormat - // Year + // Year. .replace('Y', 'yy') // Month. .replace('F', 'MM') .replace('m', 'mm') .replace('n', 'm') - // Date + // Date. .replace('d', 'dd'); // Add min and max date if set on the input. diff --git a/js/webform.element.details.save.js b/js/webform.element.details.save.js index acdaf47..866d0a4 100644 --- a/js/webform.element.details.save.js +++ b/js/webform.element.details.save.js @@ -65,7 +65,7 @@ * @returns string * The name used to store the state of details element. */ - Drupal.webformDetailsSaveGetName = function($details) { + Drupal.webformDetailsSaveGetName = function ($details) { if (!window.localStorage) { return ''; } @@ -99,5 +99,4 @@ return 'Drupal.webform.' + formId + '.' + detailsId; } - })(jQuery, Drupal); diff --git a/js/webform.element.details.toggle.js b/js/webform.element.details.toggle.js index ea01d10..0d6f56a 100644 --- a/js/webform.element.details.toggle.js +++ b/js/webform.element.details.toggle.js @@ -41,7 +41,7 @@ // Set the saved states for all the details elements. // @see webform.element.details.save.js if (Drupal.webformDetailsSaveGetName) { - $form.find('details').each(function() { + $form.find('details').each(function () { var name = Drupal.webformDetailsSaveGetName($(this)); if (name) { localStorage.setItem(name, open); diff --git a/js/webform.element.html_editor.js b/js/webform.element.html_editor.js index 12f8dcf..c8e5ff2 100644 --- a/js/webform.element.html_editor.js +++ b/js/webform.element.html_editor.js @@ -41,7 +41,7 @@ { name: 'links', items: [ 'Link', 'Unlink'] }, { name: 'tools', items: [ 'Source', '-', 'Maximize' ] } ] - }).on('change', function(evt) { + }).on('change', function (evt) { // Save data onchange since AJAX dialogs don't execute webform.onsubmit. $textarea.val(evt.editor.getData().trim()); }); diff --git a/js/webform.element.location.js b/js/webform.element.location.js index 8d7d78b..8c1423f 100644 --- a/js/webform.element.location.js +++ b/js/webform.element.location.js @@ -22,10 +22,10 @@ types: ['geocode'] }); - $geocomplete.on('input', function() { + $geocomplete.on('input', function () { // Reset attributes on input. $element.find('[data-webform-location-attribute]').val(''); - }).on('blur', function() { + }).on('blur', function () { // Make sure to get attributes on blur. if ($element.find('[data-webform-location-attribute="location"]').val() == '') { var value = $geocomplete.val(); @@ -35,7 +35,6 @@ } }); - // If there is default value look up location's attributes, else see if // the default value should be set to the browser's current geolocation. var value = $geocomplete.val(); diff --git a/js/webform.element.message.js b/js/webform.element.message.js index 25af654..3b144e9 100644 --- a/js/webform.element.message.js +++ b/js/webform.element.message.js @@ -22,6 +22,7 @@ var effect = $element.attr('data-message-close-effect') || 'hide'; switch (effect) { case 'slide': effect = 'slideUp'; break; + case 'fade': effect = 'fadeOut'; break; } @@ -30,7 +31,7 @@ return; } - $element.show().find('.js-webform-message__link').on('click', function(event) { + $element.show().find('.js-webform-message__link').on('click', function (event) { $element[effect](); setClosed($element, storage, id); $element.trigger('close'); diff --git a/js/webform.element.range.js b/js/webform.element.range.js index e2f0fad..1bd4bb4 100644 --- a/js/webform.element.range.js +++ b/js/webform.element.range.js @@ -27,9 +27,9 @@ // Display range input's output to the end user. var html = ''; html += '
'; - html += (prefix ? '' + prefix + '': ''); + html += (prefix ? '' + prefix + '' : ''); html += ''; - html += (suffix ? '' + suffix + '': ''); + html += (suffix ? '' + suffix + '' : ''); html += '
'; var height = parseInt($element.outerHeight()) || 24; @@ -38,7 +38,7 @@ // Set the container element's line height which will vertically // align the range widget and the output. $outputContainer.find('input, span').css({ - height: height + 'px', + height: height + 'px', lineHeight: height + 'px' }); diff --git a/js/webform.element.roles.js b/js/webform.element.roles.js index b39524b..1946b6a 100644 --- a/js/webform.element.roles.js +++ b/js/webform.element.roles.js @@ -16,11 +16,11 @@ attach: function (context) { $(context).find('.js-webform-roles-role[value="authenticated"]').once('webform-roles').each(function () { var $authenticated = $(this); - var $checkboxes = $authenticated.parents('.form-checkboxes').find('.js-webform-roles-role').filter(function() { + var $checkboxes = $authenticated.parents('.form-checkboxes').find('.js-webform-roles-role').filter(function () { return ($(this).val() != 'anonymous' && $(this).val() != 'authenticated'); }); - $authenticated.on('click', function() { + $authenticated.on('click', function () { if ($authenticated.is(':checked')) { $checkboxes.prop('checked', true).attr('disabled', true); } diff --git a/js/webform.element.signature.js b/js/webform.element.signature.js index 8c9488f..0be2e5f 100644 --- a/js/webform.element.signature.js +++ b/js/webform.element.signature.js @@ -24,10 +24,10 @@ // Set height. $canvas.attr('width', $wrapper.width()); - $canvas.attr('height', $wrapper.width()/3); + $canvas.attr('height', $wrapper.width() / 3); $(window).resize(function () { $canvas.attr('width', $wrapper.width()); - $canvas.attr('height', $wrapper.width()/3); + $canvas.attr('height', $wrapper.width() / 3); // Resizing clears the canvas so we need to reset the signature pad. signaturePad.clear(); diff --git a/js/webform.form.js b/js/webform.form.js index f4b6b11..9e8ca65 100644 --- a/js/webform.form.js +++ b/js/webform.form.js @@ -32,7 +32,7 @@ Drupal.behaviors.webformDisableAutoSubmit = { attach: function (context) { // @see http://stackoverflow.com/questions/11235622/jquery-disable-form-submit-on-enter - $(context).find('.webform-submission-form.js-webform-disable-autosubmit input').once('webform-disable-autosubmit').on('keyup keypress', function(e) { + $(context).find('.webform-submission-form.js-webform-disable-autosubmit input').once('webform-disable-autosubmit').on('keyup keypress', function (e) { var keyCode = e.keyCode || e.which; if (keyCode === 13) { e.preventDefault(); diff --git a/js/webform.form.submit_once.js b/js/webform.form.submit_once.js index d75c1f5..10a969f 100644 --- a/js/webform.form.submit_once.js +++ b/js/webform.form.submit_once.js @@ -17,14 +17,14 @@ */ Drupal.behaviors.webformSubmitOnce = { attach: function (context) { - $('.js-webform-submit-once', context).each(function() { + $('.js-webform-submit-once', context).each(function () { var $form = $(this); $form.removeAttr('webform-submitted'); $form.find('#edit-actions input[type="submit"]').removeAttr('webform-clicked'); // Track which submit button was clicked. // @see http://stackoverflow.com/questions/5721724/jquery-how-to-get-which-button-was-clicked-upon-form-submission - $form.find('#edit-actions input[type="submit"]').click(function() { + $form.find('#edit-actions input[type="submit"]').click(function () { $form.find('#edit-actions input[type="submit"]').removeAttr('webform-clicked'); $(this).attr('webform-clicked', 'true'); }); @@ -51,4 +51,3 @@ }; })(jQuery, Drupal); - diff --git a/js/webform.form.unsaved.js b/js/webform.form.unsaved.js index 2c1ce08..06572a0 100644 --- a/js/webform.form.unsaved.js +++ b/js/webform.form.unsaved.js @@ -26,18 +26,18 @@ unsaved = true; } else { - $('.js-webform-unsaved :input:not(input[type=\'submit\'])', context).once('webform-unsaved').on('change keypress', function(){ + $('.js-webform-unsaved :input:not(input[type=\'submit\'])', context).once('webform-unsaved').on('change keypress', function () { unsaved = true; }); } - $('.js-webform-unsaved button, .js-webform-unsaved input[type=\'submit\']', context).once('webform-unsaved').on('click', function(){ + $('.js-webform-unsaved button, .js-webform-unsaved input[type=\'submit\']', context).once('webform-unsaved').on('click', function () { unsaved = false; }); } }; - $(window).on('beforeunload', function() { + $(window).on('beforeunload', function () { if (unsaved) { return true; } @@ -54,11 +54,11 @@ * Author: chris.dance@papercut.com * Date: 19th May 2014 */ - $(function() { + $(function () { if (!navigator.userAgent.toLowerCase().match(/iphone|ipad|ipod|opera/)) { return; } - $('a').bind('click', function(evt) { + $('a').bind('click', function (evt) { var href = $(evt.target).closest('a').attr('href'); if (href !== undefined && !(href.match(/^#/) || href.trim() == '')) { if ($(window).triggerHandler('beforeunload')) { @@ -73,4 +73,3 @@ }); })(jQuery, Drupal); - diff --git a/js/webform.help.js b/js/webform.help.js index 297a50f..d833d4d 100644 --- a/js/webform.help.js +++ b/js/webform.help.js @@ -41,17 +41,17 @@ */ Drupal.behaviors.webformHelpDialog = { attach: function (context) { - $(context).find('.button-webform-play').once('webform-help-dialog').on('click', function(event) { + $(context).find('.button-webform-play').once('webform-help-dialog').on('click', function (event) { if ($(window).width() < 768) { event.stopImmediatePropagation(); } - }).each(function() { + }).each(function () { // Must make sure that this click event handler is execute first and // before the AJAX dialog handler. // @see http://stackoverflow.com/questions/2360655/jquery-event-handlers-always-execute-in-order-they-were-bound-any-way-around-t var handlers = $._data(this, 'events')['click']; var handler = handlers.pop(); - // move it at the beginning + // Move it at the beginning. handlers.splice(0, 0, handler); }); } diff --git a/js/webform.states.js b/js/webform.states.js index 5122071..f49f425 100644 --- a/js/webform.states.js +++ b/js/webform.states.js @@ -50,7 +50,7 @@ function triggerEventHandlers(input) { var $input = $(input); var type = input.type; - var tag = input.tagName.toLowerCase(); // normalize case + var tag = input.tagName.toLowerCase(); // Normalize case. if (type == 'checkbox' || type == 'radio') { $input .trigger('change') @@ -80,13 +80,13 @@ function backupValue(input) { var $input = $(input); var type = input.type; - var tag = input.tagName.toLowerCase(); // normalize case + var tag = input.tagName.toLowerCase(); // Normalize case. if (type == 'checkbox' || type == 'radio') { $input.data('webform-value', $input.prop('checked')); } else if (tag == 'select') { var values = []; - $input.find('option:selected').each(function(i, option){ + $input.find('option:selected').each(function (i, option) { values[i] = option.value; }); $input.data('webform-value', values); @@ -110,13 +110,13 @@ } var type = input.type; - var tag = input.tagName.toLowerCase(); // normalize case + var tag = input.tagName.toLowerCase(); // Normalize case. if (type == 'checkbox' || type == 'radio') { $input.prop('checked', value) } else if (tag == 'select') { - $.each(value, function(i, option_value){ + $.each(value, function (i, option_value) { $input.find("option[value='" + option_value + "']").prop("selected", true); }); } @@ -134,7 +134,7 @@ function clearValue(input) { var $input = $(input); var type = input.type; - var tag = input.tagName.toLowerCase(); // normalize case + var tag = input.tagName.toLowerCase(); // Normalize case. if (type == 'checkbox' || type == 'radio') { $input.prop('checked', false) } diff --git a/modules/webform_ui/js/webform_ui.element.js b/modules/webform_ui/js/webform_ui.element.js index 253aa74..8c9fd6b 100644 --- a/modules/webform_ui/js/webform_ui.element.js +++ b/modules/webform_ui/js/webform_ui.element.js @@ -22,7 +22,7 @@ // being used. // There is no way to capture changes to the key val. // @see core/misc/machine-name.js. - setInterval(function() { + setInterval(function () { var value = $(':input[name="key"]').val(); if ($.inArray(value, drupalSettings.webform_ui.reserved_keys) !== -1) { // Customize and display the warning message. @@ -39,5 +39,4 @@ } }; - })(jQuery, Drupal, drupalSettings); diff --git a/modules/webform_ui/src/Form/WebformUiElementTestForm.php b/modules/webform_ui/src/Form/WebformUiElementTestForm.php index ad2dc0b..14057ae 100644 --- a/modules/webform_ui/src/Form/WebformUiElementTestForm.php +++ b/modules/webform_ui/src/Form/WebformUiElementTestForm.php @@ -159,7 +159,6 @@ class WebformUiElementTestForm extends WebformUiElementFormBase { // Clear all messages including 'Unable to display this webform...' which is // generated because we are using a temp webform. // drupal_get_messages(); - return $form; } diff --git a/modules/webform_ui/src/WebformUiOptionsForm.php b/modules/webform_ui/src/WebformUiOptionsForm.php index 1252d66..36ae0ef 100644 --- a/modules/webform_ui/src/WebformUiOptionsForm.php +++ b/modules/webform_ui/src/WebformUiOptionsForm.php @@ -5,7 +5,6 @@ namespace Drupal\webform_ui; use Drupal\Core\Serialization\Yaml; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormStateInterface; -use Drupal\webform\Element\WebformOptions; use Drupal\webform\WebformOptionsForm; /** @@ -37,7 +36,7 @@ class WebformUiOptionsForm extends WebformOptionsForm { // Overriding after \Drupal\Core\Entity\EntityForm::afterBuild because // it calls ::buildEntity(), which calls ::copyFormValuesToEntity, which // attempts to populate the entity even though the 'options' have not been - // validated and set, + // validated and set,. // @see \Drupal\Core\Entity\EntityForm::afterBuild // @eee \Drupal\webform_ui\WebformUiOptionsForm::copyFormValuesToEntity // @see \Drupal\webform\Element\WebformOptions diff --git a/src/Entity/Webform.php b/src/Entity/Webform.php index ad6cd79..722a917 100644 --- a/src/Entity/Webform.php +++ b/src/Entity/Webform.php @@ -11,7 +11,6 @@ use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\user\Entity\User; use Drupal\user\UserInterface; -use Drupal\webform\Plugin\WebformElement\Details; use Drupal\webform\Plugin\WebformElement\WebformManagedFileBase; use Drupal\webform\Utility\WebformElementHelper; use Drupal\webform\WebformHandlerInterface; diff --git a/src/Form/WebformAdminSettingsForm.php b/src/Form/WebformAdminSettingsForm.php index 6556b67..1e86ad1 100644 --- a/src/Form/WebformAdminSettingsForm.php +++ b/src/Form/WebformAdminSettingsForm.php @@ -14,7 +14,6 @@ use Drupal\file\Plugin\Field\FieldType\FileItem; use Drupal\webform\Entity\Webform; use Drupal\webform\Utility\WebformArrayHelper; use Drupal\webform\WebformElementManagerInterface; -use Drupal\webform\WebformInterface; use Drupal\webform\WebformSubmissionExporterInterface; use Drupal\webform\WebformTokenManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -117,12 +116,12 @@ class WebformAdminSettingsForm extends ConfigFormBase { $element_plugins = $this->elementManager->getInstances(); // Page. - $form['page'] = [ + $form['page'] = [ '#type' => 'details', '#title' => $this->t('Page default settings'), '#tree' => TRUE, ]; - $form['page']['default_page_base_path'] = [ + $form['page']['default_page_base_path'] = [ '#type' => 'textfield', '#title' => $this->t('Default base path for webform URLs'), '#required' => TRUE, @@ -130,77 +129,77 @@ class WebformAdminSettingsForm extends ConfigFormBase { ]; // Webform. - $form['webform'] = [ + $form['webform'] = [ '#type' => 'details', '#title' => $this->t('Webform default settings'), '#tree' => TRUE, ]; - $form['webform']['default_form_closed_message'] = [ + $form['webform']['default_form_closed_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Default closed message'), '#required' => TRUE, '#default_value' => $config->get('settings.default_form_closed_message'), ]; - $form['webform']['default_form_exception_message'] = [ + $form['webform']['default_form_exception_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Default closed exception message'), '#required' => TRUE, '#default_value' => $config->get('settings.default_form_exception_message'), ]; - $form['webform']['default_form_confidential_message'] = [ + $form['webform']['default_form_confidential_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Default confidential message'), '#required' => TRUE, '#default_value' => $config->get('settings.default_form_confidential_message'), ]; - $form['webform']['default_form_submit_label'] = [ + $form['webform']['default_form_submit_label'] = [ '#type' => 'textfield', '#title' => $this->t('Default submit button label'), '#required' => TRUE, '#size' => 20, '#default_value' => $settings['default_form_submit_label'], ]; - $form['webform']['default_form_submit_once'] = [ + $form['webform']['default_form_submit_once'] = [ '#type' => 'checkbox', '#title' => $this->t('Prevent duplicate submissions'), '#description' => $this->t('If checked, the submit button will be disabled immediately after is is clicked.'), '#default_value' => $settings['default_form_submit_once'], ]; - $form['webform']['default_form_disable_back'] = [ + $form['webform']['default_form_disable_back'] = [ '#type' => 'checkbox', '#title' => $this->t('Disable back button for all webforms'), '#description' => $this->t('If checked, users will not be allowed to navigate back to the webform using the browsers back button.'), '#return_value' => TRUE, '#default_value' => $config->get('settings.default_form_disable_back'), ]; - $form['webform']['default_form_unsaved'] = [ + $form['webform']['default_form_unsaved'] = [ '#type' => 'checkbox', '#title' => $this->t('Warn users about unsaved changes'), '#description' => $this->t('If checked, users will be displayed a warning message when they navigate away from a webform with unsaved changes.'), '#return_value' => TRUE, '#default_value' => $config->get('settings.default_form_unsaved'), ]; - $form['webform']['default_form_novalidate'] = [ + $form['webform']['default_form_novalidate'] = [ '#type' => 'checkbox', '#title' => $this->t('Disable client-side validation for all webforms'), '#description' => $this->t('If checked, the novalidate attribute, which disables client-side validation, will be added to all webforms.', [':href' => 'http://www.w3schools.com/tags/att_form_novalidate.asp']), '#return_value' => TRUE, '#default_value' => $config->get('settings.default_form_novalidate'), ]; - $form['webform']['default_form_details_toggle'] = [ + $form['webform']['default_form_details_toggle'] = [ '#type' => 'checkbox', '#title' => $this->t('Display collapse/expand all details link'), '#description' => $this->t('If checked, an expand/collapse all (details) link will be added to all webforms with two or more details elements.'), '#return_value' => TRUE, '#default_value' => $config->get('settings.default_form_details_toggle'), ]; - $form['webform']['form_classes'] = [ + $form['webform']['form_classes'] = [ '#type' => 'webform_codemirror', '#title' => $this->t('Webform CSS classes'), '#description' => $this->t('A list of classes that will be provided in the "Webform CSS classes" dropdown. Enter one or more classes on each line. These styles should be available in your theme\'s CSS file.'), '#default_value' => $config->get('settings.form_classes'), ]; - $form['webform']['button_classes'] = [ + $form['webform']['button_classes'] = [ '#type' => 'webform_codemirror', '#title' => $this->t('Button CSS classes'), '#description' => $this->t('A list of classes that will be provided in "Button CSS classes" dropdown. Enter one or more classes on each line. These styles should be available in your theme\'s CSS file.'), @@ -295,30 +294,30 @@ class WebformAdminSettingsForm extends ConfigFormBase { '#default_value' => $settings['default_draft_loaded_message'], ]; - $form['confirmation'] = [ + $form['confirmation'] = [ '#type' => 'details', '#title' => $this->t('Confirmation default settings'), '#tree' => TRUE, ]; - $form['confirmation']['default_confirmation_message'] = [ + $form['confirmation']['default_confirmation_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Default confirmation message'), '#required' => TRUE, '#default_value' => $config->get('settings.default_confirmation_message'), ]; - $form['confirmation']['default_confirmation_back_label'] = [ + $form['confirmation']['default_confirmation_back_label'] = [ '#type' => 'textfield', '#title' => $this->t('Default confirmation back label'), '#required' => TRUE, '#default_value' => $config->get('settings.default_confirmation_back_label'), ]; - $form['confirmation']['confirmation_classes'] = [ + $form['confirmation']['confirmation_classes'] = [ '#type' => 'webform_codemirror', '#title' => $this->t('Confirmation CSS classes'), '#description' => $this->t('A list of classes that will be provided in the "Confirmation CSS classes" dropdown. Enter one or more classes on each line. These styles should be available in your theme\'s CSS file.'), '#default_value' => $config->get('settings.confirmation_classes'), ]; - $form['confirmation']['confirmation_back_classes'] = [ + $form['confirmation']['confirmation_back_classes'] = [ '#type' => 'webform_codemirror', '#title' => $this->t('Confirmation back link CSS classes'), '#description' => $this->t('A list of classes that will be provided in the "Confirmation back link CSS classes" dropdown. Enter one or more classes on each line. These styles should be available in your theme\'s CSS file.'), @@ -326,12 +325,12 @@ class WebformAdminSettingsForm extends ConfigFormBase { ]; // Limit. - $form['limit'] = [ + $form['limit'] = [ '#type' => 'details', '#title' => $this->t('Limit default settings'), '#tree' => TRUE, ]; - $form['limit']['default_limit_total_message'] = [ + $form['limit']['default_limit_total_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Default total submissions limit message'), '#required' => TRUE, @@ -457,7 +456,7 @@ class WebformAdminSettingsForm extends ConfigFormBase { '#type' => 'checkbox', '#title' => $this->t('Allow files to be uploaded to public file system.'), '#description' => $this->t('Public files upload destination is dangerous for webforms that are available to anonymous and/or untrusted users.') . ' ' . - $this->t('For more information see:') . ' DRUPAL-PSA-2016-003', + $this->t('For more information see:') . ' DRUPAL-PSA-2016-003', '#return_value' => TRUE, '#default_value' => $config->get('file.file_public'), ]; @@ -497,16 +496,14 @@ class WebformAdminSettingsForm extends ConfigFormBase { foreach ($element_plugins as $element_id => $element_plugin) { $items_formats = $element_plugin->getItemsFormats(); -// // Make sure the element has formats. -// if (empty($item_formats)) { -// continue; -// } - -// // Skip if the element just uses the default 'value' format. -// if (count($item_formats) == 1 && isset($item_formats['value'])) { -// continue; -// } - + // // Make sure the element has formats. + // if (empty($item_formats)) { + // continue; + // } + // // Skip if the element just uses the default 'value' format. + // if (count($item_formats) == 1 && isset($item_formats['value'])) { + // continue; + // } // Element. $element_plugin_definition = $element_plugin->getPluginDefinition(); $element_plugin_label = $element_plugin_definition['label']; @@ -526,7 +523,7 @@ class WebformAdminSettingsForm extends ConfigFormBase { '#type' => 'select', '#title' => $this->t('Item format'), '#description' => $this->t("Select how a @label element's single value is displayed.", ['@label' => $element_plugin_label]) . '
' . - $this->t('Defaults to: %value', ['%value' => $item_default_format_label]), + $this->t('Defaults to: %value', ['%value' => $item_default_format_label]), '#options' => $item_formats, '#default_value' => $config->get("format.$element_id"), ]; @@ -543,7 +540,7 @@ class WebformAdminSettingsForm extends ConfigFormBase { '#type' => 'select', '#title' => $this->t('Items format'), '#description' => $this->t("Select how a @label element's multiple values are displayed.", ['@label' => $element_plugin_label]) . '
' . - $this->t('Defaults to: %value', ['%value' => $items_default_format_label]), + $this->t('Defaults to: %value', ['%value' => $items_default_format_label]), '#options' => $items_formats, '#default_value' => $config->get("format.$element_id"), ]; @@ -551,44 +548,44 @@ class WebformAdminSettingsForm extends ConfigFormBase { } // Mail. - $form['mail'] = [ + $form['mail'] = [ '#type' => 'details', '#title' => $this->t('Email default settings'), '#tree' => TRUE, ]; - $form['mail']['default_from_mail'] = [ + $form['mail']['default_from_mail'] = [ '#type' => 'textfield', '#title' => $this->t('Default email from address'), '#required' => TRUE, '#default_value' => $config->get('mail.default_from_mail'), ]; - $form['mail']['default_from_name'] = [ + $form['mail']['default_from_name'] = [ '#type' => 'textfield', '#title' => $this->t('Default email from name'), '#required' => TRUE, '#default_value' => $config->get('mail.default_from_name'), ]; - $form['mail']['default_subject'] = [ + $form['mail']['default_subject'] = [ '#type' => 'textfield', '#title' => $this->t('Default email subject'), '#required' => TRUE, '#default_value' => $config->get('mail.default_subject'), ]; - $form['mail']['default_body_text'] = [ + $form['mail']['default_body_text'] = [ '#type' => 'webform_codemirror', '#mode' => 'text', '#title' => $this->t('Default email body (Plain text)'), '#required' => TRUE, '#default_value' => $config->get('mail.default_body_text'), ]; - $form['mail']['default_body_html'] = [ + $form['mail']['default_body_html'] = [ '#type' => 'webform_codemirror', '#mode' => 'html', '#title' => $this->t('Default email body (HTML)'), '#required' => TRUE, '#default_value' => $config->get('mail.default_body_html'), ]; - $form['mail']['token_tree_link'] = $this->tokenManager->buildTreeLink(); + $form['mail']['token_tree_link'] = $this->tokenManager->buildTreeLink(); // Export. $form['export'] = [ diff --git a/src/Plugin/WebformElement/NumericBase.php b/src/Plugin/WebformElement/NumericBase.php index a4b8e1f..952a521 100644 --- a/src/Plugin/WebformElement/NumericBase.php +++ b/src/Plugin/WebformElement/NumericBase.php @@ -3,7 +3,6 @@ namespace Drupal\webform\Plugin\WebformElement; use Drupal\Core\Form\FormStateInterface; -use Drupal\webform\Element\Webform; use Drupal\webform\WebformElementBase; use Drupal\webform\WebformInterface; use Drupal\webform\WebformSubmissionInterface; diff --git a/src/Plugin/WebformElement/OptionsBase.php b/src/Plugin/WebformElement/OptionsBase.php index abf20d7..a5977f0 100644 --- a/src/Plugin/WebformElement/OptionsBase.php +++ b/src/Plugin/WebformElement/OptionsBase.php @@ -3,10 +3,8 @@ namespace Drupal\webform\Plugin\WebformElement; use Drupal\Component\Utility\Unicode; -use Drupal\Component\Utility\Xss; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\OptGroup; -use Drupal\webform\Utility\WebformArrayHelper; use Drupal\webform\Utility\WebformOptionsHelper; use Drupal\webform\WebformElementBase; use Drupal\webform\WebformSubmissionInterface; diff --git a/src/Plugin/WebformElement/WebformManagedFileBase.php b/src/Plugin/WebformElement/WebformManagedFileBase.php index 5c51abc..0787ac1 100644 --- a/src/Plugin/WebformElement/WebformManagedFileBase.php +++ b/src/Plugin/WebformElement/WebformManagedFileBase.php @@ -2,6 +2,7 @@ namespace Drupal\webform\Plugin\WebformElement; +use Drupal\Core\Url; use Drupal\Core\Form\FormStateInterface; // ISSUE: Below import statement is throwing "Error: Cannot use Drupal\Core\Url // as Url because the name is already in use in" when executing any drush @@ -86,7 +87,7 @@ abstract class WebformManagedFileBase extends WebformElementBase { if (!isset($scheme_options[$uri_scheme]) && $this->currentUser->hasPermission('administer webform')) { drupal_set_message($this->t('The \'File\' element is unavailable because a private files directory has not been configured and public file uploads have not been enabled. For more information see: DRUPAL-PSA-2016-003'), 'warning'); $context = [ - 'link' => Link::fromTextAndUrl($this->t('Edit'), \Drupal\Core\Url::fromRoute(''))->toString(), + 'link' => Link::fromTextAndUrl($this->t('Edit'), Url::fromRoute(''))->toString(), ]; $this->logger->notice("The 'File' element is unavailable because no stream wrappers are available", $context); } @@ -208,7 +209,7 @@ abstract class WebformManagedFileBase extends WebformElementBase { /** * {@inheritdoc} */ - protected function formatTextItem(array &$element, $value, array $options = []) { + protected function formatTextItem(array &$element, $value, array $options = []) { $file = $this->getFile($element, $value, $options); $format = $this->getItemFormat($element); switch ($format) { @@ -223,7 +224,6 @@ abstract class WebformManagedFileBase extends WebformElementBase { } } - /** * {@inheritdoc} */ @@ -286,6 +286,7 @@ abstract class WebformManagedFileBase extends WebformElementBase { } return $this->entityTypeManager->getStorage('file')->loadMultiple($value); } + /** * {@inheritdoc} */ @@ -557,7 +558,7 @@ abstract class WebformManagedFileBase extends WebformElementBase { '#type' => 'webform_message', '#message_type' => 'warning', '#message_message' => $this->t('Public files upload destination is dangerous for webforms that are available to anonymous and/or untrusted users.') . ' ' . - $this->t('For more information see: DRUPAL-PSA-2016-003'), + $this->t('For more information see: DRUPAL-PSA-2016-003'), '#access' => TRUE, '#states' => [ 'visible' => [ diff --git a/src/Plugin/WebformElement/WebformMarkup.php b/src/Plugin/WebformElement/WebformMarkup.php index c26acac..2cd284c 100644 --- a/src/Plugin/WebformElement/WebformMarkup.php +++ b/src/Plugin/WebformElement/WebformMarkup.php @@ -40,8 +40,8 @@ class WebformMarkup extends WebformMarkupBase { * {@inheritdoc} */ public function form(array $form, FormStateInterface $form_state) { - $form = parent::form($form, $form_state); - $form['markup']['markup'] = [ + $form = parent::form($form, $form_state); + $form['markup']['markup'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('HTML markup'), '#description' => $this->t('Enter custom HTML into your webform.'), diff --git a/src/Plugin/WebformElement/WebformRating.php b/src/Plugin/WebformElement/WebformRating.php index 83e26d4..d623fe5 100644 --- a/src/Plugin/WebformElement/WebformRating.php +++ b/src/Plugin/WebformElement/WebformRating.php @@ -49,7 +49,6 @@ class WebformRating extends Range { parent::prepare($element, $webform_submission); } - /** * {@inheritdoc} */ diff --git a/src/Tests/WebformConfirmationTest.php b/src/Tests/WebformConfirmationTest.php index 2721abc..7cc93e4 100644 --- a/src/Tests/WebformConfirmationTest.php +++ b/src/Tests/WebformConfirmationTest.php @@ -69,8 +69,7 @@ class WebformConfirmationTest extends WebformTestBase { $this->assertUrl('webform/test_confirmation_page/confirmation', ['query' => ['custom' => 'param']]); // TODO: (TESTING) Figure out why the inline confirmation link is not including the query string parameters. - // $this->assertRaw('Back to form'); - + // $this->assertRaw('Back to form');. /* Test confirmation page custom (confirmation_type=page) */ $webform_confirmation_page_custom = Webform::load('test_confirmation_page_custom'); diff --git a/src/Tests/WebformElementAccessTest.php b/src/Tests/WebformElementAccessTest.php index 9b2bb35..ccd2561 100644 --- a/src/Tests/WebformElementAccessTest.php +++ b/src/Tests/WebformElementAccessTest.php @@ -109,7 +109,6 @@ class WebformElementAccessTest extends WebformTestBase { /* Create view */ // NOTE: Anonymous users can view submissions, so there is nothing to check. - // Check authenticated role access. $this->drupalLogin($this->adminFormUser); $this->drupalGet("/admin/structure/webform/manage/test_element_access/submission/$sid"); diff --git a/src/Tests/WebformElementFormatTest.php b/src/Tests/WebformElementFormatTest.php index b1c1836..d2368da 100644 --- a/src/Tests/WebformElementFormatTest.php +++ b/src/Tests/WebformElementFormatTest.php @@ -3,7 +3,6 @@ namespace Drupal\webform\Tests; use Drupal\Component\Render\FormattableMarkup; -use Drupal\user\Entity\User; use Drupal\webform\Entity\Webform; use Drupal\webform\Entity\WebformSubmission; use Drupal\webform\WebformSubmissionInterface; @@ -69,9 +68,9 @@ class WebformElementFormatTest extends WebformTestBase { 'Time (Raw value)' => '09:00:00', 'Entity autocomplete (Raw value)' => 'user:1', // 'Entity autocomplete (Link)' => 'admin', -// 'Entity autocomplete (Entity ID)' => '1', -// 'Entity autocomplete (Label)' => 'admin', -// 'Entity autocomplete (Label (ID))' => 'admin (1)', + // 'Entity autocomplete (Entity ID)' => '1', + // 'Entity autocomplete (Label)' => 'admin', + // 'Entity autocomplete (Label (ID))' => 'admin (1)',. 'Address (Value)' => '10 Main Street
10 Main Street
Springfield, Alabama. Loremipsum
Afghanistan


', 'Address (Raw value)' => '
  • address: 10 Main Street
  • address_2: 10 Main Street
  • city: Springfield
  • state_province: Alabama
  • postal_code: Loremipsum
  • country: Afghanistan


', 'Address (List)' => '
  • Address: 10 Main Street
  • Address 2: 10 Main Street
  • City/Town: Springfield
  • State/Province: Alabama
  • Zip/Postal Code: Loremipsum
  • Country: Afghanistan


', @@ -111,37 +110,37 @@ City/Town: Springfield State/Province: Alabama Zip/Postal Code: Loremipsum Country: Afghanistan', - 'Likert (Value): + 'Likert (Value): Please answer question 1?: 1 How about now answering question 2?: 1 Finally, here is question 3?: 1', - 'Likert (Raw value): + 'Likert (Raw value): q1: 1 q2: 1 q3: 1', - 'Likert (List): + 'Likert (List): Please answer question 1?: 1 How about now answering question 2?: 1 Finally, here is question 3?: 1', - 'Likert (Table): + 'Likert (Table): Please answer question 1?: 1 How about now answering question 2?: 1 Finally, here is question 3?: 1', - 'Date (Value): vamThursday000000Australia/Sydney', - 'Date (Raw value): Thu, 18 Jun 1942 00:00:00 +1000am4', - 'Date (Fallback date format): Thu, 06/18/1942 - 00:00', - 'Date (HTML Date): 1942-06-18', - 'Date (HTML Datetime): 1942-06-18T00:00:00+1000', - 'Date (HTML Month): 1942-06', - 'Date (HTML Time): 00:00:00', - 'Date (HTML Week): 1942-W25', - 'Date (HTML Year): 1942', - 'Date (HTML Yearless date): 06-18', - 'Date (Default long date): Thursday, June 18, 1942 - 00:00', - 'Date (Default medium date): Thu, 06/18/1942 - 00:00', - 'Date (Default short date): 06/18/1942 - 00:00', - 'Time (Value): 09:00', - 'Time (Raw value): 09:00:00', + 'Date (Value): vamThursday000000Australia/Sydney', + 'Date (Raw value): Thu, 18 Jun 1942 00:00:00 +1000am4', + 'Date (Fallback date format): Thu, 06/18/1942 - 00:00', + 'Date (HTML Date): 1942-06-18', + 'Date (HTML Datetime): 1942-06-18T00:00:00+1000', + 'Date (HTML Month): 1942-06', + 'Date (HTML Time): 00:00:00', + 'Date (HTML Week): 1942-W25', + 'Date (HTML Year): 1942', + 'Date (HTML Yearless date): 06-18', + 'Date (Default long date): Thursday, June 18, 1942 - 00:00', + 'Date (Default medium date): Thu, 06/18/1942 - 00:00', + 'Date (Default short date): 06/18/1942 - 00:00', + 'Time (Value): 09:00', + 'Time (Raw value): 09:00:00', ]; foreach ($elements as $value) { $this->assertContains($body, $value, new FormattableMarkup('Found @value', ['@value' => $value])); diff --git a/src/Tests/WebformElementManagedFilePublicTest.php b/src/Tests/WebformElementManagedFilePublicTest.php index cdda54e..ad5fae7 100644 --- a/src/Tests/WebformElementManagedFilePublicTest.php +++ b/src/Tests/WebformElementManagedFilePublicTest.php @@ -55,7 +55,6 @@ class WebformElementManagedFilePublicTest extends WebformTestBase { // NOTE: Unable to test private file upload warning because SimpleTest // automatically enables private file uploads. - // Check managed_file element is enabled. $this->drupalGet('admin/structure/webform/manage/test_element_managed_file/element/add'); $this->assertRaw('>File<'); diff --git a/src/Tests/WebformElementManagedFileTest.php b/src/Tests/WebformElementManagedFileTest.php index 8ac26e2..bc7dc58 100644 --- a/src/Tests/WebformElementManagedFileTest.php +++ b/src/Tests/WebformElementManagedFileTest.php @@ -106,7 +106,7 @@ class WebformElementManagedFileTest extends WebformTestBase { $temp_file_uri = file_create_url('private://webform/test_element_managed_file/_sid_/' . basename($this->files[1]->uri)); // Check that temp file is not linked. - $this->assertRaw(' text-1.txt'); + $this->assertRaw(' text-1.txt'); $this->assertNoRaw(' ' . basename($this->files[1]->uri) . ''); // Check that anonymous user can't access temp file. diff --git a/src/Tests/WebformHandlerRemotePostTest.php b/src/Tests/WebformHandlerRemotePostTest.php index f7e39f4..d49e8bd 100644 --- a/src/Tests/WebformHandlerRemotePostTest.php +++ b/src/Tests/WebformHandlerRemotePostTest.php @@ -70,7 +70,6 @@ class WebformHandlerRemotePostTest extends WebformTestBase { // Check remote post 'create' 500 error handling. // $this->postSubmission($webform_handler_remote, ['first_name' => 'FAIL']); // $this->assertPattern('#\s+500#ms'); - // @todo Figure out why the below test is failing on Drupal.org. // Update the remote post handlers insert url to return a 404 error. // /** @var \Drupal\webform\Plugin\WebformHandler\RemotePostWebformHandler $handler */ @@ -79,9 +78,8 @@ class WebformHandlerRemotePostTest extends WebformTestBase { // $configuration['settings']['insert_url'] .= '/broken'; // $handler->setConfiguration($configuration); // $webform_handler_remote->save(); - // $this->postSubmission($webform_handler_remote, ['first_name' => 'FAIL']); - // $this->assertPattern('#\s+404#ms'); + // $this->assertPattern('#\s+404#ms');. } } diff --git a/src/Tests/WebformSubmissionFormElementTest.php b/src/Tests/WebformSubmissionFormElementTest.php index 1916b0b..fa45836 100644 --- a/src/Tests/WebformSubmissionFormElementTest.php +++ b/src/Tests/WebformSubmissionFormElementTest.php @@ -50,7 +50,6 @@ class WebformSubmissionFormElementTest extends WebformTestBase { // @todo Determine why test_element_unique is not updating correctly during // testing. // $this->assertRaw('Submission updated in Test: Element: Unique.'); - /* Test invalid elements */ // Check invalid elements . diff --git a/src/WebformAddonsManager.php b/src/WebformAddonsManager.php index 46d5cff..108992d 100644 --- a/src/WebformAddonsManager.php +++ b/src/WebformAddonsManager.php @@ -215,7 +215,6 @@ class WebformAddonsManager implements WebformAddonsManagerInterface { 'category' => 'config', ]; - return $projects; } diff --git a/src/WebformElementBase.php b/src/WebformElementBase.php index dc607ac..414dd4e 100644 --- a/src/WebformElementBase.php +++ b/src/WebformElementBase.php @@ -1036,7 +1036,7 @@ class WebformElementBase extends PluginBase implements WebformElementInterface { $t_args = array( '%name' => empty($element['#title']) ? $element['#parents'][0] : $element['#title'], '%min' => $element['#minlength'], - '%length' => Unicode::strlen($element['#value']) + '%length' => Unicode::strlen($element['#value']), ); $form_state->setError($element, t('%name cannot be less than %min characters but is currently %length characters long.', $t_args)); } diff --git a/src/WebformEntityForm.php b/src/WebformEntityForm.php index c9467d3..b24035c 100644 --- a/src/WebformEntityForm.php +++ b/src/WebformEntityForm.php @@ -192,7 +192,7 @@ class WebformEntityForm extends BundleEntityFormBase { '#mode' => 'yaml', '#title' => $this->t('Elements (YAML)'), '#description' => $this->t('Enter a Form API (FAPI) and/or a Render Array as YAML.', $t_args) . '
' . - '' . $this->t('Please note that comments are not supported and will be removed.') . '', + '' . $this->t('Please note that comments are not supported and will be removed.') . '', '#default_value' => $webform->get('elements') , '#required' => TRUE, ]; diff --git a/src/WebformEntitySettingsForm.php b/src/WebformEntitySettingsForm.php index 68783b0..37872c2 100644 --- a/src/WebformEntitySettingsForm.php +++ b/src/WebformEntitySettingsForm.php @@ -187,11 +187,11 @@ class WebformEntitySettingsForm extends EntityForm { } // Webform. - $form['webform'] = [ + $form['webform'] = [ '#type' => 'details', '#title' => $this->t('Webform settings'), ]; - $form['webform']['status'] = [ + $form['webform']['status'] = [ '#type' => 'radios', '#title' => $this->t('Webform status'), '#default_value' => ($webform->get('status') == 1) ? 1 : 0, @@ -207,23 +207,23 @@ class WebformEntitySettingsForm extends EntityForm { ], ], ]; - $form['webform']['form_closed_message'] = [ + $form['webform']['form_closed_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Webform closed message'), '#description' => $this->t('A message to be displayed notifying the user that the webform is closed.'), '#default_value' => $settings['form_closed_message'], ]; - $form['webform']['form_exception_message'] = [ + $form['webform']['form_exception_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Webform exception message'), '#description' => $this->t('A message to be displayed if the webform breaks.'), '#default_value' => $settings['form_exception_message'], ]; - $form['webform']['form_submit'] = [ + $form['webform']['form_submit'] = [ '#type' => 'details', '#title' => $this->t('Webform submit button'), ]; - $form['webform']['form_submit']['form_submit_label'] = [ + $form['webform']['form_submit']['form_submit_label'] = [ '#type' => 'textfield', '#title' => $this->t('Webform submit button label'), '#size' => 20, @@ -235,21 +235,21 @@ class WebformEntitySettingsForm extends EntityForm { '#classes' => $this->configFactory->get('webform.settings')->get('settings.button_classes'), '#default_value' => $settings['form_submit_attributes'], ]; - $form['webform']['form_prepopulate'] = [ + $form['webform']['form_prepopulate'] = [ '#type' => 'checkbox', '#title' => $this->t('Allow elements to be populated using query string parameters.'), '#description' => $this->t("If checked, elements can be populated using query string parameters. For example, appending ?name=John+Smith to a webform's URL would setting an the 'name' element's default value to 'John Smith'."), '#return_value' => TRUE, '#default_value' => $settings['form_prepopulate'], ]; - $form['webform']['form_prepopulate_source_entity'] = [ + $form['webform']['form_prepopulate_source_entity'] = [ '#type' => 'checkbox', '#title' => $this->t('Allow source entity to be populated using query string parameters.'), '#description' => $this->t("If checked, source entity can be populated using query string parameters. For example, appending ?source_entity_type=user&source_entity_id=1 to a webform's URL would set a submission's 'Submitted to' value to '@user.", ['@user' => User::load(1)->label()]), '#return_value' => TRUE, '#default_value' => $settings['form_prepopulate_source_entity'], ]; - $settings_elements = [ + $settings_elements = [ 'form_submit_once' => [ 'title' => $this->t('Prevent duplicate submissions'), 'all_description' => $this->t('Submit button is disabled immediately after is is clicked form all webforms.'), @@ -543,7 +543,7 @@ class WebformEntitySettingsForm extends EntityForm { ]; // Submission. - $form['submission'] = [ + $form['submission'] = [ '#type' => 'details', '#title' => $this->t('Submission settings'), '#states' => [ @@ -559,14 +559,14 @@ class WebformEntitySettingsForm extends EntityForm { '#description' => $this->t('Show the previous submissions notification that appears when users have previously submitted this form.'), '#default_value' => $settings['form_previous_submissions'], ); - $form['submission']['form_confidential'] = [ + $form['submission']['form_confidential'] = [ '#type' => 'checkbox', '#title' => $this->t('Confidential submissions'), '#description' => $this->t('Confidential submissions have no recorded IP address and must be submitted while logged out.'), '#return_value' => TRUE, '#default_value' => $settings['form_confidential'], ]; - $form['submission']['form_confidential_message'] = [ + $form['submission']['form_confidential_message'] = [ '#type' => 'webform_html_editor', '#title' => $this->t('Webform confidential message'), '#description' => $this->t('A message to be displayed when authenticated users try to access a confidential webform.'), @@ -577,14 +577,14 @@ class WebformEntitySettingsForm extends EntityForm { ], ], ]; - $form['submission']['token_update'] = [ + $form['submission']['token_update'] = [ '#type' => 'checkbox', '#title' => $this->t('Allow users to update a submission using a secure token.'), '#description' => $this->t("If checked users will be able to update a submission using the webform's URL appended with the submission's (secure) token. The URL to update a submission will be available when viewing a submission's information and can be inserted into the an email using the [webform_submission:update-url] token."), '#return_value' => TRUE, '#default_value' => $settings['token_update'], ]; - $form['submission']['next_serial'] = [ + $form['submission']['next_serial'] = [ '#type' => 'number', '#title' => $this->t('Next submission number'), '#description' => $this->t('The value of the next submission number. This is usually 1 when you start and will go up with each webform submission.'), @@ -801,7 +801,7 @@ class WebformEntitySettingsForm extends EntityForm { '#type' => 'select', '#title' => $this->t('Method'), '#description' => $this->t('The HTTP method with which the form will be submitted.') . '
' . - '' . $this->t('Selecting a custom POST or GET method will automatically disable wizards, previews, drafts, submissions, limits, purging, and confirmations.') . '', + '' . $this->t('Selecting a custom POST or GET method will automatically disable wizards, previews, drafts, submissions, limits, purging, and confirmations.') . '', '#options' => [ '' => $this->t('POST (Default)'), 'post' => $this->t('POST (Custom)'), @@ -846,9 +846,9 @@ class WebformEntitySettingsForm extends EntityForm { '#mode' => 'yaml', '#title' => $this->t('Custom properties'), '#description' => - $this->t('Properties do not have to prepended with a hash (#) character, the hash character will be automatically added upon submission.') . - '
' . - $this->t('These properties and callbacks are not allowed: @properties', ['@properties' => WebformArrayHelper::toString(WebformArrayHelper::addPrefix(WebformElementHelper::$ignoredProperties))]), + $this->t('Properties do not have to prepended with a hash (#) character, the hash character will be automatically added upon submission.') . + '
' . + $this->t('These properties and callbacks are not allowed: @properties', ['@properties' => WebformArrayHelper::toString(WebformArrayHelper::addPrefix(WebformElementHelper::$ignoredProperties))]), '#default_value' => WebformArrayHelper::removePrefix($properties), ]; diff --git a/src/WebformExporterBase.php b/src/WebformExporterBase.php index 81adb96..2dc48b5 100644 --- a/src/WebformExporterBase.php +++ b/src/WebformExporterBase.php @@ -242,7 +242,7 @@ abstract class WebformExporterBase extends PluginBase implements WebformExporter // Sanitize file name. // @see http://stackoverflow.com/questions/2021624/string-sanitizer-for-filename - $file_name = preg_replace('([^\w\s\d\-_~,;:\[\]\(\].]|[\.]{2,})', '', $file_name); + $file_name = preg_replace('([^\w\s\d\-_~,;:\[\]\(\].]|[\.]{2,})', '', $file_name); $file_name = preg_replace('/\s+/', '-', $file_name); return $file_name; } diff --git a/src/WebformHelpManager.php b/src/WebformHelpManager.php index d2358c7..f813e50 100644 --- a/src/WebformHelpManager.php +++ b/src/WebformHelpManager.php @@ -282,7 +282,6 @@ class WebformHelpManager implements WebformHelpManagerInterface { continue; } - if ($api_url = $webform_element->getPluginApiUrl()) { $build['content'][$category_name]['elements'][$element_name]['title'] = [ '#type' => 'link', @@ -475,8 +474,8 @@ class WebformHelpManager implements WebformHelpManagerInterface { '#suffix' => '', 'description' => [ '#markup' => '

' . $this->t('The Webform module utilizes the third-party Open Source libraries listed below to enhance webform elements and to provide additional functionality. It is recommended that these libraries be installed in your Drupal installations /libraries directory. If these libraries are not installed, they are automatically loaded from a CDN.') . '

' . - '

' . $this->t('Currently the best way to download all the needed third party libraries is to either add webform.libraries.make.yml to your drush make file or execute the below drush command from the root of your Drupal installation.', [':href' => 'http://cgit.drupalcode.org/webform/tree/webform.libraries.make.yml?h=8.x-5.x']) . '

' . - '
drush webform-libraries-download

', + '

' . $this->t('Currently the best way to download all the needed third party libraries is to either add webform.libraries.make.yml to your drush make file or execute the below drush command from the root of your Drupal installation.', [':href' => 'http://cgit.drupalcode.org/webform/tree/webform.libraries.make.yml?h=8.x-5.x']) . '

' . + '
drush webform-libraries-download

', ], 'libraries' => [ '#prefix' => '
', @@ -718,7 +717,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { 'title' => $this->t('Defining options'), 'url' => Url::fromRoute('entity.webform_options.collection'), 'content' => $this->t('The Options page lists predefined options which are used to build select menus, radio buttons, checkboxes and likerts.') . ' ' . - $this->t('To find and download additional options, go to Webform 8.x-5.x: Options.', [':href' => 'https://www.drupal.org/node/2845530']), + $this->t('To find and download additional options, go to Webform 8.x-5.x: Options.', [':href' => 'https://www.drupal.org/node/2845530']), ]; // Elements. @@ -730,7 +729,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { 'title' => $this->t('Webform element plugins'), 'url' => Url::fromRoute('webform.element_plugins'), 'content' => $this->t('The Elements page lists all available webform element plugins.') . ' ' . - $this->t('Webform element plugins are used to enhance existing render/form elements. Webform element plugins provide default properties, data normalization, custom validation, element configuration webform, and customizable display formats.'), + $this->t('Webform element plugins are used to enhance existing render/form elements. Webform element plugins provide default properties, data normalization, custom validation, element configuration webform, and customizable display formats.'), ]; // Handlers. @@ -742,7 +741,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { 'title' => $this->t('Webform handler plugins'), 'url' => Url::fromRoute('webform.handler_plugins'), 'content' => $this->t('The Handlers page lists all available webform handler plugins.') . ' ' . - $this->t('Handlers are used to route submitted data to external applications and send notifications & confirmations.'), + $this->t('Handlers are used to route submitted data to external applications and send notifications & confirmations.'), ]; // Exporters. @@ -754,7 +753,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { 'title' => $this->t('Results exporter plugins'), 'url' => Url::fromRoute('webform.exporter_plugins'), 'content' => $this->t('The Exporters page lists all available results exporter plugins.') . ' ' . - $this->t('Exporters are used to export results into a downloadable format that can be used by MS Excel, Google Sheets, and other spreadsheet applications.'), + $this->t('Exporters are used to export results into a downloadable format that can be used by MS Excel, Google Sheets, and other spreadsheet applications.'), ]; // Third party settings. @@ -779,7 +778,6 @@ class WebformHelpManager implements WebformHelpManagerInterface { 'content' => $this->t('The Add-ons page includes a list of modules and projects that extend and/or provide additional functionality to the Webform module and Drupal\'s Form API. If you would like a module or project to be included in the below list, please submit a request to the Webform module\'s issue queue.', [':href' => 'https://www.drupal.org/node/add/project-issue/webform']), ]; - /****************************************************************************/ // Webform. /****************************************************************************/ @@ -803,7 +801,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { ], 'title' => $this->t('Editing YAML source'), 'content' => $this->t("The (View) Source page allows developers to edit a webform's render array using YAML markup.") . ' ' . - $this->t("Developers can use the (View) Source page to quickly alter a webform's labels, cut-n-paste multiple elements, reorder elements, and add customize properties and markup to elements."), + $this->t("Developers can use the (View) Source page to quickly alter a webform's labels, cut-n-paste multiple elements, reorder elements, and add customize properties and markup to elements."), 'video_id' => 'source', ]; @@ -817,7 +815,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { ], 'title' => $this->t('Testing a webform'), 'content' => $this->t("The Webform test page allows a webform to be tested using a customizable test dataset.") . ' ' . - $this->t('Multiple test submissions can be created using the devel_generate module.'), + $this->t('Multiple test submissions can be created using the devel_generate module.'), ]; // Webform settings. @@ -828,7 +826,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { ], 'title' => $this->t('Customizing webform settings'), 'content' => $this->t("The Webform settings page allows a webform's labels, messaging, and behaviors to be customized.") . ' ' . - $this->t('Administrators can open/close a webform, enable/disable drafts, allow previews, set submission limits, and disable the saving of results.'), + $this->t('Administrators can open/close a webform, enable/disable drafts, allow previews, set submission limits, and disable the saving of results.'), 'video_id' => 'form_settings', ]; @@ -861,8 +859,8 @@ class WebformHelpManager implements WebformHelpManagerInterface { ], 'title' => $this->t('Enabling webform handlers'), 'content' => $this->t('The Webform handlers page lists additional handlers (aka behaviors) that can process webform submissions.') . ' ' . - $this->t('Handlers are plugins that act on a webform submission.', [':href' => 'https://www.drupal.org/developing/api/8/plugins']) . ' ' . - $this->t('For example, sending email confirmations and notifications is done using the Email handler which is provided by the Webform module.'), + $this->t('Handlers are plugins that act on a webform submission.', [':href' => 'https://www.drupal.org/developing/api/8/plugins']) . ' ' . + $this->t('For example, sending email confirmations and notifications is done using the Email handler which is provided by the Webform module.'), 'video_id' => 'submissions', ]; @@ -900,7 +898,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { ], 'title' => $this->t('Managing results'), 'content' => $this->t("The Results page displays an overview of a webform's submissions.") . ' ' . - $this->t("Submissions can be reviewed, updated, flagged, annotated, and downloaded."), + $this->t("Submissions can be reviewed, updated, flagged, annotated, and downloaded."), 'video_id' => 'submissions', ]; @@ -937,7 +935,7 @@ class WebformHelpManager implements WebformHelpManagerInterface { ], 'title' => $this->t('Exporting configuration'), 'content' => $this->t("The Export (form) page allows developers to quickly export a single webform's configuration file.") . ' ' . - $this->t('If you run into any issues with a webform, you can also attach the below configuration (without any personal information) to a new ticket in the Webform module\'s issue queue.', [':href' => 'https://www.drupal.org/project/issues/webform']), + $this->t('If you run into any issues with a webform, you can also attach the below configuration (without any personal information) to a new ticket in the Webform module\'s issue queue.', [':href' => 'https://www.drupal.org/project/issues/webform']), 'video_id' => 'help', ]; } diff --git a/src/WebformSubmissionForm.php b/src/WebformSubmissionForm.php index b6ef828..4d3bbc6 100644 --- a/src/WebformSubmissionForm.php +++ b/src/WebformSubmissionForm.php @@ -315,8 +315,6 @@ class WebformSubmissionForm extends ContentEntityForm { $form['#attributes']['class'][] = 'js-webform-autofocus'; } - - // Details save: Attach details element save open/close library. // This ensures that the library will be loaded even if the webform is // used as a block or a node. diff --git a/src/WebformSubmissionGenerate.php b/src/WebformSubmissionGenerate.php index 1c96612..d03f296 100644 --- a/src/WebformSubmissionGenerate.php +++ b/src/WebformSubmissionGenerate.php @@ -4,7 +4,6 @@ namespace Drupal\webform; use Drupal\Core\Serialization\Yaml; use Drupal\Core\Config\ConfigFactoryInterface; -use Drupal\Core\Utility\Token; /** * Webform submission generator. @@ -113,8 +112,7 @@ class WebformSubmissionGenerate implements WebformSubmissionGenerateInterface { $values = [$values]; } - // $values = $this->tokenManager->replace($values, $webform); - + // $values = $this->tokenManager->replace($values, $webform);. // Elements that use multiple values require an array as the // default value. if ($element_handler->hasMultipleValues($element)) { diff --git a/src/WebformSubmissionListBuilder.php b/src/WebformSubmissionListBuilder.php index 2a00f9c..2ddef15 100644 --- a/src/WebformSubmissionListBuilder.php +++ b/src/WebformSubmissionListBuilder.php @@ -155,11 +155,11 @@ class WebformSubmissionListBuilder extends EntityListBuilder { $route_name = \Drupal::routeMatch()->getRouteName(); if ($route_name == "$base_route_name.webform.results_table") { - $this->columns = $webform_submission_storage->getCustomColumns($this->webform, $this->sourceEntity, $this->account, TRUE); - $this->sort = $webform_submission_storage->getCustomSetting('sort', 'serial', $this->webform, $this->sourceEntity); - $this->direction = $webform_submission_storage->getCustomSetting('direction', 'desc', $this->webform, $this->sourceEntity); - $this->limit = $webform_submission_storage->getCustomSetting('limit', 50, $this->webform, $this->sourceEntity); - $this->format = $webform_submission_storage->getCustomSetting('format', $this->format, $this->webform, $this->sourceEntity); + $this->columns = $webform_submission_storage->getCustomColumns($this->webform, $this->sourceEntity, $this->account, TRUE); + $this->sort = $webform_submission_storage->getCustomSetting('sort', 'serial', $this->webform, $this->sourceEntity); + $this->direction = $webform_submission_storage->getCustomSetting('direction', 'desc', $this->webform, $this->sourceEntity); + $this->limit = $webform_submission_storage->getCustomSetting('limit', 50, $this->webform, $this->sourceEntity); + $this->format = $webform_submission_storage->getCustomSetting('format', $this->format, $this->webform, $this->sourceEntity); $this->customize = TRUE; if ($this->format['element_format'] == 'raw') { foreach ($this->columns as &$column) { @@ -182,8 +182,8 @@ class WebformSubmissionListBuilder extends EntityListBuilder { unset($this->columns['sid']); $this->sort = 'serial'; } - $this->direction = 'desc'; - $this->limit = 50; + $this->direction = 'desc'; + $this->limit = 50; $this->customize = FALSE; } } @@ -435,8 +435,8 @@ class WebformSubmissionListBuilder extends EntityListBuilder { $element = $column['element']; - $key = $column['key']; - $value = (isset($data[$key])) ? $data[$key] : ''; + $key = $column['key']; + $value = (isset($data[$key])) ? $data[$key] : ''; $options = $column; diff --git a/src/WebformSubmissionStorageInterface.php b/src/WebformSubmissionStorageInterface.php index 370bcc3..79e3f9b 100644 --- a/src/WebformSubmissionStorageInterface.php +++ b/src/WebformSubmissionStorageInterface.php @@ -208,7 +208,7 @@ interface WebformSubmissionStorageInterface extends ContentEntityStorageInterfac * Purge webform submissions. * * @param int $count - * Amount of webform submissions to purge + * Amount of webform submissions to purge. */ public function purge($count); diff --git a/tests/modules/webform_test/includes/webform_test.test_element_format.inc b/tests/modules/webform_test/includes/webform_test.test_element_format.inc index 7b938fc..cf3d8c4 100644 --- a/tests/modules/webform_test/includes/webform_test.test_element_format.inc +++ b/tests/modules/webform_test/includes/webform_test.test_element_format.inc @@ -59,7 +59,6 @@ function webform_test_test_element_format(WebformInterface $webform, $multiple = continue; } - if ($multiple) { if (!$webform_element->hasMultipleValues($element) && !$webform_element->hasProperty('multiple') && !$webform_element->hasProperty('tags')) { continue; @@ -67,7 +66,7 @@ function webform_test_test_element_format(WebformInterface $webform, $multiple = // Set element #multiple or #tags property. $multiple_properties = ['multiple', 'tags']; - foreach ($multiple_properties as $multiple_property) { + foreach ($multiple_properties as $multiple_property) { if ($webform_element->hasProperty($multiple_property)) { $element["#$multiple_property"] = TRUE; } @@ -133,4 +132,3 @@ function webform_test_test_element_format(WebformInterface $webform, $multiple = return $data; } - diff --git a/tests/modules/webform_test/includes/webform_test.test_element_format_multiple.inc b/tests/modules/webform_test/includes/webform_test.test_element_format_multiple.inc index 890ac33..54b97aa 100644 --- a/tests/modules/webform_test/includes/webform_test.test_element_format_multiple.inc +++ b/tests/modules/webform_test/includes/webform_test.test_element_format_multiple.inc @@ -5,10 +5,8 @@ * Generate test elements with Flexbox wrappers. */ -use Drupal\Component\Utility\Unicode; use Drupal\webform\WebformInterface; - module_load_include('inc', 'webform_test', 'includes/webform_test.test_element_format'); /** @@ -45,7 +43,7 @@ function webform_test_test_element_format_multiple(WebformInterface $webform) { // Set element #multiple or #tags property. $multiple_properties = ['multiple', 'tags']; - foreach ($multiple_properties as $multiple_property) { + foreach ($multiple_properties as $multiple_property) { if ($webform_element->hasProperty($multiple_property)) { $element["#$multiple_property"] = TRUE; } @@ -75,4 +73,3 @@ function webform_test_test_element_format_multiple(WebformInterface $webform) { return $data; } - diff --git a/tests/src/Kernel/Breadcrumb/WebformBreadcrumbBuilderTest.php b/tests/src/Kernel/Breadcrumb/WebformBreadcrumbBuilderTest.php index b94099a..e5f7f89 100644 --- a/tests/src/Kernel/Breadcrumb/WebformBreadcrumbBuilderTest.php +++ b/tests/src/Kernel/Breadcrumb/WebformBreadcrumbBuilderTest.php @@ -328,7 +328,9 @@ class WebformBreadcrumbBuilderTest extends UnitTestCase { ->getMock(); $webform_submission_access->expects($this->any()) ->method('access') - ->will($this->returnCallback(function($operation) {return ($operation == 'view_own');})); + ->will($this->returnCallback(function ($operation) { + return ($operation == 'view_own'); + })); $route_match = $this->getMockRouteMatch('entity.node.webform_submission.canonical', [ ['webform_submission', $webform_submission_access], ['webform', $this->webform], diff --git a/tests/src/Kernel/Entity/WebformEntityTest.php b/tests/src/Kernel/Entity/WebformEntityTest.php index 8891862..94daeb2 100644 --- a/tests/src/Kernel/Entity/WebformEntityTest.php +++ b/tests/src/Kernel/Entity/WebformEntityTest.php @@ -44,7 +44,7 @@ class WebformEntityTest extends KernelTestBase { $elements = [ 'root' => [ '#type' => 'textfield', - '#title' => 'root' + '#title' => 'root', ], 'container' => [ '#type' => 'container', @@ -52,7 +52,7 @@ class WebformEntityTest extends KernelTestBase { 'child' => [ '#type' => 'textfield', '#title' => 'child', - ] + ], ], ]; $webform->setElements($elements); @@ -64,7 +64,7 @@ class WebformEntityTest extends KernelTestBase { $flattened_elements = [ 'root' => [ '#type' => 'textfield', - '#title' => 'root' + '#title' => 'root', ], 'container' => [ '#type' => 'container', @@ -141,7 +141,7 @@ class WebformEntityTest extends KernelTestBase { 'page_1' => ['#title' => 'Page 1'], 'page_2' => ['#title' => 'Page 2'], 'page_3' => ['#title' => 'Page 3'], - 'complete' => ['#title' => 'Complete'] + 'complete' => ['#title' => 'Complete'], ]; $this->assertEquals($webform->getPages(), $wizard_pages); @@ -154,7 +154,7 @@ class WebformEntityTest extends KernelTestBase { /** * Test paths. */ - function testPaths() { + public function testPaths() { $this->installConfig('webform'); /** @var \Drupal\webform\WebformInterface $webform */ @@ -170,7 +170,7 @@ class WebformEntityTest extends KernelTestBase { /** * Test elements CRUD operations. */ - function testElementsCrud() { + public function testElementsCrud() { $this->installEntitySchema('webform_submission'); /** @var \Drupal\webform\WebformInterface $webform */ @@ -182,7 +182,7 @@ class WebformEntityTest extends KernelTestBase { 'root' => [ '#type' => 'container', '#title' => 'root', - ] + ], ]; $webform->setElementProperties('root', $elements['root']); $this->assertEquals($webform->getElementsRaw(), Yaml::encode($elements)); @@ -208,9 +208,10 @@ class WebformEntityTest extends KernelTestBase { 'root' => [ '#type' => 'container', '#title' => 'root', - ] + ], ]; $webform->deleteElement('container'); $this->assertEquals($webform->getElementsRaw(), Yaml::encode($elements)); } + } diff --git a/tests/src/Kernel/WebformEntityElementsValidationTest.php b/tests/src/Kernel/WebformEntityElementsValidationTest.php index e450742..91878ca 100644 --- a/tests/src/Kernel/WebformEntityElementsValidationTest.php +++ b/tests/src/Kernel/WebformEntityElementsValidationTest.php @@ -132,24 +132,24 @@ duplicate: 'The root (wizard_page) is a root element that can not be used as child to another element', ], ], -/* + /* // Check validate rendering. [ 'getElementsRaw' => "machine_name: - '#type': 'machine_name' - '#machine_name': - source: + '#type': 'machine_name' + '#machine_name': + source: broken", 'getElementsOriginalRaw' => "machine_name: - '#type': 'machine_name' - '#machine_name': - source: + '#type': 'machine_name' + '#machine_name': + source: broken", 'messages' => [ 'Unable to render elements, please view the below message and the error log.
  • Query condition 'webform_submission.webform_id IN ()' cannot be empty.
', ], ], -*/ + */ ]; // Check invalid YAML. diff --git a/tests/src/Kernel/WebformSubmissionStorageTest.php b/tests/src/Kernel/WebformSubmissionStorageTest.php index 17cb5a6..0c1b920 100644 --- a/tests/src/Kernel/WebformSubmissionStorageTest.php +++ b/tests/src/Kernel/WebformSubmissionStorageTest.php @@ -100,7 +100,7 @@ class WebfromSubmissionStorageTest extends KernelTestBase { // 1: (bool) Whether the submission should be created in such time when // that it becomes eligible for purging based on its creation time // 2: (array) Array of webform submission sequence IDs that should be purged - // in the test + // in the test. $tests = []; // Test that only drafts are purged. diff --git a/tests/src/Unit/Access/WebformAccessCheckTest.php b/tests/src/Unit/Access/WebformAccessCheckTest.php index 55f8d56..ce3e79c 100644 --- a/tests/src/Unit/Access/WebformAccessCheckTest.php +++ b/tests/src/Unit/Access/WebformAccessCheckTest.php @@ -4,8 +4,6 @@ namespace Drupal\Tests\webform\Unit\Access; use Drupal\Core\Access\AccessResult; use Drupal\Tests\UnitTestCase; -use Drupal\Core\Cache\Context\CacheContextsManager; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Drupal\webform\Access\WebformAccess; /** @@ -36,7 +34,6 @@ class PermissionAccessCheckTest extends UnitTestCase { parent::setUp(); } - /** * Tests the check admin access. * @@ -51,7 +48,7 @@ class PermissionAccessCheckTest extends UnitTestCase { ->will($this->returnValueMap([ ['administer webform', TRUE], ['administer webform submission', TRUE], - ] + ] )); $submission_manager_account = $this->getMock('Drupal\Core\Session\AccountInterface'); @@ -60,7 +57,7 @@ class PermissionAccessCheckTest extends UnitTestCase { ->will($this->returnValueMap([ ['access webform overview', TRUE], ['view any webform submission', TRUE], - ] + ] )); $node = $this->getMockBuilder('Drupal\node\NodeInterface') @@ -120,5 +117,4 @@ class PermissionAccessCheckTest extends UnitTestCase { $this->assertEquals(AccessResult::allowed(), WebformAccess::checkEntityResultsAccess($webform_node, $submission_manager_account)); } - } diff --git a/tests/src/Unit/Utility/WebformOptionsHelperTest.php b/tests/src/Unit/Utility/WebformOptionsHelperTest.php index 49e8832..908c926 100644 --- a/tests/src/Unit/Utility/WebformOptionsHelperTest.php +++ b/tests/src/Unit/Utility/WebformOptionsHelperTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\webform\Unit\Utility; -use Drupal\Component\Render\FormattableMarkup; use Drupal\webform\Utility\WebformOptionsHelper; use Drupal\Tests\UnitTestCase; @@ -143,7 +142,7 @@ class WebformOptionsHelperTest extends UnitTestCase { * @see testRange() */ public function providerRange() { - $tests[] = [['#min' => 1, '#max' => 3], [1 => 1, 2 => 2, 3 => 3],]; + $tests[] = [['#min' => 1, '#max' => 3], [1 => 1, 2 => 2, 3 => 3]]; $tests[] = [['#min' => 0, '#max' => 6, '#step' => 2], [0 => 0, 2 => 2, 4 => 4, 6 => 6]]; $tests[] = [['#min' => 'A', '#max' => 'C'], ['A' => 'A', 'B' => 'B', 'C' => 'C']]; $tests[] = [['#min' => 'a', '#max' => 'c'], ['a' => 'a', 'b' => 'b', 'c' => 'c']]; diff --git a/tests/src/Unit/Utility/WebformReflectionHelperTest.php b/tests/src/Unit/Utility/WebformReflectionHelperTest.php index 08d1b29..2fa1f7b 100644 --- a/tests/src/Unit/Utility/WebformReflectionHelperTest.php +++ b/tests/src/Unit/Utility/WebformReflectionHelperTest.php @@ -5,9 +5,18 @@ namespace Drupal\Tests\webform\Unit\Utility; use Drupal\webform\Utility\WebformReflectionHelper; use Drupal\Tests\UnitTestCase; +/** + * + */ class WebformReflectionTestParent {} -class WebformReflectionTestChild extends WebformReflectionTestParent { } -class WebformReflectionTestGrandChild extends WebformReflectionTestChild { } +/** + * + */ +class WebformReflectionTestChild extends WebformReflectionTestParent {} +/** + * + */ +class WebformReflectionTestGrandChild extends WebformReflectionTestChild {} /** * Tests webform reflection utility.