Next major release

.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
 
+## [Unreleased]
+
+### Changed
+
+- Requires PHP `8.4`
+- Requires `innmind/filesystem:~9.0`
+- Requires `innmind/time:~1.0`
+
 ## 8.0.0 - 2025-04-20
 
 ### Added

composer.json

@@ -15,14 +15,14 @@
         "issues": "http://github.com/Innmind/Http/issues"
     },
     "require": {
-        "php": "~8.2",
-        "innmind/url": "~4.0",
-        "innmind/immutable": "~5.11",
-        "innmind/filesystem": "~8.0",
-        "innmind/io": "^3.0.1",
-        "innmind/time-continuum": "~4.1",
-        "innmind/media-type": "^2.0.1",
-        "innmind/validation": "~2.0",
+        "php": "~8.4",
+        "innmind/url": "~5.0",
+        "innmind/immutable": "~6.0",
+        "innmind/filesystem": "~9.0",
+        "innmind/io": "~4.0",
+        "innmind/time": "~1.0",
+        "innmind/media-type": "~3.0",
+        "innmind/validation": "~3.0",
         "ramsey/uuid": "~4.7"
     },
     "autoload": {
@@ -36,8 +36,8 @@
         }
     },
     "require-dev": {
-        "innmind/static-analysis": "^1.2.1",
-        "innmind/black-box": "~6.1",
+        "innmind/static-analysis": "~1.3",
+        "innmind/black-box": "~6.5",
         "innmind/coding-standard": "~2.0",
         "symfony/process": "^6.2"
     }

src/Content/Multipart/Data.php

@@ -41,7 +41,7 @@ public function size(): Maybe
         return Maybe::just(
             $this
                 ->chunks()
-                ->fold(new Concat)
+                ->fold(Concat::monoid)
                 ->toEncoding(Str\Encoding::ascii)
                 ->length(),
         );

src/Content/Multipart/File.php

@@ -41,7 +41,7 @@ public function size(): Maybe
     {
         $headers = $this
             ->headers()
-            ->fold(new Concat)
+            ->fold(Concat::monoid)
             ->toEncoding(Str\Encoding::ascii)
             ->length();
 

src/Factory/Files/Native.php

@@ -107,9 +107,11 @@ private function buildFile(
          */
         return Either::right(File::named(
             $name,
-            Content::atPath(
-                $this->io,
-                Path::of($path),
+            Content::io(
+                $this
+                    ->io
+                    ->files()
+                    ->read(Path::of($path)),
             ),
             MediaType::maybe($media)->match(
                 static fn($media) => $media,

src/Factory/Header/Factories.php

@@ -35,10 +35,10 @@
     Header\Referrer,
     Header\Parameter,
     Header\Parameter\Quality,
-    TimeContinuum\Format\Http,
+    Time\Format\Http,
     Method,
 };
-use Innmind\TimeContinuum\Clock;
+use Innmind\Time\Clock;
 use Innmind\Validation\Is;
 use Innmind\MediaType\MediaType;
 use Innmind\Url\Url;
@@ -381,12 +381,12 @@ public function try(Clock $clock, Str $value): Maybe
 
             self::date => Is::string()->nonEmpty()($value->toString())
                 ->maybe()
-                ->flatMap(static fn($value) => $clock->at($value, Http::new()))
+                ->flatMap(static fn($value) => $clock->at($value, Http::new())->maybe())
                 ->map(Date::of(...)),
 
             self::expires => Is::string()->nonEmpty()($value->toString())
                 ->maybe()
-                ->flatMap(static fn($value) => $clock->at($value, Http::new()))
+                ->flatMap(static fn($value) => $clock->at($value, Http::new())->maybe())
                 ->map(Expires::of(...)),
 
             self::host => Url::maybe('http://'.$value->toString())->map(static fn($url) => Host::of(
@@ -396,17 +396,17 @@ public function try(Clock $clock, Str $value): Maybe
 
             self::ifModifiedSince => Is::string()->nonEmpty()($value->toString())
                 ->maybe()
-                ->flatMap(static fn($value) => $clock->at($value, Http::new()))
+                ->flatMap(static fn($value) => $clock->at($value, Http::new())->maybe())
                 ->map(IfModifiedSince::of(...)),
 
             self::ifUnmodifiedSince => Is::string()->nonEmpty()($value->toString())
                 ->maybe()
-                ->flatMap(static fn($value) => $clock->at($value, Http::new()))
+                ->flatMap(static fn($value) => $clock->at($value, Http::new())->maybe())
                 ->map(IfUnmodifiedSince::of(...)),
 
             self::lastModified => Is::string()->nonEmpty()($value->toString())
                 ->maybe()
-                ->flatMap(static fn($value) => $clock->at($value, Http::new()))
+                ->flatMap(static fn($value) => $clock->at($value, Http::new())->maybe())
                 ->map(LastModified::of(...)),
 
             self::link => $value

src/Factory/Header/Factory.php

@@ -7,7 +7,7 @@
     Header,
     Header\Value,
 };
-use Innmind\TimeContinuum\Clock;
+use Innmind\Time\Clock;
 use Innmind\Immutable\Str;
 
 /**

src/Factory/Headers/Native.php

@@ -7,7 +7,7 @@
     Factory\Header\Factory,
     Headers,
 };
-use Innmind\TimeContinuum\Clock;
+use Innmind\Time\Clock;
 use Innmind\Immutable\Str;
 
 /**

src/Factory/HeadersFactory.php

@@ -7,7 +7,7 @@
     Headers,
     Factory\Headers\Native,
 };
-use Innmind\TimeContinuum\Clock;
+use Innmind\Time\Clock;
 
 /**
  * @psalm-immutable

src/Factory/ServerRequestFactory.php

@@ -9,7 +9,7 @@
     ProtocolVersion,
     Factory,
 };
-use Innmind\TimeContinuum\Clock;
+use Innmind\Time\Clock;
 use Innmind\Filesystem\File\Content;
 use Innmind\Url\Url;
 use Innmind\IO\IO;

src/Header/Accept/MediaType.php

@@ -3,9 +3,7 @@
 
 namespace Innmind\Http\Header\Accept;
 
-use Innmind\Http\{
-    Header\Parameter,
-};
+use Innmind\Http\Header\Parameter;
 use Innmind\Immutable\{
     Str,
     Map,

src/Header/ContentType.php

@@ -33,7 +33,7 @@ public function content(): MediaType
     #[\Override]
     public function normalize(): Header
     {
-        $mediaType = new MediaType(
+        $mediaType = MediaType::from(
             $this->content->topLevel(),
             $this->content->subType(),
             $this->content->suffix(),

src/Header/ContentType/Boundary.php

@@ -67,11 +67,11 @@ public function value(): string
 
     public function toHeader(): ContentType
     {
-        return ContentType::of(new MediaType\MediaType(
-            'multipart',
+        return ContentType::of(MediaType\MediaType::from(
+            MediaType\TopLevel::multipart,
             'form-data',
             '',
-            new MediaType\Parameter(
+            MediaType\Parameter::from(
                 'boundary',
                 $this->value,
             ),

src/Header/Date.php

@@ -5,10 +5,10 @@
 
 use Innmind\Http\{
     Header,
-    TimeContinuum\Format\Http,
+    Time\Format\Http,
 };
-use Innmind\TimeContinuum\{
-    PointInTime,
+use Innmind\Time\{
+    Point,
     Offset,
 };
 
@@ -18,19 +18,19 @@
 final class Date implements Custom
 {
     private function __construct(
-        private PointInTime $point,
+        private Point $point,
     ) {
     }
 
     /**
      * @psalm-pure
      */
-    public static function of(PointInTime $point): self
+    public static function of(Point $point): self
     {
         return new self($point);
     }
 
-    public function date(): PointInTime
+    public function date(): Point
     {
         return $this->point;
     }

src/Header/Expires.php

@@ -5,10 +5,10 @@
 
 use Innmind\Http\{
     Header,
-    TimeContinuum\Format\Http,
+    Time\Format\Http,
 };
-use Innmind\TimeContinuum\{
-    PointInTime,
+use Innmind\Time\{
+    Point,
     Offset,
 };
 
@@ -18,19 +18,19 @@
 final class Expires implements Custom
 {
     private function __construct(
-        private PointInTime $point,
+        private Point $point,
     ) {
     }
 
     /**
      * @psalm-pure
      */
-    public static function of(PointInTime $point): self
+    public static function of(Point $point): self
     {
         return new self($point);
     }
 
-    public function date(): PointInTime
+    public function date(): Point
     {
         return $this->point;
     }

src/Header/IfModifiedSince.php

@@ -5,10 +5,10 @@
 
 use Innmind\Http\{
     Header,
-    TimeContinuum\Format\Http,
+    Time\Format\Http,
 };
-use Innmind\TimeContinuum\{
-    PointInTime,
+use Innmind\Time\{
+    Point,
     Offset,
 };
 
@@ -18,19 +18,19 @@
 final class IfModifiedSince implements Custom
 {
     private function __construct(
-        private PointInTime $point,
+        private Point $point,
     ) {
     }
 
     /**
      * @psalm-pure
      */
-    public static function of(PointInTime $point): self
+    public static function of(Point $point): self
     {
         return new self($point);
     }
 
-    public function date(): PointInTime
+    public function date(): Point
     {
         return $this->point;
     }

src/Header/IfUnmodifiedSince.php

@@ -5,10 +5,10 @@
 
 use Innmind\Http\{
     Header,
-    TimeContinuum\Format\Http,
+    Time\Format\Http,
 };
-use Innmind\TimeContinuum\{
-    PointInTime,
+use Innmind\Time\{
+    Point,
     Offset,
 };
 
@@ -18,19 +18,19 @@
 final class IfUnmodifiedSince implements Custom
 {
     private function __construct(
-        private PointInTime $point,
+        private Point $point,
     ) {
     }
 
     /**
      * @psalm-pure
      */
-    public static function of(PointInTime $point): self
+    public static function of(Point $point): self
     {
         return new self($point);
     }
 
-    public function date(): PointInTime
+    public function date(): Point
     {
         return $this->point;
     }

src/Header/LastModified.php

@@ -5,10 +5,10 @@
 
 use Innmind\Http\{
     Header,
-    TimeContinuum\Format\Http,
+    Time\Format\Http,
 };
-use Innmind\TimeContinuum\{
-    PointInTime,
+use Innmind\Time\{
+    Point,
     Offset,
 };
 
@@ -18,19 +18,19 @@
 final class LastModified implements Custom
 {
     private function __construct(
-        private PointInTime $point,
+        private Point $point,
     ) {
     }
 
     /**
      * @psalm-pure
      */
-    public static function of(PointInTime $point): self
+    public static function of(Point $point): self
     {
         return new self($point);
     }
 
-    public function date(): PointInTime
+    public function date(): Point
     {
         return $this->point;
     }