Skip to content

Remove deprecated in 0.8 code #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 15, 2018
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
2 changes: 1 addition & 1 deletion docs/transport/sqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ $consumer->acknowledge($message);

$fooQueue = $psrContext->createQueue('foo');

$psrContext->purge($fooQueue);
$psrContext->purgeQueue($fooQueue);
```

[back to index](../index.md)
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
*/
class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
{
protected function tearDown()
{
if ($this->subscriptionConsumer) {
$this->subscriptionConsumer->unsubscribeAll();
}

parent::tearDown();
}

/**
* @return AmqpContext
*
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-bunny/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"enqueue/test": "0.9.x-dev",
"enqueue/enqueue": "0.9.x-dev",
"enqueue/null": "0.9.x-dev",
"queue-interop/queue-spec": "^0.5.8@dev",
"queue-interop/queue-spec": "^0.5.9@dev",
"symfony/dependency-injection": "^3.4|^4",
"symfony/config": "^3.4|^4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
*/
class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
{
protected function tearDown()
{
if ($this->subscriptionConsumer) {
$this->subscriptionConsumer->unsubscribeAll();
}

parent::tearDown();
}

/**
* @return AmqpContext
*
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-ext/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"enqueue/test": "0.9.x-dev",
"enqueue/enqueue": "0.9.x-dev",
"enqueue/null": "0.9.x-dev",
"queue-interop/queue-spec": "^0.5.8@dev",
"queue-interop/queue-spec": "^0.5.9@dev",
"empi89/php-amqp-stubs": "*@dev",
"symfony/dependency-injection": "^3.4|^4",
"symfony/config": "^3.4|^4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
*/
class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
{
protected function tearDown()
{
if ($this->subscriptionConsumer) {
$this->subscriptionConsumer->unsubscribeAll();
}

parent::tearDown();
}

/**
* @return AmqpContext
*
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-lib/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"enqueue/test": "0.9.x-dev",
"enqueue/enqueue": "0.9.x-dev",
"enqueue/null": "0.9.x-dev",
"queue-interop/queue-spec": "^0.5.8@dev",
"queue-interop/queue-spec": "^0.5.9@dev",
"symfony/dependency-injection": "^3.4|^4",
"symfony/config": "^3.4|^4"
},
Expand Down
57 changes: 0 additions & 57 deletions pkg/amqp-tools/SubscriptionConsumer.php

This file was deleted.

96 changes: 0 additions & 96 deletions pkg/amqp-tools/Tests/SubscriptionConsumerTest.php

This file was deleted.

55 changes: 0 additions & 55 deletions pkg/job-queue/Schema.php

This file was deleted.

16 changes: 0 additions & 16 deletions pkg/simple-client/SimpleClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,6 @@ public function sendEvent($topic, $message)
$this->getProducer()->sendEvent($topic, $message);
}

/**
* @deprecated since 0.8.18 and will be removed in 0.9. Use sendEvent method instead
*
* @param string $topic
* @param string|array $message
* @param bool $setupBroker
*/
public function send($topic, $message, $setupBroker = false)
{
if ($setupBroker) {
$this->setupBroker();
}

$this->sendEvent($topic, $message);
}

/**
* @param ExtensionInterface|null $runtimeExtension
*/
Expand Down
8 changes: 6 additions & 2 deletions pkg/simple-client/Tests/Functional/SimpleClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ public function testProduceAndConsumeOneMessage($config)
return Result::ACK;
});

$client->send('foo_topic', 'Hello there!', true);
$client->setupBroker();

$client->sendEvent('foo_topic', 'Hello there!');

$client->consume(new ChainExtension([
new LimitConsumptionTimeExtension(new \DateTime('+5sec')),
Expand Down Expand Up @@ -144,7 +146,9 @@ public function testProduceAndRouteToTwoConsumes($config)
return Result::ACK;
});

$client->send('foo_topic', 'Hello there!', true);
$client->setupBroker();

$client->sendEvent('foo_topic', 'Hello there!');

$client->consume(new ChainExtension([
new LimitConsumptionTimeExtension(new \DateTime('+5sec')),
Expand Down
10 changes: 0 additions & 10 deletions pkg/sqs/SqsContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,16 +185,6 @@ public function deleteQueue(SqsDestination $dest)
unset($this->queueUrls[$dest->getQueueName()]);
}

/**
* @deprecated since 0.8 will be removed 0.9 use self::purgeQueue()
*
* @param SqsDestination $dest
*/
public function purge(SqsDestination $dest)
{
$this->purgeQueue($dest);
}

/**
* @param SqsDestination $destination
*/
Expand Down
4 changes: 2 additions & 2 deletions pkg/sqs/Tests/Functional/SqsConsumptionUseCasesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ protected function setUp()
$this->context->declareQueue($replyQueue);

try {
$this->context->purge($queue);
$this->context->purge($replyQueue);
$this->context->purgeQueue($queue);
$this->context->purgeQueue($replyQueue);
} catch (\Exception $e) {
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/sqs/Tests/SqsContextTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public function testShouldAllowPurgeQueue()

$queue = $context->createQueue('aQueueName');

$context->purge($queue);
$context->purgeQueue($queue);
}

public function testShouldAllowGetQueueUrl()
Expand Down