Skip to content

Commit 9d1d7a9

Browse files
committed
AC-14558::Migration form RabbitMQ to Apache ActiveMQ
1 parent e1053ab commit 9d1d7a9

File tree

9 files changed

+14
-17
lines changed

9 files changed

+14
-17
lines changed

app/code/Magento/MysqlMq/Model/Driver/Queue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function count(): int
177177
*
178178
* @return void
179179
*/
180-
public function subscribeQueue()
180+
public function subscribeQueue(): void
181181
{
182182
throw new \BadMethodCallException('subscribeQueue is not supported in MySQL MQ driver.');
183183
}

app/code/Magento/Stomp/etc/di.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,4 @@
6565
<argument name="instanceName" xsi:type="string">\Magento\Framework\Stomp\Bulk\Queue</argument>
6666
</arguments>
6767
</virtualType>
68-
<!-- <type name="Magento\Framework\MessageQueue\BatchConsumer">-->
69-
<!-- <plugin name="batch_consumer_plugin" type="Magento\Stomp\Plugin\BatchConsumer" />-->
70-
<!-- </type>-->
7168
</config>

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/Model/AsyncTestData.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ class AsyncTestData
2525
* @param string $path
2626
* @return void
2727
*/
28-
public function setTextFilePath($path)
28+
public function setTextFilePath(string $path): void
2929
{
3030
$this->path = $path;
3131
}
3232

3333
/**
3434
* @return string
3535
*/
36-
public function getTextFilePath()
36+
public function getTextFilePath(): string
3737
{
3838
return $this->path;
3939
}
@@ -42,15 +42,15 @@ public function getTextFilePath()
4242
* @param string $strValue
4343
* @return void
4444
*/
45-
public function setValue($strValue)
45+
public function setValue(string $strValue): void
4646
{
4747
$this->msgValue = $strValue;
4848
}
4949

5050
/**
5151
* @return string
5252
*/
53-
public function getValue()
53+
public function getValue(): string
5454
{
5555
return $this->msgValue;
5656
}

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/Model/CustomHandler.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class CustomHandler
1212
/**
1313
* @param AsyncTestData $simpleDataItem
1414
*/
15-
public function process($simpleDataItem)
15+
public function process(AsyncTestData $simpleDataItem): void
1616
{
1717
file_put_contents(
1818
$simpleDataItem->getTextFilePath(),
@@ -24,7 +24,7 @@ public function process($simpleDataItem)
2424
/**
2525
* @param AsyncTestData[] $simpleDataItems
2626
*/
27-
public function processArray($simpleDataItems)
27+
public function processArray(array $simpleDataItems): void
2828
{
2929
foreach ($simpleDataItems as $objItem) {
3030
file_put_contents(
@@ -38,7 +38,7 @@ public function processArray($simpleDataItems)
3838
/**
3939
* @param mixed $simpleDataItems
4040
*/
41-
public function processMixed($simpleDataItems)
41+
public function processMixed(mixed $simpleDataItems): void
4242
{
4343
/** @var AsyncTestData[] $simpleDataItems */
4444
$simpleDataItems = is_array($simpleDataItems) ? $simpleDataItems : [$simpleDataItems];

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/Model/RequestHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class RequestHandler
1212
/**
1313
* @param AsyncTestData $simpleDataItem
1414
*/
15-
public function process(AsyncTestData $simpleDataItem)
15+
public function process(AsyncTestData $simpleDataItem): void
1616
{
1717
file_put_contents(
1818
$simpleDataItem->getTextFilePath(),

dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-skip-list.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
\Magento\Framework\Stomp\Queue::class => null,
565565
\Magento\Framework\Stomp\StompClient::class => null,
566566
\Magento\Framework\MessageQueue\QueueRepository::class => null,
567-
'Stomp\StatefulStomp' => null,
567+
Stomp\StatefulStomp::class => null,
568568
],
569569
'placeOrder-fromConstructed' => [
570570
// AMQP message queue objects
@@ -580,6 +580,6 @@
580580
\Magento\Framework\Stomp\Queue::class => null,
581581
\Magento\Framework\Stomp\StompClient::class => null,
582582
\Magento\Framework\MessageQueue\QueueRepository::class => null,
583-
'Stomp\StatefulStomp' => null,
583+
\Stomp\StatefulStomp::class => null,
584584
],
585585
];

lib/internal/Magento/Framework/Amqp/Queue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public function push(EnvelopeInterface $envelope)
206206
*
207207
* @return void
208208
*/
209-
public function subscribeQueue()
209+
public function subscribeQueue(): void
210210
{
211211
throw new \BadMethodCallException('subscribeQueue is not supported in amqp queue.');
212212
}

lib/internal/Magento/Framework/MessageQueue/QueueInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function push(EnvelopeInterface $envelope);
6565
*
6666
* @return void
6767
*/
68-
public function subscribeQueue();
68+
public function subscribeQueue(): void;
6969

7070
/**
7171
* Clear queue

lib/internal/Magento/Framework/Stomp/Queue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private function readMessage(): ?Frame
258258
/**
259259
* @inheritdoc
260260
*/
261-
public function subscribeQueue()
261+
public function subscribeQueue(): void
262262
{
263263
$stompClient = $this->getStompConsumerClient();
264264
$stompClient->subscribeQueue($this->queueName);

0 commit comments

Comments
 (0)