MAGETWO-69781: Added .DS_Store to .gitignore for Mac users #9892

ishakhsuvarov · web-flow · commit b9dc459f9663 · 2017-06-09T17:13:10.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,4 @@ atlassian*
 !/vendor/.htaccess
 /generated/*
 !/generated/.htaccess
+.DS_Store
diff --git a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
@@ -7,9 +7,12 @@
 
 use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Store\Model\Group;
 use Magento\Store\Model\ResourceModel\Website\CollectionFactory as WebsiteCollectionFactory;
 use Magento\Store\Model\ResourceModel\Group\CollectionFactory as GroupCollectionFactory;
 use Magento\Store\Model\ResourceModel\Store\CollectionFactory as StoreCollectionFactory;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\Website;
 use Magento\Store\Model\WebsiteFactory;
 use Magento\Store\Model\GroupFactory;
 use Magento\Store\Model\StoreFactory;
@@ -100,13 +103,13 @@ public function get($path = '')
         if ($this->canUseDatabase()) {
             switch ($scopePool) {
                 case 'websites':
-                    $data = $this->getWebsitesData($scopeCode);
+                    $data['websites'] = $this->getWebsitesData($scopeCode);
                     break;
                 case 'groups':
-                    $data = $this->getGroupsData($scopeCode);
+                    $data['groups'] = $this->getGroupsData($scopeCode);
                     break;
                 case 'stores':
-                    $data = $this->getStoresData($scopeCode);
+                    $data['stores'] = $this->getStoresData($scopeCode);
                     break;
                 default:
                     $data = [
@@ -127,14 +130,15 @@ public function get($path = '')
      */
     private function getWebsitesData($code = null)
     {
-        if ($code) {
+        if ($code !== null) {
             $website = $this->websiteFactory->create();
             $website->load($code);
-            $data = $website->getData();
+            $data[$code] = $website->getData();
         } else {
             $collection = $this->websiteCollectionFactory->create();
             $collection->setLoadDefault(true);
             $data = [];
+            /** @var Website $website */
             foreach ($collection as $website) {
                 $data[$website->getCode()] = $website->getData();
             }
@@ -148,14 +152,15 @@ private function getWebsitesData($code = null)
      */
     private function getGroupsData($id = null)
     {
-        if ($id) {
+        if ($id !== null) {
             $group = $this->groupFactory->create();
             $group->load($id);
-            $data = $group->getData();
+            $data[$id] = $group->getData();
         } else {
             $collection = $this->groupCollectionFactory->create();
             $collection->setLoadDefault(true);
             $data = [];
+            /** @var Group $group */
             foreach ($collection as $group) {
                 $data[$group->getId()] = $group->getData();
             }
@@ -169,14 +174,21 @@ private function getGroupsData($id = null)
      */
     private function getStoresData($code = null)
     {
-        if ($code) {
+        if ($code !== null) {
             $store = $this->storeFactory->create();
-            $store->load($code, 'code');
-            $data = $store->getData();
+
+            if (is_numeric($code)) {
+                $store->load($code);
+            } else {
+                $store->load($code, 'code');
+            }
+
+            $data[$code] = $store->getData();
         } else {
             $collection = $this->storeCollectionFactory->create();
             $collection->setLoadDefault(true);
             $data = [];
+            /** @var Store $store */
             foreach ($collection as $store) {
                 $data[$store->getCode()] = $store->getData();
             }
diff --git a/app/code/Magento/Store/App/Config/Type/Scopes.php b/app/code/Magento/Store/App/Config/Type/Scopes.php
@@ -34,15 +34,18 @@ public function __construct(
         ConfigSourceInterface $source
     ) {
         $this->source = $source;
+        $this->data = new DataObject();
     }
 
     /**
      * @inheritdoc
      */
     public function get($path = '')
     {
-        if (!$this->data) {
-            $this->data = new DataObject($this->source->get());
+        $patchChunks = explode("/", $path);
+
+        if (!$this->data->getData($path) || count($patchChunks) == 1) {
+            $this->data->addData($this->source->get($path));
         }
 
         return $this->data->getData($path);
@@ -55,6 +58,6 @@ public function get($path = '')
      */
     public function clean()
     {
-        $this->data = null;
+        $this->data = new DataObject();
     }
 }
diff --git a/app/code/Magento/Store/Model/Config/Processor/Fallback.php b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
@@ -6,7 +6,16 @@
 namespace Magento\Store\Model\Config\Processor;
 
 use Magento\Framework\App\Config\Spi\PostProcessorInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\App\Config\Type\Scopes;
+use Magento\Store\Model\ResourceModel\Store;
+use Magento\Store\Model\ResourceModel\Store\AllStoresCollectionFactory;
+use Magento\Store\Model\ResourceModel\Website;
+use Magento\Store\Model\ResourceModel\Website\AllWebsitesCollection;
+use Magento\Store\Model\ResourceModel\Website\AllWebsitesCollectionFactory;
 
 /**
  * Fallback through different scopes and merge them
@@ -18,20 +27,72 @@ class Fallback implements PostProcessorInterface
      */
     private $scopes;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var array
+     */
+    private $storeData = [];
+
+    /**
+     * @var array
+     */
+    private $websiteData = [];
+
+    /**
+     * @var Store
+     */
+    private $storeResource;
+
+    /**
+     * @var Website
+     */
+    private $websiteResource;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * Fallback constructor.
+     *
      * @param Scopes $scopes
+     * @param ResourceConnection $resourceConnection
+     * @param Store $storeResource
+     * @param Website $websiteResource
+     * @param DeploymentConfig $deploymentConfig
      */
-    public function __construct(Scopes $scopes)
-    {
+    public function __construct(
+        Scopes $scopes,
+        ResourceConnection $resourceConnection,
+        Store $storeResource,
+        Website $websiteResource,
+        DeploymentConfig $deploymentConfig
+    ) {
         $this->scopes = $scopes;
+        $this->resourceConnection = $resourceConnection;
+        $this->storeResource = $storeResource;
+        $this->websiteResource = $websiteResource;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
      * @inheritdoc
      */
     public function process(array $data)
     {
+        if ($this->deploymentConfig->isDbAvailable()) {//read only from db
+            $this->storeData = $this->storeResource->readAllStores();
+            $this->websiteData = $this->websiteResource->readAllWebsites();
+        } else {
+            $this->storeData = $this->scopes->get('stores');
+            $this->websiteData = $this->scopes->get('websites');
+        }
+
         $defaultConfig = isset($data['default']) ? $data['default'] : [];
         $result = [
             'default' => $defaultConfig,
@@ -55,12 +116,14 @@ public function process(array $data)
      * @param array $websitesConfig
      * @return array
      */
-    private function prepareWebsitesConfig(array $defaultConfig, array $websitesConfig)
-    {
+    private function prepareWebsitesConfig(
+        array $defaultConfig,
+        array $websitesConfig
+    ) {
         $result = [];
-        foreach ((array)$this->scopes->get('websites') as $websiteData) {
-            $code = $websiteData['code'];
-            $id = $websiteData['website_id'];
+        foreach ((array)$this->websiteData as $website) {
+            $code = $website['code'];
+            $id = $website['website_id'];
             $websiteConfig = isset($websitesConfig[$code]) ? $websitesConfig[$code] : [];
             $result[$code] = array_replace_recursive($defaultConfig, $websiteConfig);
             $result[$id] = $result[$code];
@@ -76,15 +139,19 @@ private function prepareWebsitesConfig(array $defaultConfig, array $websitesConf
      * @param array $storesConfig
      * @return array
      */
-    private function prepareStoresConfig(array $defaultConfig, array $websitesConfig, array $storesConfig)
-    {
+    private function prepareStoresConfig(
+        array $defaultConfig,
+        array $websitesConfig,
+        array $storesConfig
+    ) {
         $result = [];
-        foreach ((array)$this->scopes->get('stores') as $storeData) {
-            $code = $storeData['code'];
-            $id = $storeData['store_id'];
+
+        foreach ((array)$this->storeData as $store) {
+            $code = $store['code'];
+            $id = $store['store_id'];
             $websiteConfig = [];
-            if (isset($storeData['website_id'])) {
-                $websiteConfig = $this->getWebsiteConfig($websitesConfig, $storeData['website_id']);
+            if (isset($store['website_id'])) {
+                $websiteConfig = $this->getWebsiteConfig($websitesConfig, $store['website_id']);
             }
             $storeConfig = isset($storesConfig[$code]) ? $storesConfig[$code] : [];
             $result[$code] = array_replace_recursive($defaultConfig, $websiteConfig, $storeConfig);
@@ -94,17 +161,17 @@ private function prepareStoresConfig(array $defaultConfig, array $websitesConfig
     }
 
     /**
-     * Retrieve Website Config
+     * Find information about website by its ID.
      *
-     * @param array $websites
+     * @param array $websites Has next format: (website_code => [website_data])
      * @param int $id
      * @return array
      */
     private function getWebsiteConfig(array $websites, $id)
     {
-        foreach ($this->scopes->get('websites') as $websiteData) {
-            if ($websiteData['website_id'] == $id) {
-                $code = $websiteData['code'];
+        foreach ((array)$this->websiteData as $website) {
+            if ($website['website_id'] == $id) {
+                $code = $website['code'];
                 return isset($websites[$code]) ? $websites[$code] : [];
             }
         }
diff --git a/app/code/Magento/Store/Model/GroupRepository.php b/app/code/Magento/Store/Model/GroupRepository.php
@@ -62,18 +62,8 @@ public function get($id)
             return $this->entities[$id];
         }
 
-        $groupData = [];
-        $groups = $this->getAppConfig()->get('scopes', 'groups', []);
-        if ($groups) {
-            foreach ($groups as $data) {
-                if (isset($data['group_id']) && $data['group_id'] == $id) {
-                    $groupData = $data;
-                    break;
-                }
-            }
-        }
         $group = $this->groupFactory->create([
-            'data' => $groupData
+            'data' => $this->getAppConfig()->get('scopes', "groups/$id", [])
         ]);
 
         if (null === $group->getId()) {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Store.php b/app/code/Magento/Store/Model/ResourceModel/Store.php
@@ -157,6 +157,20 @@ protected function _changeGroup(\Magento\Framework\Model\AbstractModel $model)
         return $this;
     }
 
+    /**
+     * Read information about all stores
+     *
+     * @return array
+     */
+    public function readAllStores()
+    {
+        $select = $this->getConnection()
+            ->select()
+            ->from($this->getTable('store'));
+
+        return $this->getConnection()->fetchAll($select);
+    }
+
     /**
      * Retrieve select object for load object data
      *
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website.php b/app/code/Magento/Store/Model/ResourceModel/Website.php
@@ -36,6 +36,28 @@ protected function _initUniqueFields()
         return $this;
     }
 
+    /**
+     * Read all information about websites.
+     *
+     * Convert information to next format:
+     * [website_code => [website_data (website_id, code, name, etc...)]]
+     *
+     * @return array
+     */
+    public function readAllWebsites()
+    {
+        $websites = [];
+        $select = $this->getConnection()
+            ->select()
+            ->from($this->getTable('store_website'));
+
+        foreach($this->getConnection()->fetchAll($select) as $websiteData) {
+            $websites[$websiteData['code']] = $websiteData;
+        }
+
+        return $websites;
+    }
+
     /**
      * Validate website code before object save
      *
diff --git a/app/code/Magento/Store/Model/StoreRepository.php b/app/code/Magento/Store/Model/StoreRepository.php
@@ -100,14 +100,7 @@ public function getById($id)
             return $this->entitiesById[$id];
         }
 
-        $storeData = [];
-        $stores = $this->getAppConfig()->get('scopes', "stores", []);
-        foreach ($stores as $data) {
-            if (isset($data['store_id']) && $data['store_id'] == $id) {
-                $storeData = $data;
-                break;
-            }
-        }
+        $storeData = $this->getAppConfig()->get('scopes', "stores/$id", []);
         $store = $this->storeFactory->create([
             'data' => $storeData
         ]);
diff --git a/app/code/Magento/Store/Model/WebsiteRepository.php b/app/code/Magento/Store/Model/WebsiteRepository.php
@@ -92,14 +92,8 @@ public function getById($id)
         if (isset($this->entitiesById[$id])) {
             return $this->entitiesById[$id];
         }
-        $websiteData = [];
-        $websites = $this->getAppConfig()->get('scopes', 'websites', []);
-        foreach ($websites as $data) {
-            if (isset($data['website_id']) && $data['website_id'] == $id) {
-                $websiteData = $data;
-                break;
-            }
-        }
+
+        $websiteData = $this->getAppConfig()->get('scopes', "websites/$id", []);
         $website = $this->factory->create([
             'data' => $websiteData
         ]);
@@ -185,7 +179,7 @@ private function getAppConfig()
      */
     private function initDefaultWebsite()
     {
-        $websites = (array)$this->getAppConfig()->get('scopes', 'websites', []);
+        $websites = (array) $this->getAppConfig()->get('scopes', 'websites', []);
         foreach ($websites as $data) {
             if (isset($data['is_default']) && $data['is_default'] == 1) {
                 if ($this->default) {
diff --git a/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php b/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/FileUploader/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/FileUploader/Save.php
diff --git a/dev/tests/integration/testsuite/Magento/Review/Block/FormTest.php b/dev/tests/integration/testsuite/Magento/Review/Block/FormTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/config.php b/dev/tests/integration/testsuite/Magento/Review/_files/config.php

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,18 @@ public function __construct(`
`34`	`34`	`ConfigSourceInterface $source`
`35`	`35`	`) {`
`36`	`36`	`$this->source = $source;`
	`37`	`+ $this->data = new DataObject();`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`/**`
`40`	`41`	`* @inheritdoc`
`41`	`42`	`*/`
`42`	`43`	`public function get($path = '')`
`43`	`44`	`{`
`44`		`- if (!$this->data) {`
`45`		`- $this->data = new DataObject($this->source->get());`
	`45`	`+ $patchChunks = explode("/", $path);`
	`46`	`+`
	`47`	`+ if (!$this->data->getData($path) \|\| count($patchChunks) == 1) {`
	`48`	`+ $this->data->addData($this->source->get($path));`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`return $this->data->getData($path);`
`@@ -55,6 +58,6 @@ public function get($path = '')`
`55`	`58`	`*/`
`56`	`59`	`public function clean()`
`57`	`60`	`{`
`58`		`- $this->data = null;`
	`61`	`+ $this->data = new DataObject();`
`59`	`62`	`}`
`60`	`63`	`}`