MAGETWO-33407: Cover MAGETWO-31855 changes by static tests

- fixed static tests

Author: Dmytro Vilchynskyi

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml

@@ -36,7 +36,7 @@
 </script>
 <?php else :?>
 <input type="hidden" name="<?php echo $block->getInputElementName()?>"  value="" id="<?php echo $_id?>" />
-<script type="text/javascript">
+<script>
     require([
         'mage/adminhtml/grid'
     ], function(){

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

@@ -10,7 +10,7 @@
 <div class="attribute-set">
     <div class="edit-attribute-set attribute-set-col">
         <?php echo $block->getSetFormHtml() ?>
-        <script type="text/javascript">
+        <script>
 require([
     "jquery",
     "mage/mage"

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml

@@ -23,7 +23,7 @@
       <?php echo $block->getDateHtml() ?>
 
       <?php if (!$block->useCalendar()): ?>
-      <script type="text/javascript">
+      <script>
 require([
   "prototype",
   "Magento_Catalog/catalog/product/composite/configure"

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml

@@ -69,7 +69,7 @@ toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_con
         <input type="checkbox" id="inventory_use_config_min_qty" name="<?php echo $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
         <label for="inventory_use_config_min_qty"><?php echo __('Use Config Settings') ?></label>
         <?php if (!$block->isReadonly()): ?>
-        <script type="text/javascript">
+        <script>
 require(["prototype"], function(){
 toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);
 });

app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml

@@ -7,14 +7,14 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /** @var \Magento\Cookie\Block\Html\Notices $this */ ?>
-<?php if ($this->helper('Magento\Cookie\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
+<?php /** @var \Magento\Cookie\Block\Html\Notices $block */ ?>
+<?php if ($block->helper('Magento\Cookie\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
     <div class="message global cookie" id="notice-cookie-block" style="display: none">
         <div class="content">
             <p>
                 <strong><?php echo __('We use cookies to make your experience better.') ?></strong>
                 <span><?php echo __('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.') ?></span>
-                <?php echo __('<a href="%1">Learn more</a>.', $this->getPrivacyPolicyLink()) ?></p>
+                <?php echo __('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()) ?></p>
             <div class="actions">
                 <button id="btn-cookie-allow" class="action allow primary">
                     <span><?php echo __('Allow Cookies');?></span>
@@ -32,9 +32,9 @@
             $('#notice-cookie-block').mage('cookieNotices', {
                 cookieAllowButtonSelector: '#btn-cookie-allow',
                 cookieName: '<?php echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>',
-                cookieValue: '<?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>',
-                cookieLifetime: <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getCookieRestrictionLifetime()?>,
-                noCookiesUrl: '<?php echo $this->getUrl('cookie/index/noCookies') ?>'
+                cookieValue: '<?php echo $block->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>',
+                cookieLifetime: <?php echo $block->helper('Magento\Cookie\Helper\Cookie')->getCookieRestrictionLifetime()?>,
+                noCookiesUrl: '<?php echo $block->getUrl('cookie/index/noCookies') ?>'
             });
     // ]]>
 

app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml

@@ -118,7 +118,7 @@ require([
                             '<div class="fileinput-button form-buttons">'+
                                 '<span><?php echo __('Browse Files...') ?></span>' +
                                 '<input id="downloadable_link_{{id}}_sample_file" type="file" name="<?php echo $block->getFileFieldName('link_samples') ?>">' +
-                                '<script type="text/javascript">' +
+                                '<script>' +
                                 '/*<![CDATA[*/' +
                                     'linksUploader("#downloadable_link_{{id}}_sample_file", "<?php echo $block->getUploadUrl('link_samples') ?>"); ' +
                                 '/*]]>*/' +
@@ -146,7 +146,7 @@ require([
                             '<div class="fileinput-button form-buttons">'+
                                 '<span><?php echo __('Browse Files...') ?></span>' +
                                 '<input id="downloadable_link_{{id}}_file" type="file" name="<?php echo $block->getFileFieldName('links') ?>">' +
-                                '<script type="text/javascript">' +
+                                '<script>' +
                                 '/*<![CDATA[*/' +
                                     'linksUploader("#downloadable_link_{{id}}_file", "<?php echo $block->getUploadUrl('links') ?>"); ' +
                                 '/*]]>*/' +

app/code/Magento/Reports/view/adminhtml/templates/grid.phtml

@@ -94,7 +94,7 @@ require([
     </div>
 </div>
 <?php if ($block->canDisplayContainer()): ?>
-    <script type="text/javascript">
+    <script>
 require([
     "jquery",
     "validation",