Merge branch v2.3 into master

CHANGELOG.md

@@ -1,3 +1,20 @@
+## v2.3.0
+ - The `create:resources` command have been renamed to `create:scaffold`.
+ - The `--fields` option was added to the `create:scaffold` to allow you to scaffold everything using a single command. So you can use the `create:scaffold` command to create resource-file and scaffold all at the same time. For example, `php artisan create:scaffold Test --fields=id,first_field,second_field`. The previous command will first create the resource-file before it create your other resources. The `--fields` option should only be used one time only to create the resource-file not every time.
+ - The default value of the option `controller-extends` in the `create:controller` command was changed from `Http\Controllers\Controller` to `default-controller`.
+ - A new `create:api-controller` command was created to create API ready controllers.
+ - The `create_move_file_method` option in the config have been removed. Now simply if you have `moveFile` method defined in the controller base class, generating the method will be skipped. However, if the method does not extsts, it will be generated.
+ - Multiple new stubs have been added to the default templates. Any stub name that starts with `api-` have been added.
+ - The `route.stub` file have been modified.
+  - The following two properties `is-api-visible` and `api-key` were added to the Field properties to give you control on which field should be visile to the api output and what should it be called incase you want to give it a name other that what is in the database.
+  - The `create:routes` command now has a new option `without-route-clause` which will create the routes without `there` clause for the id. It may be used when the primary key is not an integer. Additionally, the options `--for-api` and `--api-version` have been added to add support for created api-based routes.
+  - added command to create api-resource with/without collection when using Laravel 5.5+.
+  - The `create:api-scaffold` command have been added to allow you to create resources for the api.
+  - The user is no longer required to publish the default templates. This is much better step to prevent upgrade braking when the template are updated during a patch release. The user should publish templates only if he/she want to modify it and rename it. **IMPORTANT** Delete existing default and default-collective templates from the folders from the default publish path of your project.
+  - The user no longer have to publish resource to install the package! One line only is required to install the package on laravel 5.5+ (i.e, composer require crestapps/laravel-code-generator --dev)
+  - **IMPORTANT**: delete the the `codegenerator.php` file from your config folder, then rename the `codegenerator_custom.php` file to `laravel-code-generator.php`. Alternatively, you can delete both `codegenerator.php` and `codegenerator_custom.php`
+ - Added `--model-extends` option to the create:model command to allow the use to extend a custom default base class.
+
 ## v2.2.7
  - Added capability to lock down resource from with in the resource file. This is helpful if you make code changes to a file and you want the code generator to protect the file from accidentally overriding it when using --force
  - When creating resources from existing database, the table name is stored in the resource-file. This step will save you from having to provide the table name via command line each time you create model.

composer.json

@@ -2,7 +2,11 @@
     "name": "crestapps/laravel-code-generator",
     "license": "MIT",
     "description": "An intelligent code generator for Laravel framework that will save you time! This awesome tool will help you generate resources like views, controllers, routes, migrations, languages and/or form-requests! It is extremely flexible and customizable to cover many on the use cases. It is shipped with cross-browsers compatible template, along with a client-side validation to modernize your application.",
+<<<<<<< HEAD
     "version": "v2.2.14",
+=======
+    "version": "v2.4.2",
+>>>>>>> v2.3
     "keywords": [
         "laravel","crud","crud generator",
         "laravel crud generator","laravel crud builder",
@@ -20,7 +24,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "~5.1"
+        "laravel/framework": ">=5.1"
     },
     "require-dev": {
         "phpunit/phpunit" : "^5.0||^6.0||^7.0",