@@ -18,6 +18,10 @@ |
||
| 18 | 18 | |
| 19 | 19 | private $item; |
| 20 | 20 | |
| 21 | + /** |
|
| 22 | + * @param string|null $driver |
|
| 23 | + * @param string|null $databaseName |
|
| 24 | + */ |
|
| 21 | 25 | public function __construct($driver, $database, $databaseName, $type, $table, $item) |
| 22 | 26 | { |
| 23 | 27 | parent::__construct(); |
@@ -14,6 +14,9 @@ |
||
| 14 | 14 | |
| 15 | 15 | private $databaseAliasStorage; |
| 16 | 16 | |
| 17 | + /** |
|
| 18 | + * @param string|null $database |
|
| 19 | + */ |
|
| 17 | 20 | public function __construct($database, RedisDatabaseAliasStorage $databaseAliasStorage) |
| 18 | 21 | { |
| 19 | 22 | $this->database = $database; |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | $databases = []; |
| 30 | 30 | foreach ($keyspace as $db => $info) { |
| 31 | 31 | $db = str_replace('db', '', $db); |
| 32 | - $alias = isset($aliases[$db]) ? ' (' . $aliases[$db] . ')' : ''; |
|
| 33 | - $info['database'] = $db . $alias; |
|
| 32 | + $alias = isset($aliases[$db]) ? ' ('.$aliases[$db].')' : ''; |
|
| 33 | + $info['database'] = $db.$alias; |
|
| 34 | 34 | $databases[$db] = $info; |
| 35 | 35 | } |
| 36 | 36 | return Multisort::sort($databases, $sorting); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | |
| 304 | 304 | public function execute($commands) |
| 305 | 305 | { |
| 306 | - $listOfCommands = array_filter(array_map('trim', explode("\n", $commands)), function ($command) { |
|
| 306 | + $listOfCommands = array_filter(array_map('trim', explode("\n", $commands)), function($command) { |
|
| 307 | 307 | return $command; |
| 308 | 308 | }); |
| 309 | 309 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | if (!is_writeable($this->baseDirname)) { |
| 43 | 43 | throw new Exception($this->translator->translate('redis.alias_storage_not_writable', ['directory' => $this->baseDirname])); |
| 44 | 44 | } |
| 45 | - $dirname = $this->baseDirname . '/' . $this->savesDirname; |
|
| 45 | + $dirname = $this->baseDirname.'/'.$this->savesDirname; |
|
| 46 | 46 | if (!file_exists($dirname)) { |
| 47 | 47 | mkdir($dirname, 0777, true); |
| 48 | 48 | } |
@@ -61,6 +61,6 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | private function createFilename() |
| 63 | 63 | { |
| 64 | - return $this->baseDirname . '/' . $this->savesDirname . '/' . $this->filename; |
|
| 64 | + return $this->baseDirname.'/'.$this->savesDirname.'/'.$this->filename; |
|
| 65 | 65 | } |
| 66 | 66 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function databaseNames(array $sorting = []) |
| 17 | 17 | { |
| 18 | - $databases = array_map(function ($database) { |
|
| 18 | + $databases = array_map(function($database) { |
|
| 19 | 19 | return $database[$this->getDatabaseNameColumn()]; |
| 20 | 20 | }, $this->databases($sorting)); |
| 21 | 21 | return $databases; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | { |
| 29 | 29 | $this->template->driver = $this->driver; |
| 30 | 30 | $this->template->actualDatabase = $this->database; |
| 31 | - $this->template->setFile(__DIR__ . '/default.latte'); |
|
| 31 | + $this->template->setFile(__DIR__.'/default.latte'); |
|
| 32 | 32 | $this->template->render(); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | ksort($databases); |
| 39 | 39 | $form = new Form(); |
| 40 | 40 | $form->setRenderer(new BootstrapVerticalRenderer()); |
| 41 | - $form->addSelect('database', $this->translator->translate($this->driver->type() . '.database_select_control.database.label'), $databases) |
|
| 42 | - ->setPrompt($this->translator->translate($this->driver->type() . '.database_select_control.database.prompt')) |
|
| 43 | - ->setAttribute('onchange', 'window.location = \'' . $this->presenter->link('Table:default', $this->driver->type()) . '&database=\' + this.value') |
|
| 41 | + $form->addSelect('database', $this->translator->translate($this->driver->type().'.database_select_control.database.label'), $databases) |
|
| 42 | + ->setPrompt($this->translator->translate($this->driver->type().'.database_select_control.database.prompt')) |
|
| 43 | + ->setAttribute('onchange', 'window.location = \''.$this->presenter->link('Table:default', $this->driver->type()).'&database=\' + this.value') |
|
| 44 | 44 | ->setDefaultValue($this->database); |
| 45 | 45 | return $form; |
| 46 | 46 | } |