@@ -29,15 +29,18 @@ protected function setUp(): void
2929 parent ::setUp ();
3030
3131 helper ('form ' );
32+
33+ $ this ->resetServices ();
3234 }
3335
3436 public function testFormOpenBasic ()
3537 {
38+ $ uri = new URI ('http://example.com/ ' );
39+ Services::injectMock ('uri ' , $ uri );
3640 $ config = new App ();
3741 $ config ->baseURL = '' ;
3842 $ config ->indexPage = 'index.php ' ;
3943 $ request = Services::request ($ config );
40- $ request ->uri = new URI ('http://example.com/ ' );
4144
4245 Services::injectMock ('request ' , $ request );
4346
@@ -67,11 +70,12 @@ public function testFormOpenBasic()
6770
6871 public function testFormOpenHasLocale ()
6972 {
73+ $ uri = new URI ('http://example.com/ ' );
74+ Services::injectMock ('uri ' , $ uri );
7075 $ config = new App ();
7176 $ config ->baseURL = '' ;
7277 $ config ->indexPage = 'index.php ' ;
7378 $ request = Services::request ($ config );
74- $ request ->uri = new URI ('http://example.com/ ' );
7579
7680 Services::injectMock ('request ' , $ request );
7781 $ expected = <<<'EOH'
@@ -89,11 +93,12 @@ public function testFormOpenHasLocale()
8993
9094 public function testFormOpenWithoutAction ()
9195 {
96+ $ uri = new URI ('http://example.com/ ' );
97+ Services::injectMock ('uri ' , $ uri );
9298 $ config = new App ();
9399 $ config ->baseURL = '' ;
94100 $ config ->indexPage = 'index.php ' ;
95101 $ request = Services::request ($ config );
96- $ request ->uri = new URI ('http://example.com/ ' );
97102
98103 Services::injectMock ('request ' , $ request );
99104
@@ -122,11 +127,12 @@ public function testFormOpenWithoutAction()
122127
123128 public function testFormOpenWithoutMethod ()
124129 {
130+ $ uri = new URI ('http://example.com/ ' );
131+ Services::injectMock ('uri ' , $ uri );
125132 $ config = new App ();
126133 $ config ->baseURL = '' ;
127134 $ config ->indexPage = 'index.php ' ;
128135 $ request = Services::request ($ config );
129- $ request ->uri = new URI ('http://example.com/ ' );
130136
131137 Services::injectMock ('request ' , $ request );
132138
@@ -155,11 +161,12 @@ public function testFormOpenWithoutMethod()
155161
156162 public function testFormOpenWithHidden ()
157163 {
164+ $ uri = new URI ('http://example.com/ ' );
165+ Services::injectMock ('uri ' , $ uri );
158166 $ config = new App ();
159167 $ config ->baseURL = '' ;
160168 $ config ->indexPage = 'index.php ' ;
161169 $ request = Services::request ($ config );
162- $ request ->uri = new URI ('http://example.com/ ' );
163170
164171 Services::injectMock ('request ' , $ request );
165172
@@ -195,11 +202,12 @@ public function testFormOpenWithHidden()
195202
196203 public function testFormOpenMultipart ()
197204 {
205+ $ uri = new URI ('http://example.com/ ' );
206+ Services::injectMock ('uri ' , $ uri );
198207 $ config = new App ();
199208 $ config ->baseURL = '' ;
200209 $ config ->indexPage = 'index.php ' ;
201210 $ request = Services::request ($ config );
202- $ request ->uri = new URI ('http://example.com/ ' );
203211
204212 Services::injectMock ('request ' , $ request );
205213
0 commit comments