mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-19 07:41:22 +02:00
Code Issues Releases Wiki Activity

Clean up code in FileDataProvider

Browse Source
This commit is contained in:
Franz Liedke
2016-01-07 16:31:21 +01:00
parent e31b80d27d
commit b48c9e6962
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
framework/core/src/Install/Console/FileDataProvider.php
View File

@@ -16,7 +16,6 @@ use Exception;
class FileDataProvider implements DataProviderInterface class FileDataProvider implements DataProviderInterface
{ {
protected $configurationFile;
protected $default; protected $default;
protected $baseUrl = null; protected $baseUrl = null;
protected $databaseConfiguration = []; protected $databaseConfiguration = [];
@@ -29,45 +28,40 @@ class FileDataProvider implements DataProviderInterface
$this->default = new DefaultsDataProvider(); $this->default = new DefaultsDataProvider();
// Get configuration file path // Get configuration file path
$this->configurationFile = $input->getOption('file'); $configurationFile = $input->getOption('file');
// Check if file exists before parsing content // Check if file exists before parsing content
if (file_exists($this->configurationFile)) { if (file_exists($configurationFile)) {
// Parse YAML // Parse YAML
$configuration = Yaml::parse(file_get_contents($this->configurationFile)); $configuration = Yaml::parse(file_get_contents($configurationFile));
// Define configuration variables // Define configuration variables
$this->baseUrl = isset($configuration['baseUrl']) ? rtrim($configuration['baseUrl'], '/') : null; $this->baseUrl = isset($configuration['baseUrl']) ? rtrim($configuration['baseUrl'], '/') : null;
$this->databaseConfiguration = isset($configuration['databaseConfiguration']) ? $configuration['databaseConfiguration'] : array(); $this->databaseConfiguration = isset($configuration['databaseConfiguration']) ? $configuration['databaseConfiguration'] : [];
$this->adminUser = isset($configuration['adminUser']) ? $configuration['adminUser'] : array(); $this->adminUser = isset($configuration['adminUser']) ? $configuration['adminUser'] : [];
$this->settings = isset($configuration['settings']) ? $configuration['settings']: array(); $this->settings = isset($configuration['settings']) ? $configuration['settings']: [];
} } else {
else {
throw new Exception('Configuration file does not exist.'); throw new Exception('Configuration file does not exist.');
} }
} }
public function getDatabaseConfiguration() public function getDatabaseConfiguration()
{ {
// Merge with defaults
return $this->databaseConfiguration + $this->default->getDatabaseConfiguration(); return $this->databaseConfiguration + $this->default->getDatabaseConfiguration();
} }
public function getBaseUrl() public function getBaseUrl()
{ {
// Merge with defaults
return (!is_null($this->baseUrl)) ? $this->baseUrl : $this->default->getBaseUrl(); return (!is_null($this->baseUrl)) ? $this->baseUrl : $this->default->getBaseUrl();
} }
public function getAdminUser() public function getAdminUser()
{ {
// Merge with defaults
return $this->adminUser + $this->default->getAdminUser(); return $this->adminUser + $this->default->getAdminUser();
} }
public function getSettings() public function getSettings()
{ {
// Merge with defaults
return $this->settings + $this->default->getSettings(); return $this->settings + $this->default->getSettings();
} }
} }