meilisearch · curquiza · Jul 9, 2020 · Jul 9, 2020
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -43,4 +43,4 @@ jobs:
 
             # Run PHP CS Fixer
             -   name: Run linter
-                run: composer test:lint
+                run: composer lint:check
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,138 @@
+# Contributing
+
+First of all, thank you for contributing to MeiliSearch! The goal of this document is to provide everything you need to know in order to contribute to MeiliSearch and its different integrations.
+
+<!-- MarkdownTOC autolink="true" style="ordered" indent="   " -->
+
+- [Assumptions](#assumptions)
+- [How to Contribute](#how-to-contribute)
+- [Development Workflow](#development-workflow)
+- [Git Guidelines](#git-guidelines)
+
+<!-- /MarkdownTOC -->
+
+## Assumptions
+
+1. **You're familiar with [GitHub](https://github.com) and the [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) (PR) workflow.**
+2. **You've read the MeiliSearch [documentation](https://docs.meilisearch.com) and the [README](/README.md).**
+3. **You know about the [MeiliSearch community](https://docs.meilisearch.com/resources/contact.html). Please use this for help.**
+
+## How to Contribute
+
+1. Make sure that the contribution you want to make is explained or detailed in a GitHub issue! Find an [existing issue](https://github.com/meilisearch/meilisearch-symfony/issues/) or [open a new one](https://github.com/meilisearch/meilisearch-symfony/issues/new).
+2. Once done, [fork the meilisearch-symfony repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) in your own GitHub account. Ask a maintainer if you want your issue to be checked before making a PR.
+3. [Create a new Git branch](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository).
+4. Review the [Development Workflow](#workflow) section that describes the steps to maintain the repository.
+5. Make your changes.
+6. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the `master` branch of the main meilisearch-symfony repository. A maintainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer.<br>
+ We do not enforce a naming convention for the PRs, but **please use something descriptive of your changes**, having in mind that the title of your PR will be automatically added to the next [release changelog](https://github.com/meilisearch/meilisearch-symfony/releases/).
+
+## Development Workflow
+
+### Using the Docker Environment
+
+#### Setup
+
+To start and build your Docker environment, just execute the next command in a terminal:
+
+```sh
+$ docker-compose up -d
+```
+
+Be sure no other MeiliSearch instance is currently running on your machine.
+
+#### Tests and Linter
+
+Each Pull Request should pass the tests, and the linter to be accepted.
+
+```sh
+# Tests
+$ docker-compose exec -e MEILISEARCH_URL=http://meilisearch:7700 php composer test:unit
+# Linter
+$ docker-compose exec php composer lint:check
+# Linter (with auto-fix)
+$ docker-compose exec php composer lint:fix
+```
+
+### Using Composer
+
+#### Setup
+
+Install the dependencies:
+
+```sh
+$ composer install
+```
+
+#### Tests and Linter
+
+Each Pull Request should pass the tests, and the linter to be accepted.
+
+```sh
+# Tests
+$ docker run -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --master-key=masterKey --no-analytics
+$ composer test:unit
+# Linter
+$ composer lint:check
+# Linter (with auto-fix)
+$ composer lint:check
+```
+
+### Release Process
+
+MeiliSearch tools follow the [Semantic Versioning Convention](https://semver.org/).
+
+#### Automated Changelogs
+
+For each PR merged on `master`, a GitHub Action is running and updates the next release description as a draft release in the [GitHub interface](https://github.com/meilisearch/meilisearch-symfony/releases). If you don't have the right access to this repository, you will not be able to see the draft release until the release is published.
+
+The draft release description is therefore generated and corresponds to all the PRs titles since the previous release. This means each PR should only do one change and the title should be descriptive of this change.
+
+About this automation:
+- As the draft release description is generated on every push on `master`, don't change it manually until the final release publishment.
+- If you don't want a PR to appear in the release changelogs: add the label `skip-changelog`. We suggest removing PRs updating the README or the CI (except for big changes).
+- If the changes you are doing in the PR are breaking: add the label `breaking-change`. In the release tag, the minor will be increased instead of the patch. The major will never be changed until [MeiliSearch](https://github.com/meilisearch/MeiliSearch) is stable.
+- If you did any mistake, for example the PR is already closed but you forgot to add a label or you misnamed your PR, don't panic: change what you want in the closed PR and run the job again.
+
+*More information about the [Release Drafter](https://github.com/release-drafter/release-drafter), used to automate these steps.*
+
+#### How to Publish the Release
+
+Make a PR modifying the file [`src/MeiliSearchBundle.php`](/src/MeiliSearchBundle.php) with the right version.
+
+```ruby
+VERSION = 'X.X.X'
+```
+
+Once the changes are merged on `master`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/meilisearch-symfony/releases).
+
+A WebHook will be triggered and push the new package to [Packagist](https://packagist.org/packages/meilisearch/search-bundle).
+
+## Git Guidelines
+
+### Git Branches
+
+All changes must be made in a branch and submitted as PR.
+We do not enforce any branch naming style, but please use something descriptive of your changes.
+
+### Git Commits
+
+As minimal requirements, your commit message should:
+- be capitalized
+- not finish by a dot or any other punctuation character (!,?)
+- start with a verb so that we can read your commit message this way: "This commit will ...", where "..." is the commit message.
+  e.g.: "Fix the home page button" or "Add more tests for create_index method"
+
+We don't follow any other convention, but if you want to use one, we recommend [this one](https://chris.beams.io/posts/git-commit/).
+
+### GitHub Pull Requests
+
+Some notes on GitHub PRs:
+- [Convert your PR as a draft](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) if your changes are a work in progress: no one will review it until you pass your PR as ready for review.<br>
+  The draft PR can be very useful if you want to show that you are working on something and make your work visible.
+- The branch related to the PR must be **up-to-date with `master`** before merging. You need to [rebase your branch](https://gist.github.com/curquiza/5f7ce615f85331f083cd467fc4e19398) if it is not.
+- All PRs must be reviewed and approved by at least one maintainer.
+- All PRs have to be **squashed and merged**.
+- The PR title should be accurate and descriptive of the changes. The title of the PR will be indeed automatically added to the next [release changlogs](https://github.com/meilisearch/meilisearch-symfony/releases/).
+
+Thank you again for reading this through, we can not wait to begin to work with you if you made your way through this contributing guide ❤️
diff --git a/README.md b/README.md
@@ -14,66 +14,44 @@
 </h4>
 
 <p align="center">
-  <a href="https://packagist.org/packages/meilisearch/meilisearch-bundle"><img src="https://img.shields.io/packagist/v/meilisearch/meilisearch-bundle" alt="Latest Stable Version"></a>
-  <a href="https://github.com/emulienfou/meilisearch-bundle/actions"><img src="https://github.com/emulienfou/meilisearch-bundle/workflows/Tests/badge.svg" alt="Test"></a>
-  <a href="https://github.com/emulienfou/meilisearch-bundle/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
+  <a href="https://packagist.org/packages/meilisearch/meilisearch-symfony"><img src="https://img.shields.io/packagist/v/meilisearch/search-bundle" alt="Latest Stable Version"></a>
+  <a href="https://github.com/meilisearch/meilisearch-symfony/actions"><img src="https://github.com/meilisearch/meilisearch-symfony/workflows/Tests/badge.svg" alt="Test"></a>
+  <a href="https://github.com/meilisearch/meilisearch-symfony/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
   <a href="https://slack.meilisearch.com"><img src="https://img.shields.io/badge/slack-MeiliSearch-blue.svg?logo=slack" alt="Slack"></a>
 </p>
 
+<p align="center">⚡ Lightning Fast, Ultra Relevant, and Typo-Tolerant Search Engine MeiliSearch bundle for Symfony</p>
 
-<p align="center">⚡ Lightning Fast, Ultra Relevant, and Typo-Tolerant Search Engine MeiliSearch Symfony Bundle</p>
-
-**MeiliSearchBundle** is a Bundle to integrate **MeiliSearch** within your Symfony Project.
-**MeiliSearch** is a powerful, fast, open-source, easy to use and deploy search engine. Both searching and indexing are highly customizable. Features such as typo-tolerance, filters, and synonyms are provided out-of-the-box.
+**MeiliSearch Symfony** is a search bundle to integrate **MeiliSearch** within your Symfony Project. **MeiliSearch** is a powerful, fast, open-source, easy to use and deploy search engine. Both searching and indexing are highly customizable. Features such as typo-tolerance, filters, and synonyms are provided out-of-the-box.
 
 ## Table of Contents <!-- omit in toc -->
 - [🤖 Compatibility with MeiliSearch](#-compatibility-with-meilisearch)
 - [✨ Features](#-features)
 - [📖 Documentation](#-documentation)
-- [⚙️ Development Workflow](#️-development-workflow)
+- [⚙️ Development Workflow and Contributing](#️-development-workflow-and-contributing)
 
 ## 🤖 Compatibility with MeiliSearch
+
 This package is compatible with the following MeiliSearch versions:
+
+- `v0.12.X`
 - `v0.11.X`
 
 ## ✨ Features
+
 * **Require** PHP 7.2 and later.
 * **Compatible** with Symfony 4.0 and later.
 * **Support** Doctrine ORM and Doctrine MongoDB.
 
 ## 📖 Documentation
-Complete documentation of the MeiliSearch Bundle is available in the [Wiki](https://github.com/emulienfou/meilisearch-bundle/wiki) section.
-
-## ⚙️ Development Workflow
-If you want to contribute, this section describes the steps to follow.
-
-Thank you for your interest in a MeiliSearch tool! ♥️
-
-### Run Docker Environment <!-- omit in toc -->
-To start and build your Docker environment, just execute the next command in a terminal:
-```sh
-docker-compose up -d
-```
-
-#### Tests <!-- omit in toc -->
-Each Pull Request should pass the tests, and the linter to be accepted.
-To execute the tests, run the next command:
-```sh
-docker-compose exec -e MEILISEARCH_URL=http://meilisearch:7700 php composer test:unit
-```
-
-### Release <!-- omit in toc -->
 
-MeiliSearch tools follow the [Semantic Versioning Convention](https://semver.org/).
+Complete documentation of the MeiliSearch Bundle is available in the [Wiki section](https://github.com/meilisearch/meilisearch-symfony/wiki).
 
-You must do a PR modifying the file `src/MeiliSearchBundle.php` with the right version.<br>
+## ⚙️ Development Workflow and Contributing
 
-```php
-const VERSION = 'X.X.X';
-```
+Any new contribution is more than welcome in this project!
 
-Then, you must create a release (with this name `vX.X.X`) via the GitHub interface.<br>
-A webhook will be triggered and push the new package on [Packagist](https://packagist.org/packages/meilisearch/meilisearch-bundle).
+If you want to know more about the development workflow or want to contribute, please visit our [contributing guidelines](/CONTRIBUTING.md) for detailed instructions!
 
 <hr>
 

diff --git a/composer.json b/composer.json
@@ -50,6 +50,7 @@
     },
     "scripts": {
         "test:unit": "phpunit --colors=always --verbose",
-        "test:lint": "php-cs-fixer fix -v --config=.php_cs.dist --using-cache=no --dry-run"
+        "lint:check": "php-cs-fixer fix -v --config=.php_cs.dist --using-cache=no --dry-run",
+        "lint:fix": "php-cs-fixer fix -v --config=.php_cs.dist --using-cache=no"
     }
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -11,8 +11,8 @@ services:
 
     meilisearch:
         image: getmeili/meilisearch
-        command: ./meilisearch --master-key=masterKey
+        command: ./meilisearch --master-key=masterKey --no-analytics=true
         ports:
             -   target: 7700
                 published: 7700
-                protocol: tcp
+                protocol: tcp