Merge branch '2.x' into master

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,7 +17,7 @@ I am targeting this branch, because {reason}.
     Remove it if this is not related.
 -->
 
-Closes #{put_issue_number_here}
+Closes #{put_issue_number_here}.
 
 ## Changelog
 
@@ -28,16 +28,16 @@ Closes #{put_issue_number_here}
     please keep it short and clear and to the point
 -->
 
-<!-- 
+<!--
     If you are updating something that doesn't require
-    a release, you can delete the whole Changelog section.
+    a release, you can delete the whole "Changelog" section.
     (eg. update to docs, tests)
 -->
 
 <!-- REMOVE EMPTY SECTIONS -->
 ```markdown
 ### Added
-- Added some `Class::newMethod` to do great stuff
+- Added some `Class::newMethod()` to do great stuff.
 
 ### Changed
 
@@ -51,13 +51,14 @@ Closes #{put_issue_number_here}
 ```
 
 <!--
-    If this is a work in progress, uncomment this section.
+    If this is a work in progress, uncomment the "To do" section.
     You can add as many tasks as you want.
     If some are not relevant, just remove them.
-    
-    ## To do
-    
-    - [ ] Update the tests
-    - [ ] Update the documentation
-    - [ ] Add an upgrade note
+-->
+<!--
+## To do
+
+- [ ] Update the tests;
+- [ ] Update the documentation;
+- [ ] Add an upgrade note.
 -->

.github/workflows/qa.yml

@@ -8,5 +8,7 @@ jobs:
       - uses: actions/checkout@master
       - name: PHPStan
         uses: "docker://oskarstark/phpstan-ga"
+        env:
+          REQUIRE_DEV: true
         with:
           args: analyse

.gitignore

@@ -3,6 +3,7 @@
 # It's auto-generated by sonata-project/dev-kit package.
 
 /build/
+/node_modules/
 /vendor/
 .php_cs.cache
 composer.lock

.php_cs.dist

@@ -26,14 +26,17 @@ $rules = [
     'header_comment' => [
         'header' => $header,
     ],
+    'logical_operators' => true,
     'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
     'no_extra_blank_lines' => true,
     'no_php4_constructor' => true,
     'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
     'no_useless_else' => true,
     'no_useless_return' => true,
+    'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
     'ordered_imports' => true,
+    'php_unit_set_up_tear_down_visibility' => true,
     'phpdoc_order' => true,
     '@PHP56Migration' => true,
     '@PHP56Migration:risky' => true,

.travis.yml

@@ -24,10 +24,8 @@ cache:
 env:
   global:
     - PATH="$HOME/.local/bin:$PATH"
-    - SYMFONY_DEPRECATIONS_HELPER=max[self]=0
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataIntlBundle.git
-    - PHPUNIT_VERSION=8
 
 matrix:
   fast_finish: true
@@ -55,6 +53,7 @@ install:
   - if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;
 
 before_script:
+  - phpenv config-rm xdebug.ini
   - if [ -x .travis/before_script_${TARGET}.sh ]; then .travis/before_script_${TARGET}.sh; fi;
 
 script: make $TARGET

.travis/install_test.sh

@@ -3,11 +3,10 @@ set -ev
 
 mkdir --parents "${HOME}/bin"
 
-wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit"
-chmod u+x "${HOME}/bin/phpunit"
-
 # Coveralls client install
 wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
 chmod u+x "${HOME}/bin/coveralls"
 
+pecl install pcov
+
 composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}