Merge branch 'MAGETWO-42231-PR' of github.corp.magento.com:magento-mpi/magento2ce into MAGETWO-42231-PR

Author: Gurzhyi, Andrii

app/code/Magento/Payment/Gateway/CommandExecuteInterface.php renamed to app/code/Magento/Payment/Gateway/CommandExecutorInterface.php

@@ -6,9 +6,9 @@
 namespace Magento\Payment\Gateway;
 
 /**
- * Interface CommandExecuteInterface
+ * Interface CommandExecutorInterface
  */
-interface CommandExecuteInterface
+interface CommandExecutorInterface
 {
     /**
      * Performs command

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

@@ -12,7 +12,7 @@
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Payment\Gateway\CommandExecuteInterface;
+use Magento\Payment\Gateway\CommandExecutorInterface;
 use Magento\Payment\Gateway\Command\CommandPoolInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
 use Magento\Payment\Gateway\Config\ValueHandlerPoolInterface;
@@ -24,7 +24,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-final class Adapter implements MethodInterface, CommandExecuteInterface
+final class Adapter implements MethodInterface, CommandExecutorInterface
 {
     /**
      * @var ValueHandlerPoolInterface

app/code/Magento/Vault/Api/PaymentTokenRepositoryInterface.php

@@ -31,16 +31,16 @@ public function getById($entityId);
     /**
      * Deletes a specified payment token.
      *
-     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $entity The invoice.
+     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $paymentToken The invoice.
      * @return bool
      */
-    public function delete(Data\PaymentTokenInterface $entity);
+    public function delete(Data\PaymentTokenInterface $paymentToken);
 
     /**
      * Performs persist operations for a specified payment token.
      *
-     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $entity The payment token.
+     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $paymentToken The payment token.
      * @return \Magento\Vault\Api\Data\PaymentTokenInterface Payment token interface.
      */
-    public function save(Data\PaymentTokenInterface $entity);
+    public function save(Data\PaymentTokenInterface $paymentToken);
 }

app/code/Magento/Vault/Model/PaymentTokenNullRepository.php

@@ -63,7 +63,7 @@ public function getById($entityId)
      * @inheritdoc
      * @throws \LogicException
      */
-    public function delete(Data\PaymentTokenInterface $entity)
+    public function delete(Data\PaymentTokenInterface $paymentToken)
     {
         throw new \LogicException(sprintf('You must implement this operation. (%s)', __METHOD__));
     }
@@ -72,7 +72,7 @@ public function delete(Data\PaymentTokenInterface $entity)
      * @inheritdoc
      * @throws \LogicException
      */
-    public function save(Data\PaymentTokenInterface $entity)
+    public function save(Data\PaymentTokenInterface $paymentToken)
     {
         throw new \LogicException(sprintf('You must implement this operation. (%s)', __METHOD__));
     }

app/code/Magento/Vault/Model/PaymentTokenRepository.php

@@ -114,13 +114,13 @@ public function getById($entityId)
     /**
      * Deletes a specified payment token.
      *
-     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $entity The invoice.
+     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $paymentToken The invoice.
      * @return bool
      */
-    public function delete(Data\PaymentTokenInterface $entity)
+    public function delete(Data\PaymentTokenInterface $paymentToken)
     {
         /** @var PaymentToken $tokenModel */
-        $tokenModel = $this->getById($entity->getEntityId());
+        $tokenModel = $this->getById($paymentToken->getEntityId());
         if (empty($tokenModel->getPublicHash())) {
             return false;
         }
@@ -137,11 +137,11 @@ public function delete(Data\PaymentTokenInterface $entity)
      * @param \Magento\Vault\Api\Data\PaymentTokenInterface $entity The payment token.
      * @return \Magento\Vault\Api\Data\PaymentTokenInterface Saved payment token data.
      */
-    public function save(Data\PaymentTokenInterface $entity)
+    public function save(Data\PaymentTokenInterface $paymentToken)
     {
-        /** @var PaymentToken $entity */
-        $this->resourceModel->save($entity);
-        return $entity;
+        /** @var PaymentToken $paymentToken */
+        $this->resourceModel->save($paymentToken);
+        return $paymentToken;
     }
 
     /**

app/code/Magento/Vault/Model/PaymentTokenRepositoryProxy.php

@@ -108,17 +108,17 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
     /**
      * @inheritdoc
      */
-    public function delete(PaymentTokenInterface $entity)
+    public function delete(PaymentTokenInterface $paymentToken)
     {
-        return $this->getRepository()->delete($entity);
+        return $this->getRepository()->delete($paymentToken);
     }
 
     /**
      * @inheritdoc
      */
-    public function save(PaymentTokenInterface $entity)
+    public function save(PaymentTokenInterface $paymentToken)
     {
-        return $this->getRepository()->save($entity);
+        return $this->getRepository()->save($paymentToken);
     }
 
     /**

app/code/Magento/Vault/Model/VaultPaymentInterface.php

@@ -6,13 +6,12 @@
 namespace Magento\Vault\Model;
 
 use Magento\Payment\Model\MethodInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Payment\Gateway\CommandExecuteInterface;
+use Magento\Payment\Gateway\CommandExecutorInterface;
 
 /**
  * Interface VaultPaymentInterface
  */
-interface VaultPaymentInterface extends MethodInterface, CommandExecuteInterface
+interface VaultPaymentInterface extends MethodInterface, CommandExecutorInterface
 {
     const VAULT_TOKEN_COMMAND = 'vault_token';