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

Author: kenjis

system/HTTP/Header.php

@@ -28,15 +28,23 @@ class Header
     /**
      * The value of the header. May have more than one
      * value. If so, will be an array of strings.
+     * E.g.,
+     *   [
+     *       'foo',
+     *       [
+     *           'bar' => 'fizz',
+     *       ],
+     *       'baz' => 'buzz',
+     *   ]
      *
-     * @var array<array<string>|string>|string
+     * @var array<int|string, array<string, string>|string>|string
      */
     protected $value;
 
     /**
      * Header constructor. name is mandatory, if a value is provided, it will be set.
      *
-     * @param array<array<string>|string>|string|null $value
+     * @param array<int|string, array<string, string>|string>|string|null $value
      */
     public function __construct(string $name, $value = null)
     {
@@ -56,7 +64,7 @@ public function getName(): string
      * Gets the raw value of the header. This may return either a string
      * of an array, depending on whether the header has multiple values or not.
      *
-     * @return array<array<string>|string>|string
+     * @return array<int|string, array<string, string>|string>|string
      */
     public function getValue()
     {
@@ -78,7 +86,7 @@ public function setName(string $name)
     /**
      * Sets the value of the header, overwriting any previous value(s).
      *
-     * @param array<array<string>|string>|string|null $value
+     * @param array<int|string, array<string, string>|string>|string|null $value
      *
      * @return $this
      */
@@ -93,7 +101,7 @@ public function setValue($value = null)
      * Appends a value to the list of values for this header. If the
      * header is a single value string, it will be converted to an array.
      *
-     * @param array<array<string>|string>|string|null $value
+     * @param array<string, string>|string|null $value
      *
      * @return $this
      */
@@ -118,7 +126,7 @@ public function appendValue($value = null)
      * Prepends a value to the list of values for this header. If the
      * header is a single value string, it will be converted to an array.
      *
-     * @param array<array<string>|string>|string|null $value
+     * @param array<string, string>|string|null $value
      *
      * @return $this
      */

tests/system/HTTP/HeaderTest.php

@@ -80,6 +80,20 @@ public function testHeaderStoresArrayValues()
         $this->assertSame($value, $header->getValue());
     }
 
+    public function testHeaderStoresArrayKeyValue()
+    {
+        $name  = 'foo';
+        $value = [
+            'key' => 'val',
+        ];
+
+        $header = new Header($name, $value);
+
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($value, $header->getValue());
+        $this->assertSame('key=val', $header->getValueLine());
+    }
+
     public function testHeaderSetters()
     {
         $name  = 'foo';

user_guide_src/source/database/transactions.rst

@@ -36,21 +36,21 @@ Running Transactions
 ====================
 
 To run your queries using transactions you will use the
-``$this->db->transStart()`` and ``$this->db->transComplete()`` functions as
+``$this->db->transStart()`` and ``$this->db->transComplete()`` methods as
 follows:
 
 .. literalinclude:: transactions/001.php
 
-You can run as many queries as you want between the start/complete
-functions and they will all be committed or rolled back based on the success
+You can run as many queries as you want between the ``transStart()``/``transComplete()``
+methods and they will all be committed or rolled back based on the success
 or failure of any given query.
 
 Strict Mode
 ===========
 
 By default, CodeIgniter runs all transactions in Strict Mode. When strict
 mode is enabled, if you are running multiple groups of transactions, if
-one group fails all groups will be rolled back. If strict mode is
+one group fails all subsequent groups will be rolled back. If strict mode is
 disabled, each group is treated independently, meaning a failure of one
 group will not affect any others.
 
@@ -61,9 +61,11 @@ Strict Mode can be disabled as follows:
 Managing Errors
 ===============
 
-If you have error reporting enabled in your Config/Database.php file
-you'll see a standard error message if the commit was unsuccessful. If
-debugging is turned off, you can manage your own errors like this:
+When you have ``DBDebug`` true in your **app/Config/Database.php** file,
+if a query error occurs, all the queries will be rolled backed, and an exception
+will be thrown. So you'll see a standard error page.
+
+If the ``DBDebug`` is false, you can manage your own errors like this:
 
 .. literalinclude:: transactions/003.php
 
@@ -84,14 +86,15 @@ Test Mode
 You can optionally put the transaction system into "test mode", which
 will cause your queries to be rolled back -- even if the queries produce
 a valid result. To use test mode simply set the first parameter in the
-``$this->db->transStart()`` function to true:
+``$this->db->transStart()`` method to true:
 
 .. literalinclude:: transactions/005.php
 
 Running Transactions Manually
 =============================
 
-If you would like to run transactions manually you can do so as follows:
+When you have ``DBDebug`` false in your **app/Config/Database.php** file, and
+if you would like to run transactions manually you can do so as follows:
 
 .. literalinclude:: transactions/006.php