Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into 4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@kenjis
kenjis committed Sep 6, 2024
2 parents 31e8f9f + 39c2898 commit 4a4a648
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 23 deletions.
4 changes: 2 additions & 2 deletions system/Database/BaseConnection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,9 +788,9 @@ public function transStart(bool $testMode = false): bool
*
* @return $this
*/
public function transException(bool $transExcetion)
public function transException(bool $transException)
{
$this->transException = $transExcetion;
$this->transException = $transException;

return $this;
}
Expand Down
30 changes: 20 additions & 10 deletions system/Helpers/html_helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
/**
* Unordered List
*
* Generates an HTML unordered list from an single or
* multi-dimensional array.
* Generates an HTML unordered list from a single or
* multidimensional array.
*
* @param array $list List entries
* @param array|object|string $attributes HTML attributes string, array, object
*/
function ul(array $list, $attributes = ''): string
Expand All @@ -36,8 +37,9 @@ function ul(array $list, $attributes = ''): string
/**
* Ordered List
*
* Generates an HTML ordered list from an single or multi-dimensional array.
* Generates an HTML ordered list from a single or multidimensional array.
*
* @param array $list List entries
* @param array|object|string $attributes HTML attributes string, array, object
*/
function ol(array $list, $attributes = ''): string
Expand All @@ -50,10 +52,10 @@ function ol(array $list, $attributes = ''): string
/**
* Generates the list
*
* Generates an HTML ordered list from an single or multi-dimensional array.
* Generates an HTML ordered list from a single or multidimensional array.
*
* @param array $list
* @param array|object|string $attributes string, array, object
* @param array $list List entries
* @param array|object|string $attributes HTML attributes string, array, object
*/
function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0): string
{
Expand Down Expand Up @@ -92,7 +94,7 @@ function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0
* Generates an image element
*
* @param array|string $src Image source URI, or array of attributes and values
* @param bool $indexPage Whether to treat $src as a routed URI string
* @param bool $indexPage Should `Config\App::$indexPage` be added to the source path
* @param array|object|string $attributes Additional HTML attributes
*/
function img($src = '', bool $indexPage = false, $attributes = ''): string
Expand Down Expand Up @@ -192,7 +194,7 @@ function doctype(string $type = 'html5'): string
* Generates link to a JS file
*
* @param array|string $src Script source or an array of attributes
* @param bool $indexPage Should indexPage be added to the JS path
* @param bool $indexPage Should `Config\App::$indexPage` be added to the JS path
*/
function script_tag($src = '', bool $indexPage = false): string
{
Expand Down Expand Up @@ -227,7 +229,7 @@ function script_tag($src = '', bool $indexPage = false): string
* Generates link tag
*
* @param array<string, bool|string>|string $href Stylesheet href or an array
* @param bool $indexPage should indexPage be added to the CSS path.
* @param bool $indexPage Should `Config\App::$indexPage` be added to the CSS path.
*/
function link_tag(
$href = '',
Expand Down Expand Up @@ -288,6 +290,7 @@ function link_tag(
* @param array|string $src Either a source string or an array of sources
* @param string $unsupportedMessage The message to display if the media tag is not supported by the browser
* @param string $attributes HTML attributes
* @param bool $indexPage Should `Config\App::$indexPage` be added to the source path
*/
function video($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
{
Expand Down Expand Up @@ -334,6 +337,7 @@ function video($src, string $unsupportedMessage = '', string $attributes = '', a
* @param array|string $src Either a source string or an array of sources
* @param string $unsupportedMessage The message to display if the media tag is not supported by the browser.
* @param string $attributes HTML attributes
* @param bool $indexPage Should `Config\App::$indexPage` be added to the source path
*/
function audio($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
{
Expand Down Expand Up @@ -413,6 +417,7 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
* @param string $src The path of the media resource
* @param string $type The MIME-type of the resource with optional codecs parameters
* @param string $attributes HTML attributes
* @param bool $indexPage Should `Config\App::$indexPage` be added to the source path
*/
function source(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
{
Expand All @@ -438,7 +443,10 @@ function source(string $src, string $type = 'unknown', string $attributes = '',
* Generates a track element to specify timed tracks. The tracks are
* formatted in WebVTT format.
*
* @param string $src The path of the .VTT file
* @param string $src The path of the .VTT file
* @param string $kind How the text track is meant to be used
* @param string $srcLanguage Language of the track text data
* @param string $label A user-readable title of the text track
*/
function track(string $src, string $kind, string $srcLanguage, string $label): string
{
Expand All @@ -461,6 +469,7 @@ function track(string $src, string $kind, string $srcLanguage, string $label): s
* @param string $data A resource URL
* @param string $type Content-type of the resource
* @param string $attributes HTML attributes
* @param bool $indexPage Should `Config\App::$indexPage` be added to the data path
*/
function object(string $data, string $type = 'unknown', string $attributes = '', array $params = [], bool $indexPage = false): string
{
Expand Down Expand Up @@ -513,6 +522,7 @@ function param(string $name, string $value, string $type = 'ref', string $attrib
* @param string $src The path of the resource to embed
* @param string $type MIME-type
* @param string $attributes HTML attributes
* @param bool $indexPage Should `Config\App::$indexPage` be added to the source path
*/
function embed(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
{
Expand Down
21 changes: 10 additions & 11 deletions user_guide_src/source/helpers/html_helper.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ The following functions are available:

.. literalinclude:: html_helper/002.php

There is an optional second parameter that is a true/false value that
specifics if the *src* should have the page specified by
``$config['indexPage']`` added to the address it creates.
There is an optional second parameter, a true/false value, that
specifies if the *src* should have ``Config\App::$indexPage`` added to the address it creates.
Presumably, this would be if you were using a media controller:

.. literalinclude:: html_helper/003.php

Additionally, an associative array can be passed as the first parameter,
for complete control over all attributes and values. If an *alt* attribute
is not provided, CodeIgniter will generate an empty string.
is not provided, CodeIgniter will generate one with empty string.

Example:

Expand Down Expand Up @@ -220,8 +219,8 @@ The following functions are available:
:returns: An HTML video element
:rtype: string

Permits you to generate HTML video element from simple or
source arrays. Example:
Permits you to generate an HTML video element from a source string or an array of sources.
Example:

.. literalinclude:: html_helper/014.php

Expand Down Expand Up @@ -269,8 +268,8 @@ The following functions are available:
:returns: An HTML source element
:rtype: string

Lets you create HTML ``<source>`` elements. The first parameter contains the
source source. Example:
Lets you create HTML ``<source>`` elements. The first parameter contains the path of the resource.
Example:

.. literalinclude:: html_helper/015.php

Expand Down Expand Up @@ -352,11 +351,11 @@ The following functions are available:

.. literalinclude:: html_helper/020.php

The following is a list of the pre-defined doctype choices. These are configurable,
pulled from **app/Config/DocTypes.php**, or they could be over-ridden in your **.env** configuration.
The following is a list of the pre-defined doctypes. These are
pulled from **app/Config/DocTypes.php**, or they could be overridden in your **.env** configuration.

=============================== =================== ==================================================================================================================================================
Document type Option Result
Document type $type parameter Result
=============================== =================== ==================================================================================================================================================
XHTML 1.1 xhtml11 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
XHTML 1.0 Strict xhtml1-strict <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
Expand Down

0 comments on commit 4a4a648

Please sign in to comment.