From aa5ec47051e5e3b7054bb540bbe5c40d75b9ad44 Mon Sep 17 00:00:00 2001 From: Simon Sessingo Date: Sat, 16 Dec 2017 23:24:31 +0100 Subject: [PATCH 1/3] Removed key check in __get as it's already performed in the __isset method. --- src/Pecee/Http/Request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php index 2fb8068..694624e 100644 --- a/src/Pecee/Http/Request.php +++ b/src/Pecee/Http/Request.php @@ -309,7 +309,7 @@ class Request public function __get($name) { - return isset($this->data[$name]) ? $this->data[$name] : null; + return $this->data[$name]; } } \ No newline at end of file From e23dd3743522d61360d857f8c40800e0f2aedd9a Mon Sep 17 00:00:00 2001 From: Simon Sessingo Date: Sat, 16 Dec 2017 23:29:00 +0100 Subject: [PATCH 2/3] Reverted changes --- src/Pecee/Http/Request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php index 694624e..2fb8068 100644 --- a/src/Pecee/Http/Request.php +++ b/src/Pecee/Http/Request.php @@ -309,7 +309,7 @@ class Request public function __get($name) { - return $this->data[$name]; + return isset($this->data[$name]) ? $this->data[$name] : null; } } \ No newline at end of file From 72d33dd497e34a63aca9f4e2f787c67edfa65f69 Mon Sep 17 00:00:00 2001 From: Simon Sessingo Date: Sun, 17 Dec 2017 09:51:56 +0100 Subject: [PATCH 3/3] Compatibility: setUri can be both string and Uri object. --- src/Pecee/Http/Request.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php index 2fb8068..61d8c3f 100644 --- a/src/Pecee/Http/Request.php +++ b/src/Pecee/Http/Request.php @@ -196,10 +196,14 @@ class Request } /** - * @param Uri $uri + * @param Uri|string $uri */ - public function setUri(Uri $uri) + public function setUri($uri) { + if (is_string($uri) === true) { + $uri = new Uri($uri); + } + $this->uri = $uri; }