1
0
mirror of https://github.com/flarum/core.git synced 2025-10-18 18:26:07 +02:00

Cleanup code from #1876

- Extract a method for email address generation
- Consistent types
- No docblocks for types where superfluous
- Tweak console output
- Don't inherit from integration test's base class in unit test
This commit is contained in:
Franz Liedke
2019-09-24 01:00:22 +02:00
parent 738ca405fe
commit 3417c0cbee
6 changed files with 66 additions and 51 deletions

View File

@@ -11,6 +11,7 @@
namespace Flarum\Install\Steps;
use Flarum\Install\BaseUrl;
use Flarum\Install\DatabaseConfig;
use Flarum\Install\ReversibleStep;
use Flarum\Install\Step;
@@ -25,7 +26,7 @@ class StoreConfig implements Step, ReversibleStep
private $configFile;
public function __construct($debugMode, DatabaseConfig $dbConfig, $baseUrl, $configFile)
public function __construct($debugMode, DatabaseConfig $dbConfig, BaseUrl $baseUrl, $configFile)
{
$this->debugMode = $debugMode;
$this->dbConfig = $dbConfig;
@@ -57,7 +58,7 @@ class StoreConfig implements Step, ReversibleStep
return [
'debug' => $this->debugMode,
'database' => $this->dbConfig->toArray(),
'url' => $this->baseUrl,
'url' => (string) $this->baseUrl,
'paths' => $this->getPathsConfig(),
];
}