test: remove $request->uri

Author: kenjis

tests/system/Helpers/URLHelper/MiscUrlTest.php

@@ -55,11 +55,12 @@ public function testPreviousURLUsesSessionFirst()
         $_SERVER['HTTP_REFERER']      = $uri1;
         $_SESSION['_ci_previous_url'] = $uri2;
 
+        $uri = new URI('http://example.com/public');
+        Services::injectMock('uri', $uri);
+
         // Since we're on a CLI, we must provide our own URI
         $this->config->baseURL = 'http://example.com/public';
         $request               = Services::request($this->config);
-        $request->uri          = new URI('http://example.com/public');
-
         Services::injectMock('request', $request);
 
         $this->assertSame($uri2, previous_url());
@@ -71,11 +72,12 @@ public function testPreviousURLUsesRefererIfNeeded()
 
         $_SERVER['HTTP_REFERER'] = $uri1;
 
+        $uri = new URI('http://example.com/public');
+        Services::injectMock('uri', $uri);
+
         // Since we're on a CLI, we must provide our own URI
         $this->config->baseURL = 'http://example.com/public';
         $request               = Services::request($this->config);
-        $request->uri          = new URI('http://example.com/public');
-
         Services::injectMock('request', $request);
 
         $this->assertSame($uri1, previous_url());
@@ -85,20 +87,22 @@ public function testPreviousURLUsesRefererIfNeeded()
 
     public function testIndexPage()
     {
-        $request      = Services::request($this->config);
-        $request->uri = new URI('http://example.com/');
+        $uri = new URI('http://example.com/');
+        Services::injectMock('uri', $uri);
 
+        $request = Services::request($this->config);
         Services::injectMock('request', $request);
 
         $this->assertSame('index.php', index_page());
     }
 
     public function testIndexPageAlt()
     {
+        $uri = new URI('http://example.com/');
+        Services::injectMock('uri', $uri);
+
         $this->config->indexPage = 'banana.php';
         $request                 = Services::request($this->config);
-        $request->uri            = new URI('http://example.com/');
-
         Services::injectMock('request', $request);
 
         $this->assertSame('banana.php', index_page($this->config));
@@ -159,10 +163,12 @@ public function anchorNormalPatterns()
      */
     public function testAnchor($expected = '', $uri = '', $title = '', $attributes = '')
     {
-        $request      = Services::request($this->config);
-        $request->uri = new URI('http://example.com/');
+        $uriObj = new URI('http://example.com/');
+        Services::injectMock('uri', $uriObj);
 
+        $request = Services::request($this->config);
         Services::injectMock('request', $request);
+
         $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
@@ -225,11 +231,13 @@ public function anchorNoindexPatterns()
      */
     public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attributes = '')
     {
+        $uriObj = new URI('http://example.com/');
+        Services::injectMock('uri', $uriObj);
+
         $this->config->indexPage = '';
         $request                 = Services::request($this->config);
-        $request->uri            = new URI('http://example.com/');
-
         Services::injectMock('request', $request);
+
         $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
@@ -282,11 +290,13 @@ public function anchorSubpagePatterns()
      */
     public function testAnchorTargetted($expected = '', $uri = '', $title = '', $attributes = '')
     {
+        $uriObj = new URI('http://example.com/');
+        Services::injectMock('uri', $uriObj);
+
         $this->config->indexPage = '';
         $request                 = Services::request($this->config);
-        $request->uri            = new URI('http://example.com/');
-
         Services::injectMock('request', $request);
+
         $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
@@ -328,10 +338,12 @@ public function anchorExamplePatterns()
      */
     public function testAnchorExamples($expected = '', $uri = '', $title = '', $attributes = '')
     {
-        $request      = Services::request($this->config);
-        $request->uri = new URI('http://example.com/');
+        $uriObj = new URI('http://example.com/');
+        Services::injectMock('uri', $uriObj);
 
+        $request = Services::request($this->config);
         Services::injectMock('request', $request);
+
         $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
@@ -387,10 +399,12 @@ public function anchorPopupPatterns()
      */
     public function testAnchorPopup($expected = '', $uri = '', $title = '', $attributes = false)
     {
-        $request      = Services::request($this->config);
-        $request->uri = new URI('http://example.com/');
+        $uriObj = new URI('http://example.com/');
+        Services::injectMock('uri', $uriObj);
 
+        $request = Services::request($this->config);
         Services::injectMock('request', $request);
+
         $this->assertSame($expected, anchor_popup($uri, $title, $attributes, $this->config));
     }
 
@@ -427,9 +441,10 @@ public function mailtoPatterns()
      */
     public function testMailto($expected = '', $email = '', $title = '', $attributes = '')
     {
-        $request      = Services::request($this->config);
-        $request->uri = new URI('http://example.com/');
+        $uri = new URI('http://example.com/');
+        Services::injectMock('uri', $uri);
 
+        $request = Services::request($this->config);
         Services::injectMock('request', $request);
 
         $this->assertSame($expected, mailto($email, $title, $attributes));
@@ -468,9 +483,10 @@ public function safeMailtoPatterns()
      */
     public function testSafeMailto($expected = '', $email = '', $title = '', $attributes = '')
     {
-        $request      = Services::incomingrequest($this->config);
-        $request->uri = new URI('http://example.com/');
+        $uri = new URI('http://example.com/');
+        Services::injectMock('uri', $uri);
 
+        $request = Services::incomingrequest($this->config);
         Services::injectMock('request', $request);
 
         $this->assertSame($expected, safe_mailto($email, $title, $attributes));