Merge pull request #117 from magento-firedrakes/MAGETWO-53667

[Firedrakes+MPI] Bugfixes and @API tags

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

@@ -507,12 +507,15 @@ private function executeCommand($commandCode, array $arguments = [])
             return null;
         }
 
-        if (isset($arguments['payment'])) {
+        /** @var InfoInterface|null $payment */
+        $payment = null;
+        if (isset($arguments['payment']) && $arguments['payment'] instanceof InfoInterface) {
+            $payment = $arguments['payment'];
             $arguments['payment'] = $this->paymentDataObjectFactory->create($arguments['payment']);
         }
 
         if ($this->commandExecutor !== null) {
-            return $this->commandExecutor->executeByCode($commandCode, $arguments);
+            return $this->commandExecutor->executeByCode($commandCode, $payment, $arguments);
         }
 
         if ($this->commandPool === null) {

app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php

@@ -6,10 +6,15 @@
 namespace Magento\Payment\Test\Unit\Model\Method;
 
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Payment\Gateway\Command\CommandManagerInterface;
 use Magento\Payment\Gateway\Command\CommandPoolInterface;
+use Magento\Payment\Gateway\CommandInterface;
+use Magento\Payment\Gateway\Config\ValueHandlerInterface;
 use Magento\Payment\Gateway\Config\ValueHandlerPoolInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Gateway\Validator\ValidatorPoolInterface;
+use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\Method\Adapter;
 
 class AdapterTest extends \PHPUnit_Framework_TestCase
@@ -158,4 +163,133 @@ public function testIsAvailableEmptyQuote()
         $this->adapter->setInfoInstance($paymentInfo);
         static::assertTrue($this->adapter->isAvailable(null));
     }
+
+    public function testExecuteCommandWithCommandExecutor()
+    {
+        /** @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject $eventManager */
+        $eventManager = $this->getMock(
+            ManagerInterface::class
+        );
+
+        /** @var ValueHandlerPoolInterface|\PHPUnit_Framework_MockObject_MockObject $valueHandlerPool */
+        $valueHandlerPool = $this->getMock(
+            ValueHandlerPoolInterface::class
+        );
+
+        /** @var CommandManagerInterface|\PHPUnit_Framework_MockObject_MockObject $commandManager */
+        $commandManager = $this->getMock(
+            CommandManagerInterface::class
+        );
+
+        /** @var PaymentDataObjectFactory|\PHPUnit_Framework_MockObject_MockObject $paymentDataObjectFactory */
+        $paymentDataObjectFactory = $this->getMockBuilder(
+            PaymentDataObjectFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $paymentInfo = $this->getMock(InfoInterface::class);
+        $paymentDO = $this->getMock(PaymentDataObjectInterface::class);
+
+        $adapter = new Adapter(
+            $eventManager,
+            $valueHandlerPool,
+            $paymentDataObjectFactory,
+            'CODE',
+            '\FormBlock',
+            '\InfoBlock',
+            null,
+            null,
+            $commandManager
+        );
+
+        $valueHandler = $this->getMock(ValueHandlerInterface::class);
+
+        $valueHandlerPool->expects(static::once())
+            ->method('get')
+            ->with('can_authorize')
+            ->willReturn($valueHandler);
+        $valueHandler->expects(static::once())
+            ->method('handle')
+            ->with(['field' => 'can_authorize'])
+            ->willReturn(true);
+
+        $paymentDataObjectFactory->expects(static::once())
+            ->method('create')
+            ->with($paymentInfo)
+            ->willReturn($paymentDO);
+
+        $commandManager->expects(static::once())
+            ->method('executeByCode')
+            ->with('authorize', $paymentInfo, ['amount' => 10, 'payment' => $paymentDO])
+            ->willReturn(null);
+
+        $adapter->authorize($paymentInfo, 10);
+    }
+
+    public function testExecuteCommandWithCommandPool()
+    {
+        /** @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject $eventManager */
+        $eventManager = $this->getMock(
+            ManagerInterface::class
+        );
+
+        /** @var ValueHandlerPoolInterface|\PHPUnit_Framework_MockObject_MockObject $valueHandlerPool */
+        $valueHandlerPool = $this->getMock(
+            ValueHandlerPoolInterface::class
+        );
+
+        /** @var CommandPoolInterface|\PHPUnit_Framework_MockObject_MockObject $commandPool */
+        $commandPool = $this->getMock(
+            CommandPoolInterface::class
+        );
+
+        /** @var PaymentDataObjectFactory|\PHPUnit_Framework_MockObject_MockObject $paymentDataObjectFactory */
+        $paymentDataObjectFactory = $this->getMockBuilder(
+            PaymentDataObjectFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $paymentInfo = $this->getMock(InfoInterface::class);
+        $paymentDO = $this->getMock(PaymentDataObjectInterface::class);
+
+        $adapter = new Adapter(
+            $eventManager,
+            $valueHandlerPool,
+            $paymentDataObjectFactory,
+            'CODE',
+            '\FormBlock',
+            '\InfoBlock',
+            $commandPool
+        );
+
+        $valueHandler = $this->getMock(ValueHandlerInterface::class);
+        $command = $this->getMock(CommandInterface::class);
+
+        $valueHandlerPool->expects(static::once())
+            ->method('get')
+            ->with('can_authorize')
+            ->willReturn($valueHandler);
+        $valueHandler->expects(static::once())
+            ->method('handle')
+            ->with(['field' => 'can_authorize'])
+            ->willReturn(true);
+
+        $paymentDataObjectFactory->expects(static::once())
+            ->method('create')
+            ->with($paymentInfo)
+            ->willReturn($paymentDO);
+
+        $commandPool->expects(static::once())
+            ->method('get')
+            ->with('authorize')
+            ->willReturn($command);
+        $command->expects(static::once())
+            ->method('execute')
+            ->with(['amount' => 10, 'payment' => $paymentDO])
+            ->willReturn(null);
+
+        $adapter->authorize($paymentInfo, 10);
+    }
 }

lib/internal/Magento/Framework/App/Action/Context.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * @api
+ */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**

lib/internal/Magento/Framework/App/ActionFactory.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App;
 
+/**
+ * @api
+ */
 class ActionFactory
 {
     /**

lib/internal/Magento/Framework/App/ActionInterface.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App;
 
+/**
+ * @api
+ */
 interface ActionInterface
 {
     const FLAG_NO_DISPATCH = 'no-dispatch';

lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App\Area;
 
+/**
+ * @api
+ */
 class FrontNameResolverFactory
 {
     /**

lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php

@@ -16,7 +16,7 @@ interface FrontNameResolverInterface
     /**
      * Retrieve front name
      *
-     * @param bool if true,  only return frontname if it is valid for the host
+     * @param bool $checkHost if true, return front name only if it is valid for the current host
      * @return string|bool
      */
     public function getFrontName($checkHost = false);

lib/internal/Magento/Framework/App/Language/Dictionary.php

@@ -11,6 +11,8 @@
 
 /**
  * A service for reading language package dictionaries
+ *
+ * @api
  */
 class Dictionary
 {

lib/internal/Magento/Framework/App/Request/DataPersistorInterface.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\App\Request;
 
+/**
+ * @api
+ */
 interface DataPersistorInterface
 {
     /**

lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App\Request;
 
+/**
+ * @api
+ */
 interface PathInfoProcessorInterface
 {
     /**

lib/internal/Magento/Framework/App/RequestInterface.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App;
 
+/**
+ * @api
+ */
 interface RequestInterface
 {
     /**

lib/internal/Magento/Framework/App/ResponseInterface.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App;
 
+/**
+ * @api
+ */
 interface ResponseInterface
 {
     /**

lib/internal/Magento/Framework/App/View/Asset/Publisher.php

@@ -12,6 +12,8 @@
 
 /**
  * A publishing service for view assets
+ *
+ * @api
  */
 class Publisher
 {

lib/internal/Magento/Framework/AppInterface.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework;
 
+/**
+ * @api
+ */
 interface AppInterface
 {
     /**

lib/internal/Magento/Framework/AuthorizationInterface.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework;
 
+/**
+ * @api
+ */
 interface AuthorizationInterface
 {
     /**

lib/internal/Magento/Framework/Component/ComponentRegistrar.php

@@ -9,6 +9,8 @@
  * Provides ability to statically register components.
  *
  * @author Josh Di Fabio <[email protected]>
+ *
+ * @api
  */
 class ComponentRegistrar implements ComponentRegistrarInterface
 {

lib/internal/Magento/Framework/Controller/ResultInterface.php

@@ -12,6 +12,8 @@
  * An abstraction of result that controller actions must return
  * The point of this kind of object is to encapsulate all information/objects relevant to the result
  * and be able to set it to the HTTP response
+ *
+ * @api
  */
 interface ResultInterface
 {

lib/internal/Magento/Framework/CurrencyInterface.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework;
 
+/**
+ * @api
+ */
 interface CurrencyInterface
 {
     /**

lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php

@@ -7,6 +7,8 @@
 
 /**
  * Interface that encapsulates complexity of expression computation
+ *
+ * @api
  */
 interface InterpreterInterface
 {

lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php

@@ -11,6 +11,9 @@
  */
 namespace Magento\Framework\Data\Form\Filter;
 
+/**
+ * @api
+ */
 interface FilterInterface
 {
     /**

lib/internal/Magento/Framework/Data/OptionSourceInterface.php

@@ -7,6 +7,8 @@
 
 /**
  * Source of option values in a form of value-label pairs
+ *
+ * @api
  */
 interface OptionSourceInterface
 {

lib/internal/Magento/Framework/Event.php

@@ -11,6 +11,9 @@
  */
 namespace Magento\Framework;
 
+/**
+ * @api
+ */
 class Event extends \Magento\Framework\DataObject
 {
     /**

lib/internal/Magento/Framework/Event/Observer.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\Event;
 
+/**
+ * @api
+ */
 class Observer extends \Magento\Framework\DataObject
 {
     /**

lib/internal/Magento/Framework/Exception/LocalizedException.php

@@ -10,6 +10,9 @@
 use Magento\Framework\Phrase;
 use Magento\Framework\Phrase\Renderer\Placeholder;
 
+/**
+ * @api
+ */
 class LocalizedException extends \Exception
 {
     /**

lib/internal/Magento/Framework/Filesystem.php

@@ -9,6 +9,9 @@
 
 use Magento\Framework\Filesystem\DriverPool;
 
+/**
+ * @api
+ */
 class Filesystem
 {
     /**

lib/internal/Magento/Framework/Filesystem/DriverInterface.php

@@ -11,6 +11,8 @@
 
 /**
  * Class Driver
+ *
+ * @api
  */
 interface DriverInterface
 {