From 7f595062e2111b39a10a5300eca45cf8076908e8 Mon Sep 17 00:00:00 2001
From: Chl <chl@xlii.si>
Date: Fri, 8 Apr 2022 23:31:04 +0200
Subject: [PATCH 1/3] script_tag: cosmetic for value-less attributes

Some attributes are usually written without values, for example :
`<script defer async src="..." />`

This is purely cosmetic as the attribute should also be accepted with an empty
value or a value identical to the attribute's name :
https://dev.w3.org/html5/pf-summary/infrastructure.html#boolean-attribute
---
 system/Helpers/html_helper.php                |  5 +++--
 tests/system/Helpers/HTMLHelperTest.php       | 21 +++++++++++++++++++
 .../source/helpers/html_helper/011.php        |  4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 868d1a27883e..0fc2f110399f 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -207,11 +207,12 @@ function script_tag($src = '', bool $indexPage = false): string
                     $script .= 'src="' . slash_item('baseURL') . $v . '" ';
                 }
             } else {
-                $script .= $k . '="' . $v . '" ';
+                // for attributes without values, like async or defer, use NULL.
+                $script .= $k . (is_null($v) ? ' ' : '="' . $v . '" ');
             }
         }
 
-        return $script . 'type="text/javascript"' . '></script>';
+        return $script . 'type="text/javascript"></script>';
     }
 }
 
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index b3ed47d0c3e6..74b087228fdd 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -248,6 +248,27 @@ public function testScriptTagWithIndexpage()
         $this->assertSame($expected, script_tag($target, true));
     }
 
+    public function testScriptTagWithSrc()
+    {
+        $target   = ['src' => 'http://site.com/js/mystyles.js'];
+        $expected = '<script src="http://site.com/js/mystyles.js" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
+    public function testScriptTagWithSrcWithoutProtocol()
+    {
+        $target   = ['src' => 'js/mystyles.js'];
+        $expected = '<script src="http://example.com/js/mystyles.js" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
+    public function testScriptTagWithSrcAndAttributes()
+    {
+        $target   = ['src' => 'js/mystyles.js', 'charset' => 'UTF-8', 'defer' => '', 'async' => null];
+        $expected = '<script src="http://example.com/js/mystyles.js" charset="UTF-8" defer="" async type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
     public function testLinkTag()
     {
         $target   = 'css/mystyles.css';
diff --git a/user_guide_src/source/helpers/html_helper/011.php b/user_guide_src/source/helpers/html_helper/011.php
index 126fd86c4952..f47bb7053770 100644
--- a/user_guide_src/source/helpers/html_helper/011.php
+++ b/user_guide_src/source/helpers/html_helper/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$script = ['src' => 'js/printer.js'];
+$script = ['src' => 'js/printer.js', 'defer' => null];
 
 echo script_tag($script);
-// <script src="http://site.com/js/printer.js" type="text/javascript"></script>
+// <script src="http://site.com/js/printer.js" defer type="text/javascript"></script>

From a8d5b894c9ae17f1a8c8721eae44c0da22bec87c Mon Sep 17 00:00:00 2001
From: Chl <chl@xlii.si>
Date: Sun, 10 Apr 2022 03:10:15 +0200
Subject: [PATCH 2/3] coding style: cs-fixer is_null() rule

---
 system/Helpers/html_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 0fc2f110399f..a15b18ff47e8 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -208,7 +208,7 @@ function script_tag($src = '', bool $indexPage = false): string
                 }
             } else {
                 // for attributes without values, like async or defer, use NULL.
-                $script .= $k . (is_null($v) ? ' ' : '="' . $v . '" ');
+                $script .= $k . (null === $v ? ' ' : '="' . $v . '" ');
             }
         }
 

From 4fd7ac58307590112e6bdb6add99c1d9d085e57f Mon Sep 17 00:00:00 2001
From: Chl <chl@xlii.si>
Date: Mon, 18 Apr 2022 16:43:20 +0200
Subject: [PATCH 3/3] script_tag: changelog, doc + test with default arg

---
 system/Helpers/html_helper.php                |  4 ++--
 tests/system/Helpers/HTMLHelperTest.php       | 10 ++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst   |  1 +
 user_guide_src/source/helpers/html_helper.rst |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index a15b18ff47e8..c2e48d890fef 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -189,8 +189,8 @@ function doctype(string $type = 'html5'): string
      *
      * Generates link to a JS file
      *
-     * @param mixed $src       Script source or an array
-     * @param bool  $indexPage Should indexPage be added to the JS path
+     * @param array|string $src       Script source or an array of attributes
+     * @param bool         $indexPage Should indexPage be added to the JS path
      */
     function script_tag($src = '', bool $indexPage = false): string
     {
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 74b087228fdd..d539d7421be6 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -269,6 +269,16 @@ public function testScriptTagWithSrcAndAttributes()
         $this->assertSame($expected, script_tag($target));
     }
 
+    /**
+     * This test has probably no real-world value but may help detecting
+     * a change in the default behaviour.
+     */
+    public function testScriptTagWithoutAnyArg()
+    {
+        $expected = '<script src="http://example.com/" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag());
+    }
+
     public function testLinkTag()
     {
         $target   = 'css/mystyles.css';
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 0ed69ab0760a..fa88608dc355 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -38,6 +38,7 @@ Enhancements
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.
 - Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
+- HTML helper ``script_tag()`` now uses ``null`` values to write boolean attributes in minimized form: ``<script src="..." defer />``. See the sample code for :php:func:`script_tag`.
 
 Changes
 *******
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 44d0089ac6c7..220e94ebee64 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -104,8 +104,8 @@ The following functions are available:
 
 .. php:function:: script_tag([$src = ''[, $indexPage = false]])
 
-    :param  mixed  $src: The source name of a JavaScript file
-    :param  bool    $indexPage: Whether to treat ``$src`` as a routed URI string
+    :param  array|string  $src: The source name or URL of a JavaScript file, or an associative array specifying the attributes
+    :param  bool          $indexPage: Whether to treat ``$src`` as a routed URI string
     :returns:   HTML script tag
     :rtype: string