mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-25 18:51:40 +02:00
Code Issues Releases Wiki Activity

Use dedicated temporary variable instead of array

Browse Source
This commit is contained in:
Franz Liedke
2019-01-22 22:16:59 +01:00
parent ee919b272b
commit ec88138f1d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,13 @@ class Installation
private $customSettings = []; private $customSettings = [];
private $adminUser = []; private $adminUser = [];
// A few instance variables to persist objects between steps.
// Could also be local variables in build(), but this way
// access in closures is easier. :)
/** @var \Illuminate\Database\ConnectionInterface */
private $db;
public function __construct($basePath, $publicPath, $storagePath) public function __construct($basePath, $publicPath, $storagePath)
{ {
$this->basePath = $basePath; $this->basePath = $basePath;
@@ -98,15 +105,11 @@ class Installation
{ {
$pipeline = new Pipeline; $pipeline = new Pipeline;
// A new array to persist some objects between steps.
// It's an instance variable so that access in closures is easier. :)
$this->tmp = [];
$pipeline->pipe(function () { $pipeline->pipe(function () {
return new Steps\ConnectToDatabase( return new Steps\ConnectToDatabase(
$this->dbConfig, $this->dbConfig,
function ($connection) { function ($connection) {
$this->tmp['db'] = $connection; $this->db = $connection;
} }
); );
}); });
@@ -118,15 +121,15 @@ class Installation
}); });
$pipeline->pipe(function () { $pipeline->pipe(function () {
return new Steps\RunMigrations($this->tmp['db'], $this->getMigrationPath()); return new Steps\RunMigrations($this->db, $this->getMigrationPath());
}); });
$pipeline->pipe(function () { $pipeline->pipe(function () {
return new Steps\WriteSettings($this->tmp['db'], $this->customSettings); return new Steps\WriteSettings($this->db, $this->customSettings);
}); });
$pipeline->pipe(function () { $pipeline->pipe(function () {
return new Steps\CreateAdminUser($this->tmp['db'], $this->adminUser); return new Steps\CreateAdminUser($this->db, $this->adminUser);
}); });
$pipeline->pipe(function () { $pipeline->pipe(function () {
@@ -134,7 +137,7 @@ class Installation
}); });
$pipeline->pipe(function () { $pipeline->pipe(function () {
return new Steps\EnableBundledExtensions($this->tmp['db'], $this->basePath, $this->getAssetPath()); return new Steps\EnableBundledExtensions($this->db, $this->basePath, $this->getAssetPath());
}); });
return $pipeline; return $pipeline;