Merge remote-tracking branch 'api/bug-fixes' into bug-fixes

Author: Hayder Sharhan

app/code/Magento/Backend/Helper/Dashboard/Order.php

@@ -35,14 +35,18 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\SalesRule\Model\RuleFactory
+     * The getter function to get the new StoreManager dependency
+     *
+     * @return \Magento\Store\Model\StoreManagerInterface
+     *
      * @deprecated
      */
-    public function getStoreManager()
+    private function getStoreManager()
     {
-        if ($this->_storeManager instanceof \Magento\Store\Model\StoreManagerInterface) {
-            $this->_storeManager = ObjectManager::getInstance()->get('\Magento\Store\Model\StoreManagerInterface');
+        if ($this->_storeManager === null) {
+            $this->_storeManager = ObjectManager::getInstance()->get('Magento\Store\Model\StoreManagerInterface');
         }
+        return $this->_storeManager;
     }
 
     /**
@@ -57,15 +61,15 @@ protected function _initCollection()
         if ($this->getParam('store')) {
             $this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
         } elseif ($this->getParam('website')) {
-            $storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
+            $storeIds = $this->getStoreManager()->getWebsite($this->getParam('website'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif ($this->getParam('group')) {
-            $storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
+            $storeIds = $this->getStoreManager()->getGroup($this->getParam('group'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif (!$this->_collection->isLive()) {
             $this->_collection->addFieldToFilter(
                 'store_id',
-                ['eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
+                ['eq' => $this->getStoreManager()->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
             );
         }
         $this->_collection->load();

app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php

@@ -65,14 +65,18 @@ public function __construct(
     }
 
     /**
+     * The getter function to get the new RuleFactory dependency
+     *
      * @return \Magento\SalesRule\Model\RuleFactory
+     *
      * @deprecated
      */
-    public function getRuleFactory()
+    private function getRuleFactory()
     {
-        if ($this->ruleFactory instanceof \Magento\SalesRule\Model\RuleFactory) {
-            $this->ruleFactory = ObjectManager::getInstance()->get('\Magento\SalesRule\Model\RuleFactory');
+        if ($this->ruleFactory === null) {
+            $this->ruleFactory = ObjectManager::getInstance()->get('Magento\SalesRule\Model\RuleFactory');
         }
+        return $this->ruleFactory;
     }
 
     /**
@@ -165,7 +169,7 @@ protected function addTabToForm($model, $fieldsetId = 'actions_fieldset', $formN
     {
         if (!$model) {
             $id = $this->getRequest()->getParam('id');
-            $model = $this->ruleFactory->create();
+            $model = $this->getRuleFactory()->create();
             $model->load($id);
         }
 

app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php

@@ -56,14 +56,18 @@ public function __construct(
     }
 
     /**
+     * The getter function to get the new RuleFactory dependency
+     *
      * @return \Magento\SalesRule\Model\RuleFactory
+     *
      * @deprecated
      */
-    public function getRuleFactory()
+    private function getRuleFactory()
     {
-        if ($this->ruleFactory instanceof \Magento\SalesRule\Model\RuleFactory) {
-            $this->ruleFactory = ObjectManager::getInstance()->get('\Magento\SalesRule\Model\RuleFactory');
+        if ($this->ruleFactory === null) {
+            $this->ruleFactory = ObjectManager::getInstance()->get('Magento\SalesRule\Model\RuleFactory');
         }
+        return $this->ruleFactory;
     }
 
     /**
@@ -156,7 +160,7 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
     {
         if (!$model) {
             $id = $this->getRequest()->getParam('id');
-            $model = $this->ruleFactory->create();
+            $model = $this->getRuleFactory()->create();
             $model->load($id);
         }
         $conditionsFieldSetId = $model->getConditionsFieldSetId($formName);

app/code/Magento/WebapiSecurity/composer.json

@@ -1,9 +1,8 @@
 {
-    "name": "magento/module-webapisecurity",
+    "name": "magento/module-webapi-security",
     "description": "WebapiSecurity module provides option to loosen security on some webapi resources.",
     "require": {
         "php": "~5.5.22|~5.6.0|~7.0.0",
-        "magento/module-backend": "100.0.*",
         "magento/module-webapi": "100.0.*",
         "magento/framework": "100.0.*"
     },

app/code/Magento/WebapiSecurity/etc/Adminhtml/system.xml renamed to app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml

@@ -172,7 +172,7 @@
         "magento/module-vault": "100.0.2",
         "magento/module-version": "100.0.2",
         "magento/module-webapi": "100.0.2",
-        "magento/module-webapisecurity": "100.0.0",
+        "magento/module-webapi-security": "100.0.0",
         "magento/module-weee": "100.0.2",
         "magento/module-widget": "100.0.2",
         "magento/module-wishlist": "100.0.2",