Skip to content

Commit 5084ac6

Browse files
committed
Merge remote-tracking branch 'bulk/async-webapi-2' into async-webapi-2
2 parents 2a6cb7a + 5496ace commit 5084ac6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/etc/di.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@
224224
<type name="Magento\Framework\Communication\Config\CompositeReader">
225225
<arguments>
226226
<argument name="readers" xsi:type="array">
227-
<!--item name="asyncServiceReader" xsi:type="array">
227+
<item name="asyncServiceReader" xsi:type="array">
228228
<item name="reader" xsi:type="object">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Communication</item>
229229
<item name="sortOrder" xsi:type="string">0</item>
230-
</item-->
230+
</item>
231231
<item name="xmlReader" xsi:type="array">
232232
<item name="reader" xsi:type="object">Magento\Framework\Communication\Config\Reader\XmlReader</item>
233233
<item name="sortOrder" xsi:type="string">10</item>
@@ -1610,7 +1610,7 @@
16101610
<type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
16111611
<arguments>
16121612
<argument name="readers" xsi:type="array">
1613-
<!--item name="asyncServiceReader" xsi:type="object" sortOrder="0">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher</item-->
1613+
<item name="asyncServiceReader" xsi:type="object" sortOrder="0">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher</item>
16141614
<item name="remoteServiceReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Publisher\Config\RemoteService\Reader</item>
16151615
<item name="xmlReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Publisher\Config\Xml\Reader</item>
16161616
<item name="envReader" xsi:type="object" sortOrder="30">Magento\Framework\MessageQueue\Publisher\Config\Env\Reader</item>

dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function initialize()
8181
);
8282
}
8383
$connections = $this->amqpHelper->getConnections();
84-
foreach ($connections as $connectionName => $connectionData) {
84+
foreach (array_keys($connections) as $connectionName) {
8585
$this->amqpHelper->deleteConnection($connectionName);
8686
}
8787
$this->amqpHelper->clearQueue("async.operations.all");

0 commit comments

Comments
 (0)