Skip to content

Commit d8b2638

Browse files
committed
[null] Do not use deprecated classes.
1 parent 170eed1 commit d8b2638

16 files changed

+67
-67
lines changed

pkg/null/NullConnectionFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
namespace Enqueue\Null;
66

7-
use Interop\Queue\PsrConnectionFactory;
8-
use Interop\Queue\PsrContext;
7+
use Interop\Queue\ConnectionFactory;
8+
use Interop\Queue\Context;
99

10-
class NullConnectionFactory implements PsrConnectionFactory
10+
class NullConnectionFactory implements ConnectionFactory
1111
{
1212
/**
1313
* @return NullContext
1414
*/
15-
public function createContext(): PsrContext
15+
public function createContext(): Context
1616
{
1717
return new NullContext();
1818
}

pkg/null/NullConsumer.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,49 @@
44

55
namespace Enqueue\Null;
66

7-
use Interop\Queue\PsrConsumer;
8-
use Interop\Queue\PsrDestination;
9-
use Interop\Queue\PsrMessage;
10-
use Interop\Queue\PsrQueue;
7+
use Interop\Queue\Consumer;
8+
use Interop\Queue\Destination;
9+
use Interop\Queue\Message;
10+
use Interop\Queue\Queue;
1111

12-
class NullConsumer implements PsrConsumer
12+
class NullConsumer implements Consumer
1313
{
1414
/**
15-
* @var PsrDestination
15+
* @var Destination
1616
*/
1717
private $queue;
1818

19-
public function __construct(PsrDestination $queue)
19+
public function __construct(Destination $queue)
2020
{
2121
$this->queue = $queue;
2222
}
2323

24-
public function getQueue(): PsrQueue
24+
public function getQueue(): Queue
2525
{
2626
return $this->queue;
2727
}
2828

2929
/**
3030
* @return NullMessage
3131
*/
32-
public function receive(int $timeout = 0): ?PsrMessage
32+
public function receive(int $timeout = 0): ?Message
3333
{
3434
return null;
3535
}
3636

3737
/**
3838
* @return NullMessage
3939
*/
40-
public function receiveNoWait(): ?PsrMessage
40+
public function receiveNoWait(): ?Message
4141
{
4242
return null;
4343
}
4444

45-
public function acknowledge(PsrMessage $message): void
45+
public function acknowledge(Message $message): void
4646
{
4747
}
4848

49-
public function reject(PsrMessage $message, bool $requeue = false): void
49+
public function reject(Message $message, bool $requeue = false): void
5050
{
5151
}
5252
}

pkg/null/NullContext.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
namespace Enqueue\Null;
66

7-
use Interop\Queue\PsrConsumer;
8-
use Interop\Queue\PsrContext;
9-
use Interop\Queue\PsrDestination;
10-
use Interop\Queue\PsrMessage;
11-
use Interop\Queue\PsrProducer;
12-
use Interop\Queue\PsrQueue;
13-
use Interop\Queue\PsrSubscriptionConsumer;
14-
use Interop\Queue\PsrTopic;
7+
use Interop\Queue\Consumer;
8+
use Interop\Queue\Context;
9+
use Interop\Queue\Destination;
10+
use Interop\Queue\Message;
11+
use Interop\Queue\Producer;
12+
use Interop\Queue\Queue;
13+
use Interop\Queue\SubscriptionConsumer;
14+
use Interop\Queue\Topic;
1515

16-
class NullContext implements PsrContext
16+
class NullContext implements Context
1717
{
1818
/**
1919
* @return NullMessage
2020
*/
21-
public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
21+
public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
2222
{
2323
$message = new NullMessage();
2424
$message->setBody($body);
@@ -31,52 +31,52 @@ public function createMessage(string $body = '', array $properties = [], array $
3131
/**
3232
* @return NullQueue
3333
*/
34-
public function createQueue(string $name): PsrQueue
34+
public function createQueue(string $name): Queue
3535
{
3636
return new NullQueue($name);
3737
}
3838

3939
/**
4040
* @return NullQueue
4141
*/
42-
public function createTemporaryQueue(): PsrQueue
42+
public function createTemporaryQueue(): Queue
4343
{
4444
return $this->createQueue(uniqid('', true));
4545
}
4646

4747
/**
4848
* @return NullTopic
4949
*/
50-
public function createTopic(string $name): PsrTopic
50+
public function createTopic(string $name): Topic
5151
{
5252
return new NullTopic($name);
5353
}
5454

5555
/**
5656
* @return NullConsumer
5757
*/
58-
public function createConsumer(PsrDestination $destination): PsrConsumer
58+
public function createConsumer(Destination $destination): Consumer
5959
{
6060
return new NullConsumer($destination);
6161
}
6262

6363
/**
6464
* @return NullProducer
6565
*/
66-
public function createProducer(): PsrProducer
66+
public function createProducer(): Producer
6767
{
6868
return new NullProducer();
6969
}
7070

7171
/**
7272
* @return NullSubscriptionConsumer
7373
*/
74-
public function createSubscriptionConsumer(): PsrSubscriptionConsumer
74+
public function createSubscriptionConsumer(): SubscriptionConsumer
7575
{
7676
return new NullSubscriptionConsumer();
7777
}
7878

79-
public function purgeQueue(PsrQueue $queue): void
79+
public function purgeQueue(Queue $queue): void
8080
{
8181
}
8282

pkg/null/NullMessage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace Enqueue\Null;
66

7-
use Interop\Queue\PsrMessage;
7+
use Interop\Queue\Message;
88

9-
class NullMessage implements PsrMessage
9+
class NullMessage implements Message
1010
{
1111
/**
1212
* @var string

pkg/null/NullProducer.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44

55
namespace Enqueue\Null;
66

7-
use Interop\Queue\PsrDestination;
8-
use Interop\Queue\PsrMessage;
9-
use Interop\Queue\PsrProducer;
7+
use Interop\Queue\Destination;
8+
use Interop\Queue\Message;
9+
use Interop\Queue\Producer;
1010

11-
class NullProducer implements PsrProducer
11+
class NullProducer implements Producer
1212
{
1313
private $priority;
1414

1515
private $timeToLive;
1616

1717
private $deliveryDelay;
1818

19-
public function send(PsrDestination $destination, PsrMessage $message): void
19+
public function send(Destination $destination, Message $message): void
2020
{
2121
}
2222

2323
/**
2424
* @return NullProducer
2525
*/
26-
public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer
26+
public function setDeliveryDelay(int $deliveryDelay = null): Producer
2727
{
2828
$this->deliveryDelay = $deliveryDelay;
2929

@@ -38,7 +38,7 @@ public function getDeliveryDelay(): ?int
3838
/**
3939
* @return NullProducer
4040
*/
41-
public function setPriority(int $priority = null): PsrProducer
41+
public function setPriority(int $priority = null): Producer
4242
{
4343
$this->priority = $priority;
4444

@@ -53,7 +53,7 @@ public function getPriority(): ?int
5353
/**
5454
* @return NullProducer
5555
*/
56-
public function setTimeToLive(int $timeToLive = null): PsrProducer
56+
public function setTimeToLive(int $timeToLive = null): Producer
5757
{
5858
$this->timeToLive = $timeToLive;
5959

pkg/null/NullQueue.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace Enqueue\Null;
66

7-
use Interop\Queue\PsrQueue;
7+
use Interop\Queue\Queue;
88

9-
class NullQueue implements PsrQueue
9+
class NullQueue implements Queue
1010
{
1111
/**
1212
* @var string

pkg/null/NullSubscriptionConsumer.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
namespace Enqueue\Null;
66

7-
use Interop\Queue\PsrConsumer;
8-
use Interop\Queue\PsrSubscriptionConsumer;
7+
use Interop\Queue\Consumer;
8+
use Interop\Queue\SubscriptionConsumer;
99

10-
class NullSubscriptionConsumer implements PsrSubscriptionConsumer
10+
class NullSubscriptionConsumer implements SubscriptionConsumer
1111
{
1212
public function consume(int $timeout = 0): void
1313
{
1414
}
1515

16-
public function subscribe(PsrConsumer $consumer, callable $callback): void
16+
public function subscribe(Consumer $consumer, callable $callback): void
1717
{
1818
}
1919

20-
public function unsubscribe(PsrConsumer $consumer): void
20+
public function unsubscribe(Consumer $consumer): void
2121
{
2222
}
2323

pkg/null/NullTopic.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Enqueue\Null;
44

5-
use Interop\Queue\PsrTopic;
5+
use Interop\Queue\Topic;
66

7-
class NullTopic implements PsrTopic
7+
class NullTopic implements Topic
88
{
99
/**
1010
* @var string

pkg/null/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Total Downloads](https://poser.pugx.org/enqueue/null/d/total.png)](https://packagist.org/packages/enqueue/null)
66
[![Latest Stable Version](https://poser.pugx.org/enqueue/null/version.png)](https://packagist.org/packages/enqueue/null)
77

8-
This is an implementation of PSR queue specification. It does not send messages any where and could be used as mock. Suitable in tests.
8+
This is an implementation of Queue Interop specification. It does not send messages any where and could be used as mock. Suitable in tests.
99

1010
## Resources
1111

pkg/null/Tests/NullConnectionFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Enqueue\Null\NullConnectionFactory;
66
use Enqueue\Null\NullContext;
77
use Enqueue\Test\ClassExtensionTrait;
8-
use Interop\Queue\PsrConnectionFactory;
8+
use Interop\Queue\ConnectionFactory;
99
use PHPUnit\Framework\TestCase;
1010

1111
class NullConnectionFactoryTest extends TestCase
@@ -14,7 +14,7 @@ class NullConnectionFactoryTest extends TestCase
1414

1515
public function testShouldImplementConnectionFactoryInterface()
1616
{
17-
$this->assertClassImplements(PsrConnectionFactory::class, NullConnectionFactory::class);
17+
$this->assertClassImplements(ConnectionFactory::class, NullConnectionFactory::class);
1818
}
1919

2020
public function testCouldBeConstructedWithoutAnyArguments()

pkg/null/Tests/NullConsumerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Enqueue\Null\NullMessage;
77
use Enqueue\Null\NullQueue;
88
use Enqueue\Test\ClassExtensionTrait;
9-
use Interop\Queue\PsrConsumer;
9+
use Interop\Queue\Consumer;
1010
use PHPUnit\Framework\TestCase;
1111

1212
class NullConsumerTest extends TestCase
@@ -15,7 +15,7 @@ class NullConsumerTest extends TestCase
1515

1616
public function testShouldImplementMessageConsumerInterface()
1717
{
18-
$this->assertClassImplements(PsrConsumer::class, NullConsumer::class);
18+
$this->assertClassImplements(Consumer::class, NullConsumer::class);
1919
}
2020

2121
public function testCouldBeConstructedWithQueueAsArgument()

pkg/null/Tests/NullContextTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Enqueue\Null\NullQueue;
1010
use Enqueue\Null\NullTopic;
1111
use Enqueue\Test\ClassExtensionTrait;
12-
use Interop\Queue\PsrContext;
12+
use Interop\Queue\Context;
1313
use PHPUnit\Framework\TestCase;
1414

1515
class NullContextTest extends TestCase
@@ -18,7 +18,7 @@ class NullContextTest extends TestCase
1818

1919
public function testShouldImplementSessionInterface()
2020
{
21-
$this->assertClassImplements(PsrContext::class, NullContext::class);
21+
$this->assertClassImplements(Context::class, NullContext::class);
2222
}
2323

2424
public function testCouldBeConstructedWithoutAnyArguments()

pkg/null/Tests/NullMessageTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Enqueue\Null\NullMessage;
66
use Enqueue\Test\ClassExtensionTrait;
7-
use Interop\Queue\PsrMessage;
7+
use Interop\Queue\Message;
88
use PHPUnit\Framework\TestCase;
99

1010
class NullMessageTest extends TestCase
@@ -13,7 +13,7 @@ class NullMessageTest extends TestCase
1313

1414
public function testShouldImplementMessageInterface()
1515
{
16-
$this->assertClassImplements(PsrMessage::class, NullMessage::class);
16+
$this->assertClassImplements(Message::class, NullMessage::class);
1717
}
1818

1919
public function testCouldBeConstructedWithoutAnyArguments()

pkg/null/Tests/NullProducerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Enqueue\Null\NullProducer;
77
use Enqueue\Null\NullTopic;
88
use Enqueue\Test\ClassExtensionTrait;
9-
use Interop\Queue\PsrProducer;
9+
use Interop\Queue\Producer;
1010
use PHPUnit\Framework\TestCase;
1111

1212
class NullProducerTest extends TestCase
@@ -15,7 +15,7 @@ class NullProducerTest extends TestCase
1515

1616
public function testShouldImplementProducerInterface()
1717
{
18-
$this->assertClassImplements(PsrProducer::class, NullProducer::class);
18+
$this->assertClassImplements(Producer::class, NullProducer::class);
1919
}
2020

2121
public function testCouldBeConstructedWithoutAnyArguments()

0 commit comments

Comments
 (0)