From 6c41ba0a9bb03f278602e10e1776ecc2f449aea8 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 9 Oct 2019 13:44:26 +0530 Subject: [PATCH] Contritbution guidelines and PR template content updated --- .github/PULL_REQUEST_TEMPLATE.md | 56 +++-------------------------- CONTRIBUTING.md | 61 ++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 51 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b4e98ce65ab..3fd9bc3a29f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,59 +1,13 @@ **BUGS:** -To encourage active collaboration, Bagisto encourages pull requests, not just bug reports. "Bug reports" may also be sent in the form of a pull request containing negative test. - -However, when filing a bug report, your issue should contain a title and a clear description of the issue. You should also include as much relevant information as possible and a code sample that demonstrates the issue. The goal of a bug report is to make it easy for yourself - and others - to replicate the bug and develop a fix. - -Remember, bug reports are created in the hope that others with the same problem will be able to collaborate with you on solving it. Creating a bug report serves to help yourself and others start on the path of fixing the problem. - -**Projects that you can contribute in:** - -1. Bagisto - -2. Bagisto docs - -3. Laravel-aliexpress-dropship - -4. Laravel-aliexpress-dropship-chrome-extension - -5. Bagisto-custom-style-extension +Please describe the issue that you solved if its not filed. Otherwise please mention issue #id and use comma +if your PR is having multiple fixes. **Core development ideas or discussion:** -If you propose a new feature, please be willing to implement at least some of the code that would be needed to complete the feature. - -Informal discussion regarding bugs, new features, and implementation of existing features takes place in the comments of the issues filed using feature template. +Describe the feature in very short lines word usage limit is 200. Otherwise use **issue #id** if the issue was +filed as **feature** request. **Which branch you should target?** -All bug fixes should be sent to the latest staging branch i.e development branch. Bug fixes should never be sent to the master branch unless they fix features that exist only in the upcoming release. - -Minor features that are fully backwards compatible with the current Laravel release may be sent to the latest stable branch. - -Major new features should always be sent to the master branch, which contains the upcoming Bagisto release. - -**Compiling assets:** - -If you are submitting a change that will affect a compiled file, such as most of the files in admin/resources/assets/sass or admin/resources/assets/js of the Bagisto repository, do not commit the compiled files. Due to their large size, they cannot realistically be reviewed by a maintainer. This could be exploited as a way to inject malicious code into Bagisto. In order to defensively prevent this, all compiled files will be generated and committed by Bagisto maintainers. - -**Code style:** - -Bagisto follow PSR-2 for coding standard and PSR-4 as of Laravel for autoloading standards. - -**PHPDoc:** - -Below is an example of a valid Bagisto doc block. Note that the @param attribute is followed by two spaces, the argument type, two more spaces, and finally the variable name: - - /** - * Register a service with CoreServiceProvider. - * - * @param string|array $loader - * @param \Closure|string|null $concrete - * @param bool $shared - * @return void - * @throws \Exception - */ - protected function registerFacades($loader, $concrete = null, $shared = false) - { - // - } \ No newline at end of file +You should fork the Bagisto repository and push your local changes to your own **development** branch. And after you are done then generate from your **development** branch to Bagisto's **master** branch. Use branches other than **master** if you are fixing any backward compatible issue. \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000000..cebb06e16e9 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,61 @@ +# Bagisto Contribution Guide + +**BUGS:** + +To encourage active collaboration, Bagisto encourages pull requests, not just bug reports. "Bug reports" may also be sent in the form of a pull request containing negative test. + +However, when filing a bug report, your issue should contain a title and a clear description of the issue. You should also include as much relevant information as possible and a code sample that demonstrates the issue. The goal of a bug report is to make it easy for yourself - and others - to replicate the bug and develop a fix. + +Remember, bug reports are created in the hope that others with the same problem will be able to collaborate with you on solving it. Creating a bug report serves to help yourself and others start on the path of fixing the problem. + +**Projects that you can contribute in:** + +1. Bagisto + +2. Bagisto docs + +3. Laravel-aliexpress-dropship + +4. Laravel-aliexpress-dropship-chrome-extension + +5. Bagisto-custom-style-extension + +**Core development ideas or discussion:** + +If you propose a new feature, please be willing to implement at least some of the code that would be needed to complete the feature. + +Informal discussion regarding bugs, new features, and implementation of existing features takes place in the comments of the issues filed using feature template. + +**Which branch you should target?** + +All bug fixes should be sent to the latest staging branch i.e development branch. Bug fixes should never be sent to the master branch unless they fix features that exist only in the upcoming release. + +Minor features that are fully backwards compatible with the current Laravel release may be sent to the latest stable branch. + +Major new features should always be sent to the master branch, which contains the upcoming Bagisto release. + +**Compiling assets:** + +If you are submitting a change that will affect a compiled file, such as most of the files in admin/resources/assets/sass or admin/resources/assets/js of the Bagisto repository, do not commit the compiled files. Due to their large size, they cannot realistically be reviewed by a maintainer. This could be exploited as a way to inject malicious code into Bagisto. In order to defensively prevent this, all compiled files will be generated and committed by Bagisto maintainers. + +**Code style:** + +Bagisto follow PSR-2 for coding standard and PSR-4 as of Laravel for autoloading standards. + +**PHPDoc:** + +Below is an example of a valid Bagisto doc block. Note that the @param attribute is followed by two spaces, the argument type, two more spaces, and finally the variable name: + + /** + * Register a service with CoreServiceProvider. + * + * @param string|array $loader + * @param \Closure|string|null $concrete + * @param bool $shared + * @return void + * @throws \Exception + */ + protected function registerFacades($loader, $concrete = null, $shared = false) + { + // + } \ No newline at end of file