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

codeigniter4 · Sep 28, 2023 · 29d4795 · 29d4795
2 parents fb30ae2 + f62e6cf
commit 29d4795
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/system/Config/Services.php b/system/Config/Services.php
@@ -521,7 +521,7 @@ public static function request(?App $config = null, bool $getShared = true)
         }
 
         // @TODO remove the following code for backward compatibility
-        return static::incomingrequest($config, $getShared);
+        return AppServices::incomingrequest($config, $getShared);
     }
 
     /**

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
@@ -33,7 +33,7 @@ as the second parameter of the ``setStatusCode()`` method:
 .. literalinclude:: response/002.php
 
 You can set format an array into either JSON or XML and set the content type header to the appropriate mime with the
-``setJSON`` and ``setXML`` methods. Typically, you will send an array of data to be converted:
+``setJSON()`` and ``setXML()`` methods. Typically, you will send an array of data to be converted:
 
 .. literalinclude:: response/003.php