Skip to content

Commit 503a386

Browse files
author
Shawn McCool
committed
update Laravel5 service provider based on the work by @cmosguy
1 parent 6368742 commit 503a386

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

src/Laravel5BackupManagerServiceProvider.php

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
/**
1212
* Class BackupManagerServiceProvider
13-
* @package BackupManager\Laravel
13+
* @package BackupManager\Integrations\Laravel
1414
*/
15-
class Laravel4BackupManagerServiceProvider extends ServiceProvider {
15+
class Laravel5BackupManagerServiceProvider extends ServiceProvider {
1616

1717
protected $defer = true;
1818

@@ -22,7 +22,8 @@ class Laravel4BackupManagerServiceProvider extends ServiceProvider {
2222
* @return void
2323
*/
2424
public function boot() {
25-
$this->package('backup-manager/laravel-4', 'backup-manager', realpath(app_path("config/packages/backup-manager/laravel-4")));
25+
$configPath = __DIR__ . '/../../../config';
26+
$this->publishes([$configPath . "/backup-manager.php" => config_path('backup-manager.php')], 'backup-manager');
2627
}
2728

2829
/**
@@ -31,6 +32,9 @@ public function boot() {
3132
* @return void
3233
*/
3334
public function register() {
35+
36+
$configPath = __DIR__ . '/../../../config';
37+
$this->mergeConfigFrom($configPath . '/backup-manager.php', 'backup-manager');
3438
$this->registerFilesystemProvider();
3539
$this->registerDatabaseProvider();
3640
$this->registerCompressorProvider();
@@ -44,8 +48,8 @@ public function register() {
4448
* @return void
4549
*/
4650
private function registerFilesystemProvider() {
47-
$this->app->bind(\BackupManager\Filesystems\FilesystemProvider::class, function ($app) {
48-
$provider = new Filesystems\FilesystemProvider(new Config($app['config']['backup-manager::storage']));
51+
$this->app->bind('BackupManager\Filesystems\FilesystemProvider', function ($app) {
52+
$provider = new Filesystems\FilesystemProvider(new Config($app['config']['backup-manager']));
4953
$provider->add(new Filesystems\Awss3Filesystem);
5054
$provider->add(new Filesystems\DropboxFilesystem);
5155
$provider->add(new Filesystems\FtpFilesystem);
@@ -62,7 +66,7 @@ private function registerFilesystemProvider() {
6266
* @return void
6367
*/
6468
private function registerDatabaseProvider() {
65-
$this->app->bind(\BackupManager\Databases\DatabaseProvider::class, function ($app) {
69+
$this->app->bind('BackupManager\Databases\DatabaseProvider', function ($app) {
6670
$provider = new Databases\DatabaseProvider($this->getDatabaseConfig($app['config']['database.connections']));
6771
$provider->add(new Databases\MysqlDatabase);
6872
$provider->add(new Databases\PostgresqlDatabase);
@@ -76,7 +80,7 @@ private function registerDatabaseProvider() {
7680
* @return void
7781
*/
7882
private function registerCompressorProvider() {
79-
$this->app->bind(\BackupManager\Compressors\CompressorProvider::class, function () {
83+
$this->app->bind('BackupManager\Compressors\CompressorProvider', function () {
8084
$provider = new Compressors\CompressorProvider;
8185
$provider->add(new Compressors\GzipCompressor);
8286
$provider->add(new Compressors\NullCompressor);
@@ -90,7 +94,7 @@ private function registerCompressorProvider() {
9094
* @return void
9195
*/
9296
private function registerShellProcessor() {
93-
$this->app->bind(\BackupManager\ShellProcessing\ShellProcessor::class, function () {
97+
$this->app->bind('BackupManager\ShellProcessing\ShellProcessor', function () {
9498
return new ShellProcessor(new Process(''));
9599
});
96100
}
@@ -102,9 +106,9 @@ private function registerShellProcessor() {
102106
*/
103107
private function registerArtisanCommands() {
104108
$this->commands([
105-
\BackupManager\Laravel\DbBackupCommand::class,
106-
\BackupManager\Laravel\DbRestoreCommand::class,
107-
\BackupManager\Laravel\DbListCommand::class
109+
'BackupManager\Integrations\Laravel\DbBackupCommand',
110+
'BackupManager\Integrations\Laravel\DbRestoreCommand',
111+
'BackupManager\Integrations\Laravel\DbListCommand',
108112
]);
109113
}
110114

@@ -115,9 +119,9 @@ private function registerArtisanCommands() {
115119
*/
116120
public function provides() {
117121
return [
118-
\BackupManager\Filesystems\FilesystemProvider::class,
119-
\BackupManager\Databases\DatabaseProvider::class,
120-
\BackupManager\ShellProcessing\ShellProcessor::class,
122+
'BackupManager\Filesystems\FilesystemProvider',
123+
'BackupManager\Databases\DatabaseProvider',
124+
'BackupManager\ShellProcessing\ShellProcessor',
121125
];
122126
}
123127

0 commit comments

Comments
 (0)