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

Author: kenjis

system/CLI/CLI.php

@@ -1060,6 +1060,7 @@ public static function table(array $tbody, array $thead = [])
         }
 
         $table = '';
+        $cols  = '';
 
         // Joins columns and append the well formatted rows to the table
         for ($row = 0; $row < $totalRows; $row++) {

system/HTTP/IncomingRequest.php

@@ -154,8 +154,16 @@ public function __construct($config, ?URI $uri = null, $body = 'php://input', ?U
             throw new InvalidArgumentException('You must supply the parameters: uri, userAgent.');
         }
 
-        // Get our body from php://input
-        if ($body === 'php://input') {
+        $this->populateHeaders();
+
+        if (
+            $body === 'php://input'
+            // php://input is not available with enctype="multipart/form-data".
+            // See https://www.php.net/manual/en/wrappers.php.php#wrappers.php.input
+            && strpos($this->getHeaderLine('Content-Type'), 'multipart/form-data') === false
+            && (int) $this->getHeaderLine('Content-Length') <= $this->getPostMaxSize()
+        ) {
+            // Get our body from php://input
             $body = file_get_contents('php://input');
         }
 
@@ -167,11 +175,34 @@ public function __construct($config, ?URI $uri = null, $body = 'php://input', ?U
 
         parent::__construct($config);
 
-        $this->populateHeaders();
         $this->detectURI($config->uriProtocol, $config->baseURL);
         $this->detectLocale($config);
     }
 
+    private function getPostMaxSize(): int
+    {
+        $postMaxSize = ini_get('post_max_size');
+
+        switch (strtoupper(substr($postMaxSize, -1))) {
+            case 'G':
+                $postMaxSize = (int) str_replace('G', '', $postMaxSize) * 1024 ** 3;
+                break;
+
+            case 'M':
+                $postMaxSize = (int) str_replace('M', '', $postMaxSize) * 1024 ** 2;
+                break;
+
+            case 'K':
+                $postMaxSize = (int) str_replace('K', '', $postMaxSize) * 1024;
+                break;
+
+            default:
+                $postMaxSize = (int) $postMaxSize;
+        }
+
+        return $postMaxSize;
+    }
+
     /**
      * Handles setting up the locale, perhaps auto-detecting through
      * content negotiation.

system/RESTful/ResourceController.php

@@ -78,7 +78,7 @@ public function edit($id = null)
     /**
      * Add or update a model resource, from "posted" properties
      *
-     * @param string|null|int$id
+     * @param int|string|null $id
      *
      * @return ResponseInterface|string|void
      */
@@ -102,6 +102,8 @@ public function delete($id = null)
     /**
      * Set/change the expected response representation for returned objects
      *
+     * @param string $format json/xml
+     *
      * @return void
      */
     public function setFormat(string $format = 'json')