Merge branch 'develop'

* develop:
  specify next release
  test against php 8.3
  fix minimum version of blackbox
  run tests via blackbox
  fix minimum version of innmind/html
  drop php 8.1 support
  disable testing against php 8.3
  update dependencies
  update dependencies

Author: Baptouuuu

.gitattributes

@@ -1,6 +1,5 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/phpunit.xml.dist export-ignore
 /fixtures export-ignore
 /tests export-ignore
 /overview export-ignore

.github/workflows/ci.yml

@@ -1,45 +1,69 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
-  phpunit:
+  blackbox:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.1', '8.2', '8.3']
+        php-version: ['8.2', '8.3']
         dependencies: ['lowest', 'highest']
-    name: 'PHPUnit'
+    name: 'BlackBox'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, intl
+          coverage: none
+      - name: Composer
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
+      - name: BlackBox
+        run: php blackbox.php
+  coverage:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
+        php-version: ['8.2', '8.3']
+        dependencies: ['lowest', 'highest']
+    name: 'Coverage'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           extensions: mbstring, intl
           coverage: xdebug
-          ini-values: xdebug.max_nesting_level=2048
       - name: Composer
         uses: "ramsey/composer-install@v2"
         with:
           dependency-versions: ${{ matrix.dependencies }}
-      - name: PHPUnit
-        run: vendor/bin/phpunit --coverage-clover=coverage.clover
-      - uses: codecov/codecov-action@v1
+      - name: BlackBox
+        run: php blackbox.php
+        env:
+          ENABLE_COVERAGE: 'true'
+      - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
   psalm:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1', '8.2', '8.3']
+        php-version: ['8.2', '8.3']
         dependencies: ['lowest', 'highest']
     name: 'Psalm'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -55,11 +79,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
     name: 'CS'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

.gitignore

@@ -2,4 +2,3 @@
 /vendor
 /var
 !/var/.gitkeep
-/.phpunit.result.cache

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 4.0.0 - 2023-11-26
+
+### Changed
+
+- Requires `innmind/immutable:~5.2`
+- Requires `innmind/operating-system:~4.1`
+- Requires `innmind/framework:~2.0`
+
+### Removed
+
+- Support for PHP `8.1`
+
 ## 3.1.0 - 2023-09-24
 
 ### Added

blackbox.php

@@ -0,0 +1,27 @@
+<?php
+declare(strict_types = 1);
+
+require 'vendor/autoload.php';
+
+use Innmind\BlackBox\{
+    Application,
+    PHPUnit\Load,
+    Runner\CodeCoverage,
+};
+
+Application::new($argv)
+    ->when(
+        \getenv('ENABLE_COVERAGE') !== false,
+        static fn(Application $app) => $app
+            ->codeCoverage(
+                CodeCoverage::of(
+                    __DIR__.'/src/',
+                    __DIR__.'/tests/',
+                )
+                    ->dumpTo('coverage.clover')
+                    ->enableWhen(true),
+            )
+            ->scenariiPerProof(1),
+    )
+    ->tryToProve(Load::directory(__DIR__.'/tests/'))
+    ->exit();

composer.json

@@ -15,13 +15,13 @@
         "issues": "http://github.com/Innmind/Profiler/issues"
     },
     "require": {
-        "php": "~8.1",
-        "innmind/immutable": "~4.13|~5.0",
+        "php": "~8.2",
+        "innmind/immutable": "~5.2",
         "ramsey/uuid": "~4.7",
-        "innmind/operating-system": "~3.7",
-        "innmind/framework": "~1.1",
+        "innmind/operating-system": "~4.1",
+        "innmind/framework": "~2.0",
         "innmind/json": "^1.3",
-        "innmind/html": "^6.1.1",
+        "innmind/html": "~6.2",
         "innmind/url-template": "^3.0"
     },
     "autoload": {
@@ -35,8 +35,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~9.0",
         "vimeo/psalm": "~5.6",
+        "innmind/black-box": "~5.5",
         "innmind/coding-standard": "~2.0"
     },
     "provide": {

phpunit.xml.dist

@@ -12,7 +12,7 @@
     Adapter,
     Name,
     Directory,
-    File\File,
+    File,
     File\Content,
 };
 use Innmind\TimeContinuum\{
@@ -48,9 +48,9 @@ public function start(string $name): Id
     {
         $id = Id::new();
         $this->storage->add(
-            Directory\Directory::named($id->toString())->add(File::named(
+            Directory::named($id->toString())->add(File::named(
                 'start.json',
-                Content\Lines::ofContent(Json::encode([
+                Content::ofString(Json::encode([
                     'name' => $name,
                     'startedAt' => $this->clock->now()->format(new ISO8601),
                 ])),
@@ -99,7 +99,7 @@ public function all(): Sequence
         return $this
             ->storage
             ->root()
-            ->files()
+            ->all()
             ->keep(Instance::of(Directory::class))
             ->flatMap(fn($profile) => ($this->load)($profile)->match(
                 static fn($profile) => Sequence::of($profile),

src/Profiler.php

@@ -17,6 +17,7 @@
 use Innmind\Filesystem\{
     Name,
     Directory,
+    File,
 };
 use Innmind\Json\{
     Json,
@@ -25,6 +26,7 @@
 use Innmind\Immutable\{
     Maybe,
     Sequence,
+    Predicate\Instance,
 };
 
 final class Load
@@ -56,6 +58,7 @@ public function __invoke(Directory $raw): Maybe
     {
         return $raw
             ->get(Name::of('start.json'))
+            ->keep(Instance::of(File::class))
             ->map(static fn($file) => $file->content()->toString())
             ->flatMap(static function($start) {
                 try {
@@ -101,6 +104,7 @@ private function exit(Profile $profile, Directory $raw): Profile
     {
         return $raw
             ->get(Name::of('exit.json'))
+            ->keep(Instance::of(File::class))
             ->map(static fn($file) => $file->content()->toString())
             ->flatMap(static function($exit) {
                 try {

src/Profiler/Load.php

@@ -7,8 +7,12 @@
 use Innmind\Filesystem\{
     Name,
     Directory,
+    File,
+};
+use Innmind\Immutable\{
+    Maybe,
+    Predicate\Instance,
 };
-use Innmind\Immutable\Maybe;
 
 final class AppGraph
 {
@@ -19,6 +23,7 @@ public function __invoke(Directory $profile): Maybe
     {
         return $profile
             ->get(Name::of('app-graph.svg'))
+            ->keep(Instance::of(File::class))
             ->map(static fn($file) => $file->content())
             ->map(Section\AppGraph::of(...));
     }

src/Profiler/Load/AppGraph.php

@@ -7,8 +7,12 @@
 use Innmind\Filesystem\{
     Name,
     Directory,
+    File,
+};
+use Innmind\Immutable\{
+    Maybe,
+    Predicate\Instance,
 };
-use Innmind\Immutable\Maybe;
 
 final class CallGraph
 {
@@ -19,6 +23,7 @@ public function __invoke(Directory $profile): Maybe
     {
         return $profile
             ->get(Name::of('call-graph.json'))
+            ->keep(Instance::of(File::class))
             ->map(static fn($file) => $file->content())
             ->map(Section\CallGraph::of(...));
     }

src/Profiler/Load/CallGraph.php

@@ -7,8 +7,12 @@
 use Innmind\Filesystem\{
     Name,
     Directory,
+    File,
+};
+use Innmind\Immutable\{
+    Maybe,
+    Predicate\Instance,
 };
-use Innmind\Immutable\Maybe;
 
 final class Environment
 {
@@ -19,6 +23,7 @@ public function __invoke(Directory $profile): Maybe
     {
         return $profile
             ->get(Name::of('environment.txt'))
+            ->keep(Instance::of(File::class))
             ->map(static fn($file) => $file->content())
             ->map(Section\Environment::of(...));
     }

src/Profiler/Load/Environment.php

@@ -7,8 +7,12 @@
 use Innmind\Filesystem\{
     Name,
     Directory,
+    File,
+};
+use Innmind\Immutable\{
+    Maybe,
+    Predicate\Instance,
 };
-use Innmind\Immutable\Maybe;
 
 final class Exception
 {
@@ -19,6 +23,7 @@ public function __invoke(Directory $profile): Maybe
     {
         return $profile
             ->get(Name::of('exception.svg'))
+            ->keep(Instance::of(File::class))
             ->map(static fn($file) => $file->content())
             ->map(Section\Exception::of(...));
     }

src/Profiler/Load/Exception.php

@@ -7,6 +7,7 @@
 use Innmind\Filesystem\{
     Name,
     Directory,
+    File,
 };
 use Innmind\Immutable\{
     Maybe,
@@ -26,11 +27,13 @@ public function __invoke(Directory $profile): Maybe
             ->flatMap(
                 static fn($http) => $http
                     ->get(Name::of('request.txt'))
+                    ->keep(Instance::of(File::class))
                     ->map(static fn($file) => $file->content())
                     ->map(static fn($request) => Section\Http::of(
                         $request,
                         $http
                             ->get(Name::of('response.txt'))
+                            ->keep(Instance::of(File::class))
                             ->map(static fn($file) => $file->content()),
                     )),
             );

src/Profiler/Load/Http.php

@@ -7,6 +7,7 @@
 use Innmind\Filesystem\{
     Name,
     Directory,
+    File,
 };
 use Innmind\Immutable\{
     Maybe,
@@ -38,9 +39,14 @@ public function __invoke(Directory $profile): Maybe
         return $profile
             ->get(Name::of($this->slug))
             ->keep(Instance::of(Directory::class))
-            ->map(static fn($all) => $all->files()->sort(
-                static fn($a, $b) => $b->name()->toString() <=> $a->name()->toString(),
-            ))
+            ->map(
+                static fn($directory) => $directory
+                    ->all()
+                    ->keep(Instance::of(File::class))
+                    ->sort(
+                        static fn($a, $b) => $b->name()->toString() <=> $a->name()->toString(),
+                    ),
+            )
             ->map(static fn($files) => $files->map(
                 static fn($file) => $file->content(),
             ))