Merge branch 'develop'

* develop: (37 commits)
  specify next release
  update documentation
  use more explicit int types
  use promoted properties
  fix deprecated code
  always return an error when signalled
  CS
  flag Failure::as() as internal
  CS
  remove useless code
  fix tests
  return an error when the channel or frame size is incorrect instead of throwing
  bump foundation
  make Continuation return an Attempt
  CS
  make MessageReader return an Attempt
  keep track of previous errors
  use Attempt as return type for all Connection methods
  make Commands return an Attempt
  make Client::run() return an Attempt to allow to add more error cases
  ...

Author: Baptouuuu

.github/workflows/ci.yml

@@ -1,19 +1,19 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
-  phpunit:
+  blackbox:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php-version: ['8.2', '8.3']
+        php-version: ['8.2', '8.3', '8.4']
         dependencies: ['lowest', 'highest']
-    name: 'PHPUnit'
+    name: 'BlackBox (${{ matrix.os }}, ${{ matrix.php-version }}, ${{ matrix.dependencies }})'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: nijel/rabbitmq-action@v1.0.0
         with:
           rabbitmq version: '3.8-management'
@@ -25,49 +25,46 @@ jobs:
           coverage: xdebug
           ini-values: xdebug.max_nesting_level=2048
       - name: Composer
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: ${{ matrix.dependencies }}
-      - name: PHPUnit
-        run: vendor/bin/phpunit --coverage-clover=coverage.clover
-        env:
-          CI: 'true'
-      - uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-  psalm:
-    runs-on: ubuntu-latest
+      - name: BlackBox
+        run: php blackbox.php ci
+  coverage:
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        php-version: ['8.2', '8.3']
-    name: 'Psalm'
+        os: [ubuntu-latest]
+        php-version: ['8.2', '8.3', '8.4']
+        dependencies: ['lowest', 'highest']
+    name: 'Coverage (${{ matrix.os }}, ${{ matrix.php-version }}, ${{ matrix.dependencies }})'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: actions/checkout@v4
+      - uses: nijel/rabbitmq-action@v1.0.0
         with:
-          php-version: ${{ matrix.php-version }}
-          extensions: mbstring, intl
-      - name: Composer
-        uses: "ramsey/composer-install@v2"
-      - name: Psalm
-        run: vendor/bin/psalm --shepherd
-  cs:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-version: ['8.2']
-    name: 'CS'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+          rabbitmq version: '3.8-management'
       - 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"
-      - name: CS
-        run: vendor/bin/php-cs-fixer fix --diff --dry-run
+        uses: "ramsey/composer-install@v3"
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
+      - name: BlackBox
+        run: php blackbox.php ci
+        env:
+          ENABLE_COVERAGE: 'true'
+      - uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+  psalm:
+    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'

.github/workflows/release.yml

@@ -0,0 +1,11 @@
+name: Create release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    uses: innmind/github-workflows/.github/workflows/release.yml@main
+    secrets: inherit

.gitignore

@@ -1,4 +1,2 @@
 composer.lock
 vendor
-.phpunit.result.cache
-.phpunit.cache

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 6.0.0 - 2025-08-08
+
+### Changed
+
+- Requires `innmind/foundation:~1.7`
+- `Innmind\AMQP\Factory::make()` timeout argument is now expressed via `Innmind\TimeContinuum\Period`
+- `Innmind\AMQP\Model\Basic\Message` expiration is now expressed via `Innmind\TimeContinuum\Period`
+- `Innmind\AMQP\Failure` is now an exception that wraps each possible failure object
+- `Innmind\AMQP\Client::run()` now returns an `Innmind\Immutable\Attempt`
+- `Innmind\AMQP\Command::__invoke()` now must return an `Innmind\Immutable\Attempt`
+
+### Fixed
+
+- PHP `8.4` deprecations
+
 ## 5.1.0 - 2024-06-16
 
 ### Changed

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 
+Copyright (c) 2017-present Innmind
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,13 +8,16 @@ This is an AMQP client implementing the version `0.9` of the protocol.
 
 The goal of this implementation is to provide a PHP land implementation (for ease of use and readability)  with a clear separation between the AMQP Model, transport layer and user API.
 
-**Note**: This implementation couldn't have been done without [`php-amqplib`](https://packagist.org/packages/php-amqplib/php-amqplib) that helped a lot to figure out the details of the transport layer.
+> [!NOTE]
+> This implementation couldn't have been done without [`php-amqplib`](https://packagist.org/packages/php-amqplib/php-amqplib) that helped a lot to figure out the details of the transport layer.
 
-**Important**: If you are using RabbitMQ be aware that it doesn't implemented the specification completely, `Qos` and `Recover` methods are not implemented. And if you find yourself using [`Value`](src/Transport/Frame/Value.php) implementations note that `ShortString`, `SignedLongLongInteger` and `SignedShortInteger` generate server errors on some methods (like using them as message headers).
+> [!IMPORTANT]
+> If you are using RabbitMQ be aware that it doesn't implemented the specification completely, `Qos` and `Recover` methods are not implemented. And if you find yourself using [`Value`](src/Transport/Frame/Value.php) implementations note that `ShortString`, `SignedLongLongInteger` and `SignedShortInteger` generate server errors on some methods (like using them as message headers).
 
 [Documentation](docs)
 
-**Important**: you must use [`vimeo/psalm`](https://packagist.org/packages/vimeo/psalm) to make sure you use this library correctly.
+> [!IMPORTANT]
+> You must use [`vimeo/psalm`](https://packagist.org/packages/vimeo/psalm) to make sure you use this library correctly.
 
 ## Installation
 
@@ -34,8 +37,8 @@ use Innmind\AMQP\{
     Model\Basic\Message,
     Model\Exchange\Type,
 };
-use Innmind\Socket\Internet\Transport;
-use Innmind\TimeContinuum\Earth\ElapsedPeriod;
+use Innmind\IO\Sockets\Internet\Transport;
+use Innmind\TimeContinuum\Period;
 use Innmind\OperatingSystem\Factory as OSFactory;
 use Innmind\Url\Url;
 use Innmind\Immutable\Str;
@@ -45,17 +48,14 @@ $client = Factory::of($os)
     ->make(
         Transport::tcp(),
         Url::of('amqp://guest:guest@localhost:5672/'),
-        new ElapsedPeriod(1000), // timeout
+        Period::second(1), // timeout
     )
     ->with(DeclareExchange::of('crawler', Type::direct))
     ->with(DeclareQueue::of('parser'))
     ->with(Bind::of('crawler', 'parser'))
     ->with(Publish::one(Message::of(Str::of('https://github.com')))->to('crawler'))
     ->run(null)
-    ->match(
-        static fn() => null, // success
-        static fn($failure) => throw new \RuntimeException($failure::class),
-    );
+    ->unwrap();
 ```
 
 The above example will declare an exchange named `crawler` and queue `parser` that will receive messages from our exchange. Finally it will publish a message with the payload `http://github.com/` to `crawler` (and the server will route it to `parser`).
@@ -77,10 +77,7 @@ $state = $client
         return $continuation->ack($state);
     }))
     ->run(null) // <- this argument will passed as the state to the handler above
-    ->match(
-        static fn($state) => $state,
-        static fn($failure) => throw new \RuntimeException($failure::class),
-    );
+    ->unwrap();
 echo $state; // will print "http://github.com/"
 // or
 $client
@@ -92,10 +89,7 @@ $client
         return $continuation->cancel($state); // instruct to stop receiving messages (current will be acknowledged first)
     }))
     ->run(null)
-    ->match(
-        static fn() => null, // in this case only reachable when you cancel the consumer
-        static fn($failure) => throw new \RuntimeException($failure::class),
-    );
+    ->unwrap(); // in this case only reachable when you cancel the consumer
 ```
 
 `reject()` and `requeue()` can also be used in the `get` callback.
@@ -129,4 +123,5 @@ Pid: 46862, Count: 4000, Time: 0.2366
 
 So it appears _pure_ functions come at a cost!
 
-**Note**: both benchmarks use manual acknowledgement of messages
+> [!NOTE]
+> both benchmarks use manual acknowledgement of messages

benchmark/client.php

@@ -7,8 +7,8 @@
     Factory,
     Transport\Connection,
 };
-use Innmind\Socket\Internet\Transport;
-use Innmind\TimeContinuum\Earth\ElapsedPeriod;
+use Innmind\IO\Sockets\Internet\Transport;
+use Innmind\TimeContinuum\Period;
 use Innmind\Url\Url;
 use Innmind\OperatingSystem\Factory as OSFactory;
 
@@ -18,6 +18,6 @@
     ->make(
         Transport::tcp(),
         Url::of('//guest:guest@localhost:5672/'),
-        new ElapsedPeriod(1000),
+        Period::second(1),
     )
     ->listenSignals($os->process());

benchmark/consumer.php

@@ -32,4 +32,4 @@
         static fn($failure) => throw new \RuntimeException($failure::class),
     );
 
-printf("Pid: %s, Count: %s, Time: %.4f\n", getmypid(), $count, microtime(true) - $start);
+printf("Pid: %s, Count: %s, Time: %.4f\n", (string) getmypid(), $count, microtime(true) - $start);

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

@@ -16,16 +16,8 @@
     },
     "require": {
         "php": "~8.2",
-        "innmind/immutable": "~5.7",
-        "innmind/time-continuum": "~3.1",
-        "innmind/math": "~6.0",
-        "innmind/url": "~4.1",
-        "ramsey/uuid": "~4.0",
-        "innmind/operating-system": "~5.0",
-        "innmind/media-type": "~2.0",
-        "innmind/filesystem": "~7.0",
-        "innmind/stream": "~4.0",
-        "innmind/io": "~2.6"
+        "innmind/foundation": "^1.7.1",
+        "ramsey/uuid": "~4.0"
     },
     "autoload": {
         "psr-4": {
@@ -38,10 +30,9 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~10.2",
         "psr/log": "~3.0",
-        "vimeo/psalm": "~5.15",
-        "innmind/black-box": "~5.5",
+        "innmind/static-analysis": "^1.2.1",
+        "innmind/black-box": "~6.5",
         "innmind/coding-standard": "~2.0"
     },
     "suggest": {