Merge pull request #13 from laramoud/develop

Develop

Author: pravodev

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "pravodev/laramoud",
+    "name": "laramoud/laravel-modules",
     "description": "Laravel modular, laravel management, modularized",
     "keywords": [
         "modules",
@@ -18,48 +18,39 @@
     "require": {
         "php": ">=7.2",
         "composer-plugin-api": "^1.0",
-        "pravodev/laramoud-installer": "dev-master",
+        "pravodev/laramoud-installer": "^1.0",
         "ext-zip": "*",
         "guzzlehttp/guzzle": "~6.0",
         "symfony/console": "~3.0|~4.0",
         "symfony/filesystem": "~3.0|~4.0",
         "symfony/process": "~3.0|~4.0"
     },
 	"support": {
-		"issues": "https://github.com/pravodev/laramoud/issues"
+		"issues": "https://github.com/laramoud/laravel-modules/issues"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0|~8.0",
-        "laravel/framework": "5.8.*",
+        "laravel/framework": "5.*",
         "phpstan/phpstan": "^0.9.2"
     },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "/var/www/pravo/laramoud-installer",
-            "options": {
-                "symlink": true
-            }
-        }
-    ],
     "autoload": {
         "psr-4": {
-            "Pravodev\\Laramoud\\": "src"
+            "Laramoud\\Modules\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Pravodev\\Laramoud\\Tests\\": "tests"
-        }
+            "Laramoud\\Modules\\Tests\\": "tests"
+        },
+        "files": [
+            "src/Utils/Helper.php"
+        ]
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Pravodev\\Laramoud\\LaramoudServiceProvider"
-            ],
-            "aliases": {
-                "Laramoud": "Pravodev\\Laramoud\\Laramoud"
-            }
+                "Laramoud\\Modules\\LaramoudServiceProvider"
+            ]
         }
     }
 }

src/Commands/ClearCommand.php

@@ -10,10 +10,10 @@
  * Copyright © 2019 PondokIT. All rights reserved.
  */
 
-namespace Pravodev\Laramoud\Commands;
+namespace Laramoud\Modules\Commands;
 
 use Illuminate\Console\Command;
-use Pravodev\Laramoud\Contracts\Module;
+use Laramoud\Modules\Contracts\Module;
 
 class ClearCommand extends Command
 {

src/Commands/Generators/ChannelMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ChannelMakeCommand as BaseChannelMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ChannelMakeCommand extends BaseChannelMakeCommand
 {

src/Commands/Generators/ConsoleMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ConsoleMakeCommand as BaseConsoleMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ConsoleMakeCommand extends BaseConsoleMakeCommand
 {

src/Commands/Generators/ControllerMakeCommand.php

@@ -10,10 +10,10 @@
  * Copyright © 2019 PondokIT. All rights reserved.
  */
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Routing\Console\ControllerMakeCommand as BaseControllerMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ControllerMakeCommand extends BaseControllerMakeCommand
 {

src/Commands/Generators/EventMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\EventMakeCommand as BaseEventMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class EventMakeCommand extends BaseEventMakeCommand
 {

src/Commands/Generators/ExceptionMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ExceptionMakeCommand as BaseExceptionMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ExceptionMakeCommand extends BaseExceptionMakeCommand
 {

src/Commands/Generators/FactoryMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Database\Console\Factories\FactoryMakeCommand as BaseFactoryMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class FactoryMakeCommand extends BaseFactoryMakeCommand
 {

src/Commands/Generators/JobMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\JobMakeCommand as BaseJobMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class JobMakeCommand extends BaseJobMakeCommand
 {

src/Commands/Generators/ListenerMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ListenerMakeCommand as BaseListenerMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ListenerMakeCommand extends BaseListenerMakeCommand
 {

src/Commands/Generators/MailMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\MailMakeCommand as BaseMailMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class MailMakeCommand extends BaseMailMakeCommand
 {

src/Commands/Generators/MiddlewareMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Routing\Console\MiddlewareMakeCommand as BaseMiddlewareMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class MiddlewareMakeCommand extends BaseMiddlewareMakeCommand
 {

src/Commands/Generators/MigrateMakeCommand.php

@@ -10,10 +10,10 @@
  * Copyright © 2019 PondokIT. All rights reserved.
  */
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Console\Command;
-use Pravodev\Laramoud\Contracts\Module;
+use Laramoud\Modules\Contracts\Module;
 
 class MigrateMakeCommand extends Command
 {
@@ -45,6 +45,11 @@ public function __construct()
 
     public function handle()
     {
+        if(file_exists($this->getModulePath($this->argument('module_name')).'/') == false){
+            $this->error('module with name '. $this->argument('module_name').' not found');
+            return;
+        }
+        
         $this->call('make:migration', [
             'name'       => $this->argument('name'),
             '--create'   => $this->option('create'),

src/Commands/Generators/ModelMakeCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ModelMakeCommand as BaseModelMakeCommand;
 use Illuminate\Support\Str;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ModelMakeCommand extends BaseModelMakeCommand
 {

src/Commands/Generators/NotificationMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\NotificationMakeCommand as BaseNotificationMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class NotificationMakeCommand extends BaseNotificationMakeCommand
 {

src/Commands/Generators/ObserverMakeCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ObserverMakeCommand as BaseObserverMakeCommand;
 use Illuminate\Support\Str;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ObserverMakeCommand extends BaseObserverMakeCommand
 {

src/Commands/Generators/PolicyMakeCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\PolicyMakeCommand as BasePolicyMakeCommand;
 use Illuminate\Support\Str;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class PolicyMakeCommand extends BasePolicyMakeCommand
 {

src/Commands/Generators/ProviderMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ProviderMakeCommand as BaseProviderMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ProviderMakeCommand extends BaseProviderMakeCommand
 {

src/Commands/Generators/RequestMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\RequestMakeCommand as BaseRequestMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class RequestMakeCommand extends BaseRequestMakeCommand
 {

src/Commands/Generators/ResourceMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\ResourceMakeCommand as BaseResourceMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class ResourceMakeCommand extends BaseResourceMakeCommand
 {

src/Commands/Generators/RuleMakeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\RuleMakeCommand as BaseRuleMakeCommand;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class RuleMakeCommand extends BaseRuleMakeCommand
 {

src/Commands/Generators/SeederMakeCommand.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Database\Console\Seeds\SeederMakeCommand as BaseSeederMakeCommand;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Composer;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class SeederMakeCommand extends BaseSeederMakeCommand
 {

src/Commands/Generators/TestMakeCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Generators;
+namespace Laramoud\Modules\Commands\Generators;
 
 use Illuminate\Foundation\Console\TestMakeCommand as BaseTestMakeCommand;
 use Illuminate\Support\Str;
-use Pravodev\Laramoud\Contracts\GeneratorTrait;
+use Laramoud\Modules\Contracts\GeneratorTrait;
 
 class TestMakeCommand extends BaseTestMakeCommand
 {

src/Commands/Migrations/MigrateCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pravodev\Laramoud\Commands\Migrations;
+namespace Laramoud\Modules\Commands\Migrations;
 
 use Illuminate\Console\Command;
-use Pravodev\Laramoud\Contracts\Module;
+use Laramoud\Modules\Contracts\Module;
 
 class MigrateCommand extends Command
 {
@@ -42,6 +42,11 @@ public function __construct()
      */
     public function handle()
     {
+        if(file_exists($this->getModulePath($this->argument('module_name')).'/') == false){
+            $this->error('module with name '. $this->argument('module_name').' not found');
+            return;
+        }
+
         $this->call('migrate', [
             '--database' => $this->option('database'),
             '--path' => $this->getMigrationPath(),