Merge pull request #8 from theanik/feature/resolve-namespace-from-config

Feature/resolve namespace from config

Author: theanik

README.md

@@ -19,8 +19,8 @@ Or add the following to your composer.json's require-dev section and `composer u
 
 ```json
 "require-dev": {
-        "theanik/laravel-more-command": "^1.2.0"
-    }
+    "theanik/laravel-more-command": "^1.3.0"
+}
 ```
 
 ## Publish Package Configuration
@@ -31,7 +31,8 @@ Or add the following to your composer.json's require-dev section and `composer u
 ```php
 <?php
 return [
-    'namespace' => 'App', // Your Desire Namespace
+    'repository-namespace' => 'App', // Your Desire Namespace for Repository Classes
+    'service-namespace' => 'App', // Your Desire Namespace for Service Classes
 ];
 ```
 
@@ -62,7 +63,7 @@ php artisan make:repository UserRepository
 ```
 or
 ```
-php artisan make:repository Backend\UserRepository
+php artisan make:repository Backend/UserRepository
 ```
 
 The above will create a **Repositories** directory inside the **App** directory.\
@@ -76,7 +77,7 @@ php artisan make:repository UserRepository -i
 ```
 or
 ```
-php artisan make:repository Backend\UserRepository -i
+php artisan make:repository Backend/UserRepository -i
 ```
 Here you need to put extra `-i` flag.
 The above will create a **Repositories** directory inside the **App** directory.
@@ -93,7 +94,7 @@ php artisan module:make-repository UserRepository Blog
 ```
 or
 ```
-php artisan module:make-repository Backend\UserRepository Blog
+php artisan module:make-repository Backend/UserRepository Blog
 ```
 
 The above will create a **Repositories** directory inside the **{Module}** directory.
@@ -107,7 +108,7 @@ php artisan module:make-repository UserRepository -i Blog
 ```
 or
 ```
-php artisan module:make-repository Backend\UserRepository -i Blog
+php artisan module:make-repository Backend/UserRepository -i Blog
 ```
 Here you need to put extra `-i` flag.
 The above will create a **Repositories** directory inside the **{Module}** directory.
@@ -145,7 +146,7 @@ php artisan make:service UserService
 ```
 or
 ```
-php artisan make:service Backend\UserService
+php artisan make:service Backend/UserService
 ```
 The above will create a **Services** directory inside the **App** directory.
 
@@ -160,7 +161,7 @@ php artisan module:make-service UserService
 ```
 or
 ```
-php artisan module:make-service Backend\UserService
+php artisan module:make-service Backend/UserService
 ```
 The above will create a **Services** directory inside the **{Module}** directory.
 
@@ -178,7 +179,7 @@ php artisan make:trait HasAuth
 ```
 or
 ```
-php artisan make:trait Backend\HasAuth
+php artisan make:trait Backend/HasAuth
 ```
 The above will create a **Traits** directory inside the **App** directory.
 
@@ -192,7 +193,7 @@ php artisan module:make-trait HasAuth
 ```
 or
 ```
-php artisan module:make-trait Backend\HasAuth
+php artisan module:make-trait Backend/HasAuth
 ```
 The above will create a **Traits** directory inside the **{Module}** directory.
 
@@ -211,7 +212,7 @@ php artisan make:view index
 ```
 or
 ```
-php artisan make:view user\index
+php artisan make:view user/index
 ```
 The above will create a **blade** file inside the **/resource/views/** directory.
 
@@ -225,7 +226,7 @@ php artisan module:make-view index
 ```
 or
 ```
-php artisan module:make-view user\index
+php artisan module:make-view user/index
 ```
 The above will create a **blade** file inside the **{Module}/Resources/views/** directory.
 

config/laravel-more-command.php

@@ -1,6 +1,30 @@
 <?php
 
-
 return [
-    'namespace' => 'App',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Repository classes namespace
+    |--------------------------------------------------------------------------
+    |
+    | This value defines the default namespace for created Repository classes.
+    | For example if the value is 'App/Http', it will create repository classes
+    | inside 'App/Http/Repositories' and class namespace will
+    | 'App/Http/Repositories/{ClassName}'.
+    |
+    */
+    'repository-namespace' => 'App',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Service classes namespace
+    |--------------------------------------------------------------------------
+    |
+    | This value defines the default namespace for created Service classes.
+    | For example if the value is 'App/Http', it will create repository classes
+    | inside 'App/Http/Services' and class namespace will
+    | 'App/Http/Services/{ClassName}'.
+    |
+    */
+    'service-namespace' => 'App',
 ];

src/Commands/ClearLogCommand.php

@@ -38,12 +38,10 @@ public function __construct()
      */
     public function handle()
     {
-        
         exec('rm -f ' . storage_path('logs/*.log'));
-        
+
         $this->info("Logs have been cleared!");
 
         Log::info("Log Cleared at ".date('l jS \of F Y h:i:s A'));
-
     }
 }

src/Commands/CommandGenerator.php

@@ -6,6 +6,7 @@
 
 abstract class CommandGenerator extends Command
 {
+    public const APP_PATH = 'App';
 
     /**
      * argumentName
@@ -20,29 +21,39 @@ abstract class CommandGenerator extends Command
      *
      * @return string
      */
-    abstract protected function getTemplateContents();
+    abstract protected function getTemplateContents(): string;
 
 
     /**
-     * Return the destination path for publishe created class file.
+     * Return the destination path for publish created class file.
      * getDestinationFilePath
      *
      * @return string
      */
-    abstract protected function getDestinationFilePath();
+    abstract protected function getDestinationFilePath(): string;
 
 
     /**
-     * Get Namespace From Config
+     * Get Repository Namespace From Config
      * @return string
      */
-    public function getNamespaceFromConfig(): string
+    public function getRepositoryNamespaceFromConfig(): string
     {
-        return config('laravel-more-command.namespace') ?? 'App';
+        return config('laravel-more-command.repository-namespace') ?? 'App';
+    }
+
+
+    /**
+     * Get Service Namespace From Config
+     * @return string
+     */
+    public function getServiceNamespaceFromConfig(): string
+    {
+        return config('laravel-more-command.service-namespace') ?? 'App';
     }
 
     /**
-     * Return the default namesapce for class
+     * Return the default namespace for class
      * getDefaultNamespace
      *
      * @return string
@@ -54,7 +65,7 @@ public function getDefaultNamespace(): string
 
 
     /**
-     * Return the default namesapce type for interface
+     * Return the default namespace type for interface
      * getDefaultInterfaceNamespace
      *
      * @return string
@@ -66,28 +77,26 @@ public function getDefaultInterfaceNamespace(): string
 
 
     /**
-     * Return a vaid class name
+     * Return a class name
      * getClass
      *
-     * @return void
+     * @return string
      */
-    public function getClass()
+    public function getClass(): string
     {
         return class_basename($this->argument($this->argumentName));
     }
 
 
     /**
-     * Generate class namespace dinamacally
+     * Generate class namespace dynamically
      * getClassNamespace
      *
-     * @return void
+     * @return string
      */
-    public function getClassNamespace()
+    public function getClassNamespace(): string
     {
-        $extra = str_replace($this->getClass(), '', $this->argument($this->argumentName));
-
-        $extra = str_replace('/', '\\', $extra);
+        $extra = str_replace(array($this->getClass(), '/'), array('', '\\'), $this->argument($this->argumentName));
 
         $namespace = $this->getDefaultNamespace();
 
@@ -100,16 +109,14 @@ public function getClassNamespace()
 
 
     /**
-     * Generate interface namespace dinamacally
+     * Generate interface namespace dynamically
      * getInterfaceNamespace
      *
-     * @return void
+     * @return string
      */
-    public function getInterfaceNamespace()
+    public function getInterfaceNamespace(): string
     {
-        $extra = str_replace($this->getClass() . 'Interface', '', $this->argument($this->argumentName) . 'Interface');
-
-        $extra = str_replace('/', '\\', $extra);
+        $extra = str_replace(array($this->getClass() . 'Interface', '/'), array('', '\\'), $this->argument($this->argumentName) . 'Interface');
 
         $namespace = $this->getDefaultInterfaceNamespace();
 
@@ -135,5 +142,4 @@ public function checkModuleExists(string $moduleName): bool
         return true;
     }
 
-
-}
+}