diff --git a/composer.json b/composer.json index 08660fc26..bb90f4dd2 100644 --- a/composer.json +++ b/composer.json @@ -29,8 +29,8 @@ "psr/http-factory": "^1.0", "psr/http-message": "^1.0|^2.0", "psr/log": "^3.0.0", - "ramsey/uuid": "^4.7", "symfony/cache": "^7.2", + "symfony/uid": "^7.1", "symfony/var-dumper": "^7.1", "symfony/var-exporter": "^7.1", "tempest/highlight": "^2.0", diff --git a/src/Tempest/Http/composer.json b/src/Tempest/Http/composer.json index 70d152c6d..82cba9e58 100644 --- a/src/Tempest/Http/composer.json +++ b/src/Tempest/Http/composer.json @@ -15,8 +15,8 @@ "laminas/laminas-diactoros": "^3.3", "psr/http-factory": "^1.0", "psr/http-message": "^1.0|^2.0", - "ramsey/uuid": "^4.7", - "symfony/var-exporter": "^7.1" + "symfony/var-exporter": "^7.1", + "symfony/uid": "^7.1" }, "autoload": { "files": [ diff --git a/src/Tempest/Http/src/Session/Resolvers/CookieSessionIdResolver.php b/src/Tempest/Http/src/Session/Resolvers/CookieSessionIdResolver.php index 375d30d94..fd9276673 100644 --- a/src/Tempest/Http/src/Session/Resolvers/CookieSessionIdResolver.php +++ b/src/Tempest/Http/src/Session/Resolvers/CookieSessionIdResolver.php @@ -4,7 +4,7 @@ namespace Tempest\Http\Session\Resolvers; -use Ramsey\Uuid\Uuid; +use Symfony\Component\Uid\Uuid; use Tempest\Clock\Clock; use Tempest\Http\Cookie\CookieManager; use Tempest\Http\Session\Session; @@ -26,7 +26,7 @@ public function resolve(): SessionId $id = $this->cookies->get(Session::ID)?->value ?? null; if (! $id) { - $id = (string) Uuid::uuid4(); + $id = (string) Uuid::v4(); $this->cookies->set( key: Session::ID, diff --git a/src/Tempest/Http/src/Session/Resolvers/HeaderSessionIdResolver.php b/src/Tempest/Http/src/Session/Resolvers/HeaderSessionIdResolver.php index 7ef316504..42febb557 100644 --- a/src/Tempest/Http/src/Session/Resolvers/HeaderSessionIdResolver.php +++ b/src/Tempest/Http/src/Session/Resolvers/HeaderSessionIdResolver.php @@ -4,7 +4,7 @@ namespace Tempest\Http\Session\Resolvers; -use Ramsey\Uuid\Uuid; +use Symfony\Component\Uid\Uuid; use Tempest\Http\Request; use Tempest\Http\Session\Session; use Tempest\Http\Session\SessionId; @@ -21,6 +21,6 @@ public function resolve(): SessionId { $id = $this->request->getHeaders()[Session::ID] ?? null; - return new SessionId($id ?? (string) Uuid::uuid4()); + return new SessionId($id ?? (string) Uuid::v4()); } }