Skip to content

Commit cd3d2c3

Browse files
committed
Merge remote-tracking branch 'origin/AC-8918' into Hammer_Platform_Health_Scope_21082023
2 parents 08e533f + 13991e4 commit cd3d2c3

File tree

3 files changed

+8
-46
lines changed

3 files changed

+8
-46
lines changed

app/code/Magento/Ups/Model/Carrier.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,10 +1745,6 @@ private function createPackages(float $totalWeight, array $packages): array
17451745
*/
17461746
protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
17471747
{
1748-
/*
1749-
* This method intentionally has no implementation.
1750-
* TODO: Implement the logic here when needed in the future.
1751-
*/
1752-
//phpcs:enable
1748+
return ''; //This method has kept empty as not required.
17531749
}
17541750
}

app/code/Magento/Ups/Model/UpsAuth.php

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
<?php
2-
/************************************************************************
3-
*
4-
* ADOBE CONFIDENTIAL
5-
* ___________________
6-
*
7-
* Copyright 2023 Adobe
8-
* All Rights Reserved.
9-
*
10-
* NOTICE: All information contained herein is, and remains
11-
* the property of Adobe and its suppliers, if any. The intellectual
12-
* and technical concepts contained herein are proprietary to Adobe
13-
* and its suppliers and are protected by all applicable intellectual
14-
* property laws, including trade secret and copyright laws.
15-
* Dissemination of this information or reproduction of this material
16-
* is strictly forbidden unless prior written permission is obtained
17-
* from Adobe.
18-
* ************************************************************************
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
195
*/
20-
216
declare(strict_types=1);
227

238
namespace Magento\Ups\Model;
@@ -130,10 +115,6 @@ public function getAccessToken($clientId, $clientSecret, $clientUrl)
130115
*/
131116
public function collectRates(RateRequest $request)
132117
{
133-
/*
134-
* This method intentionally has no implementation.
135-
* TODO: Implement the logic here when needed in the future.
136-
*/
118+
return ''; // This method has kept empty as not required.
137119
}
138-
// phpcs:enable
139120
}

dev/tests/integration/testsuite/Magento/Ups/Model/UpsAuthTest.php

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
<?php
2-
/************************************************************************
3-
*
4-
* ADOBE CONFIDENTIAL
5-
* ___________________
6-
*
7-
* Copyright 2023 Adobe
8-
* All Rights Reserved.
9-
*
10-
* NOTICE: All information contained herein is, and remains
11-
* the property of Adobe and its suppliers, if any. The intellectual
12-
* and technical concepts contained herein are proprietary to Adobe
13-
* and its suppliers and are protected by all applicable intellectual
14-
* property laws, including trade secret and copyright laws.
15-
* Dissemination of this information or reproduction of this material
16-
* is strictly forbidden unless prior written permission is obtained
17-
* from Adobe.
18-
* ************************************************************************
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
195
*/
20-
216
declare(strict_types=1);
227

238
namespace Magento\Ups\Model;

0 commit comments

Comments
 (0)