Merge fa80452 into 80a399b

.github/ISSUE_TEMPLATE.md

@@ -8,20 +8,40 @@
     Otherwise remove it.
 -->
 
-| Question       | Answer
-|----------------|-------------------------------
-| Bundle version | composer show sonata-project/*
-| Symfony version| composer show symfony/*
-| php version    | php --version
+### Environment
 
-# Error message
+#### Sonata packages
 
+```bash
+$ composer show sonata-project/*
+# Put the result here.
 ```
-Error message goes here
+
+#### Symfony packages
+
+```bash
+$ composer show symfony/*
+# Put the result here.
+```
+
+#### PHP version
+
+```bash
+$ php -v
+# Put the result here.
 ```
 
-# Steps to reproduce
+## Subject
+
+<!--
+    Give here as many details as possible.
+    Next sections are for ERRORS only.
+-->
+
+## Steps to reproduce
+
+## Expected results
 
-# Expected results
+## Actual results
 
-# Actual results
+<!-- If it's an error message or piece of code, use code block tags. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,30 @@
 <!-- THE PR TEMPLATE IS NOT AN OPTION. DO NOT DELETE IT! -->
 
+<!--
+    Show us you choose the right branch.
+    Different branches are used for different things :
+    - 1.x is for everything backwards compatible, like patches, features and deprecation notices
+    - master is for deprecation removals and other changes that cannot be done without a BC-break
+    More details here: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/1.x/CONTRIBUTING.md#the-base-branch
+-->
+I am targetting this branch, because…
+
 <!--
     Specify which issues will be fixed/closed.
     Remove it if this is not related.
 -->
 
 Closes #
+Fixes #
 
-### Changelog
+## Changelog
 
 <!-- MANDATORY
     Fill the changelog part inside the code block.
-    Remove unneeded sections.
     Follow this schema: http://keepachangelog.com/
 -->
 
+<!-- REMOVE EMPTY SECTIONS -->
 ```markdown
 ### Added
 - Added some `Class::newMethod` to do great stuff
@@ -30,19 +40,18 @@ Closes #
 ### Security
 ```
 
-### Subject
-
-<!-- Describe your Pull Request content here -->
-
-### To do
+## To do
 
 <!--
-    Complete the tasks.
+    If this is a work in progress, COMPLETE and ADD needed tasks.
     You can add as many tasks as you want.
-    If some are not relevant, just remove them.
+    If some are not relevant, just REMOVE them.
 -->
 
-- [ ] My PR stuff
 - [ ] Update the tests
 - [ ] Update the documentation
 - [ ] Add an upgrade note
+
+## Subject
+
+<!-- Describe your Pull Request content here -->

.styleci.yml

@@ -7,10 +7,13 @@
 preset: symfony
 
 enabled:
+  - combine_consecutive_unsets
+  - long_array_syntax
   - newline_after_open_tag
+  - no_php4_constructor
+  - no_useless_else
   - ordered_class_elements
   - ordered_use
-  - long_array_syntax
 # Comment strict rules for the moment. Should be uncomment later to see StyleCI PR results
 #  - strict
 #  - strict_param