Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,35 +80,4 @@ jobs:
uses: jakejarvis/wait-action@master

- name: Run tests with phpunit
run: XDEBUG_MODE=coverage php ./vendor/bin/phpunit --configuration ./phpunit.xml --coverage-clover=coverage.clover

- name: Upload coverage file
uses: actions/upload-artifact@v2
with:
name: phpunit.coverage
path: coverage.clover

upload_coverage:
name: Upload coverage
runs-on: ubuntu-latest
needs: phpunit
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
coverage: none
tools: composer

- name: Download coverage files
uses: actions/download-artifact@v2
with:
path: reports

- name: Send code coverage report to Scrutinizer
run: |
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover ./reports/phpunit.coverage/coverage.clover
run: php ./vendor/bin/phpunit --configuration ./phpunit.xml
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

[![Latest Version on Packagist][ico-version]][link-packagist]
[![Software License][ico-license]](LICENSE.md)
[![Coverage Status][ico-scrutinizer]][link-scrutinizer]
[![Quality Score][ico-code-quality]][link-code-quality]
![Continuous Integration](https://github.com/phpinnacle/ridge/workflows/Continuous%20Integration/badge.svg)
[![Shepherd](https://shepherd.dev/github/phpinnacle/ridge/coverage.svg)](https://shepherd.dev/github/phpinnacle/ridge)
[![Total Downloads][ico-downloads]][link-downloads]

This library is a pure asynchronous PHP implementation of the AMQP 0-9-1 protocol.
Expand Down
68 changes: 34 additions & 34 deletions tests/ChannelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,14 @@ public function testMandatoryPublish(Client $client)
});

$channel->events()->onReturn(function (Message $message) use ($deferred, $watcher) {
self::assertSame($message->content(), '.');
self::assertSame($message->exchange(), '');
self::assertSame($message->routingKey(), '404');
self::assertSame($message->headers(), []);
self::assertNull($message->consumerTag());
self::assertNull($message->deliveryTag());
self::assertFalse($message->redelivered());
self::assertTrue($message->returned());
self::assertSame($message->content, '.');
self::assertSame($message->exchange, '');
self::assertSame($message->routingKey, '404');
self::assertSame($message->headers, []);
self::assertNull($message->consumerTag);
self::assertNull($message->deliveryTag);
self::assertFalse($message->redelivered);
self::assertTrue($message->returned);

Loop::cancel($watcher);

Expand Down Expand Up @@ -252,7 +252,7 @@ public function testImmediatePublish(Client $client)
});

$channel->events()->onReturn(function (Message $message) use ($deferred, $watcher) {
self::assertTrue($message->returned());
self::assertTrue($message->returned);

Loop::cancel($watcher);

Expand All @@ -277,8 +277,8 @@ public function testConsume(Client $client)

/** @noinspection PhpUnusedLocalVariableInspection */
$tag = yield $channel->consume(function (Message $message) use ($client, &$tag) {
self::assertEquals('hi', $message->content());
self::assertEquals($tag, $message->consumerTag());
self::assertEquals('hi', $message->content);
self::assertEquals($tag, $message->consumerTag);

yield $client->disconnect();
}, 'test_queue', false, true);
Expand Down Expand Up @@ -318,7 +318,7 @@ public function testHeaders(Client $client)
yield $channel->consume(function (Message $message) use ($client) {
self::assertEquals('text/html', $message->header('content-type'));
self::assertEquals('value', $message->header('custom'));
self::assertEquals('<b>hi html</b>', $message->content());
self::assertEquals('<b>hi html</b>', $message->content);

yield $client->disconnect();
}, 'test_queue', false, true);
Expand All @@ -338,13 +338,13 @@ public function testGet(Client $client)

self::assertNotNull($message1);
self::assertInstanceOf(Message::class, $message1);
self::assertEquals('', $message1->exchange());
self::assertEquals('.', $message1->content());
self::assertEquals('get_test', $message1->routingKey());
self::assertEquals(1, $message1->deliveryTag());
self::assertNull($message1->consumerTag());
self::assertFalse($message1->redelivered());
self::assertIsArray($message1->headers());
self::assertEquals('', $message1->exchange);
self::assertEquals('.', $message1->content);
self::assertEquals('get_test', $message1->routingKey);
self::assertEquals(1, $message1->deliveryTag);
self::assertNull($message1->consumerTag);
self::assertFalse($message1->redelivered);
self::assertIsArray($message1->headers);

self::assertNull(yield $channel->get('get_test', true));

Expand All @@ -354,8 +354,8 @@ public function testGet(Client $client)
$message2 = yield $channel->get('get_test');

self::assertNotNull($message2);
self::assertEquals(2, $message2->deliveryTag());
self::assertFalse($message2->redelivered());
self::assertEquals(2, $message2->deliveryTag);
self::assertFalse($message2->redelivered);

$client->disconnect()->onResolve(function () use ($client) {
yield $client->connect();
Expand All @@ -368,9 +368,9 @@ public function testGet(Client $client)

self::assertNotNull($message3);
self::assertInstanceOf(Message::class, $message3);
self::assertEquals('', $message3->exchange());
self::assertEquals('..', $message3->content());
self::assertTrue($message3->redelivered());
self::assertEquals('', $message3->exchange);
self::assertEquals('..', $message3->content);
self::assertTrue($message3->redelivered);

yield $channel->ack($message3);

Expand Down Expand Up @@ -409,7 +409,7 @@ public function testNack(Client $client)
$message = yield $channel->get('test_queue');

self::assertNotNull($message);
self::assertFalse($message->redelivered());
self::assertFalse($message->redelivered);

$promise = $channel->nack($message);

Expand All @@ -421,7 +421,7 @@ public function testNack(Client $client)
$message = yield $channel->get('test_queue');

self::assertNotNull($message);
self::assertTrue($message->redelivered());
self::assertTrue($message->redelivered);

yield $channel->nack($message, false, false);

Expand All @@ -442,7 +442,7 @@ public function testReject(Client $client)
$message = yield $channel->get('test_queue');

self::assertNotNull($message);
self::assertFalse($message->redelivered());
self::assertFalse($message->redelivered);

$promise = $channel->reject($message);

Expand All @@ -454,7 +454,7 @@ public function testReject(Client $client)
$message = yield $channel->get('test_queue');

self::assertNotNull($message);
self::assertTrue($message->redelivered());
self::assertTrue($message->redelivered);

yield $channel->reject($message, false);

Expand All @@ -475,7 +475,7 @@ public function testRecover(Client $client)
$message = yield $channel->get('test_queue');

self::assertNotNull($message);
self::assertFalse($message->redelivered());
self::assertFalse($message->redelivered);

$promise = $channel->recover(true);

Expand All @@ -487,7 +487,7 @@ public function testRecover(Client $client)
$message = yield $channel->get('test_queue');

self::assertNotNull($message);
self::assertTrue($message->redelivered());
self::assertTrue($message->redelivered);

yield $channel->ack($message);

Expand All @@ -506,7 +506,7 @@ public function testBigMessage(Client $client)
yield $channel->publish($body, '', 'test_queue');

yield $channel->consume(function (Message $message, Channel $channel) use ($body, $client) {
self::assertEquals(\strlen($body), \strlen($message->content()));
self::assertEquals(\strlen($body), \strlen($message->content));

yield $channel->ack($message);
yield $client->disconnect();
Expand Down Expand Up @@ -547,12 +547,12 @@ public function testEmptyMessage(Client $client)
$message = yield $channel->get('empty_body_message_test', true);

self::assertNotNull($message);
self::assertEquals('', $message->content());
self::assertEquals('', $message->content);

$count = 0;

yield $channel->consume(function (Message $message, Channel $channel) use ($client, &$count) {
self::assertEmpty($message->content());
self::assertEmpty($message->content);

yield $channel->ack($message);

Expand Down Expand Up @@ -581,7 +581,7 @@ public function testTxs(Client $client)

self::assertNotNull($message);
self::assertInstanceOf(Message::class, $message);
self::assertEquals('.', $message->content());
self::assertEquals('.', $message->content);

$channel->publish('..', '', 'tx_test');
$channel->txRollback();
Expand Down