IRequest, IResponse, Url: parameters $default are deprecated

Author: dg

src/Http/IRequest.php

@@ -37,19 +37,17 @@ function getUrl();
 	 * Returns variable provided to the script via URL query ($_GET).
 	 * If no key is passed, returns the entire array.
 	 * @param  string key
-	 * @param  mixed  default value
 	 * @return mixed
 	 */
-	function getQuery($key = NULL, $default = NULL);
+	function getQuery($key = NULL);
 
 	/**
 	 * Returns variable provided to the script via POST method ($_POST).
 	 * If no key is passed, returns the entire array.
 	 * @param  string key
-	 * @param  mixed  default value
 	 * @return mixed
 	 */
-	function getPost($key = NULL, $default = NULL);
+	function getPost($key = NULL);
 
 	/**
 	 * Returns uploaded file.
@@ -67,10 +65,9 @@ function getFiles();
 	/**
 	 * Returns variable provided to the script via HTTP cookies.
 	 * @param  string key
-	 * @param  mixed  default value
 	 * @return mixed
 	 */
-	function getCookie($key, $default = NULL);
+	function getCookie($key);
 
 	/**
 	 * Returns variables provided to the script via HTTP cookies.
@@ -97,10 +94,9 @@ function isMethod($method);
 	 * Return the value of the HTTP header. Pass the header name as the
 	 * plain, HTTP-specified header name (e.g. 'Accept-Encoding').
 	 * @param  string
-	 * @param  string|NULL
 	 * @return string|NULL
 	 */
-	function getHeader($header, $default = NULL);
+	function getHeader($header);
 
 	/**
 	 * Returns all HTTP headers.

src/Http/IResponse.php

@@ -145,10 +145,9 @@ function isSent();
 	/**
 	 * Returns value of an HTTP header.
 	 * @param  string
-	 * @param  string|NULL
 	 * @return string|NULL
 	 */
-	function getHeader($header, $default = NULL);
+	function getHeader($header);
 
 	/**
 	 * Returns a list of headers to sent.

src/Http/Request.php

@@ -97,37 +97,33 @@ public function getUrl()
 	 * Returns variable provided to the script via URL query ($_GET).
 	 * If no key is passed, returns the entire array.
 	 * @param  string key
-	 * @param  mixed  default value
 	 * @return mixed
 	 */
-	public function getQuery($key = NULL, $default = NULL)
+	public function getQuery($key = NULL)
 	{
 		if (func_num_args() === 0) {
 			return $this->url->getQueryParameters();
-		} else {
-			return $this->url->getQueryParameter($key, $default);
+		} elseif (func_num_args() > 1) {
+			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
 		}
+		return $this->url->getQueryParameter($key);
 	}
 
 
 	/**
 	 * Returns variable provided to the script via POST method ($_POST).
 	 * If no key is passed, returns the entire array.
 	 * @param  string key
-	 * @param  mixed  default value
 	 * @return mixed
 	 */
-	public function getPost($key = NULL, $default = NULL)
+	public function getPost($key = NULL)
 	{
 		if (func_num_args() === 0) {
 			return $this->post;
-
-		} elseif (isset($this->post[$key])) {
-			return $this->post[$key];
-
-		} else {
-			return $default;
+		} elseif (func_num_args() > 1) {
+			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
 		}
+		return $this->post[$key] ?? NULL;
 	}
 
 
@@ -155,12 +151,14 @@ public function getFiles()
 	/**
 	 * Returns variable provided to the script via HTTP cookies.
 	 * @param  string key
-	 * @param  mixed  default value
 	 * @return mixed
 	 */
-	public function getCookie($key, $default = NULL)
+	public function getCookie($key)
 	{
-		return $this->cookies[$key] ?? $default;
+		if (func_num_args() > 1) {
+			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
+		}
+		return $this->cookies[$key] ?? NULL;
 	}
 
 
@@ -202,13 +200,15 @@ public function isMethod($method)
 	 * Return the value of the HTTP header. Pass the header name as the
 	 * plain, HTTP-specified header name (e.g. 'Accept-Encoding').
 	 * @param  string
-	 * @param  string|NULL
 	 * @return string|NULL
 	 */
-	public function getHeader($header, $default = NULL)
+	public function getHeader($header)
 	{
+		if (func_num_args() > 1) {
+			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
+		}
 		$header = strtolower($header);
-		return $this->headers[$header] ?? $default;
+		return $this->headers[$header] ?? NULL;
 	}
 
 

src/Http/Response.php

@@ -200,19 +200,20 @@ public function isSent()
 	/**
 	 * Returns value of an HTTP header.
 	 * @param  string
-	 * @param  string|NULL
 	 * @return string|NULL
 	 */
-	public function getHeader($header, $default = NULL)
+	public function getHeader($header)
 	{
+		if (func_num_args() > 1) {
+			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
+		}
 		$header .= ':';
 		$len = strlen($header);
 		foreach (headers_list() as $item) {
 			if (strncasecmp($item, $header, $len) === 0) {
 				return ltrim(substr($item, $len));
 			}
 		}
-		return $default;
 	}
 
 

src/Http/Url.php

@@ -299,12 +299,14 @@ public function getQueryParameters()
 
 	/**
 	 * @param string
-	 * @param mixed
 	 * @return mixed
 	 */
-	public function getQueryParameter($name, $default = NULL)
+	public function getQueryParameter($name)
 	{
-		return $this->query[$name] ?? $default;
+		if (func_num_args() > 1) {
+			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
+		}
+		return $this->query[$name] ?? NULL;
 	}
 
 

tests/Http/Url.query.phpt

@@ -50,7 +50,6 @@ Assert::same(['arg3' => 'value3'],  $url->getQueryParameters());
 $url->setQuery(['arg' => 'value']);
 Assert::same('value', $url->getQueryParameter('arg'));
 Assert::same(NULL, $url->getQueryParameter('invalid'));
-Assert::same(123, $url->getQueryParameter('invalid', 123));
 
 $url->setQueryParameter('arg2', 'abc');
 Assert::same('abc', $url->getQueryParameter('arg2'));