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

Author: kenjis

composer.json

@@ -32,7 +32,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "1.0.0",
+        "rector/rector": "1.0.1",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

system/BaseModel.php

@@ -45,7 +45,7 @@
  *      - process various callbacks
  *      - allow intermingling calls to the db connection
  *
- * @phpstan-type row_array array<int|string, float|int|null|string>
+ * @phpstan-type row_array array<int|string, float|int|null|object|string>
  * @phpstan-type event_data_beforeinsert array{data: row_array}
  * @phpstan-type event_data_afterinsert array{id: int|string, data: row_array, result: bool}
  * @phpstan-type event_data_beforefind array{id?: int|string, method: string, singleton: bool, limit?: int, offset?: int}

system/HTTP/CURLRequest.php

@@ -380,7 +380,7 @@ public function send(string $method, string $url)
         // Set the string we want to break our response from
         $breakString = "\r\n\r\n";
 
-        if (strpos($output, 'HTTP/1.1 100 Continue') === 0) {
+        while (strpos($output, 'HTTP/1.1 100 Continue') === 0) {
             $output = substr($output, strpos($output, $breakString) + 4);
         }
 

tests/system/HTTP/CURLRequestTest.php

@@ -1111,4 +1111,30 @@ public function testUserAgentOption(): void
         $this->assertArrayHasKey(CURLOPT_USERAGENT, $options);
         $this->assertSame($agent, $options[CURLOPT_USERAGENT]);
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/8347
+     */
+    public function testMultipleHTTP100(): void
+    {
+        $jsonBody = '{"name":"John Doe","age":30}';
+
+        $output = "HTTP/1.1 100 Continue
+Mark bundle as not supporting multiuse
+HTTP/1.1 100 Continue
+Mark bundle as not supporting multiuse
+HTTP/1.1 200 OK
+Server: Werkzeug/2.2.2 Python/3.7.17
+Date: Sun, 28 Jan 2024 06:05:36 GMT
+Content-Type: application/json
+Content-Length: 33\r\n\r\n" . $jsonBody;
+
+        $this->request->setOutput($output);
+
+        $response = $this->request->request('GET', 'http://example.com');
+
+        $this->assertSame($jsonBody, $response->getBody());
+
+        $this->assertSame(200, $response->getStatusCode());
+    }
 }

user_guide_src/source/installation/upgrade_file_upload/001.php

@@ -11,7 +11,7 @@ public function index()
 
     public function do_upload()
     {
-        $this->validate([
+        $this->validateData([], [
             'userfile' => [
                 'uploaded[userfile]',
                 'max_size[userfile,100]',

user_guide_src/source/installation/upgrade_validations.rst

@@ -35,9 +35,10 @@ Upgrade Guide
 
 2. Within the controller you have to change the following:
 
-    - ``$this->load->helper(array('form', 'url'));`` to ``helper(['form', 'url']);``
+    - ``$this->load->helper(array('form', 'url'));`` to ``helper('form');``
     - remove the line ``$this->load->library('form_validation');``
-    - ``if ($this->form_validation->run() == FALSE)`` to ``if (! $this->validate([]))``
+    - ``if ($this->form_validation->run() == FALSE)`` to ``if (! $this->validateData($data, $rules))``
+      where ``$data`` is the data to validate, typically, the POST data ``$this->request->getPost()``.
     - ``$this->load->view('myform');`` to ``return view('myform', ['validation' => $this->validator,]);``
 
 3. You have to change the validation rules. The new syntax is to set the rules as array in the controller:

user_guide_src/source/installation/upgrade_validations/001.php

@@ -1,6 +1,6 @@
 <?php
 
-$isValid = $this->validate([
+$isValid = $this->validateData($data, [
     'name'  => 'required|min_length[3]',
     'email' => 'required|valid_email',
     'phone' => 'required|numeric|max_length[10]',

user_guide_src/source/installation/upgrade_validations/002.php

@@ -8,9 +8,11 @@ class Form extends Controller
 {
     public function index()
     {
-        helper(['form', 'url']);
+        helper('form');
 
-        if (! $this->validate([
+        $data = $this->request->getPost();
+
+        if (! $this->validateData($data, [
             // Validation rules
         ])) {
             return view('myform');

user_guide_src/source/intro/index.rst

@@ -2,20 +2,26 @@
 Welcome to CodeIgniter4
 #######################
 
-CodeIgniter is an Application Development Framework - a toolkit - for
+CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and
+secure.
+
+It is an Application Development Framework - a toolkit - for
 people who build web sites using PHP. Its goal is to enable you to
 develop projects much faster than you could if you were writing code
 from scratch, by providing a rich set of libraries for commonly needed
 tasks, as well as a simple interface and logical structure to access
-these libraries. CodeIgniter lets you creatively focus on your project
-by minimizing the amount of code needed for a given task.
+these libraries.
+
+CodeIgniter lets you creatively focus on your project by minimizing the amount
+of code needed for a given task.
 
 Where possible, CodeIgniter has been kept as flexible as possible,
 allowing you to work in the way you want, not being forced into working
 any certain way. The framework can have core parts easily extended
 or completely replaced to make the system work the way you need it to.
-In short, CodeIgniter is the malleable framework that tries to provide
-the tools you need while staying out of the way.
+
+In short, CodeIgniter is the malleable framework that tries to provide the tools
+you need while staying out of the way.
 
 *****************************
 Is CodeIgniter Right for You?
@@ -25,12 +31,14 @@ CodeIgniter is right for you if:
 
 -  You want a framework with a small footprint.
 -  You need exceptional performance.
+-  You want a framework that incorporates a number of features and techniques to
+   enable you to do good security practices easily.
+-  You want a non-magical framework that you can easily find and read the source
+   code.
 -  You want a framework that requires nearly zero configuration.
--  You want a framework that does not require you to use the command
-   line.
 -  You want a framework that does not require you to adhere to
    restrictive coding rules.
--  You are not interested in large-scale monolithic libraries like PEAR.
+-  You want a framework that makes it easy to create test code.
 -  You do not want to be forced to learn a templating language (although
    a template parser is optionally available if you desire one).
 -  You eschew complexity, favoring simple solutions.

user_guide_src/source/libraries/validation.rst

@@ -1049,7 +1049,7 @@ file upload related rules::
     <input type="file" name="avatar">
 
     // In the controller
-    $this->validate([
+    $this->validateData([], [
         'avatar' => 'uploaded[avatar]|max_size[avatar,1024]',
     ]);
 

user_guide_src/source/libraries/validation/045.php

@@ -2,7 +2,7 @@
 
 // In Controller.
 
-if (! $this->validate([
+if (! $this->validateData($data, [
     'username' => 'required',
     'password' => 'required|min_length[10]',
 ])) {