Skip to content

Commit c738721

Browse files
committed
do not depend on enqueue/enqueue lib. use only queue interop features.
1 parent b5a922d commit c738721

3 files changed

Lines changed: 64 additions & 11 deletions

File tree

‎pkg/laravel-queue/Connector.php‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Enqueue\LaravelQueue;
44

55
use Illuminate\Queue\Connectors\ConnectorInterface;
6-
use function Enqueue\dsn_to_context;
6+
use Interop\Queue\PsrConnectionFactory;
77

88
class Connector implements ConnectorInterface
99
{
@@ -12,10 +12,29 @@ class Connector implements ConnectorInterface
1212
*/
1313
public function connect(array $config)
1414
{
15-
return new Queue(
16-
dsn_to_context($config['dsn']),
17-
isset($config['queue']) ? $config['queue'] : 'default',
18-
isset($config['time_to_run']) ? $config['time_to_run'] : 0
19-
);
15+
$config = array_replace([
16+
'connection_factory_class' => null,
17+
'queue' => 'default',
18+
'time_to_run' => 0,
19+
], $config);
20+
21+
if (empty($config['connection_factory_class'])) {
22+
throw new \LogicException('The "connection_factory_class" option is required');
23+
}
24+
25+
$factoryClass = $config['connection_factory_class'];
26+
if (false == class_exists($factoryClass)) {
27+
throw new \LogicException(sprintf('The "connection_factory_class" option "%s" is not a class', $factoryClass));
28+
}
29+
30+
$rc = new \ReflectionClass($factoryClass);
31+
if (false == $rc->implementsInterface(PsrConnectionFactory::class)) {
32+
throw new \LogicException(sprintf('The "connection_factory_class" option must contain a class that implements "%s" but it is not', PsrConnectionFactory::class));
33+
}
34+
35+
/** @var PsrConnectionFactory $factory */
36+
$factory = new $factoryClass($config);
37+
38+
return new Queue($factory->createContext(), $config['queue'], $config['time_to_run']);
2039
}
2140
}

‎pkg/laravel-queue/Tests/ConnectorTest.php‎

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

55
use Enqueue\LaravelQueue\Connector;
66
use Enqueue\LaravelQueue\Queue;
7+
use Enqueue\Null\NullConnectionFactory;
78
use Enqueue\Null\NullContext;
89
use Enqueue\Test\ClassExtensionTrait;
910
use Illuminate\Queue\Connectors\ConnectorInterface;
@@ -24,18 +25,51 @@ public function testCouldBeConstructedWithoutAnyArguments()
2425
new Connector();
2526
}
2627

28+
public function testThrowIfConnectorFactoryClassOptionNotSet()
29+
{
30+
$connector = new Connector();
31+
32+
$this->expectException(\LogicException::class);
33+
$this->expectExceptionMessage('The "connection_factory_class" option is required');
34+
$connector->connect([]);
35+
}
36+
37+
public function testThrowIfConnectorFactoryClassOptionIsNotValidClass()
38+
{
39+
$connector = new Connector();
40+
41+
$this->expectException(\LogicException::class);
42+
$this->expectExceptionMessage('The "connection_factory_class" option "invalidClass" is not a class');
43+
$connector->connect([
44+
'connection_factory_class' => 'invalidClass',
45+
]);
46+
}
47+
48+
public function testThrowIfConnectorFactoryClassOptionDoesNotImplementPsrConnectionFactoryInterface()
49+
{
50+
$connector = new Connector();
51+
52+
$this->expectException(\LogicException::class);
53+
$this->expectExceptionMessage('The "connection_factory_class" option must contain a class that implements "Interop\Queue\PsrConnectionFactory" but it is not');
54+
$connector->connect([
55+
'connection_factory_class' => \stdClass::class,
56+
]);
57+
}
58+
2759
public function testShouldReturnQueueOnConnectMethodCall()
2860
{
2961
$connector = new Connector();
3062

31-
$this->assertInstanceOf(Queue::class, $connector->connect(['dsn' => 'null://']));
63+
$this->assertInstanceOf(Queue::class, $connector->connect([
64+
'connection_factory_class' => NullConnectionFactory::class,
65+
]));
3266
}
3367

3468
public function testShouldSetExpectedOptionsIfNotProvidedOnConnectMethodCall()
3569
{
3670
$connector = new Connector();
3771

38-
$queue = $connector->connect(['dsn' => 'null://']);
72+
$queue = $connector->connect(['connection_factory_class' => NullConnectionFactory::class]);
3973

4074
$this->assertInstanceOf(NullContext::class, $queue->getPsrContext());
4175

@@ -50,7 +84,7 @@ public function testShouldSetExpectedCustomOptionsIfProvidedOnConnectMethodCall(
5084
$connector = new Connector();
5185

5286
$queue = $connector->connect([
53-
'dsn' => 'null://',
87+
'connection_factory_class' => NullConnectionFactory::class,
5488
'queue' => 'theCustomQueue',
5589
'time_to_run' => 123,
5690
]);

‎pkg/laravel-queue/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"require": {
1414
"php": ">=5.6",
1515
"illuminate/queue": "^5.4",
16-
"queue-interop/queue-interop": "^0.5",
17-
"enqueue/enqueue": "^0.6@dev"
16+
"queue-interop/queue-interop": "^0.5"
1817
},
1918
"require-dev": {
2019
"phpunit/phpunit": "~5.5",
20+
"enqueue/enqueue": "^0.6@dev",
2121
"enqueue/null": "^0.6@dev",
2222
"enqueue/test": "^0.6@dev"
2323
},

0 commit comments

Comments
 (0)