Merge pull request #85 from MohamedKhedr700/bugfix/existing-trait

Enhance pass existing trait
hassanzohdy · Jul 20, 2022 · 895ca3f · 895ca3f
2 parents 8fb2e40 + e9640b6
commit 895ca3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/module/Models/model.stub b/module/Models/model.stub
@@ -48,18 +48,6 @@ class {{ ModelName }} extends Model
      */
     const MODEL_LINKS_ARRAY = [];
 
-    /**
-     * Define list of other models that will be affected as the current object is part of array
-     * as the current model is sub-document to it when it gets created
-     *
-     * @example ModelClass::class => searchingColumn will be converted to ['searchingColumn['id'], 'columnName', 'sharedInfo']
-     * @example ModelClass::class => [searchingColumn, creatingColumn]
-     * @example ModelClass::class => [searchingColumn, creatingColumn, sharedInfoMethod]
-     *
-     * @const array
-     */
-    const ON_MODEL_CREATE_PUSH = [];
-
     /**
      * Define list of other models that will be affected
      * as the current model is sub-document to it when it gets created

diff --git a/src/Console/Commands/EngezTrait.php b/src/Console/Commands/EngezTrait.php
@@ -54,7 +54,7 @@ public function handle()
     {
         $this->init();
 
-        $this->validateArguments();
+        if ($this->validateArguments() === false) return;
 
         $this->create();
 
@@ -86,13 +86,15 @@ public function validateArguments()
         parent::validateArguments();
 
         if (!in_array($this->option('type'), [static::TYPE_GENERAL, static::TYPE_REQUEST])) {
-            return $this->missingRequiredOption('This controller type does not exits, Did you mean? ' . implode(PHP_EOL, static::TRAIT_TYPES));
+            return $this->missingRequiredOption('This trait type does not exits, Did you mean? ' . implode(PHP_EOL, static::TRAIT_TYPES));
         }
 
         $baseDir = $this->isRequestTrait() ? 'Traits/Validation' : 'Traits';
 
         if ($this->files->exists($this->modulePath("$baseDir/$this->traitName.php"))) {
-            return $this->info('You already have this trait');
+            $this->info('You already have this trait');
+
+            return false;
         }
     }