Merge branch 'develop'

* develop:
  specify next release
  replace Maybes by Attempts
  use promoted properties
  add NoDiscard attributes
  update dependencies
  fix ci badge

Author: Baptouuuu

.github/workflows/ci.yml

@@ -12,5 +12,3 @@ jobs:
     uses: innmind/github-workflows/.github/workflows/psalm-matrix.yml@main
   cs:
     uses: innmind/github-workflows/.github/workflows/cs.yml@main
-    with:
-      php-version: '8.2'

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 5.0.0 - 2026-02-15
+
+### Changed
+
+- Requires PHP `8.4`
+- Requires `innmind/foundation:~2.1`
+- `Innmind\HttpSession\Manager::start()`, `::save()` and `::close()` now return a `Innmind\Immutable\Attempt`
+
 ## 4.1.0 - 2025-07-30
 
 ### Changed

README.md

@@ -1,6 +1,6 @@
 # Http session
 
-[![Build Status](https://github.com/Innmind/HttpSession/workflows/CI/badge.svg?branch=master)](https://github.com/Innmind/HttpSession/actions?query=workflow%3ACI)
+[![CI](https://github.com/Innmind/HttpSession/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Innmind/HttpSession/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/Innmind/HttpSession/branch/develop/graph/badge.svg)](https://codecov.io/gh/Innmind/HttpSession)
 [![Type Coverage](https://shepherd.dev/github/Innmind/HttpSession/coverage.svg)](https://shepherd.dev/github/Innmind/HttpSession)
 

composer.json

@@ -15,8 +15,8 @@
         "issues": "http://github.com/Innmind/HttpSession/issues"
     },
     "require": {
-        "php": "~8.2",
-        "innmind/foundation": "~1.3"
+        "php": "~8.4",
+        "innmind/foundation": "~2.1"
     },
     "autoload": {
         "psr-4": {
@@ -31,7 +31,7 @@
     },
     "require-dev": {
         "innmind/black-box": "^6.4.1",
-        "innmind/static-analysis": "^1.2.1",
+        "innmind/static-analysis": "~1.3",
         "innmind/coding-standard": "~2.0"
     }
 }

psalm.xml

@@ -14,4 +14,7 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <UndefinedAttributeClass errorLevel="suppress" />
+    </issueHandlers>
 </psalm>

src/Manager.php

@@ -5,24 +5,27 @@
 
 use Innmind\Http\ServerRequest;
 use Innmind\Immutable\{
-    Maybe,
+    Attempt,
     SideEffect,
 };
 
 interface Manager
 {
     /**
-     * @return Maybe<Session>
+     * @return Attempt<Session>
      */
-    public function start(ServerRequest $request): Maybe;
+    #[\NoDiscard]
+    public function start(ServerRequest $request): Attempt;
 
     /**
-     * @return Maybe<SideEffect>
+     * @return Attempt<SideEffect>
      */
-    public function save(Session $session): Maybe;
+    #[\NoDiscard]
+    public function save(Session $session): Attempt;
 
     /**
-     * @return Maybe<SideEffect>
+     * @return Attempt<SideEffect>
      */
-    public function close(Session $session): Maybe;
+    #[\NoDiscard]
+    public function close(Session $session): Attempt;
 }

src/Manager/Native.php

@@ -17,6 +17,7 @@
 use Innmind\Url\Path;
 use Innmind\Immutable\{
     Map,
+    Attempt,
     Maybe,
     SideEffect,
 };
@@ -32,24 +33,25 @@ private function __construct(?Path $save = null)
         }
     }
 
+    #[\NoDiscard]
     public static function of(?Path $save = null): self
     {
         return new self($save);
     }
 
     #[\Override]
-    public function start(ServerRequest $request): Maybe
+    public function start(ServerRequest $request): Attempt
     {
         if ($this->session instanceof Id) {
-            /** @var Maybe<Session> */
-            return Maybe::nothing();
+            /** @var Attempt<Session> */
+            return Attempt::error(new \LogicException('Session already started'));
         }
 
         $this->configureSessionId($request);
 
         if (\session_start(['use_cookies' => false]) === false) {
-            /** @var Maybe<Session> */
-            return Maybe::nothing();
+            /** @var Attempt<Session> */
+            return Attempt::error(new \RuntimeException('Failed to start session'));
         }
 
         /** @var Map<string, mixed> */
@@ -76,15 +78,16 @@ public function start(ServerRequest $request): Maybe
                 $this->session = $session->id();
 
                 return $session;
-            });
+            })
+            ->attempt(static fn() => new \RuntimeException('Session id or name is invalid'));
     }
 
     #[\Override]
-    public function save(Session $session): Maybe
+    public function save(Session $session): Attempt
     {
         if ($this->session !== $session->id()) {
-            /** @var Maybe<SideEffect> */
-            return Maybe::nothing();
+            /** @var Attempt<SideEffect> */
+            return Attempt::error(new \LogicException('Trying to save a different session than the started one'));
         }
 
         $_ = $session
@@ -95,32 +98,32 @@ public function save(Session $session): Maybe
             });
 
         if (\session_write_close() === false) {
-            /** @var Maybe<SideEffect> */
-            return Maybe::nothing();
+            /** @var Attempt<SideEffect> */
+            return Attempt::error(new \RuntimeException('Failed to persist the session data'));
         }
 
         $this->session = null;
         $_SESSION = [];
 
-        return Maybe::just(new SideEffect);
+        return Attempt::result(SideEffect::identity);
     }
 
     #[\Override]
-    public function close(Session $session): Maybe
+    public function close(Session $session): Attempt
     {
         if ($this->session !== $session->id()) {
-            /** @var Maybe<SideEffect> */
-            return Maybe::nothing();
+            /** @var Attempt<SideEffect> */
+            return Attempt::error(new \LogicException('Trying to close a different session than the started one'));
         }
 
         if (\session_destroy() === false) {
-            /** @var Maybe<SideEffect> */
-            return Maybe::nothing();
+            /** @var Attempt<SideEffect> */
+            return Attempt::error(new \RuntimeException('Failed to close the session'));
         }
 
         $this->session = null;
 
-        return Maybe::just(new SideEffect);
+        return Attempt::result(SideEffect::identity);
     }
 
     private function configureSessionId(ServerRequest $request): void

src/Session.php

@@ -18,36 +18,34 @@
  */
 final class Session
 {
-    private Id $id;
-    private Name $name;
-    /** @var Map<string, mixed> */
-    private Map $values;
-
     /**
      * @param Map<string, mixed> $values
      */
-    private function __construct(Id $id, Name $name, Map $values)
-    {
-        $this->id = $id;
-        $this->name = $name;
-        $this->values = $values;
+    private function __construct(
+        private Id $id,
+        private Name $name,
+        private Map $values,
+    ) {
     }
 
     /**
      * @psalm-pure
      *
      * @param Map<string, mixed> $values
      */
+    #[\NoDiscard]
     public static function of(Id $id, Name $name, Map $values): self
     {
         return new self($id, $name, $values);
     }
 
+    #[\NoDiscard]
     public function id(): Id
     {
         return $this->id;
     }
 
+    #[\NoDiscard]
     public function name(): Name
     {
         return $this->name;
@@ -58,6 +56,7 @@ public function name(): Name
      *
      * @throws LogicException
      */
+    #[\NoDiscard]
     public function get(string $key): mixed
     {
         return $this->maybe($key)->match(
@@ -69,16 +68,19 @@ public function get(string $key): mixed
     /**
      * @return Maybe<mixed>
      */
+    #[\NoDiscard]
     public function maybe(string $key): Maybe
     {
         return $this->values->get($key);
     }
 
+    #[\NoDiscard]
     public function contains(string $key): bool
     {
         return $this->values->contains($key);
     }
 
+    #[\NoDiscard]
     public function with(string $key, mixed $value): self
     {
         return new self(
@@ -95,6 +97,7 @@ public function with(string $key, mixed $value): self
      *
      * @return Map<string, mixed>
      */
+    #[\NoDiscard]
     public function values(): Map
     {
         return $this->values;

src/Session/Id.php

@@ -13,25 +13,24 @@
  */
 final class Id
 {
-    private string $value;
-
-    private function __construct(string $value)
+    private function __construct(private string $value)
     {
-        $this->value = $value;
     }
 
     /**
      * @psalm-pure
      *
      * @return Maybe<self>
      */
+    #[\NoDiscard]
     public static function maybe(string $value): Maybe
     {
         return Maybe::just(Str::of($value))
             ->filter(static fn($value) => $value->matches('~^[\w\-\_]+$~'))
             ->map(static fn($value) => new self($value->toString()));
     }
 
+    #[\NoDiscard]
     public function toString(): string
     {
         return $this->value;

src/Session/Name.php

@@ -14,25 +14,24 @@
  */
 final class Name
 {
-    private string $value;
-
-    private function __construct(string $value)
+    private function __construct(private string $value)
     {
-        $this->value = $value;
     }
 
     /**
      * @psalm-pure
      *
      * @return Maybe<self>
      */
+    #[\NoDiscard]
     public static function maybe(string $value): Maybe
     {
         return Maybe::just(Str::of($value))
             ->filter(static fn($value) => $value->matches('~^[\w\-\_]+$~'))
             ->map(static fn($value) => new self($value->toString()));
     }
 
+    #[\NoDiscard]
     public function toString(): string
     {
         return $this->value;