Merge remote-tracking branch 'origin/develop' into MAGETWO-51014

Author: rliukshyn

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -205,7 +205,7 @@ define([
                 container: 'paypal-container',
                 singleUse: true,
                 headless: true,
-                amount: this.amount,
+                amount: this.grandTotalAmount,
                 currency: totals['base_currency_code'],
                 locale: this.getLocale(),
                 enableShippingAddress: true,

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php

@@ -157,7 +157,7 @@ protected function _prepareBundlePriceByType($priceType, $entityIds = null)
             '=?',
             \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
         );
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         $this->_addAttributeToSelect($select, 'status', "e.$linkField", 'cs.store_id', $statusCond, true);
         if ($this->moduleManager->isEnabled('Magento_Tax')) {
             $taxClassId = $this->_addAttributeToSelect($select, 'tax_class_id', "e.$linkField", 'cs.store_id');
@@ -404,7 +404,7 @@ protected function _calculateBundleSelectionPrice($priceType)
             );
         }
 
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         $select = $connection->select()->from(
             ['i' => $this->_getBundlePriceTable()],
             ['entity_id', 'customer_group_id', 'website_id']
@@ -484,7 +484,7 @@ protected function _prepareBundlePrice($entityIds = null)
     protected function _prepareTierPriceIndex($entityIds = null)
     {
         $connection = $this->getConnection();
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         // remove index by bundle products
         $select = $connection->select()->from(
             ['i' => $this->_getTierPriceIndexTable()],

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php

@@ -47,7 +47,7 @@ protected function _getBundleOptionTable()
     protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryTable = false)
     {
         $this->_cleanBundleOptionStockData();
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         $idxTable = $usePrimaryTable ? $this->getMainTable() : $this->getIdxTable();
         $connection = $this->getConnection();
         $select = $connection->select()->from(
@@ -118,7 +118,7 @@ protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryT
     protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
     {
         $this->_prepareBundleOptionStockData($entityIds, $usePrimaryTable);
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         $connection = $this->getConnection();
         $select = $connection->select()->from(
             ['e' => $this->getTable('catalog_product_entity')],

app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php

@@ -28,18 +28,15 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Category
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
     ) {
         parent::__construct($context);
         $this->resultPageFactory = $resultPageFactory;
         $this->resultJsonFactory = $resultJsonFactory;
-        $this->storeManager = $storeManager;
     }
 
     /**
@@ -52,20 +49,20 @@ public function __construct(
     public function execute()
     {
         $storeId = (int)$this->getRequest()->getParam('store');
-        $store = $this->storeManager->getStore($storeId);
-        $this->storeManager->setCurrentStore($store->getCode());
+        $store = $this->getStoreManager()->getStore($storeId);
+        $this->getStoreManager()->setCurrentStore($store->getCode());
 
         $categoryId = (int)$this->getRequest()->getParam('id');
 
         if (!$categoryId) {
             if ($storeId) {
-                $categoryId = (int)$this->storeManager->getStore($storeId)->getRootCategoryId();
+                $categoryId = (int)$this->getStoreManager()->getStore($storeId)->getRootCategoryId();
             } else {
-                $defaultStoreView = $this->storeManager->getDefaultStoreView();
+                $defaultStoreView = $this->getStoreManager()->getDefaultStoreView();
                 if ($defaultStoreView) {
                     $categoryId = (int)$defaultStoreView->getRootCategoryId();
                 } else {
-                    $stores = $this->storeManager->getStores();
+                    $stores = $this->getStoreManager()->getStores();
                     if (count($stores)) {
                         $store = reset($stores);
                         $categoryId = (int)$store->getRootCategoryId();
@@ -114,4 +111,16 @@ public function execute()
 
         return $resultPage;
     }
+
+    /**
+     * @return \Magento\Store\Model\StoreManagerInterface
+     */
+    private function getStoreManager()
+    {
+        if (null === $this->storeManager) {
+            $this->storeManager = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Store\Model\StoreManagerInterface');
+        }
+        return $this->storeManager;
+    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php

@@ -64,7 +64,7 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
     protected $attributeGroupFactory;
 
     /**
-     * @var AttributeManagementInterfaces
+     * @var AttributeManagementInterface
      */
     protected $attributeManagement;
 
@@ -82,42 +82,15 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
      * @param \Magento\Backend\App\Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @param AttributeRepositoryInterface $attributeRepository
-     * @param AttributeSetRepositoryInterface $attributeSetRepository
-     * @param AttributeGroupRepositoryInterface $attributeGroupRepository
-     * @param AttributeGroupInterfaceFactory $attributeGroupFactory
-     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param SortOrderBuilder $sortOrderBuilder
-     * @param AttributeManagementInterface $attributeManagement
-     * @param LoggerInterface $logger
-     * @param ExtensionAttributesFactory $extensionAttributesFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        AttributeRepositoryInterface $attributeRepository,
-        AttributeSetRepositoryInterface $attributeSetRepository,
-        AttributeGroupRepositoryInterface $attributeGroupRepository,
-        AttributeGroupInterfaceFactory $attributeGroupFactory,
-        SearchCriteriaBuilder $searchCriteriaBuilder,
-        SortOrderBuilder $sortOrderBuilder,
-        AttributeManagementInterface $attributeManagement,
-        LoggerInterface $logger,
-        ExtensionAttributesFactory $extensionAttributesFactory
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultJsonFactory = $resultJsonFactory;
-        $this->attributeRepository = $attributeRepository;
-        $this->attributeSetRepository = $attributeSetRepository;
-        $this->attributeGroupRepository = $attributeGroupRepository;
-        $this->attributeGroupFactory = $attributeGroupFactory;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->sortOrderBuilder = $sortOrderBuilder;
-        $this->attributeManagement = $attributeManagement;
-        $this->logger = $logger;
-        $this->extensionAttributesFactory = $extensionAttributesFactory;
     }
 
     /**
@@ -133,22 +106,22 @@ public function execute()
 
         try {
             /** @var AttributeSetInterface $attributeSet */
-            $attributeSet = $this->attributeSetRepository->get($request->getParam('templateId'));
+            $attributeSet = $this->getAttributeSetRepository()->get($request->getParam('templateId'));
             $groupCode = $request->getParam('groupCode');
             $groupName = $request->getParam('groupName');
             $groupSortOrder = $request->getParam('groupSortOrder');
 
             $attributeSearchCriteria = $this->getBasicAttributeSearchCriteriaBuilder()->create();
-            $attributeGroupSearchCriteria = $this->searchCriteriaBuilder
+            $attributeGroupSearchCriteria = $this->getSearchCriteriaBuilder()
                 ->addFilter('attribute_set_id', $attributeSet->getAttributeSetId())
                 ->addFilter('attribute_group_code', $groupCode)
-                ->addSortOrder($this->sortOrderBuilder->setAscendingDirection()->create())
+                ->addSortOrder($this->getSortOrderBuilder()->setAscendingDirection()->create())
                 ->setPageSize(1)
                 ->create();
 
             try {
                 /** @var AttributeGroupInterface[] $attributeGroupItems */
-                $attributeGroupItems = $this->attributeGroupRepository->getList($attributeGroupSearchCriteria)
+                $attributeGroupItems = $this->getAttributeGroupRepository()->getList($attributeGroupSearchCriteria)
                     ->getItems();
 
                 if (!$attributeGroupItems) {
@@ -159,28 +132,28 @@ public function execute()
                 $attributeGroup = reset($attributeGroupItems);
             } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
                 /** @var AttributeGroupInterface $attributeGroup */
-                $attributeGroup = $this->attributeGroupFactory->create();
+                $attributeGroup = $this->getAttributeGroupFactory()->create();
             }
 
             $extensionAttributes = $attributeGroup->getExtensionAttributes()
-                ?: $this->extensionAttributesFactory->create(AttributeGroupInterface::class);
+                ?: $this->getExtensionAttributesFactory()->create(AttributeGroupInterface::class);
 
             $extensionAttributes->setAttributeGroupCode($groupCode);
             $extensionAttributes->setSortOrder($groupSortOrder);
             $attributeGroup->setAttributeGroupName($groupName);
             $attributeGroup->setAttributeSetId($attributeSet->getAttributeSetId());
             $attributeGroup->setExtensionAttributes($extensionAttributes);
 
-            $this->attributeGroupRepository->save($attributeGroup);
+            $this->getAttributeGroupRepository()->save($attributeGroup);
 
             /** @var AttributeInterface[] $attributesItems */
-            $attributesItems = $this->attributeRepository->getList(
+            $attributesItems = $this->getAttributeRepository()->getList(
                 ProductAttributeInterface::ENTITY_TYPE_CODE,
                 $attributeSearchCriteria
             )->getItems();
 
             array_walk($attributesItems, function (AttributeInterface $attribute) use ($attributeSet, $attributeGroup) {
-                $this->attributeManagement->assign(
+                $this->getAttributeManagement()->assign(
                     ProductAttributeInterface::ENTITY_TYPE_CODE,
                     $attributeSet->getAttributeSetId(),
                     $attributeGroup->getAttributeGroupId(),
@@ -192,7 +165,7 @@ public function execute()
             $response->setError(true);
             $response->setMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->logger->critical($e);
+            $this->getLogger()->critical($e);
             $response->setError(true);
             $response->setMessage(__('Unable to add attribute'));
         }
@@ -214,8 +187,116 @@ private function getBasicAttributeSearchCriteriaBuilder()
             throw new LocalizedException(__('Please, specify attributes'));
         }
 
-        return $this->searchCriteriaBuilder
+        return $this->getSearchCriteriaBuilder()
             ->addFilter('attribute_set_id', new \Zend_Db_Expr('null'), 'is')
             ->addFilter('attribute_id', [$attributeIds['selected']], 'in');
     }
+
+    /**
+     * @return AttributeRepositoryInterface
+     */
+    private function getAttributeRepository()
+    {
+        if (null === $this->attributeRepository) {
+            $this->attributeRepository = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Eav\Api\AttributeRepositoryInterface');
+        }
+        return $this->attributeRepository;
+    }
+
+    /**
+     * @return AttributeSetRepositoryInterface
+     */
+    private function getAttributeSetRepository()
+    {
+        if (null === $this->attributeSetRepository) {
+            $this->attributeSetRepository = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Catalog\Api\AttributeSetRepositoryInterface');
+        }
+        return $this->attributeSetRepository;
+    }
+
+    /**
+     * @return AttributeGroupRepositoryInterface
+     */
+    private function getAttributeGroupRepository()
+    {
+        if (null === $this->attributeGroupRepository) {
+            $this->attributeGroupRepository = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Eav\Api\AttributeGroupRepositoryInterface');
+        }
+        return $this->attributeGroupRepository;
+    }
+
+    /**
+     * @return AttributeGroupInterfaceFactory
+     */
+    private function getAttributeGroupFactory()
+    {
+        if (null === $this->attributeGroupFactory) {
+            $this->attributeGroupFactory = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Eav\Api\Data\AttributeGroupInterfaceFactory');
+        }
+        return $this->attributeGroupFactory;
+    }
+
+    /**
+     * @return SearchCriteriaBuilder
+     */
+    private function getSearchCriteriaBuilder()
+    {
+        if (null === $this->searchCriteriaBuilder) {
+            $this->searchCriteriaBuilder = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Framework\Api\SearchCriteriaBuilder');
+        }
+        return $this->searchCriteriaBuilder;
+    }
+
+    /**
+     * @return SortOrderBuilder
+     */
+    private function getSortOrderBuilder()
+    {
+        if (null === $this->sortOrderBuilder) {
+            $this->sortOrderBuilder = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Framework\Api\SortOrderBuilder');
+        }
+        return $this->sortOrderBuilder;
+    }
+
+    /**
+     * @return AttributeManagementInterface
+     */
+    private function getAttributeManagement()
+    {
+        if (null === $this->attributeManagement) {
+            $this->attributeManagement = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Eav\Api\AttributeManagementInterface');
+        }
+        return $this->attributeManagement;
+    }
+
+    /**
+     * @return LoggerInterface
+     */
+    private function getLogger()
+    {
+        if (null === $this->logger) {
+            $this->logger = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Psr\Log\LoggerInterface');
+        }
+        return $this->logger;
+    }
+
+    /**
+     * @return ExtensionAttributesFactory
+     */
+    private function getExtensionAttributesFactory()
+    {
+        if (null === $this->extensionAttributesFactory) {
+            $this->extensionAttributesFactory = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Framework\Api\ExtensionAttributesFactory');
+        }
+        return $this->extensionAttributesFactory;
+    }
 }