Merge branch 'master' of https://github.com/CrestApps/laravel-code-generator into proposed-changes

* 'master' of https://github.com/CrestApps/laravel-code-generator:
  Add casting to the model
  Add labels fields-file, improves the foreign relations
  Add function to set values like Auth::Id(). and add config to define common relations

Author: Stefano Manfredini

composer.json

@@ -2,7 +2,7 @@
     "name": "crestapps/laravel-code-generator",
     "license": "MIT",
     "description": "A clean code generator for Laravel framework that will save you time! This awesome tool will help you generate resources like views, controllers, routes, migrations, languages or request-forms! It is extremely flexible and customizable to cover many use cases. It is shipped with cross-browsers compatible template, along with a client-side validation to modernize your application.",
-    "version": "v1.3.0",
+    "version": "v2.0.0",
     "keywords": [
         "laravel","crud","crud generator",
         "laravel crud generator","laravel crud builder",

config/.php_cs.cache

@@ -1 +1 @@
-{"php":"7.1.1","version":"2.3.1:v2.3.1#d5257f7433bb490299c4f300d95598fd911a8ab0","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"codegenerator.php":295300723}}
+{"php":"7.1.1","version":"2.3.1:v2.3.1#d5257f7433bb490299c4f300d95598fd911a8ab0","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"codegenerator.php":1292351656}}

config/codegenerator.php

@@ -161,55 +161,71 @@
     | to use. Here is description of the definition array
     | 
     | "name" will be used to create the relation method's name.
-    | "model" the foreign model.
+    | "type" will be used to set the relation type
+    | "params" the parameters to use for the "type" relation.
     | "field" the field on the foreign model to use as display name.
     | "on-create" sets a value to use when this model is created. If your using an authentication
     |             system such as laravel build in authentication. you can automaticly set 
     |             the user Id who created the model by setting this value to 'Auth::Id();'.
     | "on-update" sets a value to use when this model is update.
-    | "on-delete" sets a value to use when this model is soft-deleted.
     |
     */
-    'common_foreign_keys' => [
-        'owner_id'      => [
-            'name'      => 'owner', 
-            'model'     => 'App\\User',
-            'field'     => 'name',
-            'on-create' => null,
-            'on-update' => null,
-            'on-delete' => null
+
+    "common_foreign_keys" => [
+        "owner_id"      => [
+            "name"      => "owner",
+            "type"      => "belongsTo",
+            "params"    => [
+                "App\\User",
+                "owner_id"
+            ],
+            "field"     => "name",
+            "on-store"  => null,
+            "on-update" => null,
         ],
-        'operator_id'      => [
-            'name'      => 'operator',
-            'model'     => 'App\\User',
-            'field'     => 'name',
-            'on-create' => null,
-            'on-update' => null,
-            'on-delete' => null
+        "operator_id"   => [
+            "name"      => "operator",
+            "type"      => "belongsTo",
+            "params"    => [
+                "App\\User",
+                "operator_id"
+            ],
+            "field"     => "name",
+            "on-store"  => null,
+            "on-update" => null,
         ],
-        'created_by'      => [
-            'name'      => 'creator',
-            'model'     => 'App\\User',
-            'field'     => 'name',
-            'on-create' => 'Auth::Id();',
-            'on-update' => null,
-            'on-delete' => null
+        "author_id"     => [
+            "name"      => "author",
+            "type"      => "belongsTo",
+            "params"    => [
+                "App\\User",
+                "author_id"
+            ],
+            "field"     => "name",
+            "on-store"  => null,
+            "on-update" => null,
         ],
-        'updated_by'      => [
-            'name'      => 'updator',
-            'model'     => 'App\\User',
-            'field'     => 'name',
-            'on-create' => null,
-            'on-update' => 'Auth::Id();',
-            'on-delete' => null
+        "created_by"    => [
+            "name"      => "creator",
+            "type"      => "belongsTo",
+            "params"    => [
+                "App\\User",
+                "created_by"
+            ],
+            "field"     => "name",
+            "on-store"  => "Illuminate\Support\Facades\Auth::Id();",
+            "on-update" => null,
         ],
-        'deleted_by'      => [
-            'name'      => 'deleator',
-            'model'     => 'App\\User',
-            'field'     => 'name',
-            'on-create' => null,
-            'on-update' => null,
-            'on-delete' => 'Auth::Id();'
+        "updated_by"    => [
+            "name"      => "updator",
+            "type"      => "belongsTo",
+            "params"    => [
+                "App\\User",
+                "created_by"
+            ],
+            "field"     => "name",
+            "on-store" => null,
+            "on-update" => "Illuminate\Support\Facades\Auth::Id();",
         ]
     ],
 

src/Commands/.php_cs.cache

@@ -1 +1 @@
-{"php":"7.1.1","version":"2.3.1:v2.3.1#d5257f7433bb490299c4f300d95598fd911a8ab0","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"CreateControllerCommand.php":2028451951,"CreateLanguageCommand.php":143920987,"FieldsFileCreateCommand.php":-1927885825}}
+{"php":"7.1.1","version":"2.3.1:v2.3.1#d5257f7433bb490299c4f300d95598fd911a8ab0","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"CreateControllerCommand.php":-832128993,"CreateLanguageCommand.php":143920987,"FieldsFileCreateCommand.php":-280774643,"CreateModelCommand.php":-1845010254}}