Skip to content

Commit 88b2cbf

Browse files
author
Shawn McCool
committed
Merge pull request backup-manager#3 from rodrigore/master
Fix issue backup-manager#2 : Laravel 5.1 support
2 parents 75faf17 + d369a6d commit 88b2cbf

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/BaseCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function autocomplete($dialog, array $list, $default = null) {
3535
* @internal param string $style
3636
* @return void
3737
*/
38-
public function table(array $headers, array $rows, $style = 'default') {
38+
public function table(array $headers, $rows, $style = 'default') {
3939
$table = $this->getHelperSet()->get('table');
4040
$table->setHeaders($headers);
4141
$table->setRows($rows);

src/Laravel5BackupManagerServiceProvider.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ class Laravel5BackupManagerServiceProvider extends ServiceProvider {
2222
* @return void
2323
*/
2424
public function boot() {
25-
$configPath = __DIR__ . '/../../../config';
26-
$this->publishes([$configPath . "/backup-manager.php" => config_path('backup-manager.php')], 'backup-manager');
25+
$this->publishes([config_path() . "/backup-manager.php" => config_path('backup-manager.php')], 'backup-manager');
2726
}
2827

2928
/**
@@ -33,8 +32,7 @@ public function boot() {
3332
*/
3433
public function register() {
3534

36-
$configPath = __DIR__ . '/../../../config';
37-
$this->mergeConfigFrom($configPath . '/backup-manager.php', 'backup-manager');
35+
$this->mergeConfigFrom(config_path() . '/backup-manager.php', 'backup-manager');
3836
$this->registerFilesystemProvider();
3937
$this->registerDatabaseProvider();
4038
$this->registerCompressorProvider();
@@ -106,9 +104,9 @@ private function registerShellProcessor() {
106104
*/
107105
private function registerArtisanCommands() {
108106
$this->commands([
109-
'BackupManager\Integrations\Laravel\DbBackupCommand',
110-
'BackupManager\Integrations\Laravel\DbRestoreCommand',
111-
'BackupManager\Integrations\Laravel\DbListCommand',
107+
'BackupManager\Laravel\DbBackupCommand',
108+
'BackupManager\Laravel\DbRestoreCommand',
109+
'BackupManager\Laravel\DbListCommand',
112110
]);
113111
}
114112

0 commit comments

Comments
 (0)