Merge remote-tracking branch 'obsessive-owls/MAGETWO-95391' into 2.3.0-qwerty-bugs1

Author: cpartica

app/code/Magento/Widget/Block/Adminhtml/Widget.php

@@ -15,7 +15,9 @@
 class Widget extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * @return void
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _construct()
     {
@@ -40,13 +42,16 @@ protected function _construct()
         $this->buttonList->update('reset', 'label', __('Cancel'));
         $this->buttonList->update('reset', 'onclick', 'wWidget.closeModal()');
 
-        $this->_formScripts[] = 'require(["mage/adminhtml/wysiwyg/widget"],'
-            . ' function(){wWidget = new WysiwygWidget.Widget('
-            . '"widget_options_form", "select_widget_type", "widget_options", "'
-            . $this->getUrl(
-                'adminhtml/*/loadOptions'
-            ) . '", "' . $this->getRequest()->getParam(
-                'widget_target_id'
-            ) . '");});';
+        $this->_formScripts[] = <<<EOJS
+require(['mage/adminhtml/wysiwyg/widget'], function() {
+    wWidget = new WysiwygWidget.Widget(
+        'widget_options_form',
+        'select_widget_type',
+        'widget_options',
+        '{$this->getUrl('adminhtml/*/loadOptions')}',
+        '{$this->escapeJs($this->getRequest()->getParam('widget_target_id'))}'
+    );
+});
+EOJS;
     }
 }