Port Symfony 6 support from master into 3.x branch (#48)

* Port Symfony 6 support from master with CI config changes

* Add missing test CI config

* Fix PhpStan

Author: bocharsky-bw

.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    name: Test
+    runs-on: Ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '7.2', '7.3', '7.4', '8.0' ]
+        strategy: [ 'highest' ]
+        sf_version: ['']
+        include:
+          - php: 7.4
+            strategy: 'lowest'
+          - php: 7.3
+            sf_version: '3.*'
+          - php: 7.3
+            sf_version: '4.*'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          tools: flex
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.sf_version }}
+        with:
+          dependency-versions: ${{ matrix.strategy }}
+          composer-options: --no-interaction --prefer-dist --optimize-autoloader
+
+      - name: Run tests
+        run: ./vendor/bin/phpunit

.github/workflows/static.yml

@@ -1,22 +1,24 @@
-on: [push, pull_request]
-name: Static analysis
+name: Static code analysis
+
+on: [pull_request]
+
 jobs:
   phpstan:
     name: PHPStan
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
       - name: PHPStan
-        uses: docker://oskarstark/phpstan-ga
+        uses: docker://jakzal/phpqa:php7.3-alpine
         with:
-          args: analyze --no-progress
+          args: phpstan analyze
 
   php-cs-fixer:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
       - name: PHP-CS-Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
+        uses: docker://jakzal/phpqa:php7.3-alpine
         with:
-          args: --dry-run --diff-format udiff
+          args: php-cs-fixer fix --dry-run --diff -vvv

.gitignore

@@ -1,3 +1,4 @@
+/.php-cs-fixer.cache
 /behat.yml
 /build/
 /composer.lock

.php-cs-fixer.php

@@ -0,0 +1,17 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude(__DIR__.'/vendor')
+    ->name('*.php')
+    ->in(__DIR__)
+;
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+;

.php_cs

@@ -10,10 +10,10 @@
     ],
     "require": {
         "php": ">=7.2",
-        "symfony/translation": " ^3.4 || ^4.3 || ^5.0"
+        "symfony/translation": " ^3.4 || ^4.3 || ^5.0 || ^6.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.3 || ^5.0",
+        "symfony/phpunit-bridge": "^4.3 || ^5.0 || ^6.0",
         "phpunit/phpunit": "^8.4"
     },
     "autoload": {

composer.json

@@ -23,9 +23,9 @@ interface TransferableStorage
     /**
      * Get messages from the storage into the $catalogue.
      *
-     * @var array a list of arbitrary options that could be used. The array SHOULD
-     *            use a format of array<string, array<mixed $value>.
-     *            Example: ['foo' => ['bar', 'baz]]
+     * @param array $options a list of arbitrary options that could be used. The array SHOULD
+     *                       use a format of array<string, array<mixed $value>.
+     *                       Example: ['foo' => ['bar', 'baz]]
      */
     public function export(MessageCatalogueInterface $catalogue, array $options = []): void;
 
@@ -34,9 +34,9 @@ public function export(MessageCatalogueInterface $catalogue, array $options = []
      * should be considered as a "force merge". Existing messages in the storage
      * will be overwritten but no message will be removed.
      *
-     * @var array a list of arbitrary options that could be used. The array SHOULD
-     *            use a format of array<string, array<mixed $value>.
-     *            Example: ['foo' => ['bar', 'baz]]
+     * @param array $options a list of arbitrary options that could be used. The array SHOULD
+     *                       use a format of array<string, array<mixed $value>.
+     *                       Example: ['foo' => ['bar', 'baz]]
      */
     public function import(MessageCatalogueInterface $catalogue, array $options = []): void;
 }