github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-06 16:37:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Combine building and storing config in one step

Browse Source
This commit is contained in:
Franz Liedke 2019-01-22 22:13:40 +01:00
parent 24c91e49bc
commit ee919b272b
3 changed files with 48 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/core/src/Install/Installation.php
View File

@ -102,15 +102,6 @@ class Installation
// It's an instance variable so that access in closures is easier. :) // It's an instance variable so that access in closures is easier. :)
$this->tmp = []; $this->tmp = [];
$pipeline->pipe(function () {
return new Steps\BuildConfig(
$this->debug, $this->dbConfig, $this->baseUrl,
function ($config) {
$this->tmp['config'] = $config;
}
);
});
$pipeline->pipe(function () { $pipeline->pipe(function () {
return new Steps\ConnectToDatabase( return new Steps\ConnectToDatabase(
$this->dbConfig, $this->dbConfig,
@ -121,7 +112,9 @@ class Installation
}); });
$pipeline->pipe(function () { $pipeline->pipe(function () {
return new Steps\StoreConfig($this->tmp['config'], $this->getConfigPath()); return new Steps\StoreConfig(
$this->debug, $this->dbConfig, $this->baseUrl, $this->getConfigPath()
);
}); });
$pipeline->pipe(function () { $pipeline->pipe(function () {

75
framework/core/src/Install/Steps/BuildConfig.php
View File

@ -1,75 +0,0 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Flarum\Install\Steps;
use Flarum\Install\Step;
class BuildConfig implements Step
{
private $debugMode;
private $dbConfig;
private $baseUrl;
private $store;
public function __construct($debugMode, $dbConfig, $baseUrl, callable $store)
{
$this->debugMode = $debugMode;
$this->dbConfig = $dbConfig;
$this->baseUrl = $baseUrl;
$this->store = $store;
}
public function getMessage()
{
return 'Building config array';
}
public function run()
{
$config = [
'debug' => $this->debugMode,
'database' => $this->getDatabaseConfig(),
'url' => $this->baseUrl,
'paths' => $this->getPathsConfig(),
];
($this->store)($config);
}
private function getDatabaseConfig()
{
return [
'driver' => $this->dbConfig['driver'],
'host' => $this->dbConfig['host'],
'database' => $this->dbConfig['database'],
'username' => $this->dbConfig['username'],
'password' => $this->dbConfig['password'],
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => $this->dbConfig['prefix'],
'port' => $this->dbConfig['port'],
'strict' => false,
];
}
private function getPathsConfig()
{
return [
'api' => 'api',
'admin' => 'admin',
];
}
}

49
framework/core/src/Install/Steps/StoreConfig.php
View File

@ -16,13 +16,20 @@ use Flarum\Install\Step;
class StoreConfig implements Step, ReversibleStep class StoreConfig implements Step, ReversibleStep
{ {
private $config; private $debugMode;
private $dbConfig;
private $baseUrl;
private $configFile; private $configFile;
public function __construct(array $config, $configFile) public function __construct($debugMode, $dbConfig, $baseUrl, $configFile)
{ {
$this->config = $config; $this->debugMode = $debugMode;
$this->dbConfig = $dbConfig;
$this->baseUrl = $baseUrl;
$this->configFile = $configFile; $this->configFile = $configFile;
} }
@ -35,7 +42,7 @@ class StoreConfig implements Step, ReversibleStep
{ {
file_put_contents( file_put_contents(
$this->configFile, $this->configFile,
'<?php return '.var_export($this->config, true).';' '<?php return '.var_export($this->buildConfig(), true).';'
); );
} }
@ -43,4 +50,38 @@ class StoreConfig implements Step, ReversibleStep
{ {
@unlink($this->configFile); @unlink($this->configFile);
} }
private function buildConfig()
{
return [
'debug' => $this->debugMode,
'database' => $this->getDatabaseConfig(),
'url' => $this->baseUrl,
'paths' => $this->getPathsConfig(),
];
}
private function getDatabaseConfig()
{
return [
'driver' => $this->dbConfig['driver'],
'host' => $this->dbConfig['host'],
'database' => $this->dbConfig['database'],
'username' => $this->dbConfig['username'],
'password' => $this->dbConfig['password'],
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => $this->dbConfig['prefix'],
'port' => $this->dbConfig['port'],
'strict' => false,
];
}
private function getPathsConfig()
{
return [
'api' => 'api',
'admin' => 'admin',
];
}
} }