MAGETWO-32923: Creating Invoice

- unit test coverage
- made converter not required for http clients

Author: dkvashninbay

app/code/Magento/Payment/Gateway/Command/CommandException.php

@@ -5,7 +5,9 @@
  */
 namespace Magento\Payment\Gateway\Command;
 
-class CommandException extends \Exception
+use Magento\Framework\Exception\LocalizedException;
+
+class CommandException extends LocalizedException
 {
 
 }

app/code/Magento/Payment/Gateway/Command/GatewayCommand.php

@@ -82,7 +82,9 @@ public function execute(array $commandSubject)
                 array_merge($commandSubject, ['response' => $response])
             );
             if (!$result->isValid()) {
-                throw new CommandException;
+                throw new CommandException(
+                    __(implode("\n", $result->getFailsDescription()))
+                );
             }
         }
 

app/code/Magento/Payment/Gateway/Helper/SubjectReader.php

@@ -30,7 +30,7 @@ public static function readPayment(array $subject)
      * Reads amount from subject
      *
      * @param array $subject
-     * @return int|double|string
+     * @return mixed
      */
     public static function readAmount(array $subject)
     {

app/code/Magento/Payment/Gateway/Http/Client/Soap.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Payment\Gateway\Http\Client;
 
+use Magento\Framework\Webapi\Soap\ClientFactory;
 use Magento\Payment\Gateway\Http\ClientInterface;
 use Magento\Payment\Gateway\Http\ConverterInterface;
 use Magento\Payment\Gateway\Http\TransferInterface;
@@ -22,15 +23,24 @@ class Soap implements ClientInterface
      */
     private $converter;
 
+    /**
+     * @var ClientFactory
+     */
+    private $clientFactory;
+
     /**
      * @param Logger $logger
+     * @param ClientFactory $clientFactory
+     * @param ConverterInterface | null $converter
      */
     public function __construct(
         Logger $logger,
+        ClientFactory $clientFactory,
         ConverterInterface $converter = null
     ) {
         $this->logger = $logger;
         $this->converter = $converter;
+        $this->clientFactory = $clientFactory;
     }
 
     /**
@@ -46,16 +56,24 @@ public function placeRequest(TransferInterface $transferObject)
     {
         $this->logger->debug(['request' => $transferObject->getBody()]);
 
-        $client = new \SoapClient($transferObject->getClientConfig()['wsdl'], ['trace' => true]);
+        $client = $this->clientFactory->create(
+            $transferObject->getClientConfig()['wsdl'],
+            ['trace' => true]
+        );
 
         try {
             $client->__setSoapHeaders($transferObject->getHeaders());
 
+            $response = $client->__soapCall(
+                $transferObject->getMethod(),
+                [$transferObject->getBody()]
+            );
+
             $result = $this->converter
                 ? $this->converter->convert(
-                    $client->__soapCall($transferObject->getMethod(), [$transferObject->getBody()])
+                    $response
                 )
-                : null;
+                : [$response];
 
             $this->logger->debug(['response' => $result]);
         } catch (\Exception $e) {

app/code/Magento/Payment/Gateway/Http/Client/Zend.php

@@ -9,6 +9,7 @@
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Payment\Gateway\Http\ClientInterface;
 use Magento\Payment\Gateway\Http\ConverterInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
 use Magento\Payment\Model\Method\Logger;
 
 class Zend implements ClientInterface
@@ -31,7 +32,7 @@ class Zend implements ClientInterface
     /**
      * @param ZendClientFactory $clientFactory
      * @param Logger $logger
-     * @param ConverterInterface $converter
+     * @param ConverterInterface | null $converter
      */
     public function __construct(
         ZendClientFactory $clientFactory,
@@ -46,7 +47,7 @@ public function __construct(
     /**
      * {inheritdoc}
      */
-    public function placeRequest(\Magento\Payment\Gateway\Http\TransferInterface $transferObject)
+    public function placeRequest(TransferInterface $transferObject)
     {
         $log = [
             'request' => $transferObject->getBody(),
@@ -67,7 +68,12 @@ public function placeRequest(\Magento\Payment\Gateway\Http\TransferInterface $tr
                 $client->setParameterPost($transferObject->getBody());
                 break;
             default:
-                throw new \LogicException(sprintf('Unsupported HTTP method %s', $transferObject->getMethod()));
+                throw new \LogicException(
+                    sprintf(
+                        'Unsupported HTTP method %s',
+                        $transferObject->getMethod()
+                    )
+                );
         }
 
         $client->setHeaders($transferObject->getHeaders());
@@ -79,10 +85,12 @@ public function placeRequest(\Magento\Payment\Gateway\Http\TransferInterface $tr
 
             $result = $this->converter
                 ? $this->converter->convert($response->getBody())
-                : $response->getBody();
+                : [$response->getBody()];
             $log['response'] = $result;
         } catch (\Zend_Http_Client_Exception $e) {
-            throw new \Magento\Payment\Gateway\Http\ClientException(__($e->getMessage()));
+            throw new \Magento\Payment\Gateway\Http\ClientException(
+                __($e->getMessage())
+            );
         } catch (\Magento\Payment\Gateway\Http\ConverterException $e) {
             throw $e;
         } finally {

app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php

@@ -30,6 +30,11 @@ public function __construct(
      */
     protected function createResult($isValid, array $fails = [])
     {
-        return $this->resultInterfaceFactory->create(['isValid' => (bool)$isValid, 'failsDescription' => $fails]);
+        return $this->resultInterfaceFactory->create(
+            [
+                'isValid' => (bool)$isValid,
+                'failsDescription' => $fails
+            ]
+        );
     }
 }

app/code/Magento/Payment/Gateway/Validator/CountryValidator.php

@@ -9,28 +9,23 @@
 use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 
-class CountryValidator implements ValidatorInterface
+class CountryValidator extends AbstractValidator
 {
     /**
      * @var \Magento\Payment\Gateway\ConfigInterface
      */
     private $config;
 
     /**
-     * @var ResultInterfaceFactory
-     */
-    private $resultFactory;
-
-    /**
-     * @param \Magento\Payment\Gateway\ConfigInterface $config
      * @param ResultInterfaceFactory $resultFactory
+     * @param \Magento\Payment\Gateway\ConfigInterface $config
      */
     public function __construct(
-        ConfigInterface $config,
-        ResultInterfaceFactory $resultFactory
+        ResultInterfaceFactory $resultFactory,
+        ConfigInterface $config
     ) {
         $this->config = $config;
-        $this->resultFactory = $resultFactory;
+        parent::__construct($resultFactory);
     }
 
     /**
@@ -55,10 +50,6 @@ public function validate(array $validationSubject)
             }
         }
 
-        return $this->resultFactory->create(
-            [
-                'isValid' => $isValid
-            ]
-        );
+        return $this->createResult($isValid);
     }
 }

app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php

@@ -9,7 +9,7 @@
 use Magento\Framework\ObjectManager\TMapFactory;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 
-class ValidatorComposite implements ValidatorInterface
+class ValidatorComposite extends AbstractValidator
 {
     /**
      * @var ValidatorInterface[] | TMap
@@ -37,7 +37,7 @@ public function __construct(
                 'type' => 'Magento\Payment\Gateway\Validator\ValidatorInterface'
             ]
         );
-        $this->resultFactory = $resultFactory;
+        parent::__construct($resultFactory);
     }
 
     /**
@@ -61,11 +61,6 @@ public function validate(array $validationSubject)
             }
         }
 
-        return $this->resultFactory->create(
-            [
-                'isValid' => $isValid,
-                'failsDescription' => $failsDescriptionAggregate
-            ]
-        );
+        return $this->createResult($isValid, $failsDescriptionAggregate);
     }
 }

app/code/Magento/Payment/Model/Method/Adapter.php

@@ -580,6 +580,7 @@ public function assignData($data)
 
     /**
      * {inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function initialize($paymentAction, $stateObject)
     {