fixed Unit tests and static tests failures

Author: glo05363

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

@@ -600,6 +600,8 @@ protected function _getQuotes()
 
         if ($params['49_residential'] === '01') {
             $residentialAddressIndicator = $params['49_residential'];
+        } else {
+            $residentialAddressIndicator = '';
         }
 
         $rateParams = [
@@ -841,7 +843,6 @@ protected function _parseRestResponse($rateResponse)
      * @param array $costArr
      * @param array $priceArr
      * @param bool $negotiatedActive
-     * @param array $rateResponseData
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function processShippingRateForItem(
@@ -850,8 +851,7 @@ private function processShippingRateForItem(
         array $allowedCurrencies,
         array &$costArr,
         array &$priceArr,
-        bool $negotiatedActive,
-        array $rateResponseData
+        bool $negotiatedActive
     ): void {
         $code = $shipElement['Service']['Code'] ?? '';
         if (in_array($code, $allowedMethods)) {
@@ -1196,12 +1196,9 @@ public function getResponse()
     public function getAllowedMethods()
     {
         $allowedMethods = explode(',', (string)$this->getConfigData('allowed_methods'));
-        $isUpsXml = $this->getConfigData('type') === 'UPS_API';
         $origin = $this->getConfigData('origin_shipment');
 
-        $availableByTypeMethods = $isUpsXml
-            ? $this->configHelper->getCode('originShipment', $origin)
-            : $this->configHelper->getCode('method');
+        $availableByTypeMethods = $this->configHelper->getCode('originShipment', $origin);
 
         $methods = [];
         foreach ($availableByTypeMethods as $methodCode => $methodData) {
@@ -1564,7 +1561,7 @@ private function requestQuotes(DataObject $request): array
         $this->_prepareShipmentRequest($request);
         $rawJsonRequest = $this->_formShipmentRequest($request);
         $accessToken = $this->setAPIAccessRequest();
-        $this->_debug(['request_quote' => $this->filterDebugData($rawJsonRequest)]);
+        $this->_debug(['request_quote' => $rawJsonRequest]);
         $headers = [
             'Content-Type' => 'application/json',
             'Authorization' => 'Bearer '. $accessToken,
@@ -1626,7 +1623,7 @@ protected function _doShipmentRequest(DataObject $request)
         $this->_prepareShipmentRequest($request);
         $result = new DataObject();
         $rawXmlRequest = $this->_formShipmentRequest($request);
-        $this->setXMLAccessRequest();
+        //$this->setXMLAccessRequest();
         $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
         $debugData = [];

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

@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\Ups\Model;
 
@@ -9,9 +14,6 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Store\Model\StoreManagerInterface;
 
-/**
- * UPS OAuth Token
- */
 class UpsOauth
 {
     /**

app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php

@@ -137,7 +137,6 @@ protected function setUp(): void
         $this->countryFactory->method('create')
             ->willReturn($this->country);
 
-        $xmlFactory = $this->getXmlFactory();
         $httpClientFactory = $this->getHttpClientFactory();
 
         $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
@@ -154,7 +153,6 @@ protected function setUp(): void
                 'rateErrorFactory' => $this->errorFactory,
                 'countryFactory' => $this->countryFactory,
                 'rateFactory' => $rateFactory,
-                'xmlElFactory' => $xmlFactory,
                 'logger' => $this->logger,
                 'httpClientFactory' => $httpClientFactory,
                 'configHelper' => $this->configHelper
@@ -178,11 +176,9 @@ public function scopeConfigGetValue(string $path)
             'carriers/ups/title' => 'ups Title',
             'carriers/ups/specificerrmsg' => 'ups error message',
             'carriers/ups/min_package_weight' => 2,
-            'carriers/ups/type' => 'UPS',
             'carriers/ups/debug' => 1,
             'carriers/ups/username' => 'user',
-            'carriers/ups/password' => 'pass',
-            'carriers/ups/access_license_number' => 'acn'
+            'carriers/ups/password' => 'pass'
         ];
 
         return $pathMap[$path] ?? null;
@@ -546,7 +542,6 @@ public function getCountryById(?string $id): Country
     }
 
     /**
-     * @param string $carrierType
      * @param string $methodType
      * @param string $methodCode
      * @param string $methodTitle
@@ -557,7 +552,6 @@ public function getCountryById(?string $id): Country
      * @dataProvider allowedMethodsDataProvider
      */
     public function testGetAllowedMethods(
-        string $carrierType,
         string $methodType,
         string $methodCode,
         string $methodTitle,
@@ -573,12 +567,6 @@ public function testGetAllowedMethods(
                         null,
                         $allowedMethods
                     ],
-                    [
-                        'carriers/ups/type',
-                        ScopeInterface::SCOPE_STORE,
-                        null,
-                        $carrierType
-                    ],
                     [
                         'carriers/ups/origin_shipment',
                         ScopeInterface::SCOPE_STORE,
@@ -601,23 +589,6 @@ public function allowedMethodsDataProvider(): array
     {
         return [
             [
-                'UPS',
-                'method',
-                '1DM',
-                'Next Day Air Early AM',
-                '',
-                []
-            ],
-            [
-                'UPS',
-                'method',
-                '1DM',
-                'Next Day Air Early AM',
-                '1DM,1DML,1DA',
-                ['1DM' => 'Next Day Air Early AM']
-            ],
-            [
-                'UPS_XML',
                 'originShipment',
                 '01',
                 'UPS Next Day Air',
@@ -627,36 +598,6 @@ public function allowedMethodsDataProvider(): array
         ];
     }
 
-    /**
-     * Creates mock for XML factory.
-     *
-     * @return ElementFactory|MockObject
-     */
-    private function getXmlFactory(): MockObject
-    {
-        $xmlElFactory = $this->getMockBuilder(ElementFactory::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['create'])
-            ->getMock();
-        $xmlElFactory->method('create')
-            ->willReturnCallback(
-                function ($data) {
-                    $helper = new ObjectManager($this);
-
-                    if (empty($data['data'])) {
-                        $data['data'] = '<?xml version = "1.0" ?><ShipmentAcceptRequest/>';
-                    }
-
-                    return $helper->getObject(
-                        Element::class,
-                        ['data' => $data['data']]
-                    );
-                }
-            );
-
-        return $xmlElFactory;
-    }
-
     /**
      * Creates mocks for http client factory and client.
      *