#334 #413 fix template name conflict with swagger

InfyOmLabs · Nov 21, 2017 · 9bbee3b · 9bbee3b
1 parent 8f28e77
commit 9bbee3b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Generators/API/APIControllerGenerator.php b/src/Generators/API/APIControllerGenerator.php
@@ -42,7 +42,7 @@ private function fillDocs($templateData)
         $methods = ['controller', 'index', 'store', 'show', 'update', 'destroy'];
 
         if ($this->commandData->getAddOn('swagger')) {
-            $templatePrefix = 'controller';
+            $templatePrefix = 'controller_docs';
             $templateType = 'swagger-generator';
         } else {
             $templatePrefix = 'api.docs.controller';

diff --git a/src/Generators/ModelGenerator.php b/src/Generators/ModelGenerator.php
@@ -173,14 +173,14 @@ public function generateSwagger($templateData)
     {
         $fieldTypes = SwaggerGenerator::generateTypes($this->commandData->fields);
 
-        $template = get_template('model.model', 'swagger-generator');
+        $template = get_template('model_docs.model', 'swagger-generator');
 
         $template = fill_template($this->commandData->dynamicVars, $template);
 
         $template = str_replace('$REQUIRED_FIELDS$',
             '"'.implode('"'.', '.'"', $this->generateRequiredFields()).'"', $template);
 
-        $propertyTemplate = get_template('model.property', 'swagger-generator');
+        $propertyTemplate = get_template('model_docs.property', 'swagger-generator');
 
         $properties = SwaggerGenerator::preparePropertyFields($propertyTemplate, $fieldTypes);
 

diff --git a/src/Generators/SwaggerGenerator.php b/src/Generators/SwaggerGenerator.php
@@ -101,13 +101,13 @@ public static function generateTypes($inputFields)
 
     public static function generateSwagger($fields, $fillables, $variables)
     {
-        $template = get_template('model.model', 'swagger-generator');
+        $template = get_template('model_docs.model', 'swagger-generator');
 
         $templateData = fill_template($variables, $template);
 
         $templateData = str_replace('$REQUIRED_FIELDS$', '"'.implode('", "', $fillables).'"', $templateData);
 
-        $propertyTemplate = get_template('model.property', 'swagger-generator');
+        $propertyTemplate = get_template('model_docs.property', 'swagger-generator');
 
         $properties = self::preparePropertyFields($propertyTemplate, $fields);
 

diff --git a/src/Generators/VueJs/ControllerGenerator.php b/src/Generators/VueJs/ControllerGenerator.php
@@ -71,7 +71,7 @@ private function fillDocs($templateData)
         $methods = ['controller', 'index', 'store', 'show', 'update', 'destroy'];
 
         if ($this->commandData->getAddOn('swagger')) {
-            $templatePrefix = 'controller';
+            $templatePrefix = 'controller_docs';
             $templateType = 'swagger-generator';
         } else {
             $templatePrefix = 'api.docs.controller';