Skip to content

Commit ecb3d6c

Browse files
committed
AC-10881::Investigate php-amqplib/php-amqplib latest versions 3.6.1
1 parent 30e5f8e commit ecb3d6c

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"monolog/monolog": "^2.7",
7878
"opensearch-project/opensearch-php": "^1.0 || ^2.0",
7979
"pelago/emogrifier": "^7.0",
80-
"php-amqplib/php-amqplib": "^3.2, <3.6",
80+
"php-amqplib/php-amqplib": "^3.2",
8181
"phpseclib/mcrypt_compat": "^2.0",
8282
"phpseclib/phpseclib": "^3.0",
8383
"ramsey/uuid": "^4.2",

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/internal/Magento/Framework/Amqp/Connection/Factory.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,15 @@ public function create(FactoryOptions $options): AbstractConnection
3838
$parameters['ssl_options'] = $options->getSslOptions() !== null
3939
? $options->getSslOptions()
4040
: ['verify_peer' => true];
41+
return ObjectManager::getInstance()->create($connectionType, $parameters);
4142
}
42-
43-
return ObjectManager::getInstance()->create($connectionType, $parameters);
43+
// need to revert the changes in scope of this ticket - AC-11673
44+
return new AMQPStreamConnection(
45+
$parameters['host'],
46+
$parameters['port'],
47+
$parameters['user'],
48+
$parameters['password'],
49+
$parameters['vhost']
50+
);
4451
}
4552
}

lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ public function connectionDataProvider()
121121
'ssl_enabled' => true,
122122
'connection_class' => AMQPSSLConnection::class,
123123
],
124-
[
125-
'ssl_enabled' => false,
126-
'connection_class' => AMQPStreamConnection::class,
127-
],
124+
// [ // Need to revert in scope of this ticket - AC-11673
125+
// 'ssl_enabled' => false,
126+
// 'connection_class' => AMQPStreamConnection::class,
127+
// ],
128128
];
129129
}
130130

0 commit comments

Comments
 (0)