Merge remote-tracking branch 'upstream/develop' into 4.3

kenjis · kenjis · commit 8e795334c1d3 · 2022-12-09T09:10:03.000+09:00
Conflicts:
	user_guide_src/source/tutorial/create_news_items/004.php
	user_guide_src/source/tutorial/news_section/008.php
	user_guide_src/source/tutorial/static_pages/004.php
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
@@ -66,7 +66,7 @@ trait ResponseTrait
     /**
      * How to format the response data.
      * Either 'json' or 'xml'. If blank will be
-     * determine through content negotiation.
+     * determined through content negotiation.
      *
      * @var string
      */
diff --git a/system/Common.php b/system/Common.php
@@ -65,6 +65,7 @@ function app_timezone(): string
      *    $foo = cache('bar');
      *
      * @return CacheInterface|mixed
+     * @phpstan-return ($key is null ? CacheInterface : mixed)
      */
     function cache(?string $key = null)
     {
@@ -198,7 +199,7 @@ function command(string $command)
     /**
      * More simple way of getting config instances from Factories
      *
-     * @return mixed
+     * @return object|null
      */
     function config(string $name, bool $getShared = true)
     {
@@ -361,7 +362,7 @@ function db_connect($db = null, bool $getShared = true)
      *
      * @param string|null $default
      *
-     * @return mixed
+     * @return bool|string|null
      */
     function env(string $key, $default = null)
     {
@@ -999,7 +1000,7 @@ function session(?string $val = null)
      *
      * @param mixed ...$params
      *
-     * @return mixed
+     * @return object
      */
     function service(string $name, ...$params)
     {
@@ -1013,7 +1014,7 @@ function service(string $name, ...$params)
      *
      * @param mixed ...$params
      *
-     * @return mixed
+     * @return object|null
      */
     function single_service(string $name, ...$params)
     {
@@ -1125,7 +1126,7 @@ function stringify_attributes($attributes, bool $js = false): string
      * returns its return value if any.
      * Otherwise will start or stop the timer intelligently.
      *
-     * @return mixed|Timer
+     * @return Timer
      */
     function timer(?string $name = null, ?callable $callable = null)
     {
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
@@ -23,7 +23,7 @@
  * large performance boost and helps keep code clean of lengthy
  * instantiation checks.
  *
- * @method static BaseConfig config(...$arguments)
+ * @method static BaseConfig|null config(...$arguments)
  */
 class Factories
 {
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
@@ -34,8 +34,8 @@ class Timer
      * Multiple calls can be made to this method so that several
      * execution points can be measured.
      *
-     * @param string $name The name of this timer.
-     * @param float  $time Allows user to provide time.
+     * @param string     $name The name of this timer.
+     * @param float|null $time Allows user to provide time.
      *
      * @return Timer
      */
diff --git a/system/Email/Email.php b/system/Email/Email.php
@@ -392,7 +392,7 @@ class Email
     protected static $func_overload;
 
     /**
-     * @param array|null $config
+     * @param array|\Config\Email|null $config
      */
     public function __construct($config = null)
     {
@@ -405,7 +405,7 @@ public function __construct($config = null)
     /**
      * Initialize preferences
      *
-     * @param array|\Config\Email $config
+     * @param array|\Config\Email|null $config
      *
      * @return Email
      */
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -18,6 +18,7 @@
 use Config\Services;
 use InvalidArgumentException;
 use Locale;
+use stdClass;
 
 /**
  * Class IncomingRequest
@@ -509,7 +510,7 @@ public function getDefaultLocale(): string
      * @param int|null          $filter Filter constant
      * @param mixed             $flags
      *
-     * @return mixed
+     * @return array|bool|float|int|stdClass|string|null
      */
     public function getVar($index = null, $filter = null, $flags = null)
     {
@@ -550,7 +551,7 @@ public function getVar($index = null, $filter = null, $flags = null)
      *
      * @see http://php.net/manual/en/function.json-decode.php
      *
-     * @return mixed
+     * @return array|bool|float|int|stdClass|null
      */
     public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
     {
@@ -565,7 +566,7 @@ public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
      * @param int|null       $filter Filter Constant
      * @param array|int|null $flags  Option
      *
-     * @return mixed
+     * @return array|bool|float|int|stdClass|string|null
      */
     public function getJsonVar(string $index, bool $assoc = false, ?int $filter = null, $flags = null)
     {
@@ -599,7 +600,7 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
      * A convenience method that grabs the raw input stream(send method in PUT, PATCH, DELETE) and decodes
      * the String into an array.
      *
-     * @return mixed
+     * @return array
      */
     public function getRawInput()
     {
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
@@ -85,7 +85,7 @@ public function getMethod(bool $upper = false): string
     /**
      * Sets the request method. Used when spoofing the request.
      *
-     * @return Request
+     * @return $this
      *
      * @deprecated Use withMethod() instead for immutability
      *
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
@@ -148,11 +148,11 @@ class URI
     /**
      * Builds a representation of the string from the component parts.
      *
-     * @param string $scheme
-     * @param string $authority
-     * @param string $path
-     * @param string $query
-     * @param string $fragment
+     * @param string|null $scheme    URI scheme. E.g., http, ftp
+     * @param string      $authority
+     * @param string      $path
+     * @param string      $query
+     * @param string      $fragment
      */
     public static function createURIString(
         ?string $scheme = null,
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -91,6 +91,7 @@ function _get_uri(string $relativePath = '', ?App $config = null): URI
      * Returns a site URL as defined by the App config.
      *
      * @param array|string $relativePath URI string or array of URI segments
+     * @param string|null  $scheme       URI scheme. E.g., http, ftp
      * @param App|null     $config       Alternate configuration to use
      */
     function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string
@@ -118,6 +119,7 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul
      * Base URLs are trimmed site URLs without the index page.
      *
      * @param array|string $relativePath URI string or array of URI segments
+     * @param string|null  $scheme       URI scheme. E.g., http, ftp
      */
     function base_url($relativePath = '', ?string $scheme = null): string
     {
diff --git a/system/Model.php b/system/Model.php
@@ -646,9 +646,9 @@ public function builder(?string $table = null)
      * data here. This allows it to be used with any of the other
      * builder methods and still get validated data, like replace.
      *
-     * @param mixed     $key    Field name, or an array of field/value pairs
-     * @param mixed     $value  Field value, if $key is a single field
-     * @param bool|null $escape Whether to escape values
+     * @param array|object|string               $key    Field name, or an array of field/value pairs
+     * @param bool|float|int|object|string|null $value  Field value, if $key is a single field
+     * @param bool|null                         $escape Whether to escape values
      *
      * @return $this
      */
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
@@ -36,6 +36,8 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void
         $service1 = single_service($service);
         $service2 = single_service($service);
 
+        assert($service1 !== null);
+
         $this->assertInstanceOf(get_class($service1), $service2);
         $this->assertNotSame($service1, $service2);
     }
@@ -64,6 +66,8 @@ public function testSingleServiceWithAtLeastOneParamSupplied(string $service): v
         $service1 = single_service($service, ...$params);
         $service2 = single_service($service, ...$params);
 
+        assert($service1 !== null);
+
         $this->assertInstanceOf(get_class($service1), $service2);
         $this->assertNotSame($service1, $service2);
 
@@ -77,6 +81,9 @@ public function testSingleServiceWithAllParamsSupplied(): void
         $cache1 = single_service('cache', null, true);
         $cache2 = single_service('cache', null, true);
 
+        assert($cache1 !== null);
+        assert($cache2 !== null);
+
         // Assert that even passing true as last param this will
         // not create a shared instance.
         $this->assertInstanceOf(get_class($cache1), $cache2);
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
@@ -32,13 +32,42 @@ If you expect a GET request, you use the ``get()`` method:
 .. literalinclude:: routing/001.php
 
 A route takes the URI path (``/``) on the left, and maps it to the controller and method (``Home::index``) on the right,
-along with any parameters that should be passed to the controller. The controller and method should
+along with any parameters that should be passed to the controller.
+
+The controller and method should
 be listed in the same way that you would use a static method, by separating the class
-and its method with a double-colon, like ``Users::list``. If that method requires parameters to be
+and its method with a double-colon, like ``Users::list``.
+
+If that method requires parameters to be
 passed to it, then they would be listed after the method name, separated by forward-slashes:
 
 .. literalinclude:: routing/002.php
 
+Examples
+========
+
+Here are a few basic routing examples.
+
+A URL containing the word **journals** in the first segment will be mapped to the ``\App\Controllers\Blogs`` class,
+and the default method, which is usually ``index()``:
+
+.. literalinclude:: routing/006.php
+
+A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users()`` method.
+The ID will be set to ``34``:
+
+.. literalinclude:: routing/007.php
+
+A URL with **product** as the first segment, and anything in the second will be mapped to the ``\App\Controllers\Catalog`` class
+and the ``productLookup()`` method:
+
+.. literalinclude:: routing/008.php
+
+A URL with **product** as the first segment, and a number in the second will be mapped to the ``\App\Controllers\Catalog`` class
+and the ``productLookupByID()`` method passing in the match as a variable to the method:
+
+.. literalinclude:: routing/009.php
+
 HTTP verbs
 ==========
 
@@ -99,31 +128,6 @@ Placeholders Description
 .. note:: ``{locale}`` cannot be used as a placeholder or other part of the route, as it is reserved for use
     in :doc:`localization </outgoing/localization>`.
 
-Examples
-========
-
-Here are a few basic routing examples.
-
-A URL containing the word **journals** in the first segment will be mapped to the ``\App\Controllers\Blogs`` class,
-and the default method, which is usually ``index()``:
-
-.. literalinclude:: routing/006.php
-
-A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users()`` method.
-The ID will be set to ``34``:
-
-.. literalinclude:: routing/007.php
-
-A URL with **product** as the first segment, and anything in the second will be mapped to the ``\App\Controllers\Catalog`` class
-and the ``productLookup()`` method:
-
-.. literalinclude:: routing/008.php
-
-A URL with **product** as the first segment, and a number in the second will be mapped to the ``\App\Controllers\Catalog`` class
-and the ``productLookupByID()`` method passing in the match as a variable to the method:
-
-.. literalinclude:: routing/009.php
-
 Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route:
 
 .. literalinclude:: routing/010.php
@@ -133,6 +137,9 @@ Controller should take into account the maximum parameters:
 
 .. literalinclude:: routing/011.php
 
+.. important:: Do not put any placeholder after ``(:any)``. Because the number of
+    parameters passed to the controller method may change.
+
 If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
 routes. With the examples URLs from above:
 
@@ -188,7 +195,7 @@ is allowed, as are back-references.
 
     .. literalinclude:: routing/018.php
 
-In the above example, a URI similar to **products/shirts/123** would instead call the ``show`` method
+In the above example, a URI similar to **products/shirts/123** would instead call the ``show()`` method
 of the ``Products`` controller class, with the original first and second segment passed as arguments to it.
 
 With regular expressions, you can also catch a segment containing a forward slash (``/``), which would usually
@@ -202,7 +209,7 @@ redirect them back to the same page after they log in, you may find this example
 For those of you who don't know regular expressions and want to learn more about them,
 `regular-expressions.info <https://www.regular-expressions.info/>`_ might be a good starting point.
 
-.. important:: Note: You can also mix and match wildcards with regular expressions.
+.. note:: You can also mix and match placeholders with regular expressions.
 
 Closures
 ========
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
@@ -22,10 +22,11 @@ Upgrade Guide
 =============
 
 1. If you use the Auto Routing in the same way as CI3, you need to enable :ref:`auto-routing`.
-2. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
+2. The placeholder ``(:any)`` in CI3 will be ``(:segment)`` in CI4.
+3. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
 
     - ``$route['journals'] = 'blogs';`` to ``$routes->add('journals', 'Blogs::index');``. This would map to the ``index()`` method in the ``Blogs`` controller.
-    - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:any)', 'Catalog::productLookup');``
+    - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:segment)', 'Catalog::productLookup');``
     - ``$route['login/(.+)'] = 'auth/login/$1';`` to ``$routes->add('login/(.+)', 'Auth::login/$1');``
 
 Code Example
diff --git a/user_guide_src/source/installation/upgrade_routing/001.php b/user_guide_src/source/installation/upgrade_routing/001.php
@@ -2,14 +2,13 @@
 
 namespace Config;
 
-// Create a new instance of our RouteCollection class.
-$routes = Services::routes();
+// ...
 
-// Load the system's routing file first, so that the app and ENVIRONMENT
-// can override as needed.
-if (file_exists(SYSTEMPATH . 'Config/Routes.php')) {
-    require SYSTEMPATH . 'Config/Routes.php';
-}
+/*
+ * --------------------------------------------------------------------
+ * Route Definitions
+ * --------------------------------------------------------------------
+ */
 
 // ...
 
@@ -21,4 +20,6 @@
 $routes->add('posts/update', 'Posts::update');
 $routes->add('drivers/create', 'Drivers::create');
 $routes->add('drivers/update', 'Drivers::update');
-$routes->add('posts/(:any)', 'Posts::view/$1');
+$routes->add('posts/(:segment)', 'Posts::view/$1');
+
+// ...
diff --git a/user_guide_src/source/installation/upgrade_routing/ci3sample/001.php b/user_guide_src/source/installation/upgrade_routing/ci3sample/001.php
@@ -1,12 +1,14 @@
 <?php
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$route['posts/index'] = 'posts/index';
+// ...
+
+$route['posts/index']  = 'posts/index';
 $route['teams/create'] = 'teams/create';
 $route['teams/update'] = 'teams/update';
 
-$route['posts/create'] = 'posts/create';
-$route['posts/update'] = 'posts/update';
+$route['posts/create']   = 'posts/create';
+$route['posts/update']   = 'posts/update';
 $route['drivers/create'] = 'drivers/create';
 $route['drivers/update'] = 'drivers/update';
-$route['posts/(:any)'] = 'posts/view/$1';
+$route['posts/(:any)']   = 'posts/view/$1';
diff --git a/user_guide_src/source/tutorial/create_news_items/004.php b/user_guide_src/source/tutorial/create_news_items/004.php
diff --git a/user_guide_src/source/tutorial/news_section/008.php b/user_guide_src/source/tutorial/news_section/008.php
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
diff --git a/user_guide_src/source/tutorial/static_pages/004.php b/user_guide_src/source/tutorial/static_pages/004.php

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ trait ResponseTrait`
`66`	`66`	`/**`
`67`	`67`	`* How to format the response data.`
`68`	`68`	`* Either 'json' or 'xml'. If blank will be`
`69`		`- * determine through content negotiation.`
	`69`	`+ * determined through content negotiation.`
`70`	`70`	`*`
`71`	`71`	`* @var string`
`72`	`72`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ function app_timezone(): string`
`65`	`65`	`* $foo = cache('bar');`
`66`	`66`	`*`
`67`	`67`	`* @return CacheInterface\|mixed`
	`68`	`+ * @phpstan-return ($key is null ? CacheInterface : mixed)`
`68`	`69`	`*/`
`69`	`70`	`function cache(?string $key = null)`
`70`	`71`	`{`
`@@ -198,7 +199,7 @@ function command(string $command)`
`198`	`199`	`/**`
`199`	`200`	`* More simple way of getting config instances from Factories`
`200`	`201`	`*`
`201`		`- * @return mixed`
	`202`	`+ * @return object\|null`
`202`	`203`	`*/`
`203`	`204`	`function config(string $name, bool $getShared = true)`
`204`	`205`	`{`
`@@ -361,7 +362,7 @@ function db_connect($db = null, bool $getShared = true)`
`361`	`362`	`*`
`362`	`363`	`* @param string\|null $default`
`363`	`364`	`*`
`364`		`- * @return mixed`
	`365`	`+ * @return bool\|string\|null`
`365`	`366`	`*/`
`366`	`367`	`function env(string $key, $default = null)`
`367`	`368`	`{`
`@@ -999,7 +1000,7 @@ function session(?string $val = null)`
`999`	`1000`	`*`
`1000`	`1001`	`* @param mixed ...$params`
`1001`	`1002`	`*`
`1002`		`- * @return mixed`
	`1003`	`+ * @return object`
`1003`	`1004`	`*/`
`1004`	`1005`	`function service(string $name, ...$params)`
`1005`	`1006`	`{`
`@@ -1013,7 +1014,7 @@ function service(string $name, ...$params)`
`1013`	`1014`	`*`
`1014`	`1015`	`* @param mixed ...$params`
`1015`	`1016`	`*`
`1016`		`- * @return mixed`
	`1017`	`+ * @return object\|null`
`1017`	`1018`	`*/`
`1018`	`1019`	`function single_service(string $name, ...$params)`
`1019`	`1020`	`{`
`@@ -1125,7 +1126,7 @@ function stringify_attributes($attributes, bool $js = false): string`
`1125`	`1126`	`* returns its return value if any.`
`1126`	`1127`	`* Otherwise will start or stop the timer intelligently.`
`1127`	`1128`	`*`
`1128`		`- * @return mixed\|Timer`
	`1129`	`+ * @return Timer`
`1129`	`1130`	`*/`
`1130`	`1131`	`function timer(?string $name = null, ?callable $callable = null)`
`1131`	`1132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* large performance boost and helps keep code clean of lengthy`
`24`	`24`	`* instantiation checks.`
`25`	`25`	`*`
`26`		`- * @method static BaseConfig config(...$arguments)`
	`26`	`+ * @method static BaseConfig\|null config(...$arguments)`
`27`	`27`	`*/`
`28`	`28`	`class Factories`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ class Timer`
`34`	`34`	`* Multiple calls can be made to this method so that several`
`35`	`35`	`* execution points can be measured.`
`36`	`36`	`*`
`37`		`- * @param string $name The name of this timer.`
`38`		`- * @param float $time Allows user to provide time.`
	`37`	`+ * @param string $name The name of this timer.`
	`38`	`+ * @param float\|null $time Allows user to provide time.`
`39`	`39`	`*`
`40`	`40`	`* @return Timer`
`41`	`41`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ class Email`
`392`	`392`	`protected static $func_overload;`
`393`	`393`
`394`	`394`	`/**`
`395`		`- * @param array\|null $config`
	`395`	`+ * @param array\|\Config\Email\|null $config`
`396`	`396`	`*/`
`397`	`397`	`public function __construct($config = null)`
`398`	`398`	`{`
`@@ -405,7 +405,7 @@ public function __construct($config = null)`
`405`	`405`	`/**`
`406`	`406`	`* Initialize preferences`
`407`	`407`	`*`
`408`		`- * @param array\|\Config\Email $config`
	`408`	`+ * @param array\|\Config\Email\|null $config`
`409`	`409`	`*`
`410`	`410`	`* @return Email`
`411`	`411`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`use Config\Services;`
`19`	`19`	`use InvalidArgumentException;`
`20`	`20`	`use Locale;`
	`21`	`+use stdClass;`
`21`	`22`
`22`	`23`	`/**`
`23`	`24`	`* Class IncomingRequest`
`@@ -509,7 +510,7 @@ public function getDefaultLocale(): string`
`509`	`510`	`* @param int\|null $filter Filter constant`
`510`	`511`	`* @param mixed $flags`
`511`	`512`	`*`
`512`		`- * @return mixed`
	`513`	`+ * @return array\|bool\|float\|int\|stdClass\|string\|null`
`513`	`514`	`*/`
`514`	`515`	`public function getVar($index = null, $filter = null, $flags = null)`
`515`	`516`	`{`
`@@ -550,7 +551,7 @@ public function getVar($index = null, $filter = null, $flags = null)`
`550`	`551`	`*`
`551`	`552`	`* @see http://php.net/manual/en/function.json-decode.php`
`552`	`553`	`*`
`553`		`- * @return mixed`
	`554`	`+ * @return array\|bool\|float\|int\|stdClass\|null`
`554`	`555`	`*/`
`555`	`556`	`public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)`
`556`	`557`	`{`
`@@ -565,7 +566,7 @@ public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)`
`565`	`566`	`* @param int\|null $filter Filter Constant`
`566`	`567`	`* @param array\|int\|null $flags Option`
`567`	`568`	`*`
`568`		`- * @return mixed`
	`569`	`+ * @return array\|bool\|float\|int\|stdClass\|string\|null`
`569`	`570`	`*/`
`570`	`571`	`public function getJsonVar(string $index, bool $assoc = false, ?int $filter = null, $flags = null)`
`571`	`572`	`{`
`@@ -599,7 +600,7 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu`
`599`	`600`	`* A convenience method that grabs the raw input stream(send method in PUT, PATCH, DELETE) and decodes`
`600`	`601`	`* the String into an array.`
`601`	`602`	`*`
`602`		`- * @return mixed`
	`603`	`+ * @return array`
`603`	`604`	`*/`
`604`	`605`	`public function getRawInput()`
`605`	`606`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getMethod(bool $upper = false): string`
`85`	`85`	`/**`
`86`	`86`	`* Sets the request method. Used when spoofing the request.`
`87`	`87`	`*`
`88`		`- * @return Request`
	`88`	`+ * @return $this`
`89`	`89`	`*`
`90`	`90`	`* @deprecated Use withMethod() instead for immutability`
`91`	`91`	`*`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ function _get_uri(string $relativePath = '', ?App $config = null): URI`
`91`	`91`	`* Returns a site URL as defined by the App config.`
`92`	`92`	`*`
`93`	`93`	`* @param array\|string $relativePath URI string or array of URI segments`
	`94`	`+ * @param string\|null $scheme URI scheme. E.g., http, ftp`
`94`	`95`	`* @param App\|null $config Alternate configuration to use`
`95`	`96`	`*/`
`96`	`97`	`function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string`
`@@ -118,6 +119,7 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul`
`118`	`119`	`* Base URLs are trimmed site URLs without the index page.`
`119`	`120`	`*`
`120`	`121`	`* @param array\|string $relativePath URI string or array of URI segments`
	`122`	`+ * @param string\|null $scheme URI scheme. E.g., http, ftp`
`121`	`123`	`*/`
`122`	`124`	`function base_url($relativePath = '', ?string $scheme = null): string`
`123`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -646,9 +646,9 @@ public function builder(?string $table = null)`
`646`	`646`	`* data here. This allows it to be used with any of the other`
`647`	`647`	`* builder methods and still get validated data, like replace.`
`648`	`648`	`*`
`649`		`- * @param mixed $key Field name, or an array of field/value pairs`
`650`		`- * @param mixed $value Field value, if $key is a single field`
`651`		`- * @param bool\|null $escape Whether to escape values`
	`649`	`+ * @param array\|object\|string $key Field name, or an array of field/value pairs`
	`650`	`+ * @param bool\|float\|int\|object\|string\|null $value Field value, if $key is a single field`
	`651`	`+ * @param bool\|null $escape Whether to escape values`
`652`	`652`	`*`
`653`	`653`	`* @return $this`
`654`	`654`	`*/`