diff --git a/README.md b/README.md index 9eade71f..6ddc5752 100644 --- a/README.md +++ b/README.md @@ -111,4 +111,3 @@ notes and assume that _things will be changing_. which contain fields that you define! These webforms use the standard Drupal fields. [Is this module still needed?](https://www.drupal.org/node/2809179) - diff --git a/includes/webform.theme.inc b/includes/webform.theme.inc index da61f113..66813be1 100644 --- a/includes/webform.theme.inc +++ b/includes/webform.theme.inc @@ -723,7 +723,6 @@ function template_preprocess_webform_composite_telephone(array &$variables) { } } - /******************************************************************************/ // Element templates /******************************************************************************/ diff --git a/js/webform.admin.js b/js/webform.admin.js index 61c2d5a3..bd09d409 100644 --- a/js/webform.admin.js +++ b/js/webform.admin.js @@ -43,7 +43,7 @@ // Only attach the click event handler to the entire table and determine // which row triggers the event. $('.webform-results__table', context).once('webform-results-table').click(function (event) { - if (event.target.tagName == 'A' || event.target.tagName == 'BUTTON') { + if (event.target.tagName === 'A' || event.target.tagName === 'BUTTON') { return true; } diff --git a/js/webform.block.js b/js/webform.block.js index de73eed1..ddfefff5 100644 --- a/js/webform.block.js +++ b/js/webform.block.js @@ -34,7 +34,7 @@ * A string with the summary. */ function selectSummary(context) { - return $(context).find("#edit-visibility-webform-webforms option:selected").map(function(){ return this.text }).get().join(", ") || Drupal.t('Not restricted'); + return $(context).find('#edit-visibility-webform-webforms option:selected').map(function () { return this.text }).get().join(", ") || Drupal.t('Not restricted'); } $('[data-drupal-selector="edit-visibility-webform"]').drupalSetSummary(selectSummary); diff --git a/js/webform.element.codemirror.js b/js/webform.element.codemirror.js index 262d410e..dc7bdaeb 100644 --- a/js/webform.element.codemirror.js +++ b/js/webform.element.codemirror.js @@ -10,7 +10,7 @@ // @see http://codemirror.net/doc/manual.html#config Drupal.webform = Drupal.webform || {}; Drupal.webform.codeMirror = Drupal.webform.codeMirror || {}; - Drupal.webform.codeMirror.options = Drupal.webform.codeMirror.options|| {}; + Drupal.webform.codeMirror.options = Drupal.webform.codeMirror.options || {}; /** * Initialize CodeMirror editor. @@ -66,7 +66,7 @@ // Set CodeMirror to be readonly when the textarea is disabled. // @see webform.states.js $input.on('webform:disabled', function () { - editor.setOption("readOnly", $input.is(':disabled')); + editor.setOption('readOnly', $input.is(':disabled')); }); }); diff --git a/js/webform.element.color.js b/js/webform.element.color.js index d2ceaf09..6b42f972 100644 --- a/js/webform.element.color.js +++ b/js/webform.element.color.js @@ -39,7 +39,7 @@ $element[0].value = $output[0].value; }); } - }) + }); } }; diff --git a/js/webform.element.counter.js b/js/webform.element.counter.js index 5b23feda..a8a91135 100644 --- a/js/webform.element.counter.js +++ b/js/webform.element.counter.js @@ -9,7 +9,7 @@ // @see http://qwertypants.github.io/jQuery-Word-and-Character-Counter-Plugin/ Drupal.webform = Drupal.webform || {}; - Drupal.webform.counter = Drupal.webform.counter|| {}; + Drupal.webform.counter = Drupal.webform.counter || {}; Drupal.webform.counter.options = Drupal.webform.counter.options|| {}; /** @@ -27,7 +27,7 @@ // Only word type can be defined, otherwise the counter defaults to // character counting. - if ($(this).attr('data-counter-type') == 'word') { + if ($(this).attr('data-counter-type') === 'word') { options.type = 'word'; } diff --git a/js/webform.element.details.save.js b/js/webform.element.details.save.js index 866d0a4b..f7274cda 100644 --- a/js/webform.element.details.save.js +++ b/js/webform.element.details.save.js @@ -27,7 +27,7 @@ return; } - var open = ($details.attr('open') != 'open') ? 1 : 0; + var open = ($details.attr('open') !== 'open') ? 1 : 0; localStorage.setItem(name, open); }); @@ -45,7 +45,7 @@ return; } - if (open == 1) { + if (open === 1) { $details.attr('open', 'open'); } else { @@ -62,7 +62,7 @@ * @param $details * A details element. * - * @returns string + * @return string * The name used to store the state of details element. */ Drupal.webformDetailsSaveGetName = function ($details) { diff --git a/js/webform.element.details.toggle.js b/js/webform.element.details.toggle.js index 0d6f56af..f9603df0 100644 --- a/js/webform.element.details.toggle.js +++ b/js/webform.element.details.toggle.js @@ -61,20 +61,20 @@ /** * Determine if a webform's details are all opened. * - * @param $form + * @param {jQuery} $form * A webform. * - * @returns {boolean} + * @return {boolean} * TRUE if a webform's details are all opened. */ function isFormDetailsOpen($form) { - return ($form.find('details[open]').length == $form.find('details').length) + return ($form.find('details[open]').length === $form.find('details').length) } /** * Set a webform's details toggle state widget label. * - * @param $form + * @param {jQuery} $form * A webform. */ function setDetailsToggleLabel($form) { diff --git a/js/webform.element.html_editor.js b/js/webform.element.html_editor.js index 5e168ad6..cffa2c2d 100644 --- a/js/webform.element.html_editor.js +++ b/js/webform.element.html_editor.js @@ -43,13 +43,13 @@ // Toolbar settings. format_tags: 'p;h2;h3;h4;h5;h6', toolbar: [ - { name: 'styles', items: ['Format', 'Font', 'FontSize' ] }, - { name: 'basicstyles', items: [ 'Bold', 'Italic', 'Subscript', 'Superscript' ] }, - { name: 'insert', items: [ 'SpecialChar' ] }, - { name: 'colors', items: [ 'TextColor', 'BGColor' ] }, - { name: 'paragraph', items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote'] }, - { name: 'links', items: [ 'Link', 'Unlink'] }, - { name: 'tools', items: [ 'Source', '-', 'Maximize' ] } + {name: 'styles', items: ['Format', 'Font', 'FontSize' ]}, + {name: 'basicstyles', items: [ 'Bold', 'Italic', 'Subscript', 'Superscript' ]}, + {name: 'insert', items: [ 'SpecialChar' ]}, + {name: 'colors', items: [ 'TextColor', 'BGColor' ]}, + {name: 'paragraph', items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote']}, + {name: 'links', items: [ 'Link', 'Unlink']}, + {name: 'tools', items: [ 'Source', '-', 'Maximize' ]} ] }, Drupal.webform.htmlEditor.options); diff --git a/js/webform.element.icheck.js b/js/webform.element.icheck.js index e00b9bd1..0442515d 100644 --- a/js/webform.element.icheck.js +++ b/js/webform.element.icheck.js @@ -35,7 +35,7 @@ }) .on('ifUnchecked', function (e) { $(e.target).removeAttr('checked').click(); - }) + }); }); } }; @@ -49,24 +49,24 @@ */ Drupal.behaviors.webformICheckTableSelectAll = { attach: function(context) { - $('table[data-webform-icheck] th.select-all').bind('DOMNodeInserted', function() { + $('table[data-webform-icheck] th.select-all').bind('DOMNodeInserted', function () { $(this).unbind('DOMNodeInserted'); - $(this).find('input[type="checkbox"]').each(function() { - var icheck = $(this).closest('table[data-webform-icheck]').attr('data-webform-icheck'); + $(this).find('input[type="checkbox"]').each(function () { + var icheck = $(this).closest('table[data-webform-icheck]').attr('data-webform-icheck'); - var options = $.extend({ - checkboxClass: 'icheckbox_' + icheck, - radioClass: 'iradio_' + icheck - }, Drupal.webform.iCheck.options); + var options = $.extend({ + checkboxClass: 'icheckbox_' + icheck, + radioClass: 'iradio_' + icheck + }, Drupal.webform.iCheck.options); - $(this).iCheck(options) - }) - .on('ifChanged', function() { - var _index = $(this).parents('th').index() + 1; - $(this).parents('thead').next('tbody').find('tr td:nth-child(' + _index + ') input') - .iCheck(!$(this).is(':checked') ? 'check' : 'uncheck') - .iCheck($(this).is(':checked') ? 'check' : 'uncheck'); - }); + $(this).iCheck(options) + }) + .on('ifChanged', function () { + var _index = $(this).parents('th').index() + 1; + $(this).parents('thead').next('tbody').find('tr td:nth-child(' + _index + ') input') + .iCheck(!$(this).is(':checked') ? 'check' : 'uncheck') + .iCheck($(this).is(':checked') ? 'check' : 'uncheck'); + }); }); } }; diff --git a/js/webform.element.message.js b/js/webform.element.message.js index 3b144e94..976131c2 100644 --- a/js/webform.element.message.js +++ b/js/webform.element.message.js @@ -37,7 +37,7 @@ $element.trigger('close'); event.preventDefault(); }); - }) + }); } }; diff --git a/js/webform.element.other.js b/js/webform.element.other.js index d866cad7..06253c1a 100644 --- a/js/webform.element.other.js +++ b/js/webform.element.other.js @@ -5,7 +5,7 @@ (function ($, Drupal) { - "use strict"; + 'use strict'; /** * Toggle other input (text) field. diff --git a/js/webform.element.radios.js b/js/webform.element.radios.js index 0c696754..670d6597 100644 --- a/js/webform.element.radios.js +++ b/js/webform.element.radios.js @@ -37,7 +37,7 @@ } if (required) { - $target.find('input[type="radio"]').attr({'required': 'required', 'aria-required': 'aria-required'}) + $target.find('input[type="radio"]').attr({'required': 'required', 'aria-required': 'aria-required'}); $target.find('legend span').addClass('js-form-required form-required'); } else { diff --git a/js/webform.element.range.js b/js/webform.element.range.js index 1bd4bb4f..ece22d71 100644 --- a/js/webform.element.range.js +++ b/js/webform.element.range.js @@ -55,7 +55,7 @@ $output.on('input', function () { $element[0].value = $output[0].value; }); - }) + }); } }; diff --git a/js/webform.element.roles.js b/js/webform.element.roles.js index 1946b6a2..882b96ae 100644 --- a/js/webform.element.roles.js +++ b/js/webform.element.roles.js @@ -17,7 +17,7 @@ $(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 () { - return ($(this).val() != 'anonymous' && $(this).val() != 'authenticated'); + return ($(this).val() !== 'anonymous' && $(this).val() != 'authenticated'); }); $authenticated.on('click', function () { @@ -32,7 +32,7 @@ if ($authenticated.is(':checked')) { $checkboxes.prop('checked', true).attr('disabled', true); } - }) + }); } }; diff --git a/js/webform.element.select2.js b/js/webform.element.select2.js index 9592b0dd..557af1f0 100644 --- a/js/webform.element.select2.js +++ b/js/webform.element.select2.js @@ -9,9 +9,9 @@ // @see https://select2.github.io/options.html Drupal.webform = Drupal.webform || {}; - Drupal.webform.select2 = Drupal.webform.select2|| {}; + Drupal.webform.select2 = Drupal.webform.select2 || {}; Drupal.webform.select2.options = Drupal.webform.select2.options || {}; - + /** * Initialize Select2 support. * diff --git a/js/webform.element.signature.js b/js/webform.element.signature.js index b8793697..e5e4c887 100644 --- a/js/webform.element.signature.js +++ b/js/webform.element.signature.js @@ -44,7 +44,7 @@ // Initialize signature canvas. var options = $.extend({ - 'onEnd': function () { + onEnd: function () { $input.val(signaturePad.toDataURL()); } }, Drupal.webform.signaturePad.options); diff --git a/js/webform.element.telephone.js b/js/webform.element.telephone.js index 27fbf501..1f26fe12 100644 --- a/js/webform.element.telephone.js +++ b/js/webform.element.telephone.js @@ -29,17 +29,17 @@ // @todo: Figure out how to lazy load utilsScript (build/js/utils.js). // @see https://github.com/jackocnr/intl-tel-input#utilities-script var options = $.extend({ - 'nationalMode': false, - 'initialCountry': $telephone.attr('data-webform-telephone-international-initial-country') || '' + nationalMode: false, + initialCountry: $telephone.attr('data-webform-telephone-international-initial-country') || '' }, Drupal.webform.intlTelInput.options); $telephone.intlTelInput(options); - var reset = function() { + var reset = function () { $telephone.removeClass('error'); $error.hide(); }; - $telephone.blur(function() { + $telephone.blur(function () { reset(); if ($.trim($telephone.val())) { if (!$telephone.intlTelInput('isValidNumber')) { @@ -50,7 +50,7 @@ }); $telephone.on('keyup change', reset); - }) + }); } }; diff --git a/js/webform.element.time.js b/js/webform.element.time.js index ec18bfd1..99b01642 100644 --- a/js/webform.element.time.js +++ b/js/webform.element.time.js @@ -11,7 +11,7 @@ Drupal.webform = Drupal.webform || {}; Drupal.webform.timePicker = Drupal.webform.timePicker || {}; Drupal.webform.timePicker.options = Drupal.webform.timePicker.options || {}; - + /** * Attach timepicker fallback on time elements. * diff --git a/js/webform.form.disable_back.js b/js/webform.form.disable_back.js index 952fecbc..f48ed09d 100644 --- a/js/webform.form.disable_back.js +++ b/js/webform.form.disable_back.js @@ -3,8 +3,10 @@ * Javascript to disable back button. */ +'use strict'; + // From: http://stackoverflow.com/questions/17962130/restrict-user-to-refresh-and-back-forward-in-any-browser -history.pushState({ page: 1 }, "Title 1", "#no-back"); +history.pushState({page: 1}, 'Title 1', '#no-back'); window.onhashchange = function (event) { - window.location.hash = "no-back"; + window.location.hash = 'no-back'; }; diff --git a/js/webform.form.submit_once.js b/js/webform.form.submit_once.js index 10a969f8..994d85da 100644 --- a/js/webform.form.submit_once.js +++ b/js/webform.form.submit_once.js @@ -46,7 +46,7 @@ var $progress = $('
 
'); $clickedButton.after($progress); }); - }) + }); } }; diff --git a/js/webform.form.unsaved.js b/js/webform.form.unsaved.js index 06572a08..c4b5bd17 100644 --- a/js/webform.form.unsaved.js +++ b/js/webform.form.unsaved.js @@ -43,7 +43,7 @@ } }); - /*! + /** * An experimental shim to partially emulate onBeforeUnload on iOS. * Part of https://github.com/codedance/jquery.AreYouSure/ * @@ -60,7 +60,7 @@ } $('a').bind('click', function (evt) { var href = $(evt.target).closest('a').attr('href'); - if (href !== undefined && !(href.match(/^#/) || href.trim() == '')) { + if (href !== undefined && !(href.match(/^#/) || href.trim() === '')) { if ($(window).triggerHandler('beforeunload')) { if (!confirm(Drupal.t('Changes you made may not be saved.') + '\n\n' + Drupal.t('Press OK to leave this page or Cancel to stay.'))) { return false; diff --git a/js/webform.help.js b/js/webform.help.js index d833d4d4..13d8dcf1 100644 --- a/js/webform.help.js +++ b/js/webform.help.js @@ -20,7 +20,7 @@ var $widget = $(context).find('.webform-help-accordion'); $widget.once('webform-help-accordion').accordion({ collapsible: true, - heightStyle: "content" + heightStyle: 'content' }); var $container = $('h3' + location.hash, $widget); diff --git a/js/webform.states.js b/js/webform.states.js index 3fd4c12d..a92ffbcf 100644 --- a/js/webform.states.js +++ b/js/webform.states.js @@ -13,7 +13,7 @@ var $document = $(document); $document.on('state:visible', function (e) { if (!e.trigger) { - return TRUE; + return true; } if (!e.value) { @@ -51,17 +51,17 @@ var $input = $(input); var type = input.type; var tag = input.tagName.toLowerCase(); // Normalize case. - if (type == 'checkbox' || type == 'radio') { + if (type === 'checkbox' || type === 'radio') { $input .trigger('change') .trigger('blur'); } - else if (tag == 'select') { + else if (tag === 'select') { $input .trigger('change') .trigger('blur'); } - else if (type != 'submit' && type != 'button') { + else if (type !== 'submit' && type !== 'button') { $input .trigger('input') .trigger('change') @@ -88,10 +88,10 @@ } // Backup value. - if (type == 'checkbox' || type == 'radio') { + if (type === 'checkbox' || type === 'radio') { $input.data('webform-value', $input.prop('checked')); } - else if (tag == 'select') { + else if (tag === 'select') { var values = []; $input.find('option:selected').each(function (i, option) { values[i] = option.value; @@ -119,22 +119,22 @@ var type = input.type; var tag = input.tagName.toLowerCase(); // Normalize case. - if (type == 'checkbox' || type == 'radio') { - $input.prop('checked', value) + if (type === 'checkbox' || type === 'radio') { + $input.prop('checked', value); } - else if (tag == 'select') { + else if (tag === 'select') { $.each(value, function (i, option_value) { $input.find("option[value='" + option_value + "']").prop("selected", true); }); } - else if (type != 'submit' && type != 'button') { + else if (type !== 'submit' && type !== 'button') { input.value = value; } } // Restore required. if ($input.data('webform-required')) { - $input.prop('required', TRUE); + $input.prop('required', true); } } @@ -150,10 +150,10 @@ // Clear value. var type = input.type; var tag = input.tagName.toLowerCase(); // Normalize case. - if (type == 'checkbox' || type == 'radio') { + if (type === 'checkbox' || type === 'radio') { $input.prop('checked', false); } - else if (tag == 'select') { + else if (tag === 'select') { if ($input.find('option[value=""]').length) { $input.val(''); } @@ -161,8 +161,8 @@ input.selectedIndex = -1; } } - else if (type != 'submit' && type != 'button') { - input.value = (type == 'color') ? '#000000' : ''; + else if (type !== 'submit' && type != 'button') { + input.value = (type === 'color') ? '#000000' : ''; } // Clear required. diff --git a/modules/webform_demo/webform_demo_application_evaluation/webform_demo_application_evaluation.install b/modules/webform_demo/webform_demo_application_evaluation/webform_demo_application_evaluation.install index 2bcc3429..f74525ba 100644 --- a/modules/webform_demo/webform_demo_application_evaluation/webform_demo_application_evaluation.install +++ b/modules/webform_demo/webform_demo_application_evaluation/webform_demo_application_evaluation.install @@ -32,7 +32,7 @@ function webform_demo_application_evaluation_install() { $webform_submission_devel_generate = $devel_generate_manager->createInstance('webform_submission', []); $webform_submission_devel_generate->generateElements([ 'webform_ids' => [ - 'demo_application' => 'demo_application' + 'demo_application' => 'demo_application', ], 'entity-type' => 'node', 'entity-id' => $webform_node->id(), @@ -66,7 +66,7 @@ function webform_demo_application_evaluation_uninstall() { ->condition('webform.target_id', 'demo_application') ->execute(); if ($entity_ids) { - /** @var $nodes \Drupal\node\Entity\Node[] */ + /** @var \Drupal\node\Entity\Node[] $nodes */ $nodes = Node::loadMultiple($entity_ids); foreach ($nodes as $node) { $node->delete(); diff --git a/modules/webform_node/webform_node.install b/modules/webform_node/webform_node.install index 4660ae39..5092d0ef 100644 --- a/modules/webform_node/webform_node.install +++ b/modules/webform_node/webform_node.install @@ -7,7 +7,6 @@ use Drupal\node\Entity\NodeType; - /** * Implements hook_requirements(). */ @@ -54,4 +53,3 @@ function webform_node_uninstall() { } } } - diff --git a/src/Element/WebformElementMultiple.php b/src/Element/WebformElementMultiple.php index 08cdd0ad..7e98e3be 100644 --- a/src/Element/WebformElementMultiple.php +++ b/src/Element/WebformElementMultiple.php @@ -58,12 +58,12 @@ class WebformElementMultiple extends FormElement { $cardinality = $element['#value']; $element['#tree'] = TRUE; - + $element['container'] = [ '#type' => 'container', - '#attributes' => ['class' => [ - 'container-inline', - ]], + '#attributes' => [ + 'class' => ['container-inline'], + ], ]; $element['container']['cardinality'] = [ diff --git a/src/Element/WebformElementStates.php b/src/Element/WebformElementStates.php index 842b0e2f..e722f01b 100644 --- a/src/Element/WebformElementStates.php +++ b/src/Element/WebformElementStates.php @@ -497,7 +497,7 @@ class WebformElementStates extends FormElement { * * @param array $element * An element. - * @param $name + * @param string $name * The name. * * @return string diff --git a/src/Element/WebformMapping.php b/src/Element/WebformMapping.php index 252eef74..46bb49dd 100644 --- a/src/Element/WebformMapping.php +++ b/src/Element/WebformMapping.php @@ -115,7 +115,6 @@ class WebformMapping extends FormElement { return $element; } - /** * Validates a mapping element. */ diff --git a/src/Element/WebformOtherBase.php b/src/Element/WebformOtherBase.php index d63770a9..5061773a 100644 --- a/src/Element/WebformOtherBase.php +++ b/src/Element/WebformOtherBase.php @@ -223,7 +223,7 @@ abstract class WebformOtherBase extends FormElement { * @return array * An associative array container (element) type and other value. */ - protected static function convertDefaultValueToElementValue($element) { + protected static function convertDefaultValueToElementValue(array $element) { $type = str_replace('webform_', '', static::$type); $default_value = isset($element['#default_value']) ? $element['#default_value'] : NULL; diff --git a/src/Element/WebformTelephone.php b/src/Element/WebformTelephone.php index 551e6f98..948cbd61 100644 --- a/src/Element/WebformTelephone.php +++ b/src/Element/WebformTelephone.php @@ -55,4 +55,5 @@ class WebformTelephone extends WebformCompositeBase { $element['#attached']['library'][] = 'webform/webform.element.composite_telephone'; return $element; } + } diff --git a/src/Element/WebformTermSelect.php b/src/Element/WebformTermSelect.php index e6c5f61a..a36a6a79 100644 --- a/src/Element/WebformTermSelect.php +++ b/src/Element/WebformTermSelect.php @@ -82,4 +82,5 @@ class WebformTermSelect extends Select { } $element['#options'] = $options; } + } diff --git a/src/Form/WebformHandlerFormBase.php b/src/Form/WebformHandlerFormBase.php index d84e8262..91aa018c 100644 --- a/src/Form/WebformHandlerFormBase.php +++ b/src/Form/WebformHandlerFormBase.php @@ -193,7 +193,8 @@ abstract class WebformHandlerFormBase extends FormBase { if ($is_new) { $this->webform->addWebformHandler($this->webformHandler->getConfiguration()); } - else { // Update an existing handlers config. + else { + // Update an existing handlers config. $id = $this->webformHandler->getHandlerId(); $currentConfig = $this->webformHandler->getConfiguration(); $this->webform->getHandlers()->setInstanceConfiguration($id, $currentConfig); @@ -248,7 +249,7 @@ abstract class WebformHandlerFormBase extends FormBase { * * @param \Drupal\Core\Form\FormStateInterface $handler_state * The webform handler webform state. - * @param \Drupal\Core\Form\FormStateInterface &$form_state + * @param \Drupal\Core\Form\FormStateInterface &$form_state * The webform state. */ protected function processHandlerFormErrors(FormStateInterface $handler_state, FormStateInterface &$form_state) { diff --git a/src/Plugin/DevelGenerate/WebformSubmissionDevelGenerate.php b/src/Plugin/DevelGenerate/WebformSubmissionDevelGenerate.php index f3d7fc67..0514a060 100644 --- a/src/Plugin/DevelGenerate/WebformSubmissionDevelGenerate.php +++ b/src/Plugin/DevelGenerate/WebformSubmissionDevelGenerate.php @@ -275,7 +275,7 @@ class WebformSubmissionDevelGenerate extends DevelGenerateBase implements Contai */ protected function generateSubmission(&$results) { $webform_id = array_rand(array_filter($results['webform_ids'])); - /** @var \Drupal\webform\WebformInterface $webform */ + /** @var \Drupal\webform\WebformInterface $webform */ $webform = $this->webformStorage->load($webform_id); $users = $results['users']; diff --git a/src/Plugin/WebformElement/Radios.php b/src/Plugin/WebformElement/Radios.php index 89d4b85f..62dde622 100644 --- a/src/Plugin/WebformElement/Radios.php +++ b/src/Plugin/WebformElement/Radios.php @@ -42,4 +42,3 @@ class Radios extends OptionsBase { } } - diff --git a/src/Plugin/WebformElement/WebformManagedFileBase.php b/src/Plugin/WebformElement/WebformManagedFileBase.php index fd76ebc9..9485d9f6 100644 --- a/src/Plugin/WebformElement/WebformManagedFileBase.php +++ b/src/Plugin/WebformElement/WebformManagedFileBase.php @@ -3,10 +3,7 @@ namespace Drupal\webform\Plugin\WebformElement; 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 -// webform command that loads this file. -// use Drupal\Core\Url. +use Drupal\Core\Url as UrlGenerator; use Drupal\Core\StreamWrapper\StreamWrapperInterface; use Drupal\Core\Link; use Drupal\file\Entity\File; @@ -93,7 +90,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'), UrlGenerator::fromRoute(''))->toString(), ]; $this->logger->notice("The 'File' element is unavailable because no stream wrappers are available", $context); } diff --git a/src/Plugin/WebformElement/WebformMapping.php b/src/Plugin/WebformElement/WebformMapping.php index b9380571..b5370bf9 100644 --- a/src/Plugin/WebformElement/WebformMapping.php +++ b/src/Plugin/WebformElement/WebformMapping.php @@ -189,7 +189,6 @@ class WebformMapping extends WebformElementBase { } } - /** * {@inheritdoc} */ diff --git a/src/Plugin/WebformElement/WebformMessage.php b/src/Plugin/WebformElement/WebformMessage.php index 12f697f9..eb3ee727 100644 --- a/src/Plugin/WebformElement/WebformMessage.php +++ b/src/Plugin/WebformElement/WebformMessage.php @@ -4,7 +4,7 @@ namespace Drupal\webform\Plugin\WebformElement; use Drupal\Core\Form\FormStateInterface; use Drupal\webform\WebformSubmissionInterface; -use \Drupal\webform\Element\WebformMessage as WebformMessageElement; +use Drupal\webform\Element\WebformMessage as WebformMessageElement; /** * Provides a 'webform_message' element. diff --git a/src/Plugin/WebformElement/WebformTelephone.php b/src/Plugin/WebformElement/WebformTelephone.php index 09d78d86..97a444f3 100644 --- a/src/Plugin/WebformElement/WebformTelephone.php +++ b/src/Plugin/WebformElement/WebformTelephone.php @@ -122,8 +122,8 @@ class WebformTelephone extends WebformCompositeBase { '#type' => 'select', '#empty_option' => '', '#options' => [ - 'auto' => $this->t('Auto detect'), - ] + CountryManager::getStandardList(), + 'auto' => $this->t('Auto detect'), + ] + CountryManager::getStandardList(), '#states' => [ 'visible' => [ ':input[name="properties[phone__international]"]' => ['checked' => TRUE] diff --git a/src/Plugin/WebformHandler/EmailWebformHandler.php b/src/Plugin/WebformHandler/EmailWebformHandler.php index 13755b7c..c8a60d59 100644 --- a/src/Plugin/WebformHandler/EmailWebformHandler.php +++ b/src/Plugin/WebformHandler/EmailWebformHandler.php @@ -118,15 +118,15 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe public function getSummary() { $settings = $this->getEmailConfiguration(); // Simplify the [webform_submission:values:.*] tokens. - array_walk($settings, function(&$value, $key) { + array_walk($settings, function (&$value, $key) { if (is_string($value)) { $value = preg_replace('/\[webform_submission:values:([^:]+):(?:raw|value)\]/', '[\1]', $value); $value = preg_replace('/\[webform_submission:/', '[', $value); } }); return [ - '#settings' => $settings, - ] + parent::getSummary(); + '#settings' => $settings, + ] + parent::getSummary(); } /** @@ -247,9 +247,9 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe '#title' => $this->t('Send to'), '#open' => TRUE, ]; - $form['to'] += $this->buildElement($form_state, 'to_mail', $this->t('To email'), $this->t('To email address'), $mail_element_options, $options_element_options, TRUE); - $form['to'] += $this->buildElement($form_state, 'cc_mail', $this->t('CC email'), $this->t('CC email address'), $mail_element_options, $options_element_options, FALSE); - $form['to'] += $this->buildElement($form_state, 'bcc_mail', $this->t('BCC email'), $this->t('Bcc email address'), $mail_element_options, $options_element_options, FALSE); + $form['to'] += $this->buildElement('to_mail', $this->t('To email'), $this->t('To email address'), $mail_element_options, $options_element_options, TRUE); + $form['to'] += $this->buildElement('cc_mail', $this->t('CC email'), $this->t('CC email address'), $mail_element_options, $options_element_options, FALSE); + $form['to'] += $this->buildElement('bcc_mail', $this->t('BCC email'), $this->t('Bcc email address'), $mail_element_options, $options_element_options, FALSE); // From. $form['from'] = [ @@ -257,8 +257,8 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe '#title' => $this->t('Send from'), '#open' => TRUE, ]; - $form['from'] += $this->buildElement($form_state, 'from_mail', $this->t('From email'), $this->t('From email address'), $mail_element_options, NULL, TRUE); - $form['from'] += $this->buildElement($form_state, 'from_name', $this->t('From name'), $this->t('From name'), $text_element_options); + $form['from'] += $this->buildElement('from_mail', $this->t('From email'), $this->t('From email address'), $mail_element_options, NULL, TRUE); + $form['from'] += $this->buildElement('from_name', $this->t('From name'), $this->t('From name'), $text_element_options); // Message. $form['message'] = [ @@ -266,7 +266,7 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe '#title' => $this->t('Message'), '#open' => TRUE, ]; - $form['message'] += $this->buildElement($form_state, 'subject', $this->t('Subject'), $this->t('subject'), $text_element_options); + $form['message'] += $this->buildElement('subject', $this->t('Subject'), $this->t('subject'), $text_element_options); // Message: Body. // Building a custom select other element that toggles between @@ -516,7 +516,7 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe * A webform submission. * @param string $configuration_name * The email configuration name. (ie to, cc, bcc, or from) - * @param $configuration_value + * @param string $configuration_value * The email configuration value. * * @return array @@ -647,7 +647,7 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe $t_args = ['%subject' => $message['subject']]; drupal_set_message($this->t('Message not sent %subject because a To, Cc, or Bcc email was not provided.', $t_args), 'warning'); } - return ; + return; } // Send message. @@ -766,8 +766,8 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe */ public function getMessageSummary(array $message) { return [ - '#settings' => $message, - ] + parent::getSummary(); + '#settings' => $message, + ] + parent::getSummary(); } /** @@ -847,7 +847,7 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe * @return array * A select other element. */ - protected function buildElement(FormStateInterface $form_state, $name, $title, $label, array $element_options, array $options_options = NULL, $required = FALSE) { + protected function buildElement($name, $title, $label, array $element_options, array $options_options = NULL, $required = FALSE) { list($element_name, $element_type) = (strpos($name, '_') !== FALSE) ? explode('_', $name) : [$name, 'text']; $options = []; @@ -933,7 +933,7 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe '#type' => 'value', '#value' => [], '#parents' => ['settings', $options_name], - '#prefix' => '
', + '#prefix' => '
', '#suffix' => '
', ]; } @@ -960,7 +960,7 @@ class EmailWebformHandler extends WebformHandlerBase implements WebformHandlerMe $name = prev($trigger_element['#array_parents']); $options_name = strtok($name, '_') . '_options'; - $target_parents = array_slice($trigger_element['#array_parents'], 0, -2); + $target_parents = array_slice($trigger_element['#array_parents'], 0, -2); $target_parents[] = $options_name; $element = NestedArray::getValue($form, $target_parents); diff --git a/tests/modules/webform_test/includes/webform_test.test_element_icheck_styles.inc b/tests/modules/webform_test/includes/webform_test.test_element_icheck_styles.inc index 900cbe87..e1217b76 100644 --- a/tests/modules/webform_test/includes/webform_test.test_element_icheck_styles.inc +++ b/tests/modules/webform_test/includes/webform_test.test_element_icheck_styles.inc @@ -94,7 +94,7 @@ function _webform_test_test_element_icheck_options() { 'minimal-green' => t('Green'), 'minimal-aero' => t('Aero'), ], - [(string) t('Square'),] => [ + [(string) t('Square')] => [ 'square-square' => t('Black'), 'square-grey' => t('Grey'), 'square-yellow' => t('Yellow'), diff --git a/tests/modules/webform_test_element/src/Element/WebformTest.php b/tests/modules/webform_test_element/src/Element/WebformTest.php index da265a00..f5c12f91 100644 --- a/tests/modules/webform_test_element/src/Element/WebformTest.php +++ b/tests/modules/webform_test_element/src/Element/WebformTest.php @@ -2,7 +2,7 @@ namespace Drupal\webform_test_element\Element; -use \Drupal\Core\Render\Element\Textfield; +use Drupal\Core\Render\Element\Textfield; /** * Provides a webform element for testing webform element plugin. diff --git a/tests/modules/webform_test_handler/src/Plugin/WebformHandler/TestEntityMappingWebformHandler.php b/tests/modules/webform_test_handler/src/Plugin/WebformHandler/TestEntityMappingWebformHandler.php index 18b4fe74..cfac63d4 100644 --- a/tests/modules/webform_test_handler/src/Plugin/WebformHandler/TestEntityMappingWebformHandler.php +++ b/tests/modules/webform_test_handler/src/Plugin/WebformHandler/TestEntityMappingWebformHandler.php @@ -6,7 +6,6 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Serialization\Yaml; use Drupal\webform\WebformHandlerBase; -use Drupal\webform\WebformSubmissionInterface; /** * Webform submission entity mapping test handler. diff --git a/tests/src/Unit/Utility/WebformElementHelperTest.php b/tests/src/Unit/Utility/WebformElementHelperTest.php index c134d0ca..f7a9c298 100644 --- a/tests/src/Unit/Utility/WebformElementHelperTest.php +++ b/tests/src/Unit/Utility/WebformElementHelperTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\webform\Unit\Utility; use Drupal\Component\Render\FormattableMarkup; -use Drupal\Core\Render\Markup; use Drupal\webform\Utility\WebformElementHelper; use Drupal\Tests\UnitTestCase; @@ -141,7 +140,6 @@ class WebformElementHelperTest extends UnitTestCase { return $tests; } - /** * Tests WebformElementHelper::convertRenderMarkupToStrings(). * diff --git a/tests/src/Unit/Utility/WebformFormHelperTest.php b/tests/src/Unit/Utility/WebformFormHelperTest.php index e1f3b471..59621be4 100644 --- a/tests/src/Unit/Utility/WebformFormHelperTest.php +++ b/tests/src/Unit/Utility/WebformFormHelperTest.php @@ -124,7 +124,7 @@ class WebformFormHelperTest extends UnitTestCase { ], [ '#title' => 'two-SECOND', - ] + ], ], ]); @@ -148,7 +148,7 @@ class WebformFormHelperTest extends UnitTestCase { ], [ '#title' => 'two-SECOND', - ] + ], ], ]); }