Skip to content

Commit

Permalink
Merge pull request #331 from denisrocks/master
Browse files Browse the repository at this point in the history
Migration to laravel 5.5
  • Loading branch information
kaidesu authored Sep 6, 2017
2 parents 7a500db + 517e968 commit 72f622e
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 14 deletions.
12 changes: 11 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/support": "5.4.*"
"illuminate/support": "5.5.*"
},
"autoload": {
"psr-4": {
Expand All @@ -20,5 +20,15 @@
},
"suggest": {
"wikimedia/composer-merge-plugin": "Allows the ability to create and merge composer.json files for your individual modules for module-specific dependency management."
},
"extra": {
"laravel": {
"providers": [
"Caffeinated\\Modules\\ModulesServiceProvider"
],
"aliases": {
"Module": "Caffeinated\\Modules\\Facades\\Module"
}
}
}
}
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleDisableCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ModuleDisableCommand extends Command
*
* @return mixed
*/
public function fire()
public function handle()
{
$slug = $this->argument('slug');

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleEnableCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ModuleEnableCommand extends Command
*
* @return mixed
*/
public function fire()
public function handle()
{
$slug = $this->argument('slug');

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleListCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct(Modules $module)
*
* @return mixed
*/
public function fire()
public function handle()
{
$modules = $this->module->all();

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleMigrateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function __construct(Migrator $migrator, Modules $module)
*
* @return mixed
*/
public function fire()
public function handle()
{
$this->prepareDatabase();

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleMigrateRefreshCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ModuleMigrateRefreshCommand extends Command
*
* @return mixed
*/
public function fire()
public function handle()
{
if (!$this->confirmToProceed()) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleMigrateResetCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function __construct(Modules $module, Filesystem $files, Migrator $migrat
*
* @return mixed
*/
public function fire()
public function handle()
{
if (!$this->confirmToProceed()) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleMigrateRollbackCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct(Migrator $migrator, Modules $module)
*
* @return mixed
*/
public function fire()
public function handle()
{
if (!$this->confirmToProceed()) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleOptimizeCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ModuleOptimizeCommand extends Command
*
* @return mixed
*/
public function fire()
public function handle()
{
$this->info('Generating optimized module cache');

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/ModuleSeedCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function __construct(Modules $module)
*
* @return mixed
*/
public function fire()
public function handle()
{
$slug = $this->argument('slug');

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Generators/MakeMigrationCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class MakeMigrationCommand extends Command
*
* @return void
*/
public function fire()
public function handle()
{
$arguments = $this->argument();
$option = $this->option();
Expand Down
4 changes: 2 additions & 2 deletions src/Console/Generators/MakeModelCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ class MakeModelCommand extends GeneratorCommand
*
* @return void
*/
public function fire()
public function handle()
{
if (parent::fire() !== false) {
if (parent::handle() !== false) {
if ($this->option('migration')) {
$table = Str::plural(Str::snake(class_basename($this->argument('name'))));

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Generators/MakeModuleCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function __construct(Filesystem $files, Modules $module)
*
* @return mixed
*/
public function fire()
public function handle()
{
$this->container['slug'] = str_slug($this->argument('slug'));
$this->container['name'] = studly_case($this->container['slug']);
Expand Down

1 comment on commit 72f622e

@Litiano
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaidesu please create a new version.

Please sign in to comment.