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

Author: kenjis

system/Common.php

@@ -471,10 +471,8 @@ function esc($data, string $context = 'html', ?string $encoding = null)
      *
      * @see https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security
      *
-     * @param int               $duration How long should the SSL header be set for? (in seconds)
-     *                                    Defaults to 1 year.
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
+     * @param int $duration How long should the SSL header be set for? (in seconds)
+     *                      Defaults to 1 year.
      *
      * @throws HTTPException
      * @throws RedirectException

system/Database/OCI8/Forge.php

@@ -218,19 +218,24 @@ protected function _attributeType(array &$attributes)
         switch (strtoupper($attributes['TYPE'])) {
             case 'TINYINT':
                 $attributes['CONSTRAINT'] ??= 3;
+
                 // no break
             case 'SMALLINT':
                 $attributes['CONSTRAINT'] ??= 5;
+
                 // no break
             case 'MEDIUMINT':
                 $attributes['CONSTRAINT'] ??= 7;
+
                 // no break
             case 'INT':
             case 'INTEGER':
                 $attributes['CONSTRAINT'] ??= 11;
+
                 // no break
             case 'BIGINT':
                 $attributes['CONSTRAINT'] ??= 19;
+
                 // no break
             case 'NUMERIC':
                 $attributes['TYPE'] = 'NUMBER';
@@ -261,6 +266,7 @@ protected function _attributeType(array &$attributes)
             case 'ENUM':
             case 'VARCHAR':
                 $attributes['CONSTRAINT'] ??= 255;
+
                 // no break
             case 'TEXT':
             case 'MEDIUMTEXT':

system/HTTP/IncomingRequest.php

@@ -821,6 +821,7 @@ public function getPostGet($index = null, $filter = null, $flags = null)
         if ($index === null) {
             return array_merge($this->getGet($index, $filter, $flags), $this->getPost($index, $filter, $flags));
         }
+
         // Use $_POST directly here, since filter_has_var only
         // checks the initial POST data, not anything that might
         // have been added since.
@@ -843,6 +844,7 @@ public function getGetPost($index = null, $filter = null, $flags = null)
         if ($index === null) {
             return array_merge($this->getPost($index, $filter, $flags), $this->getGet($index, $filter, $flags));
         }
+
         // Use $_GET directly here, since filter_has_var only
         // checks the initial GET data, not anything that might
         // have been added since.

system/Helpers/number_helper.php

@@ -15,8 +15,7 @@
     /**
      * Formats a numbers as bytes, based on size, and adds the appropriate suffix
      *
-     * @param int|string $num    Will be cast as int
-     * @param string     $locale
+     * @param int|string $num Will be cast as int
      *
      * @return bool|string
      */

system/Helpers/text_helper.php

@@ -584,6 +584,7 @@ function random_string(string $type = 'alnum', int $len = 8): string
 
                 return bin2hex(random_bytes($len / 2));
         }
+
         // 'basic' type treated as default
         return (string) mt_rand();
     }

system/Test/TestResponse.php

@@ -134,6 +134,7 @@ public function isOK(): bool
         if ($status >= 400 || $status < 200) {
             return false;
         }
+
         // Empty bodies are not considered valid, unless in redirects
         return ! ($status < 300 && empty($this->response->getBody()));
     }

user_guide_src/source/outgoing/response/003.php

@@ -6,5 +6,6 @@
 ];
 
 return $this->response->setJSON($data);
+
 // or
 return $this->response->setXML($data);