MAGETWO-32953: Fix Bamboo builds

Cari Spruiell · Cari Spruiell · commit 76fa1f7c305a · 2015-01-26T14:39:51.000-06:00
- fix code formatting issues
- fix outdated references to Magento\Store\Model\StoreManagerInterface
diff --git a/app/code/Magento/Backend/Model/Config/ScopeDefiner.php b/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
@@ -37,6 +37,9 @@ public function getScope()
             'store'
         ) ? \Magento\Framework\Store\ScopeInterface::SCOPE_STORE : ($this->_request->getParam(
             'website'
-        ) ? \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE : \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT);
+        ) ?
+            \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE
+            :
+            \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT);
     }
 }
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php b/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
@@ -18,7 +18,10 @@ abstract class AbstractComposite extends \Magento\Backend\Model\Config\Structure
      * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param Iterator $childrenIterator
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager, Iterator $childrenIterator)
+    public function __construct(
+        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        Iterator $childrenIterator
+    )
     {
         parent::__construct($storeManager);
         $this->_childrenIterator = $childrenIterator;
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -45,7 +45,10 @@ public function __construct(
      */
     public function isRssAllowed()
     {
-        return $this->_scopeConfig->getValue('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(
+            'rss/catalog/category',
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Rss/Category.php b/app/code/Magento/Catalog/Block/Rss/Category.php
@@ -215,7 +215,10 @@ public function getCacheLifetime()
      */
     public function isAllowed()
     {
-        return $this->_scopeConfig->isSetFlag('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag(
+            'rss/catalog/category',
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -121,7 +121,10 @@ public function getRssData()
     {
         $newUrl = $this->rssUrlBuilder->getUrl(['type' => 'special_products', 'store_id' => $this->getStoreId()]);
         $title = __('%1 - Special Products', $this->storeManager->getStore()->getFrontendName());
-        $lang = $this->_scopeConfig->getValue('general/locale/code', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        $lang = $this->_scopeConfig->getValue(
+            'general/locale/code',
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        );
 
         $data = [
             'title' => $title,
@@ -253,7 +256,10 @@ protected function getCustomerGroupId()
      */
     public function isAllowed()
     {
-        return $this->_scopeConfig->isSetFlag('rss/catalog/special', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag(
+            'rss/catalog/special',
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
@@ -48,7 +48,9 @@ public function execute()
 
         if ($storeId) {
             if (!$categoryId) {
-                $store = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore($storeId);
+                $store = $this->_objectManager
+                    ->get('Magento\Framework\Store\StoreManagerInterface')
+                    ->getStore($storeId);
                 $rootId = $store->getRootCategoryId();
                 $this->getRequest()->setParam('id', $rootId);
             }
diff --git a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
@@ -81,7 +81,8 @@ public function add($productSku, $customerGroupId, $price)
         $product = $this->productRepository->get($productSku, true);
         $groupPrices = $product->getData('group_price');
         $websiteIdentifier = 0;
-        if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) != 0) {
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
         $found = false;
@@ -125,7 +126,8 @@ public function remove($productSku, $customerGroupId)
     {
         $product = $this->productRepository->get($productSku, true);
         $websiteIdentifier = 0;
-        if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) != 0) {
+        $value = $this->config->getValue('catalog/price/scope',\Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
         $this->priceModifier->removeGroupPrice($product, $customerGroupId, $websiteIdentifier);
@@ -139,7 +141,8 @@ public function getList($productSku, $websiteId = null)
     {
         $product = $this->productRepository->get($productSku, true);
         $priceKey = 'website_price';
-        if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) == 0) {
+        $value = $this->config->getValue('catalog/price/scope',\Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        if ($value == 0) {
             $priceKey = 'price';
         }
 
diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -93,7 +93,8 @@ public function add($productSku, $customerGroupId, $price, $qty)
         $product = $this->productRepository->get($productSku, ['edit_mode' => true]);
         $tierPrices = $product->getData('tier_price');
         $websiteIdentifier = 0;
-        if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) != 0) {
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
         $found = false;
@@ -148,7 +149,8 @@ public function remove($productSku, $customerGroupId, $qty)
     {
         $product = $this->productRepository->get($productSku, ['edit_mode' => true]);
         $websiteIdentifier = 0;
-        if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) != 0) {
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
         $this->priceModifier->removeTierPrice($product, $customerGroupId, $qty, $websiteIdentifier);
@@ -163,7 +165,8 @@ public function getList($productSku, $customerGroupId)
         $product = $this->productRepository->get($productSku, ['edit_mode' => true]);
 
         $priceKey = 'website_price';
-        if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) == 0) {
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        if ($value == 0) {
             $priceKey = 'price';
         }
 
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
@@ -332,7 +332,10 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
      */
     protected function _getEmails($configPath, $storeId)
     {
-        $data = $this->_scopeConfig->getValue($configPath, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);
+        $data = $this->_scopeConfig->getValue(
+            $configPath,
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId
+        );
         if (!empty($data)) {
             return explode(',', $data);
         }
diff --git a/app/code/Magento/Contact/Controller/Index.php b/app/code/Magento/Contact/Controller/Index.php
@@ -83,7 +83,12 @@ public function __construct(
      */
     public function dispatch(RequestInterface $request)
     {
-        if (!$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if (
+        !$this->scopeConfig->isSetFlag(
+            self::XML_PATH_ENABLED,
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        )
+        ) {
             throw new NotFoundException();
         }
         return parent::dispatch($request);
diff --git a/app/code/Magento/Contact/Helper/Data.php b/app/code/Magento/Contact/Helper/Data.php
@@ -60,7 +60,10 @@ public function __construct(
      */
     public function isEnabled()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(
+            self::XML_PATH_ENABLED,
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
diff --git a/app/code/Magento/Core/App/Router/Base.php b/app/code/Magento/Core/App/Router/Base.php
@@ -115,7 +115,7 @@ class Base implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\Store\StoreManagerInterface|\Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
@@ -404,7 +404,10 @@ protected function _getCurrentSecureUrl($request)
     protected function _shouldBeSecure($path)
     {
         return parse_url(
-            $this->_scopeConfig->getValue('web/unsecure/base_url', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+            $this->_scopeConfig->getValue(
+                'web/unsecure/base_url',
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            ),
             PHP_URL_SCHEME
         ) === 'https' || $this->_scopeConfig->isSetFlag(
             \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
diff --git a/app/code/Magento/GiftMessage/Model/CartRepository.php b/app/code/Magento/GiftMessage/Model/CartRepository.php
@@ -26,7 +26,7 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
     /**
      * Store manager interface.
      *
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var \Magento\Framework\Store\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -53,14 +53,14 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
 
     /**
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param GiftMessageManager $giftMessageManager
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
      */
     public function __construct(
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Store\StoreManagerInterface $storeManager,
         \Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
         \Magento\GiftMessage\Helper\Message $helper,
         \Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -27,7 +27,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
     /**
      * Store manager interface.
      *
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var \Magento\Framework\Store\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -54,14 +54,14 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
 
     /**
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param GiftMessageManager $giftMessageManager
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
      */
     public function __construct(
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Store\StoreManagerInterface $storeManager,
         \Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
         \Magento\GiftMessage\Helper\Message $helper,
         \Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
@@ -1125,7 +1125,10 @@ public function getName()
      */
     public function beforeDelete()
     {
-        $this->_configDataResource->clearScopeData(\Magento\Framework\Store\ScopeInterface::SCOPE_STORES, $this->getId());
+        $this->_configDataResource->clearScopeData(
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+            $this->getId()
+        );
 
         return parent::beforeDelete();
     }
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -120,6 +120,9 @@ public function getCustomer()
     public function isRssAllow()
     {
         return $this->_moduleManager->isEnabled('Magento_Rss')
-            && $this->_scopeConfig->isSetFlag('rss/wishlist/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+            && $this->_scopeConfig->isSetFlag(
+                'rss/wishlist/active',
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            );
     }
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -130,7 +130,10 @@ public function generateWsdlUrl($services, $storeCode = null)
         /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
         $storeCode = !is_null($storeCode)
             ? (string)$storeCode
-            : Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getCode();
+            : Bootstrap::getObjectManager()
+                ->get('Magento\Framework\Store\StoreManagerInterface')
+                ->getStore()
+                ->getCode();
 
         /** TESTS_BASE_URL is initialized in PHPUnit configuration */
         $wsdlUrl = rtrim(TESTS_BASE_URL, '/') . self::WSDL_BASE_PATH . '/' . $storeCode . '?wsdl=1&services=';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -91,10 +91,12 @@ public function testSaveOrder()
             ->setCustomerEmail('customer@null.com')
             ->setBillingAddress($billingAddress)
             ->setShippingAddress($shippingAddress)
-            ->setStoreId($this->objectManager
-                ->get('Magento\Framework\Store\StoreManagerInterface')
-                ->getStore()
-                ->getId())
+            ->setStoreId(
+                $this->objectManager
+                    ->get('Magento\Framework\Store\StoreManagerInterface')
+                    ->getStore()
+                    ->getId()
+            )
             ->addItem($orderItem)
             ->setPayment($payment);
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
@@ -70,7 +70,6 @@
     ['Magento\RecurringPayment'],
     ['Magento\PayPalRecurringPayment'],
     ['Magento\ConfigurableProduct\Service'],
-    ['Magento\Catalog\Service'],
     ['Magento\Core\Model\TemplateEngine\Decorator', 'Magento\Developer\Model\TemplateEngine\Decorator'],
     ['Magento\Catalog\Service'],
     ['Magento\CheckoutAgreements\Service'],
diff --git a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
@@ -46,7 +46,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
         $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->model = new CheckoutAgreementsRepository(
             $this->factoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
@@ -101,7 +101,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
         $this->giftMessageManagerMock =
             $this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
         $this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
@@ -100,7 +100,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
         $this->giftMessageManagerMock =
             $this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
         $this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ public function getScope()`
`37`	`37`	`'store'`
`38`	`38`	`) ? \Magento\Framework\Store\ScopeInterface::SCOPE_STORE : ($this->_request->getParam(`
`39`	`39`	`'website'`
`40`		`- ) ? \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE : \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT);`
	`40`	`+ ) ?`
	`41`	`+ \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE`
	`42`	`+ :`
	`43`	`+ \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT);`
`41`	`44`	`}`
`42`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,10 @@ public function __construct(`
`45`	`45`	`*/`
`46`	`46`	`public function isRssAllowed()`
`47`	`47`	`{`
`48`		`- return $this->_scopeConfig->getValue('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);`
	`48`	`+ return $this->_scopeConfig->getValue(`
	`49`	`+ 'rss/catalog/category',`
	`50`	`+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE`
	`51`	`+ );`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,10 @@ public function getCacheLifetime()`
`215`	`215`	`*/`
`216`	`216`	`public function isAllowed()`
`217`	`217`	`{`
`218`		`- return $this->_scopeConfig->isSetFlag('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);`
	`218`	`+ return $this->_scopeConfig->isSetFlag(`
	`219`	`+ 'rss/catalog/category',`
	`220`	`+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE`
	`221`	`+ );`
`219`	`222`	`}`
`220`	`223`
`221`	`224`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public function add($productSku, $customerGroupId, $price)`
`81`	`81`	`$product = $this->productRepository->get($productSku, true);`
`82`	`82`	`$groupPrices = $product->getData('group_price');`
`83`	`83`	`$websiteIdentifier = 0;`
`84`		`- if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) != 0) {`
	`84`	`+ $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);`
	`85`	`+ if ($value != 0) {`
`85`	`86`	`$websiteIdentifier = $this->storeManager->getWebsite()->getId();`
`86`	`87`	`}`
`87`	`88`	`$found = false;`
`@@ -125,7 +126,8 @@ public function remove($productSku, $customerGroupId)`
`125`	`126`	`{`
`126`	`127`	`$product = $this->productRepository->get($productSku, true);`
`127`	`128`	`$websiteIdentifier = 0;`
`128`		`- if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) != 0) {`
	`129`	`+ $value = $this->config->getValue('catalog/price/scope',\Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);`
	`130`	`+ if ($value != 0) {`
`129`	`131`	`$websiteIdentifier = $this->storeManager->getWebsite()->getId();`
`130`	`132`	`}`
`131`	`133`	`$this->priceModifier->removeGroupPrice($product, $customerGroupId, $websiteIdentifier);`
`@@ -139,7 +141,8 @@ public function getList($productSku, $websiteId = null)`
`139`	`141`	`{`
`140`	`142`	`$product = $this->productRepository->get($productSku, true);`
`141`	`143`	`$priceKey = 'website_price';`
`142`		`- if ($this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE) == 0) {`
	`144`	`+ $value = $this->config->getValue('catalog/price/scope',\Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);`
	`145`	`+ if ($value == 0) {`
`143`	`146`	`$priceKey = 'price';`
`144`	`147`	`}`
`145`	`148`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,10 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one`
`332`	`332`	`*/`
`333`	`333`	`protected function _getEmails($configPath, $storeId)`
`334`	`334`	`{`
`335`		`- $data = $this->_scopeConfig->getValue($configPath, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);`
	`335`	`+ $data = $this->_scopeConfig->getValue(`
	`336`	`+ $configPath,`
	`337`	`+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId`
	`338`	`+ );`
`336`	`339`	`if (!empty($data)) {`
`337`	`340`	`return explode(',', $data);`
`338`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,12 @@ public function __construct(`
`83`	`83`	`*/`
`84`	`84`	`public function dispatch(RequestInterface $request)`
`85`	`85`	`{`
`86`		`- if (!$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {`
	`86`	`+ if (`
	`87`	`+ !$this->scopeConfig->isSetFlag(`
	`88`	`+ self::XML_PATH_ENABLED,`
	`89`	`+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE`
	`90`	`+ )`
	`91`	`+ ) {`
`87`	`92`	`throw new NotFoundException();`
`88`	`93`	`}`
`89`	`94`	`return parent::dispatch($request);`