geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 22:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed possible bug causing InputHandler not to get the correct request-method + simplified Request class.

Browse Source
This commit is contained in:
Simon Sessingø
2021-03-28 04:24:33 +02:00
parent 9e19cbfb71
commit 6ccd06911e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Request.php
+7 -8
View File
@@ -23,6 +23,8 @@ class Request
public const CONTENT_TYPE_FORM_DATA = 'multipart/form-data'; public const CONTENT_TYPE_FORM_DATA = 'multipart/form-data';
public const CONTENT_TYPE_X_FORM_ENCODED = 'application/x-www-form-urlencoded'; public const CONTENT_TYPE_X_FORM_ENCODED = 'application/x-www-form-urlencoded';
public const FORCE_METHOD_KEY = '_method';
/** /**
* All request-types * All request-types
* @var string[] * @var string[]
@@ -127,13 +129,10 @@ class Request
$this->setHost($this->getHeader('http-host')); $this->setHost($this->getHeader('http-host'));
// Check if special IIS header exist, otherwise use default. // Check if special IIS header exist, otherwise use default.
$this->setUrl(new Url($this->getFirstHeader(['unencoded-url', 'request-uri',]))); $this->setUrl(new Url($this->getFirstHeader(['unencoded-url', 'request-uri'])));
$this->setContentType((string)$this->getHeader('content-type'));
$this->setContentType(strtolower($this->getHeader('content-type'))); $this->setMethod((string)($_POST[static::FORCE_METHOD_KEY] ?? $this->getHeader('request-method')));
$this->method = strtolower($this->getHeader('request-method'));
$this->inputHandler = new InputHandler($this); $this->inputHandler = new InputHandler($this);
$this->method = strtolower($this->inputHandler->value('_method', $this->getHeader('request-method')));
} }
public function isSecure(): bool public function isSecure(): bool
@@ -324,9 +323,9 @@ class Request
protected function setContentType(string $contentType): self protected function setContentType(string $contentType): self
{ {
if(strpos($contentType, ';') > 0) { if(strpos($contentType, ';') > 0) {
$this->contentType = substr($contentType, 0, strpos($contentType, ';')); $this->contentType = strtolower(substr($contentType, 0, strpos($contentType, ';')));
} else { } else {
$this->contentType = $contentType; $this->contentType = strtolower($contentType);
} }
return $this; return $this;