fix: ControllerTestTrait::withUri() updates Request instance

kenjis · kenjis · commit d80c7b5a3574 · 2023-08-16T14:07:55.000+09:00
diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
@@ -278,7 +278,13 @@ public function withLogger($logger)
      */
     public function withUri(string $uri)
     {
-        $this->uri = new URI($uri);
+        $factory   = Services::siteurifactory();
+        $this->uri = $factory->createFromString($uri);
+        Services::injectMock('uri', $this->uri);
+
+        // Update the Request instance, because Request has the SiteURI instance.
+        $this->request = Services::incomingrequest(null, false);
+        Services::injectMock('request', $this->request);
 
         return $this;
     }
diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst
@@ -347,6 +347,10 @@ Bugs Fixed
   (e.g., **foo-bar**) and one URI for underscores (e.g., **foo_bar**). This bug
   has been fixed. Now the URI for underscores (**foo_bar**) is not accessible.
 - **Output Buffering:** Bug fix with output buffering.
+- **ControllerTestTrait:** ``ControllerTestTrait::withUri()`` creates a new Request
+  instance with the URI. Because the Request instance should have the URI instance.
+  Also if the hostname in the URI string is invalid with ``Config\App``, the valid
+  hostname will be set.
 
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
@@ -101,6 +101,11 @@ representing a valid URI:
 
 It is a good practice to always provide the URI during testing to avoid surprises.
 
+.. note:: Since v4.4.0, this method creates a new Request instance with the URI.
+    Because the Request instance should have the URI instance. Also if the hostname
+    in the URI string is invalid with ``Config\App``, the valid hostname will be
+    set.
+
 withBody($body)
 ---------------
 

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,13 @@ public function withLogger($logger)`
`278`	`278`	`*/`
`279`	`279`	`public function withUri(string $uri)`
`280`	`280`	`{`
`281`		`- $this->uri = new URI($uri);`
	`281`	`+ $factory = Services::siteurifactory();`
	`282`	`+ $this->uri = $factory->createFromString($uri);`
	`283`	`+ Services::injectMock('uri', $this->uri);`
	`284`	`+`
	`285`	`+ // Update the Request instance, because Request has the SiteURI instance.`
	`286`	`+ $this->request = Services::incomingrequest(null, false);`
	`287`	`+ Services::injectMock('request', $this->request);`
`282`	`288`
`283`	`289`	`return $this;`
`284`	`290`	`}`