@@ -876,14 +876,14 @@ public function testBasedNoIndex()
876
876
877
877
// going through request
878
878
$ this ->assertSame ('http://example.com/ci/v4/controller/method ' , (string ) $ request ->uri );
879
- $ this ->assertSame ('/ci/v4/controller/method ' , $ request ->uri ->getPath ());
879
+ $ this ->assertSame ('/ci/v4/controller/method ' , $ request ->getUri () ->getPath ());
880
880
881
881
// standalone
882
882
$ uri = new URI ('http://example.com/ci/v4/controller/method ' );
883
883
$ this ->assertSame ('http://example.com/ci/v4/controller/method ' , (string ) $ uri );
884
884
$ this ->assertSame ('/ci/v4/controller/method ' , $ uri ->getPath ());
885
885
886
- $ this ->assertSame ($ uri ->getPath (), $ request ->uri ->getPath ());
886
+ $ this ->assertSame ($ uri ->getPath (), $ request ->getUri () ->getPath ());
887
887
}
888
888
889
889
public function testBasedWithIndex ()
@@ -902,15 +902,15 @@ public function testBasedWithIndex()
902
902
Services::injectMock ('request ' , $ request );
903
903
904
904
// going through request
905
- $ this ->assertSame ('http://example.com/ci/v4/index.php/controller/method ' , (string ) $ request ->uri );
906
- $ this ->assertSame ('/ci/v4/index.php/controller/method ' , $ request ->uri ->getPath ());
905
+ $ this ->assertSame ('http://example.com/ci/v4/index.php/controller/method ' , (string ) $ request ->getUri () );
906
+ $ this ->assertSame ('/ci/v4/index.php/controller/method ' , $ request ->getUri () ->getPath ());
907
907
908
908
// standalone
909
909
$ uri = new URI ('http://example.com/ci/v4/index.php/controller/method ' );
910
910
$ this ->assertSame ('http://example.com/ci/v4/index.php/controller/method ' , (string ) $ uri );
911
911
$ this ->assertSame ('/ci/v4/index.php/controller/method ' , $ uri ->getPath ());
912
912
913
- $ this ->assertSame ($ uri ->getPath (), $ request ->uri ->getPath ());
913
+ $ this ->assertSame ($ uri ->getPath (), $ request ->getUri () ->getPath ());
914
914
}
915
915
916
916
public function testForceGlobalSecureRequests ()
@@ -933,13 +933,13 @@ public function testForceGlobalSecureRequests()
933
933
Services::injectMock ('request ' , $ request );
934
934
935
935
// Detected by request
936
- $ this ->assertSame ('https://example.com/ci/v4/controller/method ' , (string ) $ request ->uri );
936
+ $ this ->assertSame ('https://example.com/ci/v4/controller/method ' , (string ) $ request ->getUri () );
937
937
938
938
// Standalone
939
939
$ uri = new URI ('http://example.com/ci/v4/controller/method ' );
940
940
$ this ->assertSame ('https://example.com/ci/v4/controller/method ' , (string ) $ uri );
941
941
942
- $ this ->assertSame (trim ($ uri ->getPath (), '/ ' ), trim ($ request ->uri ->getPath (), '/ ' ));
942
+ $ this ->assertSame (trim ($ uri ->getPath (), '/ ' ), trim ($ request ->getUri () ->getPath (), '/ ' ));
943
943
}
944
944
945
945
public function testZeroAsURIPath ()
0 commit comments