Merge pull request #12 from bhavingajjar/3.x

3.x

Author: bhavingajjar

composer.json

@@ -15,11 +15,16 @@
             "name": "Bhavin Gajjar",
             "email": "[email protected]",
             "role": "Developer"
+        },
+        {
+            "name": "Dipesh Sukhia",
+            "email": "[email protected]",
+            "role": "Developer"
         }
     ],
     "require": {
-        "php": "^7.2",
-        "illuminate/support": "5.8.*|^6.0|^7.0"
+        "php": "^7.2|^8.0",
+        "illuminate/support": "5.8.*|^6.0|^7.0|^8.0"
     },
     "require-dev": {
         "orchestra/testbench": "3.8.*",

config/config.php

@@ -13,7 +13,8 @@
     | Example: 'app/Model' or 'app/model' or 'app/Models' or 'app/Data/Model' etc...
     |
     */
-    'model_directory_path' => 'app',
+
+    'model_directory_path' => is_dir(base_path('app/Models')) ? 'app/Models':'app',
 
     'allow_cross_origin' => env('API_ALLOW_CROSS_ORIGIN', false),
     'json_response' => env('API_JSON_RESPONSE', true),

src/LaravelApiGenerator.php

@@ -39,6 +39,7 @@ public function generateController()
             $template = str_replace('{{modelName}}', $this->model, $template);
             $template = str_replace('{{modelNameLower}}', strtolower($this->model), $template);
             $template = str_replace('{{modelNameCamel}}', Str::camel($this->model), $template);
+            $template = str_replace('{{modelNameSpace}}', is_dir(base_path('app/Models')) ? 'Models\\'.$this->model : $this->model, $template);
             file_put_contents(base_path('app/Http/Controllers/Api/'.$this->model.'Controller.php'), $template);
             $this->result = true;
         }
@@ -50,7 +51,7 @@ public function generateResource()
     {
         $this->result = false;
         if (! file_exists(base_path('app/Http/Resources/'.$this->model.'Resource.php'))) {
-            $model = app('App\\'.$this->model);
+            $model = is_dir(base_path('app/Models')) ? app('App\\Models\\'.$this->model) : app('App\\'.$this->model);
             $columns = $model->getConnection()->getSchemaBuilder()->getColumnListing($model->getTable());
             $print_columns = null;
             foreach ($columns as $key => $column) {
@@ -82,14 +83,26 @@ public function generateCollection()
     public function generateRoute()
     {
         $this->result = false;
-        $template = "Route::apiResource('{{modelNameLower}}', 'Api\{{modelName}}Controller');"."\n";
+        if(app()->version() >= 8 ){
+            $nameSpace = "\nuse App\Http\Controllers\Api\{{modelName}}Controller;";
+            $template = "Route::apiResource('{{modelNameLower}}', {{modelName}}Controller::class);\n";
+            $nameSpace = str_replace('{{modelName}}', $this->model, $nameSpace);
+        }else{
+            $template = "Route::apiResource('{{modelNameLower}}', 'Api\{{modelName}}Controller');\n";
+        }
         $route = str_replace('{{modelNameLower}}', Str::camel(Str::plural($this->model)), $template);
         $route = str_replace('{{modelName}}', $this->model, $route);
         if (! strpos(file_get_contents(base_path('routes/api.php')), $route)) {
             file_put_contents(base_path('routes/api.php'), $route, FILE_APPEND);
+            if(app()->version() >= 8 ){
+                if (! strpos(file_get_contents(base_path('routes/api.php')), $nameSpace)) {
+                    $lines = file(base_path('routes/api.php'));
+                    $lines[0] = $lines[0]."\n".$nameSpace;
+                    file_put_contents(base_path('routes/api.php'), $lines);
+                }
+            }
             $this->result = true;
         }
-
         return $this->result;
     }
 

src/resources/stubs/controller.stub

@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\{{modelName}};
+use App\{{modelNameSpace}};
 use App\Http\Resources\{{modelName}}Resource;
 use App\Http\Resources\{{modelName}}Collection;