refactor: clean up session management

Author: innocenzi

composer.json

@@ -250,7 +250,7 @@
         "lint:fix": "vendor/bin/mago lint --fix --format-after-fix",
         "style": "composer fmt && composer lint:fix",
         "test": "composer phpunit",
-        "test:stop": "composer phpunit --stop-on-error --stop-on-failure",
+        "test:stop": "composer phpunit -- --stop-on-error --stop-on-failure",
         "lint": "vendor/bin/mago lint --potentially-unsafe --minimum-fail-level=note",
         "phpstan": "vendor/bin/phpstan analyse src tests --memory-limit=1G",
         "rector": "vendor/bin/rector process --no-ansi",

packages/auth/src/Authentication/AuthenticatorInitializer.php

@@ -9,14 +9,15 @@
 use Tempest\Container\Initializer;
 use Tempest\Container\Singleton;
 use Tempest\Http\Session\Session;
+use Tempest\Http\Session\SessionManager;
 
 final readonly class AuthenticatorInitializer implements Initializer
 {
     #[Singleton]
     public function initialize(Container $container): Authenticator
     {
         return new SessionAuthenticator(
-            authConfig: $container->get(AuthConfig::class),
+            sessionManager: $container->get(SessionManager::class),
             session: $container->get(Session::class),
             authenticatableResolver: $container->get(AuthenticatableResolver::class),
         );

packages/auth/src/Authentication/SessionAuthenticator.php

@@ -4,16 +4,16 @@
 
 namespace Tempest\Auth\Authentication;
 
-use Tempest\Auth\AuthConfig;
 use Tempest\Http\Session\Session;
+use Tempest\Http\Session\SessionManager;
 
 final readonly class SessionAuthenticator implements Authenticator
 {
     public const string AUTHENTICATABLE_KEY = '#authenticatable:id';
     public const string AUTHENTICATABLE_CLASS = '#authenticatable:class';
 
     public function __construct(
-        private AuthConfig $authConfig,
+        private SessionManager $sessionManager,
         private Session $session,
         private AuthenticatableResolver $authenticatableResolver,
     ) {}
@@ -34,7 +34,8 @@ public function authenticate(Authenticatable $authenticatable): void
     public function deauthenticate(): void
     {
         $this->session->remove(self::AUTHENTICATABLE_KEY);
-        $this->session->destroy();
+        $this->session->remove(self::AUTHENTICATABLE_CLASS);
+        $this->sessionManager->save($this->session);
     }
 
     public function current(): ?Authenticatable

packages/core/src/AppConfig.php

@@ -12,19 +12,18 @@ final class AppConfig
 
     public string $baseUri;
 
-    public function __construct(
-        public ?string $name = null,
+    public string $name;
 
-        ?Environment $environment = null,
+    /** @var array<class-string<\Tempest\Core\InsightsProvider>> */
+    public array $insightsProviders = [];
 
+    public function __construct(
+        ?string $name = null,
+        ?Environment $environment = null,
         ?string $baseUri = null,
-
-        /**
-         * @var array<class-string<\Tempest\Core\InsightsProvider>>
-         */
-        public array $insightsProviders = [],
     ) {
+        $this->name = $name ?: env('NAME') ?? 'tempest';
         $this->environment = $environment ?? Environment::fromEnv();
-        $this->baseUri = $baseUri ?? env('BASE_URI') ?? '';
+        $this->baseUri = $baseUri ?: env('BASE_URI') ?? '';
     }
 }

packages/core/src/Config/app.config.php

@@ -7,6 +7,6 @@
 use function Tempest\env;
 
 return new AppConfig(
-    name: env('APPLICATION_NAME'),
+    name: env('APPLICATION_NAME') ?? 'tempest',
     baseUri: env('BASE_URI'),
 );

packages/core/src/FrameworkKernel.php

@@ -248,6 +248,7 @@ public function registerExceptionHandler(): self
 
         $handler = $this->container->get(ExceptionHandler::class);
 
+        ini_set('display_errors', 'Off');
         set_exception_handler($handler->handle(...));
         set_error_handler(function (int $code, string $message, string $filename, int $line) use ($handler): bool {
             $handler->handle(new ErrorException(
@@ -258,7 +259,7 @@ public function registerExceptionHandler(): self
             ));
 
             return true;
-        }, error_levels: E_ERROR);
+        }, error_levels: E_ALL);
 
         return $this;
     }

packages/http/src/Cookie/Cookie.php

@@ -28,9 +28,9 @@ public function __construct(
         public ?int $maxAge = null,
         public ?string $domain = null,
         public ?string $path = '/',
-        public bool $secure = false,
+        public bool $secure = true,
         public bool $httpOnly = false,
-        public ?SameSite $sameSite = null,
+        public SameSite $sameSite = SameSite::LAX,
     ) {}
 
     public function withValue(string $value): self

packages/http/src/Header.php

@@ -4,6 +4,8 @@
 
 namespace Tempest\Http;
 
+use BackedEnum;
+
 final class Header
 {
     public function __construct(
@@ -14,6 +16,10 @@ public function __construct(
 
     public function add(mixed $value): void
     {
+        if ($value instanceof BackedEnum) {
+            $value = $value->value;
+        }
+
         $this->values[] = $value;
     }
 

packages/http/src/IsResponse.php

@@ -23,10 +23,6 @@ trait IsResponse
     /** @var \Tempest\Http\Header[] */
     private(set) array $headers = [];
 
-    public Session $session {
-        get => get(Session::class);
-    }
-
     public CookieManager $cookieManager {
         get => get(CookieManager::class);
     }
@@ -72,27 +68,6 @@ public function removeHeader(string $key): self
         return $this;
     }
 
-    public function addSession(string $name, mixed $value): self
-    {
-        $this->session->set($name, $value);
-
-        return $this;
-    }
-
-    public function removeSession(string $name): self
-    {
-        $this->session->remove($name);
-
-        return $this;
-    }
-
-    public function destroySession(): self
-    {
-        $this->session->destroy();
-
-        return $this;
-    }
-
     public function addCookie(Cookie $cookie): self
     {
         $this->cookieManager->add($cookie);
@@ -107,13 +82,6 @@ public function removeCookie(string $key): self
         return $this;
     }
 
-    public function flash(string $key, mixed $value): self
-    {
-        $this->session->flash($key, $value);
-
-        return $this;
-    }
-
     public function setContentType(ContentType $contentType): self
     {
         $this->removeHeader(ContentType::HEADER)

packages/http/src/Response.php

@@ -30,14 +30,6 @@ public function addHeader(string $key, string $value): self;
 
     public function removeHeader(string $key): self;
 
-    public function addSession(string $name, mixed $value): self;
-
-    public function flash(string $key, mixed $value): self;
-
-    public function removeSession(string $name): self;
-
-    public function destroySession(): self;
-
     public function addCookie(Cookie $cookie): self;
 
     public function removeCookie(string $key): self;