Skip to content

Commit 811d0d8

Browse files
committed
[client] Rename resource key factoryClass -> driverClass
1 parent 7c26ed1 commit 811d0d8

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

pkg/enqueue/Client/DriverFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function create(ConnectionFactory $factory, string $dsn, array $config):
3333
$dsn = new Dsn($dsn);
3434

3535
if ($driverInfo = $this->findDriverInfo($dsn, Resources::getAvailableDrivers())) {
36-
$driverClass = $driverInfo['factoryClass'];
36+
$driverClass = $driverInfo['driverClass'];
3737

3838
if (RabbitMqDriver::class === $driverClass) {
3939
if (false == $factory instanceof AmqpConnectionFactory) {

pkg/enqueue/Client/Resources.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static function getAvailableDrivers(): array
3737

3838
$availableMap = [];
3939
foreach ($map as $item) {
40-
if (class_exists($item['factoryClass'])) {
40+
if (class_exists($item['driverClass'])) {
4141
$availableMap[] = $item;
4242
}
4343
}
@@ -52,67 +52,67 @@ public static function getKnownDrivers(): array
5252

5353
$map[] = [
5454
'schemes' => ['amqp', 'amqps'],
55-
'factoryClass' => AmqpDriver::class,
55+
'driverClass' => AmqpDriver::class,
5656
'requiredSchemeExtensions' => [],
5757
'packages' => ['enqueue/enqueue', 'enqueue/amqp-bunny'],
5858
];
5959
$map[] = [
6060
'schemes' => ['amqp', 'amqps'],
61-
'factoryClass' => RabbitMqDriver::class,
61+
'driverClass' => RabbitMqDriver::class,
6262
'requiredSchemeExtensions' => ['rabbitmq'],
6363
'packages' => ['enqueue/enqueue', 'enqueue/amqp-bunny'],
6464
];
6565
$map[] = [
6666
'schemes' => ['file'],
67-
'factoryClass' => FsDriver::class,
67+
'driverClass' => FsDriver::class,
6868
'requiredSchemeExtensions' => [],
6969
'packages' => ['enqueue/enqueue', 'enqueue/fs'],
7070
];
7171
$map[] = [
7272
'schemes' => ['null'],
73-
'factoryClass' => GenericDriver::class,
73+
'driverClass' => GenericDriver::class,
7474
'requiredSchemeExtensions' => [],
7575
'packages' => ['enqueue/enqueue', 'enqueue/null'],
7676
];
7777
$map[] = [
7878
'schemes' => ['gps'],
79-
'factoryClass' => GpsDriver::class,
79+
'driverClass' => GpsDriver::class,
8080
'requiredSchemeExtensions' => [],
8181
'packages' => ['enqueue/enqueue', 'enqueue/gps'],
8282
];
8383
$map[] = [
8484
'schemes' => ['redis'],
85-
'factoryClass' => RedisDriver::class,
85+
'driverClass' => RedisDriver::class,
8686
'requiredSchemeExtensions' => [],
8787
'packages' => ['enqueue/enqueue', 'enqueue/redis'],
8888
];
8989
$map[] = [
9090
'schemes' => ['sqs'],
91-
'factoryClass' => SqsDriver::class,
91+
'driverClass' => SqsDriver::class,
9292
'requiredSchemeExtensions' => [],
9393
'packages' => ['enqueue/enqueue', 'enqueue/sqs'],
9494
];
9595
$map[] = [
9696
'schemes' => ['stomp'],
97-
'factoryClass' => StompDriver::class,
97+
'driverClass' => StompDriver::class,
9898
'requiredSchemeExtensions' => [],
9999
'packages' => ['enqueue/enqueue', 'enqueue/stomp'],
100100
];
101101
$map[] = [
102102
'schemes' => ['stomp'],
103-
'factoryClass' => RabbitMqStompDriver::class,
103+
'driverClass' => RabbitMqStompDriver::class,
104104
'requiredSchemeExtensions' => ['rabbitmq'],
105105
'packages' => ['enqueue/enqueue', 'enqueue/stomp'],
106106
];
107107
$map[] = [
108108
'schemes' => ['kafka', 'rdkafka'],
109-
'factoryClass' => RdKafkaDriver::class,
109+
'driverClass' => RdKafkaDriver::class,
110110
'requiredSchemeExtensions' => [],
111111
'packages' => ['enqueue/enqueue', 'enqueue/rdkafka'],
112112
];
113113
$map[] = [
114114
'schemes' => ['mongodb'],
115-
'factoryClass' => MongodbDriver::class,
115+
'driverClass' => MongodbDriver::class,
116116
'requiredSchemeExtensions' => [],
117117
'packages' => ['enqueue/enqueue', 'enqueue/mongodb'],
118118
];
@@ -132,19 +132,19 @@ public static function getKnownDrivers(): array
132132
'sqlite3',
133133
'sqlite',
134134
],
135-
'factoryClass' => DbalDriver::class,
135+
'driverClass' => DbalDriver::class,
136136
'requiredSchemeExtensions' => [],
137137
'package' => ['enqueue/enqueue', 'enqueue/dbal'],
138138
];
139139
$map[] = [
140140
'schemes' => ['gearman'],
141-
'factoryClass' => GenericDriver::class,
141+
'driverClass' => GenericDriver::class,
142142
'requiredSchemeExtensions' => [],
143143
'package' => ['enqueue/enqueue', 'enqueue/gearman'],
144144
];
145145
$map[] = [
146146
'schemes' => ['beanstalk'],
147-
'factoryClass' => GenericDriver::class,
147+
'driverClass' => GenericDriver::class,
148148
'requiredSchemeExtensions' => [],
149149
'package' => ['enqueue/enqueue', 'enqueue/pheanstalk'],
150150
];
@@ -173,7 +173,7 @@ public static function addDriver(string $driverClass, array $schemes, array $req
173173
self::getKnownDrivers();
174174
self::$knownDrivers[] = [
175175
'schemes' => $schemes,
176-
'factoryClass' => $driverClass,
176+
'driverClass' => $driverClass,
177177
'requiredSchemeExtensions' => $requiredExtensions,
178178
'packages' => $packages,
179179
];

pkg/enqueue/Tests/Client/ResourcesTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public function testShouldGetAvailableDriverInExpectedFormat()
3333

3434
$driverInfo = $availableDrivers[0];
3535

36-
$this->assertArrayHasKey('factoryClass', $driverInfo);
37-
$this->assertSame(AmqpDriver::class, $driverInfo['factoryClass']);
36+
$this->assertArrayHasKey('driverClass', $driverInfo);
37+
$this->assertSame(AmqpDriver::class, $driverInfo['driverClass']);
3838

3939
$this->assertArrayHasKey('schemes', $driverInfo);
4040
$this->assertSame(['amqp', 'amqps'], $driverInfo['schemes']);
@@ -55,8 +55,8 @@ public function testShouldGetAvailableDriverWithRequiredExtensionInExpectedForma
5555

5656
$driverInfo = $availableDrivers[1];
5757

58-
$this->assertArrayHasKey('factoryClass', $driverInfo);
59-
$this->assertSame(RabbitMqDriver::class, $driverInfo['factoryClass']);
58+
$this->assertArrayHasKey('driverClass', $driverInfo);
59+
$this->assertSame(RabbitMqDriver::class, $driverInfo['driverClass']);
6060

6161
$this->assertArrayHasKey('schemes', $driverInfo);
6262
$this->assertSame(['amqp', 'amqps'], $driverInfo['schemes']);
@@ -77,8 +77,8 @@ public function testShouldGetKnownDriversInExpectedFormat()
7777

7878
$driverInfo = $knownDrivers[0];
7979

80-
$this->assertArrayHasKey('factoryClass', $driverInfo);
81-
$this->assertSame(AmqpDriver::class, $driverInfo['factoryClass']);
80+
$this->assertArrayHasKey('driverClass', $driverInfo);
81+
$this->assertSame(AmqpDriver::class, $driverInfo['driverClass']);
8282

8383
$this->assertArrayHasKey('schemes', $driverInfo);
8484
$this->assertSame(['amqp', 'amqps'], $driverInfo['schemes']);
@@ -126,7 +126,7 @@ public function testShouldAllowRegisterDriverThatIsNotInstalled()
126126

127127
$driverInfo = end($availableDrivers);
128128

129-
$this->assertSame('theDriverClass', $driverInfo['factoryClass']);
129+
$this->assertSame('theDriverClass', $driverInfo['driverClass']);
130130
}
131131

132132
public function testShouldAllowGetPreviouslyRegisteredDriver()
@@ -144,8 +144,8 @@ public function testShouldAllowGetPreviouslyRegisteredDriver()
144144

145145
$driverInfo = end($availableDrivers);
146146

147-
$this->assertArrayHasKey('factoryClass', $driverInfo);
148-
$this->assertSame($driverClass, $driverInfo['factoryClass']);
147+
$this->assertArrayHasKey('driverClass', $driverInfo);
148+
$this->assertSame($driverClass, $driverInfo['driverClass']);
149149

150150
$this->assertArrayHasKey('schemes', $driverInfo);
151151
$this->assertSame(['fooscheme', 'barscheme'], $driverInfo['schemes']);

0 commit comments

Comments
 (0)