Skip to content

feat: Adds support for UUID versions 6–8 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lucasdanielsx wants to merge 1 commit into from
Closed

feat: Adds support for UUID versions 6–8 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ update:
@docker-compose run --rm hyperf-opentelemetry -c "composer update"

test:
@docker-compose run --rm hyperf-opentelemetry sh -c "composer test"
@docker-compose run --rm hyperf-opentelemetry -c "composer test"

2 changes: 1 addition & 1 deletion src/Support/Uri.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class Uri
{
public static function sanitize(string $uri, array $uriMask = []): string
{
$uuid = '/\/(?<=\/)([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})(?=\/|$)/i';
$uuid = '/\/(?<=\/)([0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12})(?=\/|$)/i';

$defaultPatterns = [
$uuid => '/{uuid}',
Expand Down
36 changes: 36 additions & 0 deletions tests/Unit/Support/UriTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,40 @@ public function testSanitizeEmptyUri()
$result = Uri::sanitize($uri);
$this->assertSame('/', $result);
}

public function testSanitizeUuidV1ToV4()
{
$uri = '/5c4f7ab3-7849-4422-a262-cd1bfc5ae7ae/';
$result = Uri::sanitize($uri);
$this->assertStringContainsString('/{uuid}', $result);
}

public function testSanitizeUuidV1ToV5()
{
$uri = '/123e4567-e89b-12d3-a456-426614174000/';
$result = Uri::sanitize($uri);
$this->assertStringContainsString('/{uuid}', $result);
}

public function testSanitizeUuidV6()
{
$uri = '/01000000-9f9e-6094-2a9d-08ddf52351e2/';
$result = Uri::sanitize($uri);
$this->assertStringContainsString('/{uuid}', $result);
}

public function testSanitizeUuidV7()
{
$uri = '/01890f28-54c2-7d11-bc99-9bb9d1a9e9af/';
$result = Uri::sanitize($uri);
$this->assertStringContainsString('/{uuid}', $result);
}

public function testSanitizeUuidV8()
{
$uri = '/ffffffff-ffff-8fff-9fff-ffffffffffff/';
$result = Uri::sanitize($uri);
$this->assertStringContainsString('/{uuid}', $result);
}

}