Skip to content

Commit 5c6213a

Browse files
committed
Clean some things up;
1 parent c8348ee commit 5c6213a

4 files changed

Lines changed: 45 additions & 42 deletions

File tree

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@
3535
},
3636
"autoload-dev": {
3737
"classmap": [
38-
"tests/stubs/laravel/modules",
38+
"tests/stubs/laravel/addons",
3939
"tests/stubs/laravel/themes"
4040
],
4141
"psr-4": {
4242
"Fusion\\Tests\\": "tests/src/",
43-
"App\\": "tests/stubs/laravel/app/",
44-
"Modules\\": "tests/stubs/laravel/modules/",
45-
"Themes\\": "tests/stubs/laravel/themes/"
43+
"App\\": "tests/stubs/laravel/app/"
4644
}
4745
},
4846
"minimum-stability": "dev",

composer.lock

Lines changed: 36 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Console/InstallCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private function install()
258258

259259
Artisan::call('fusion:sync');
260260
Artisan::call('config:clear');
261-
Artisan::call('module:optimize');
261+
Artisan::call('addon:discover');
262262

263263
event('fusioncms.installed');
264264

src/Http/Controllers/Web/Installer/InstallController.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function index(Request $request)
2727

2828
/**
2929
* Install FusionCMS.
30-
*
30+
*
3131
* @param Request $request
3232
* @return Redirect
3333
*/
@@ -68,21 +68,21 @@ public function store(Request $request)
6868
dispatch_now($instance);
6969
} catch (Exception $exception) {
7070
Log::error($exception->getMessage(), (array) $exception->getTrace()[0]);
71-
71+
7272
return back();
7373
}
7474
}
7575

7676
Artisan::call('fusion:sync');
7777
Artisan::call('config:clear');
78-
Artisan::call('module:optimize');
78+
Artisan::call('addon:discover');
7979

8080
return redirect('/admin');
8181
}
8282

8383
/**
8484
* Returns formatted data.
85-
*
85+
*
8686
* @return array
8787
*/
8888
private function getData()
@@ -95,7 +95,7 @@ private function getData()
9595

9696
/**
9797
* Returns formatted rules.
98-
*
98+
*
9999
* @return array
100100
*/
101101
private function getRules()
@@ -111,7 +111,7 @@ private function getRules()
111111

112112
/**
113113
* Returns formatted messages.
114-
*
114+
*
115115
* @return array
116116
*/
117117
private function getMessages()

0 commit comments

Comments
 (0)