MAGETWO-51947: Prepare pull request

Author: Alex Bomko

app/code/Magento/BundleSampleData/Model/Product.php

@@ -117,12 +117,11 @@ private function getOptionFactory()
     {
 
         if (!($this->optionFactory)) {
-            return ObjectManager::getInstance()->get(
+            $this->optionFactory = ObjectManager::getInstance()->get(
                 '\Magento\Bundle\Api\Data\OptionInterfaceFactory'
             );
-        } else {
-            return $this->optionFactory;
         }
+        return $this->optionFactory;
     }
 
     /**
@@ -135,12 +134,11 @@ private function getLinkFactory()
     {
 
         if (!($this->linkFactory)) {
-            return ObjectManager::getInstance()->get(
+            $this->linkFactory = ObjectManager::getInstance()->get(
                 '\Magento\Bundle\Api\Data\LinkInterfaceFactory'
             );
-        } else {
-            return $this->linkFactory;
         }
+        return $this->linkFactory;
     }
 
     /**
@@ -153,11 +151,10 @@ private function getProductRepository()
     {
 
         if (!($this->productRepository)) {
-            return ObjectManager::getInstance()->get(
+            $this->productRepository = ObjectManager::getInstance()->get(
                 '\Magento\Catalog\Api\ProductRepositoryInterface'
             );
-        } else {
-            return $this->productRepository;
         }
+        return $this->productRepository;
     }
 }