Remove type attribute from tracking code (#17685)

* Remove redundant type="text/javascript" from matomo tracking code, see #17281

* Fix system test expected output

* Fix more system tests' expected output

* Fix integration tests

* Fixed UI tests failure caused by removing type attribute from script tags

* Fix UI tests

* Fix lfs screenshot

* plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png: convert to Git LFS

* plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png: convert to Git LFS

* tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png: convert to Git LFS

* tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png: convert to Git LFS

* tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png: convert to Git LFS

Co-authored-by: sgiehl <stefan@matomo.org>

10 files changed, 33 insertions, 33 deletions

diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
index d267226719..0cccd30d8c 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:705ed714271df281728087c668dee48f4d5c4d05cc745059c3369d82574dca98
-size 240228
+oid sha256:ad5bd993d8ac509429d42a87ba484f08e2891e7ef23505f95e1dbc91d0c77c6b
+size 236944
diff --git a/plugins/Morpheus/templates/javascriptCode.twig b/plugins/Morpheus/templates/javascriptCode.twig
index 20780230d2..1a3fde3ebf 100644
--- a/plugins/Morpheus/templates/javascriptCode.twig
+++ b/plugins/Morpheus/templates/javascriptCode.twig
@@ -1,5 +1,5 @@
 <!-- Matomo -->
-<script type="text/javascript">
+<script>
   var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
 {$options}  _paq.push(['trackPageView']);
@@ -9,11 +9,11 @@
     {$optionsBeforeTrackerUrl}_paq.push(['setTrackerUrl', u+'{$matomoPhpFilename}']);
     _paq.push(['setSiteId', '{$idSite}']);
     {% if loadAsync %}var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'{$matomoJsFilename}'; s.parentNode.insertBefore(g,s);{% endif %}
+    g.async=true; g.src=u+'{$matomoJsFilename}'; s.parentNode.insertBefore(g,s);{% endif %}
 
   })();
 </script>
-{% if not loadAsync %}<script type='text/javascript' src="{$protocol}{$piwikUrl}/{$matomoJsFilename}"></script>
+{% if not loadAsync %}<script src="{$protocol}{$piwikUrl}/{$matomoJsFilename}"></script>
 {% endif %}
 {% if trackNoScript %}<noscript><p><img src="{$protocol}{$piwikUrl}/{$matomoPhpFilename}?idsite={$idSite}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
 {% endif %}
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager_after3_7_0__SitesManager.getJavascriptTag.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager_after3_7_0__SitesManager.getJavascriptTag.xml
index 2ed83de275..1ef87b06eb 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager_after3_7_0__SitesManager.getJavascriptTag.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager_after3_7_0__SitesManager.getJavascriptTag.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push(['trackPageView']);
@@ -10,7 +10,7 @@
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0__SitesManager.getJavascriptTag.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0__SitesManager.getJavascriptTag.xml
index f18e88255b..735d63beac 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0__SitesManager.getJavascriptTag.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0__SitesManager.getJavascriptTag.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push(['trackPageView']);
@@ -10,7 +10,7 @@
     _paq.push(['setTrackerUrl', u+'piwik.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0_but_forced__SitesManager.getJavascriptTag.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0_but_forced__SitesManager.getJavascriptTag.xml
index 2ed83de275..1ef87b06eb 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0_but_forced__SitesManager.getJavascriptTag.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager_prior3_7_0_but_forced__SitesManager.getJavascriptTag.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push(['trackPageView']);
@@ -10,7 +10,7 @@
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
index 6eee1cc461..6d0c51b93c 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8abce161c3760b2e2d53a5a9470986ff1eaf8fff6986a2cc07ef50918a048de
-size 110507
+oid sha256:90e921862d34025cc8915b1832f6c96a6967acfa60047c55d16786f92f546454
+size 110504
diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
index 47f6c5d54b..b3faa1405c 100644
--- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
+++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
@@ -40,7 +40,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
             $crossDomain = true);
 
         $expected = "&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);
@@ -62,7 +62,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;noscript&gt;&lt;p&gt;&lt;img src=&quot;//piwik-server/piwik/matomo.php?idsite=1&amp;amp;rec=1&quot; style=&quot;border:0;&quot; alt=&quot;&quot; /&gt;&lt;/p&gt;&lt;/noscript&gt;
@@ -79,7 +79,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
         $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik');
 
         $expected = "&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push(['trackPageView']);
@@ -89,7 +89,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
@@ -117,7 +117,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
             $doNotTrack = true);
 
         $expected = "&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);" . ($this->hasCustomVariables() ? "
@@ -136,7 +136,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
@@ -164,7 +164,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
             $doNotTrack = true);
 
         $expected = "&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);" . ($this->hasCustomVariables() ? "
@@ -184,7 +184,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
@@ -208,7 +208,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
             $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true);
 
         $expected = "&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);
@@ -221,7 +221,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     
   })();
 &lt;/script&gt;
-&lt;script type='text/javascript' src=&quot;//localhost/piwik/matomo.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;//localhost/piwik/matomo.js&quot;&gt;&lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
 ";
 
@@ -245,7 +245,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
         );
 
         $expected = '&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);' . ($this->hasCustomVariables() ? '
@@ -262,7 +262,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     _paq.push([\'setTrackerUrl\', u+\'matomo.php\']);
     _paq.push([\'setSiteId\', \'1\']);
     var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
-    g.type=\'text/javascript\'; g.async=true; g.src=u+\'matomo.js\'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+\'matomo.js\'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
@@ -279,7 +279,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
         $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik');
 
         $expected = '&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push([\'trackPageView\']);
@@ -289,7 +289,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     _paq.push([\'setTrackerUrl\', u+\'matomo.php\']);
     _paq.push([\'setSiteId\', \'1\']);
     var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
-    g.type=\'text/javascript\'; g.async=true; g.src=u+\'matomo.js\'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+\'matomo.js\'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
index 2ed83de275..1ef87b06eb 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo --&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+&lt;script&gt;
   var _paq = window._paq = window._paq || [];
   /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
   _paq.push(['trackPageView']);
@@ -10,7 +10,7 @@
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Code --&gt;
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
index 7021f9b796..77b41a9fe2 100644
--- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
+++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40435d9f6f44a8c87fb7a0c0315ee770c9610f8762b52784134130ac8805cc26
-size 154492
+oid sha256:accb79f60be4d13cdc2756410380a0e19c9b15a868a204c0857a91a595785268
+size 151171
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
index 22764853fb..266d4ef5b8 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6834f27568c174f646599f3fc9e38d82a695e9ade9c9e6d1509bac188b9ee592
-size 442940
+oid sha256:ffaff714fe580a96e0c7a1220825d0992acb11bb8c22f4d31af50235655523de
+size 439452