Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-12 07:30:58 +01:00
Code Issues Packages Projects Releases Activity

Moved URI parts filtering functions to Framework\UriPartsFilter class

Browse Source
This commit is contained in:
Matias Griese
2018-02-17 14:28:26 +02:00
parent 82868037ec
commit d39253e36f
3 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
system/src/Grav/Common/Uri.php
View File

@@ -9,6 +9,7 @@
namespace Grav\Common;
use Grav\Common\Page\Page;
use Grav\Framework\Uri\UriPartsFilter;
class Uri
{
@@ -1200,13 +1201,7 @@ class Uri
*/
public static function filterUserInfo($info)
{
return preg_replace_callback(
'/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=]+|%(?![A-Fa-f0-9]{2}))/u',
function ($match) {
return rawurlencode($match[0]);
},
$info
);
return UriPartsFilter::filterUserInfo($info);
}
/**
@@ -1223,13 +1218,7 @@ class Uri
*/
public static function filterPath($path)
{
return preg_replace_callback(
'/(?:[^a-zA-Z0-9_\-\.~:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/u',
function ($match) {
return rawurlencode($match[0]);
},
$path
);
return UriPartsFilter::filterPath($path);
}
/**
@@ -1240,12 +1229,6 @@ class Uri
*/
public static function filterQuery($query)
{
return preg_replace_callback(
'/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/u',
function ($match) {
return rawurlencode($match[0]);
},
$query
);
return UriPartsFilter::filterQueryOrFragment($query);
}
}

34
system/src/Grav/Framework/Psr7/AbstractUri.php
View File

@@ -8,7 +8,7 @@
namespace Grav\Framework\Psr7;
use Grav\Framework\Uri\UriFilter;
use Grav\Framework\Uri\UriPartsFilter;
use Psr\Http\Message\UriInterface;
/**
@@ -138,7 +138,7 @@ abstract class AbstractUri implements UriInterface
*/
public function withScheme($scheme)
{
$scheme = UriFilter::filterScheme($scheme);
$scheme = UriPartsFilter::filterScheme($scheme);
if ($this->scheme === $scheme) {
return $this;
@@ -158,8 +158,8 @@ abstract class AbstractUri implements UriInterface
*/
public function withUserInfo($user, $password = '')
{
$user = UriFilter::filterUserInfo($user);
$password = UriFilter::filterUserInfo($password);
$user = UriPartsFilter::filterUserInfo($user);
$password = UriPartsFilter::filterUserInfo($password);
if ($this->user === $user && $this->password === $password) {
return $this;
@@ -178,7 +178,7 @@ abstract class AbstractUri implements UriInterface
*/
public function withHost($host)
{
$host = UriFilter::filterHost($host);
$host = UriPartsFilter::filterHost($host);
if ($this->host === $host) {
return $this;
@@ -196,7 +196,7 @@ abstract class AbstractUri implements UriInterface
*/
public function withPort($port)
{
$port = UriFilter::filterPort($port);
$port = UriPartsFilter::filterPort($port);
if ($this->port === $port) {
return $this;
@@ -215,7 +215,7 @@ abstract class AbstractUri implements UriInterface
*/
public function withPath($path)
{
$path = UriFilter::filterPath($path);
$path = UriPartsFilter::filterPath($path);
if ($this->path === $path) {
return $this;
@@ -233,7 +233,7 @@ abstract class AbstractUri implements UriInterface
*/
public function withQuery($query)
{
$query = UriFilter::filterQueryOrFragment($query);
$query = UriPartsFilter::filterQueryOrFragment($query);
if ($this->query === $query) {
return $this;
@@ -251,7 +251,7 @@ abstract class AbstractUri implements UriInterface
*/
public function withFragment($fragment)
{
$fragment = UriFilter::filterQueryOrFragment($fragment);
$fragment = UriPartsFilter::filterQueryOrFragment($fragment);
if ($this->fragment === $fragment) {
return $this;
@@ -354,14 +354,14 @@ abstract class AbstractUri implements UriInterface
*/
protected function initParts(array $parts)
{
$this->scheme = isset($parts['scheme']) ? UriFilter::filterScheme($parts['scheme']) : '';
$this->user = isset($parts['user']) ? UriFilter::filterUserInfo($parts['user']) : '';
$this->password = isset($parts['pass']) ? UriFilter::filterUserInfo($parts['pass']) : '';
$this->host = isset($parts['host']) ? UriFilter::filterHost($parts['host']) : '';
$this->port = isset($parts['port']) ? UriFilter::filterPort((int)$parts['port']) : null;
$this->path = isset($parts['path']) ? UriFilter::filterPath($parts['path']) : '';
$this->query = isset($parts['query']) ? UriFilter::filterQueryOrFragment($parts['query']) : '';
$this->fragment = isset($parts['fragment']) ? UriFilter::filterQueryOrFragment($parts['fragment']) : '';
$this->scheme = isset($parts['scheme']) ? UriPartsFilter::filterScheme($parts['scheme']) : '';
$this->user = isset($parts['user']) ? UriPartsFilter::filterUserInfo($parts['user']) : '';
$this->password = isset($parts['pass']) ? UriPartsFilter::filterUserInfo($parts['pass']) : '';
$this->host = isset($parts['host']) ? UriPartsFilter::filterHost($parts['host']) : '';
$this->port = isset($parts['port']) ? UriPartsFilter::filterPort((int)$parts['port']) : null;
$this->path = isset($parts['path']) ? UriPartsFilter::filterPath($parts['path']) : '';
$this->query = isset($parts['query']) ? UriPartsFilter::filterQueryOrFragment($parts['query']) : '';
$this->fragment = isset($parts['fragment']) ? UriPartsFilter::filterQueryOrFragment($parts['fragment']) : '';
$this->unsetDefaultPort();
$this->validate();

2
system/src/Grav/Framework/Uri/UriFilter.php → system/src/Grav/Framework/Uri/UriPartsFilter.php
View File

@@ -12,7 +12,7 @@ namespace Grav\Framework\Uri;
* Class Uri
* @package Grav\Framework\Uri
*/
class UriFilter
class UriPartsFilter
{
const HOSTNAME_REGEX = '/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/u';