Merge pull request #2253 from pjsde/fix_parameters

jim-parry · web-flow · commit 222489e527a0 · 2019-09-23T11:38:41.000-07:00
Fix invalid parameters
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
@@ -234,7 +234,7 @@ public function getIPAddress(): string
 	 */
 	public function isValidIP(string $ip = null, string $which = null): bool
 	{
-		switch (strtolower($which))
+		switch (strtolower( (string) $which))
 		{
 			case 'ipv4':
 				$which = FILTER_FLAG_IPV4;
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
@@ -714,7 +714,7 @@ public function sendHeaders()
 		// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html
 		if (! isset($this->headers['Date']))
 		{
-			$this->setDate(\DateTime::createFromFormat('U', time()));
+			$this->setDate(\DateTime::createFromFormat('U', (string) time()));
 		}
 
 		// HTTP Status

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public function getIPAddress(): string`
`234`	`234`	`*/`
`235`	`235`	`public function isValidIP(string $ip = null, string $which = null): bool`
`236`	`236`	`{`
`237`		`- switch (strtolower($which))`
	`237`	`+ switch (strtolower( (string) $which))`
`238`	`238`	`{`
`239`	`239`	`case 'ipv4':`
`240`	`240`	`$which = FILTER_FLAG_IPV4;`
Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ public function sendHeaders()`
`714`	`714`	`// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html`
`715`	`715`	`if (! isset($this->headers['Date']))`
`716`	`716`	`{`
`717`		`- $this->setDate(\DateTime::createFromFormat('U', time()));`
	`717`	`+ $this->setDate(\DateTime::createFromFormat('U', (string) time()));`
`718`	`718`	`}`
`719`	`719`
`720`	`720`	`// HTTP Status`