MAGETWO-90327: Dedicated debug logging files for Payment and Shipping activity

Author: StasKozar

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

@@ -234,6 +234,7 @@ public function scopeConfigGetValue(string $path)
             'carriers/fedex/allowed_methods' => 'ServiceType',
             'carriers/fedex/debug' => 1,
         ];
+
         return isset($pathMap[$path]) ? $pathMap[$path] : null;
     }
 

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

@@ -485,7 +485,7 @@ protected function _getCgiQuotes()
 
                 $debugData['result'] = $responseBody;
                 $this->_setCachedQuotes($params, $responseBody);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $responseBody = '';
             }
@@ -745,7 +745,7 @@ protected function _getXmlQuotes()
                 $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
                 $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $xmlResponse = '';
             }
@@ -1033,7 +1033,7 @@ protected function _getXmlTracking($trackings)
                 $client->post($url, $this->_xmlAccessRequest . $xmlRequest);
                 $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $xmlResponse = '';
             }
@@ -1445,14 +1445,14 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
             $xmlResponse = $client->getBody();
             $debugData['result'] = $xmlResponse;
             $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
             $xmlResponse = '';
         }
 
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
         }
 
@@ -1493,7 +1493,6 @@ public function getShipAcceptUrl()
      *
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
-     * @throws \Exception
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1513,14 +1512,14 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
                 $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
                 $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['code' => $e->getCode(), 'error' => $e->getMessage()];
             }
         }
 
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
             $result->setErrors($e->getMessage());
         }

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

@@ -160,10 +160,10 @@ protected function setUp()
     /**
      * Callback function, emulates getValue function.
      *
-     * @param $path
+     * @param string $path
      * @return null|string
      */
-    public function scopeConfigGetValue($path)
+    public function scopeConfigGetValue(string $path)
     {
         $pathMap = [
             'carriers/ups/free_method' => 'free_method',
@@ -384,6 +384,8 @@ public function countryDataProvider()
 
     /**
      * Checks a case when UPS processes request to create shipment.
+     *
+     * @return void
      */
     public function testRequestToShipment()
     {