Merge pull request #1282 from fmertins/20181002_system_test

lonnieezell · web-flow · commit 40cfacfe626b · 2018-10-03T22:30:38.000-05:00
system/Test/FeatureTestCase::setupRequest(), minor fixes phpdoc block…
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
@@ -208,10 +208,11 @@ public function options(string $path, array $params = null)
 	 *
 	 * @param string      $method
 	 * @param string|null $path
+	 * @param string|null $params
 	 *
 	 * @return \CodeIgniter\HTTP\IncomingRequest
 	 */
-	protected function setupRequest(string $method, string $path=null, $params = null)
+	protected function setupRequest(string $method, string $path = null, string $params = null): IncomingRequest
 	{
 		$config = config(App::class);
 		$uri    = new URI($config->baseURL .'/'. trim($path, '/ '));

Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,11 @@ public function options(string $path, array $params = null)`
`208`	`208`	`*`
`209`	`209`	`* @param string $method`
`210`	`210`	`* @param string\|null $path`
	`211`	`+ * @param string\|null $params`
`211`	`212`	`*`
`212`	`213`	`* @return \CodeIgniter\HTTP\IncomingRequest`
`213`	`214`	`*/`
`214`		`- protected function setupRequest(string $method, string $path=null, $params = null)`
	`215`	`+ protected function setupRequest(string $method, string $path = null, string $params = null): IncomingRequest`
`215`	`216`	`{`
`216`	`217`	`$config = config(App::class);`
`217`	`218`	`$uri = new URI($config->baseURL .'/'. trim($path, '/ '));`