MAGETWO-71522: [Backport] - Checkout using Paypal with configurable product fails and increases QTY of both configurable and simple products - for 2.1

Author: ameysar

dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php

@@ -23,6 +23,7 @@ class ExpressTest extends \Magento\TestFramework\TestCase\AbstractController
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Paypal/_files/quote_payment.php
+     * @return void
      */
     public function testReviewAction()
     {
@@ -45,6 +46,7 @@ public function testReviewAction()
     /**
      * @magentoDataFixture   Magento/Paypal/_files/quote_payment_express.php
      * @magentoConfigFixture current_store paypal/general/business_account merchant_2012050718_biz@example.com
+     * @return void
      */
     public function testCancelAction()
     {
@@ -82,6 +84,7 @@ public function testCancelAction()
      *
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @return void
      */
     public function testStartActionCustomerToQuote()
     {
@@ -143,6 +146,7 @@ public function testStartActionCustomerToQuote()
      * @magentoDataFixture  Magento/Paypal/_files/quote_express_configurable.php
      * @magentoDbIsolation  enabled
      * @magentoAppIsolation enabled
+     * @return void
      */
     public function testReturnAction()
     {

dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express_configurable.php

@@ -13,15 +13,15 @@
 
 require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/product_configurable.php';
 
-/** @var $objectManager \Magento\TestFramework\ObjectManager */
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
 $objectManager = Bootstrap::getObjectManager();
 
 /** @var \Magento\Catalog\Model\Product $product */
 /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
 $product = $productRepository->get('configurable');
 
-/** @var $options Collection */
+/** @var Collection $options */
 $options = $objectManager->create(Collection::class);
 $option = $options->setAttributeFilter($attribute->getId())->getFirstItem();