Skip to content

Commit e41c22e

Browse files
committedMar 24, 2015
MAGETWO-35136: Delete Segments
- deleting BackendConfig - deleting session segment - deleting dbconfig - deleting dbConfig and EncryptConfig - deleting Cache and Db config - refactoring modules' config
1 parent bcbbaed commit e41c22e

File tree

42 files changed

+242
-1010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+242
-1010
lines changed
 

‎app/code/Magento/Backend/Setup/ConfigOptionsList.php

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ class ConfigOptionsList implements ConfigOptionsListInterface
2525
*/
2626
const CONFIG_PATH_BACKEND_FRONTNAME = 'backend/frontName';
2727

28+
/**
29+
* Key for config
30+
*/
31+
const KEY_FRONTNAME = 'frontend';
32+
2833
/**
2934
* {@inheritdoc}
3035
*/

‎app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php

+10-11
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
*/
1010
namespace Magento\MediaStorage\Model\Config\Source\Storage\Media;
1111

12-
use Magento\Framework\App\DeploymentConfig;
13-
use Magento\Framework\App\DeploymentConfig\ResourceConfig;
12+
use Magento\Framework\App\DeploymentConfig\Reader;
13+
use Magento\Setup\Model\ConfigOptionsList;
1414

1515
class Database implements \Magento\Framework\Option\ArrayInterface
1616
{
1717
/**
18-
* @var DeploymentConfig
18+
* @var Reader
1919
*/
20-
protected $_deploymentConfig;
20+
protected $reader;
2121

2222
/**
23-
* @param DeploymentConfig $deploymentConfig
23+
* @param Reader $reader
2424
*/
25-
public function __construct(DeploymentConfig $deploymentConfig)
25+
public function __construct(Reader $reader)
2626
{
27-
$this->_deploymentConfig = $deploymentConfig;
27+
$this->reader = $reader;
2828
}
2929

3030
/**
@@ -35,10 +35,9 @@ public function __construct(DeploymentConfig $deploymentConfig)
3535
public function toOptionArray()
3636
{
3737
$resourceOptions = [];
38-
$resourceInfo = $this->_deploymentConfig->getSegment(ResourceConfig::CONFIG_KEY);
39-
if (null !== $resourceInfo) {
40-
$resourceConfig = new ResourceConfig($resourceInfo);
41-
foreach (array_keys($resourceConfig->getData()) as $resourceName) {
38+
$resourceConfig = $this->reader->getConfigData(ConfigOptionsList::KEY_RESOURCE);
39+
if (null !== $resourceConfig) {
40+
foreach (array_keys($resourceConfig) as $resourceName) {
4241
$resourceOptions[] = ['value' => $resourceName, 'label' => $resourceName];
4342
}
4443
sort($resourceOptions);

0 commit comments

Comments
 (0)