Merge branch 'develop' into 4.6

user_guide_src/source/helpers/html_helper.rst

@@ -28,9 +28,9 @@ The following functions are available:
 .. php:function:: img([$src = ''[, $indexPage = false[, $attributes = '']]])
 
     :param  string|array  $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  mixed   $attributes: Additional HTML attributes
-    :returns:   HTML image element
+    :returns:   An HTML image element
     :rtype: string
 
     Lets you create HTML ``<img>`` elements. The first parameter contains the
@@ -80,14 +80,14 @@ The following functions are available:
     :param  string  $type:      Type of the related document
     :param  string  $title:     Link title
     :param  string  $media:     Media type
-    :param  bool    $indexPage: Whether to treat ``$src`` as a routed URI string
+    :param  bool    $indexPage: Should indexPage be added to the link path
     :param  string  $hreflang:  Hreflang type
     :returns:   An HTML link element
     :rtype: string
 
     Lets you create HTML ``<link>`` elements. This is useful for stylesheet links,
     as well as other links. The parameters are *href*, with optional *rel*,
-    *type*, *title*, *media* and *indexPage*.
+    *type*, *title*, *media*, *indexPage* and *hreflang*.
 
     *indexPage* is a boolean value that specifies if the *href* should have
     the page specified by ``$config['indexPage']`` added to the address it creates.
@@ -215,7 +215,7 @@ The following functions are available:
     :param  string  $unsupportedMessage: The message to display if the video element is not supported by the browser
     :param  string  $attributes:         HTML attributes
     :param  array   $tracks:             Use the track function inside an array. See :php:func:`track()` function
-    :param  bool    $indexPage:
+    :param  bool    $indexPage:          Should indexPage be added to the video source path
     :returns:                            An HTML video element
     :rtype: string
 
@@ -254,7 +254,7 @@ The following functions are available:
     :param  string  $unsupportedMessage: The message to display if the audio element is not supported by the browser
     :param  string  $attributes:
     :param  array   $tracks:             Use the track function inside an array. See :php:func:`track()` function
-    :param  bool    $indexPage:
+    :param  bool    $indexPage:          Should indexPage be added to the audio source path
     :returns:                            An HTML audio element
     :rtype: string
 
@@ -278,7 +278,7 @@ The following functions are available:
     :param  string  $src:        The path of the resource to embed
     :param  bool    $type:       MIME-type
     :param  array   $attributes: HTML attributes
-    :param  bool    $indexPage:
+    :param  bool    $indexPage:  Should indexPage be added to the source path
     :returns:   An HTML embed element
     :rtype: string
 
@@ -292,6 +292,7 @@ The following functions are available:
     :param  string  $data:       A resource URL
     :param  bool    $type:       Content-type of the resource
     :param  array   $attributes: HTML attributes
+    :param  bool    $indexPage:  Should indexPage be added to the resource URL
     :param  array   $params:     Use the param function inside an array. See :php:func:`param()` function
     :returns:   An HTML object element
     :rtype: string

user_guide_src/source/incoming/filters.rst

@@ -132,7 +132,7 @@ They are special filters that are applied to every request made by the
 framework. They are applied before and after other kinds of filters that are
 explained below.
 
-.. note:: The Required Filters are always executed even if a route does not exist.
+.. note:: The Required Filters are always executed. However, if the route does not exist, only the Before Filters are executed.
 
 You should take care with how many you use here, since it could have performance
 implications to have too many run on every request. But the filters set by default

user_guide_src/source/tutorial/create_news_items/001.php

@@ -8,7 +8,7 @@ class Filters extends BaseConfig
 {
     // ...
 
-    public $methods = [
+    public array $methods = [
         'POST' => ['csrf'],
     ];