Merge pull request #344 from skipperbent/v3-development

Version 3.4.9.3
_method is not supported as fallback for every request-type.
2026-06-24 03:59:16 +00:00 · 2017-12-17 10:41:22 +01:00 · 2017-12-17 10:37:33 +01:00 · 2017-12-17 09:53:39 +01:00 · 2017-12-17 09:51:56 +01:00 · 2017-12-16 23:29:00 +01:00
1 changed files with 7 additions and 3 deletions
@@ -36,7 +36,7 @@ class Request
        $this->setUri(new Uri($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));

        $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
    }

    protected function parseHeaders()
@@ -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;
    }
Author	SHA1	Message	Date
Simon Sessingø	2db20dce6b	Merge pull request #344 from skipperbent/v3-development Version 3.4.9.3	2017-12-17 10:41:22 +01:00
Simon Sessingo	f2d106c649	_method is not supported as fallback for every request-type.	2017-12-17 10:37:33 +01:00
Simon Sessingø	c6341960d7	Merge pull request #341 from skipperbent/v3-development Version 3.4.9.2	2017-12-17 09:53:39 +01:00
Simon Sessingo	72d33dd497	Compatibility: setUri can be both string and Uri object.	2017-12-17 09:51:56 +01:00
Simon Sessingo	e23dd37435	Reverted changes	2017-12-16 23:29:00 +01:00
Simon Sessingo	aa5ec47051	Removed key check in __get as it's already performed in the __isset method.	2017-12-16 23:24:31 +01:00