upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Type hint JSON content type regex and use preg_match less

Browse source 
Signed-off-by: Stanimir Bozhilov <stanimir@audriga.com>
This commit is contained in:
Stanimir Bozhilov 2022-09-22 11:25:39 +02:00
parent f286a9d6ac
commit d80f8f6c82
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/AppFramework/Http/Request.php
View file

@ -107,7 +107,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
/** @var bool */
protected $contentDecoded = false;
protected $jsonContentTypeRegex = '/application\/(\w+\+)?json/';
/** @var string */
protected string $jsonContentTypeRegex = '/application\/(\w+\+)?json/';
/**
* @param array $vars An associative array with the following optional values:
@ -406,13 +407,12 @@ class Request implements \ArrayAccess, \Countable, IRequest {
&& $this->getHeader('Content-Length') !== '0'
&& $this->getHeader('Content-Length') !== ''
&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') === false
&& preg_match($this->jsonContentTypeRegex, $this->getHeader('Content-Type')) === 0
&& strpos($this->getHeader('Content-Type'), 'application/json') === false
) {
if ($this->content === false) {
throw new \LogicException(
'"put" can only be accessed once if not '
. 'application/x-www-form-urlencoded, application/json '
. 'or other content type, related to JSON (like application/scim+json).'
. 'application/x-www-form-urlencoded or application/json.'
);
}
$this->content = false;