Merge 2.x into master

.php_cs.dist

@@ -37,6 +37,7 @@ $rules = [
     '@PHP56Migration' => true,
     '@PHP56Migration:risky' => true,
     '@PHPUnit57Migration:risky' => true,
+    'single_line_throw' => false,
     '@PHP70Migration' => true,
     '@PHP70Migration:risky' => true,
     '@PHPUnit60Migration:risky' => true,

.travis.yml

@@ -12,6 +12,7 @@ language: php
 php:
   - '7.2'
   - '7.3'
+  - '7.4snapshot'
   - nightly
 
 dist: xenial
@@ -37,27 +38,28 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: TARGET=docs
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: TARGET=lint
     - php: '7.2'
       env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SYMFONY=3.4.*
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SYMFONY='dev-master as 3.4.x-dev'
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_BLOCK=3.*
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_BLOCK='dev-master as 3.x-dev'
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_ADMIN=3.*
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_ADMIN='dev-master as 3.x-dev'
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
+    - php: 7.4snapshot
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
     - env: SYMFONY='dev-master as 3.4.x-dev'

.travis/install_test.sh

@@ -10,10 +10,4 @@ chmod u+x "${HOME}/bin/phpunit"
 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"
 
-# To be removed when these issues are resolved:
-# https://github.com/composer/composer/issues/5355
-if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
-    composer update --prefer-dist --no-interaction --prefer-stable --quiet
-fi
-
 composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}

src/Block/Breadcrumb/BaseBreadcrumbMenuBlockService.php

@@ -103,7 +103,6 @@ protected function getContext()
     /**
      * Initialize breadcrumb menu.
      *
-     *
      * @return ItemInterface
      */
     protected function getRootMenu(BlockContextInterface $blockContext)

src/DependencyInjection/SonataSeoExtension.php

@@ -113,7 +113,6 @@ protected function configureSitemap(array $config, ContainerBuilder $container):
     /**
      * Fix the sitemap configuration.
      *
-     *
      * @return array
      */
     protected function fixConfiguration(array $config)