MAGETWO-99673: Implement deferred

Author: Oleksandr Gorkun

app/code/Magento/Shipping/Model/Shipping.php

@@ -9,6 +9,7 @@
 use Magento\Quote\Model\Quote\Address\RateCollectorInterface;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Quote\Model\Quote\Address\RateRequestFactory;
+use Magento\Quote\Model\Quote\Address\RateResult\Error;
 use Magento\Sales\Model\Order\Shipment;
 use Magento\Shipping\Model\Carrier\AbstractCarrier;
 use Magento\Shipping\Model\Rate\CarrierResult;
@@ -278,7 +279,7 @@ private function prepareCarrier(string $carrierCode, RateRequest $request): Abst
         }
         $carrier->setActiveFlag($this->_availabilityConfigField);
         $result = $carrier->checkAvailableShipCountries($request);
-        if (false !== $result && !$result instanceof \Magento\Quote\Model\Quote\Address\RateResult\Error) {
+        if (false !== $result && !$result instanceof Error) {
             $result = $carrier->processAdditionalValidation($request);
         }
         if (!$result) {
@@ -287,7 +288,7 @@ private function prepareCarrier(string $carrierCode, RateRequest $request): Abst
              * if the delivery country is not within specific countries
              */
             throw new \RuntimeException('Cannot collect rates for given request');
-        } elseif ($result instanceof \Magento\Quote\Model\Quote\Address\RateResult\Error) {
+        } elseif ($result instanceof Error) {
             $this->getResult()->append($result);
             throw new \RuntimeException('Error occurred while preparing a carrier');
         }

app/code/Magento/Shipping/Test/Unit/Model/Rate/PackageResultTest.php

@@ -51,8 +51,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $errorMock = $this->getMockBuilder(Error::class)->disableOriginalConstructor()->getMock();
-        $errorMock->expects($this->any())->method('getErrorMessage')->willReturn('error message');
-        $this->errorFactory->expects($this->any())->method('create')->willReturn($errorMock);
+        $errorMock->method('getErrorMessage')->willReturn('error message');
+        $this->errorFactory->method('create')->willReturn($errorMock);
 
         $this->result = new PackageResult($this->storeManager, $this->errorFactory);
     }
@@ -78,10 +78,9 @@ public function testComposing(): void
             ->setMethods(['getMethod', 'getPrice', 'setPrice'])
             ->getMock();
         $price1 = 3;
-        $rate1->expects($this->any())->method('getMethod')->willReturn('method');
-        $rate1->expects($this->any())->method('getPrice')->willReturnReference($price1);
-        $rate1->expects($this->any())
-            ->method('setPrice')
+        $rate1->method('getMethod')->willReturn('method');
+        $rate1->method('getPrice')->willReturnReference($price1);
+        $rate1->method('setPrice')
             ->willReturnCallback(
                 function ($price) use (&$price1) {
                     $price1 = $price;
@@ -91,7 +90,7 @@ function ($price) use (&$price1) {
         $result1 = $this->getMockBuilder(Result::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $result1->expects($this->any())->method('getAllRates')->willReturn([$rate1]);
+        $result1->method('getAllRates')->willReturn([$rate1]);
         $result1->expects($this->once())
             ->method('updateRatePrice')
             ->with(2)
@@ -106,18 +105,17 @@ function () use (&$price1) {
             ->setMethods(['getMethod', 'getPrice', 'setPrice'])
             ->getMock();
         $price2 = 4;
-        $rate2->expects($this->any())->method('getMethod')->willReturn('method');
-        $rate2->expects($this->any())->method('getPrice')->willReturnReference($price2);
-        $rate2->expects($this->any())
-            ->method('setPrice')
+        $rate2->method('getMethod')->willReturn('method');
+        $rate2->method('getPrice')->willReturnReference($price2);
+        $rate2->method('setPrice')
             ->willReturnCallback(
                 function ($price) use (&$price2) {
                     $price2 = $price;
                 }
             );
         /** @var Result|MockObject $result2 */
         $result2 = $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
-        $result2->expects($this->any())->method('getAllRates')->willReturn([$rate2]);
+        $result2->method('getAllRates')->willReturn([$rate2]);
         $result2->expects($this->once())
             ->method('updateRatePrice')
             ->with(3)
@@ -147,10 +145,9 @@ public function testAppendSameReference(): void
             ->setMethods(['getMethod', 'getPrice', 'setPrice'])
             ->getMock();
         $price1 = 3;
-        $rate1->expects($this->any())->method('getMethod')->willReturn('method');
-        $rate1->expects($this->any())->method('getPrice')->willReturnReference($price1);
-        $rate1->expects($this->any())
-            ->method('setPrice')
+        $rate1->method('getMethod')->willReturn('method');
+        $rate1->method('getPrice')->willReturnReference($price1);
+        $rate1->method('setPrice')
             ->willReturnCallback(
                 function ($price) use (&$price1) {
                     $price1 = $price;
@@ -160,7 +157,7 @@ function ($price) use (&$price1) {
         $result1 = $this->getMockBuilder(Result::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $result1->expects($this->any())->method('getAllRates')->willReturn([$rate1]);
+        $result1->method('getAllRates')->willReturn([$rate1]);
 
         $this->result->appendPackageResult($result1, 1);
         $this->result->appendPackageResult($result1, 2);

dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php

@@ -25,7 +25,7 @@
 class CarrierTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Dhl\Model\Carrier
+     * @var Carrier
      */
     private $dhlCarrier;
 
@@ -49,8 +49,8 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->dhlCarrier = $objectManager->get(\Magento\Dhl\Model\Carrier::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->dhlCarrier = $objectManager->get(Carrier::class);
         $this->httpClient = $objectManager->get(AsyncClientInterface::class);
         $this->config = $objectManager->get(ReinitableConfigInterface::class);
         $this->restoreCountry = $this->config->getValue('shipping/origin/country_id', 'store', 'default_store');