Skip to content

Commit 4865fbf

Browse files
committed
AC-13574: Investigate replacement of package - laminas/laminas-oauth
1 parent 96dec49 commit 4865fbf

File tree

9 files changed

+292
-270
lines changed

9 files changed

+292
-270
lines changed

app/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<preference for="Magento\Framework\App\Route\ConfigInterface" type="Magento\Framework\App\Route\Config" />
7676
<preference for="Magento\Framework\App\ResourceConnection\ConfigInterface" type="Magento\Framework\App\ResourceConnection\Config\Proxy" />
7777
<preference for="Magento\Framework\Oauth\OauthInterface" type="Magento\Framework\Oauth\Oauth"/>
78+
<preference for="Magento\Framework\Oauth\Helper\Signature\HmacInterface" type="Magento\Framework\Oauth\Helper\Signature\Hmac" />
7879
<preference for="Magento\Framework\View\Design\Theme\Domain\PhysicalInterface" type="Magento\Theme\Model\Theme\Domain\Physical" />
7980
<preference for="Magento\Framework\View\Design\Theme\Domain\VirtualInterface" type="Magento\Theme\Model\Theme\Domain\Virtual" />
8081
<preference for="Magento\Framework\View\Design\Theme\Domain\StagingInterface" type="Magento\Theme\Model\Theme\Domain\Staging" />

composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,21 @@
4747
"colinmollenhour/credis": "^1.15",
4848
"colinmollenhour/php-redis-session-abstract": "^2.0",
4949
"composer/composer": "^2.0, !=2.2.16",
50-
"magento/elasticsearch": "^1.0.0",
5150
"duosecurity/duo_api_php": "^1.1",
5251
"duosecurity/duo_universal_php": "^1.0",
5352
"elasticsearch/elasticsearch": "^7.17 || ^8.15",
5453
"ezyang/htmlpurifier": "^4.17",
5554
"guzzlehttp/guzzle": "^7.5",
5655
"laminas/laminas-captcha": "^2.18",
5756
"laminas/laminas-code": "^4.13",
58-
"magento/laminas-db": "^1.0.0",
59-
"magento/laminas-di": "^1.0.0",
6057
"laminas/laminas-escaper": "^2.13",
6158
"laminas/laminas-eventmanager": "^3.11",
6259
"laminas/laminas-feed": "^2.22",
63-
"magento/laminas-file": "^1.0.0",
6460
"laminas/laminas-filter": "^2.33",
6561
"laminas/laminas-http": "^2.15",
6662
"laminas/laminas-i18n": "^2.17",
6763
"laminas/laminas-modulemanager": "^2.11",
6864
"laminas/laminas-mvc": "^3.6",
69-
"magento/laminas-oauth": "^1.0.0",
7065
"laminas/laminas-permissions-acl": "^2.10",
7166
"laminas/laminas-servicemanager": "^3.16",
7267
"laminas/laminas-soap": "^2.10",
@@ -77,7 +72,12 @@
7772
"league/flysystem-aws-s3-v3": "^3.0",
7873
"magento/composer": "^1.10.1-beta1",
7974
"magento/composer-dependency-version-audit-plugin": "^0.1",
75+
"magento/elasticsearch": "^1.0.0",
76+
"magento/laminas-db": "^1.0.0",
77+
"magento/laminas-di": "^1.0.0",
78+
"magento/laminas-file": "^1.0.0",
8079
"magento/magento-composer-installer": ">=0.4.0",
80+
"magento/ringphp": "^1.0.0",
8181
"magento/zend-cache": "^1.16",
8282
"magento/zend-db": "^1.16",
8383
"magento/zend-pdf": "^1.16",
@@ -99,8 +99,7 @@
9999
"tubalmartin/cssmin": "^4.1",
100100
"web-token/jwt-framework": "^3.4",
101101
"webonyx/graphql-php": "^15.0",
102-
"wikimedia/less.php": "^5.0",
103-
"magento/ringphp": "^1.0.0"
102+
"wikimedia/less.php": "^5.0"
104103
},
105104
"require-dev": {
106105
"magento/allure-phpunit": "^1.0.0",

composer.lock

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

dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
6-
76
namespace Magento\TestFramework\Authentication\Rest;
87

98
use Magento\Framework\Oauth\Helper\Utility;
9+
use Magento\Framework\Oauth\Helper\Signature\Hmac;
1010
use Magento\TestFramework\Helper\Bootstrap;
1111
use Magento\TestFramework\ObjectManager;
1212
use OAuth\Common\Consumer\Credentials;
@@ -19,8 +19,6 @@
1919
use OAuth\OAuth1\Signature\SignatureInterface;
2020
use OAuth\OAuth1\Token\StdOAuth1Token;
2121
use OAuth\OAuth1\Token\TokenInterface;
22-
use Laminas\OAuth\Http\Utility as HTTPUtility;
23-
use Magento\Framework\Oauth\Helper\Signature\HmacFactory;
2422

2523
/**
2624
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -60,7 +58,7 @@ public function __construct(
6058
}
6159
if (!isset($helper)) {
6260
/** @phpstan-ignore-next-line */
63-
$helper = new Utility(new HTTPUtility(), new HmacFactory(ObjectManager::getInstance()));
61+
$helper = new Utility(new Hmac());
6462
}
6563
if (!isset($signature)) {
6664
$signature = new \Magento\TestFramework\Authentication\Rest\OauthClient\Signature($helper, $credentials);

0 commit comments

Comments
 (0)