Fixes for failed static tests in Bundle module.

magento · Mar 18, 2020 · 659beb2 · 659beb2
1 parent 49c261e
commit 659beb2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -54,6 +54,11 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
      */
     private $metadataPool;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param \Magento\Bundle\Api\Data\LinkInterfaceFactory $linkFactory
@@ -82,7 +87,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getChildren($productSku, $optionId = null)
     {
@@ -105,7 +110,7 @@ public function getChildren($productSku, $optionId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\LinkInterface $linkedProduct)
     {
@@ -115,7 +120,8 @@ public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\L
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -169,6 +175,8 @@ public function saveChild(
     }
 
     /**
+     * Map data from the product link object to the new selection model
+     *
      * @param \Magento\Bundle\Model\Selection $selectionModel
      * @param \Magento\Bundle\Api\Data\LinkInterface $productLink
      * @param string $linkedProductId
@@ -217,7 +225,8 @@ protected function mapProductLinkToSelectionModel(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function addChild(
@@ -297,7 +306,7 @@ public function addChild(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function removeChild($sku, $optionId, $childSku)
     {
@@ -336,6 +345,8 @@ public function removeChild($sku, $optionId, $childSku)
     }
 
     /**
+     * Build new Link object from the product and selection
+     *
      * @param \Magento\Catalog\Model\Product $selection
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Bundle\Api\Data\LinkInterface
@@ -367,6 +378,8 @@ private function buildLink(\Magento\Catalog\Model\Product $selection, \Magento\C
     }
 
     /**
+     * Retrieve bundle options with selections
+     *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return \Magento\Bundle\Api\Data\OptionInterface[]
      */
@@ -392,6 +405,7 @@ private function getOptions(\Magento\Catalog\Api\Data\ProductInterface $product)
 
     /**
      * Get MetadataPool instance
+     *
      * @return MetadataPool
      */
     private function getMetadataPool()

diff --git a/app/code/Magento/Bundle/Model/Option/SaveAction.php b/app/code/Magento/Bundle/Model/Option/SaveAction.php
@@ -102,7 +102,7 @@ public function save(ProductInterface $bundleProduct, OptionInterface $option)
             }
         } else {
             if (!$existingOption->getOptionId()) {
-                throw new NoSuchEntityException(
+                throw new \Magento\Framework\Exception\NoSuchEntityException(
                     __("The option that was requested doesn't exist. Verify the entity and try again.")
                 );
             }

diff --git a/app/code/Magento/Bundle/Model/Selection.php b/app/code/Magento/Bundle/Model/Selection.php
@@ -105,6 +105,6 @@ public function afterSave()
                 $this->unsSelectionPriceType();
             }
         }
-        parent::afterSave();
+        return parent::afterSave();
     }
 }
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -11,7 +11,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
- * Class LinkManagementTest
+ * Unit Test for Link Management Model
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -121,7 +121,7 @@ protected function setUp()
             ->setMethods(['get'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->productType = $this->getMockBuilder(\Magento\Bundle\Model\Product\Type\Interceptor::class)
+        $this->productType = $this->getMockBuilder(\Magento\Bundle\Model\Product\Type::class)
             ->setMethods(['getOptionsCollection', 'setStoreFilter', 'getSelectionsCollection', 'getOptionsIds'])
             ->disableOriginalConstructor()
             ->getMock();