Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-13 07:18:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize uri building

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-07-30 21:26:30 +02:00
parent 2177024fdc
commit e736214417
2 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Uri/UriFactory.php
View File

@ -132,7 +132,7 @@ final class UriFactory
$data = $uri->getQueryArray(); $data = $uri->getQueryArray();
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
self::setQuery('?' . $key, $value); self::setQuery('?' . $key, $value, true);
} }
} }
@ -192,36 +192,39 @@ final class UriFactory
*/ */
private static function unique(string $url) : string private static function unique(string $url) : string
{ {
$parts = \explode('&', \str_replace('?', '&', $url)); // handle edge cases / normalization
$query = ''; $url = \str_replace(
$partCount = \count($parts); ['=%', '=#', '=?'],
$fragment = ''; ['=%25', '=%23', '=%3F'],
$url
);
if (($fragStart = \strripos($parts[$partCount - 1], '#')) !== false) { $urlStructure = \parse_url($url);
$fragment = \substr($parts[$partCount - 1], $fragStart); \parse_str($urlStructure['query'] ?? '', $urlStructure['query']);
$parts[$partCount - 1] = \substr($parts[$partCount - 1], 0, $fragStart);
}
if ($partCount > 1) { $escaped =
$pars = \array_slice($parts, 1); (isset($urlStructure['scheme']) && !empty($urlStructure['scheme'])
$length = \count($pars); ? $urlStructure['scheme'] . '://' : '')
$url = $parts[0]; . (isset($urlStructure['username']) && !empty($urlStructure['username'])
$keys = []; ? $urlStructure['username'] . ':' : '')
. (isset($urlStructure['password']) && !empty($urlStructure['password'])
? $urlStructure['password'] . '@' : '')
. (isset($urlStructure['host']) && !empty($urlStructure['host'])
? $urlStructure['host'] : '')
. (isset($urlStructure['port']) && !empty($urlStructure['port'])
? ':' . $urlStructure['port'] : '')
. (isset($urlStructure['path']) && !empty($urlStructure['path'])
? $urlStructure['path'] : '')
. (isset($urlStructure['query']) && !empty($urlStructure['query'])
? '?' . \http_build_query($urlStructure['query']) : '')
. (isset($urlStructure['fragment']) && !empty($urlStructure['fragment'])
? '#' . \str_replace('\#', '#', $urlStructure['fragment']) : '');
for ($i = $length - 1; $i > -1; --$i) { return \str_replace(
$spl = \explode('=', $pars[$i]); ['%5C%7B', '%5C%7D', '%5C%3F', '%5C%23'],
['{', '}', '?', '#'],
if (isset($spl[1]) && !\in_array($spl[0], $keys)) { $escaped
$keys[] = $spl[0]; );
if (!empty($spl[1])) {
$query = $spl[0] . '=' . \urlencode($spl[1]) . '&' . $query;
}
}
}
}
return $url . (!empty($query) ? '?' . \rtrim($query, '&') : '') . $fragment;
} }
/** /**

34
tests/Uri/UriFactoryTest.php
View File

@ -172,7 +172,7 @@ class UriFactoryTest extends \PHPUnit\Framework\TestCase
self::assertTrue(UriFactory::setQuery('/valid2', 'query4')); self::assertTrue(UriFactory::setQuery('/valid2', 'query4'));
$expected = 'www.test-uri.com?id=1&test=someString&two=PATH&hash=test&none=%23none&found=%2Fnot&v=query4'; $expected = 'www.test-uri.com?id=1&test=someString&two=PATH&hash=test&none=%23none&found=%2Fnot%3Fv%3Dquery4';
self::assertEquals($expected, UriFactory::build($uri, $vars)); self::assertEquals($expected, UriFactory::build($uri, $vars));
} }
@ -193,4 +193,36 @@ class UriFactoryTest extends \PHPUnit\Framework\TestCase
self::assertEquals($uri, UriFactory::build('{%}')); self::assertEquals($uri, UriFactory::build('{%}'));
self::assertEquals($uri, UriFactory::build('{/base}{/rootPath}{/}?{?}#{#}')); self::assertEquals($uri, UriFactory::build('{/base}{/rootPath}{/}?{?}#{#}'));
} }
/**
* @testdox In case of duplicated query elements the last element is used
* @covers phpOMS\Uri\UriFactory
* @group framework
*/
public function testDuplicatedQueryElements() : void
{
$uri = 'http://www.test-uri.com/path/here?id=123&ab=c&id=456#fragi';
$expected = 'http://www.test-uri.com/path/here?id=456&ab=c#fragi';
UriFactory::setupUriBuilder(new HttpUri($uri));
self::assertEquals($expected, UriFactory::build('{/base}{/rootPath}{/}?id={?id}&ab={?ab}#{#}'));
}
/**
* @testdox The uri variables can be unescaped
* @covers phpOMS\Uri\UriFactory
* @group framework
*/
public function testVariableUnescape() : void
{
$uri = 'http://www.test-uri.com/path/here?id=123&ab=c#fragi';
$escaped = '{/base}{/rootPath}{/}?id=\{\?id\}&ab={?ab}#{#}';
$unescaped = 'http://www.test-uri.com/path/here?id={?id}&ab=c#fragi';
var_dump('TEST:');
UriFactory::setupUriBuilder(new HttpUri($uri));
self::assertEquals($unescaped, UriFactory::build($escaped));
}
} }