Add Symfony 6 support (#61)

* 🔧 Update php cs fixer configuration

* ⬆️ Upgrade dependencies for Symfony 6

* ⬆️ Upgrade dependencies (docker/ci)

* 🔧 Update phpunit configuration file

* 👷 Update phpstan rules

* 🩹 Fix static analysis

* 💚 Remove udiff format argument

* 💚 Revert to phpunit 8.5 for php7.2

Author: damienlagae

.github/workflows/static.yml

@@ -19,4 +19,4 @@ jobs:
       - name: Run PHP-CS-Fixer
         uses: docker://jakzal/phpqa:php7.3-alpine
         with:
-            args: php-cs-fixer fix --dry-run --diff-format udiff -vvv
+            args: php-cs-fixer fix --dry-run -vvv

.gitignore

@@ -3,3 +3,5 @@
 /phpspec.yml
 /phpunit.xml
 /vendor/
+/.php-cs-fixer.cache
+/.phpunit.result.cache

.php-cs-fixer.php

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

.php_cs

@@ -1,13 +1,13 @@
 .PHONY: ${TARGETS}
 
 DIR := ${CURDIR}
-QA_IMAGE := jakzal/phpqa:php7.3-alpine
+QA_IMAGE := jakzal/phpqa:php8.1-alpine
 
 cs-fix:
-	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff -vvv
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix -vvv
 
 cs-diff:
-	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff --dry-run -vvv
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --dry-run -vvv
 
 phpstan:
 	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) phpstan analyze

Makefile

@@ -11,18 +11,18 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "php-translation/symfony-storage": "^2.1",
-        "symfony/translation": "^4.4.20 || ^5.2.5",
-        "symfony/yaml": "^4.4.20 || ^5.2.5",
+        "symfony/translation": "^4.4.20 || ^5.2.5 || ^6.0",
+        "symfony/yaml": "^4.4.20 || ^5.2.5 || ^6.0",
         "friendsofapi/localise.biz": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5",
-        "symfony/framework-bundle": "^4.4.20 || ^5.2.5",
+        "symfony/framework-bundle": "^4.4.20 || ^5.2.5 || ^6.0",
         "nyholm/psr7": "^1.2",
-        "nyholm/symfony-bundle-test": "^1.6.1",
+        "nyholm/symfony-bundle-test": "^1.6.1, <1.8",
         "php-http/curl-client": "^2.0",
         "php-http/httplug-bundle": "^1.16",
-        "php-http/message": "^1.6"
+        "php-http/message": "^1.11"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -1,10 +1,5 @@
 parameters:
     ignoreErrors:
-        -
-            message: "#^Method Translation\\\\PlatformAdapter\\\\Loco\\\\Bridge\\\\Symfony\\\\DependencyInjection\\\\TranslationAdapterLocoExtension\\:\\:load\\(\\) has no return typehint specified\\.$#"
-            count: 1
-            path: src/Bridge/Symfony/DependencyInjection/TranslationAdapterLocoExtension.php
-
         -
             message: "#^Call to an undefined method FAPI\\\\Localise\\\\Model\\\\Translation\\\\Translation\\|Psr\\\\Http\\\\Message\\\\ResponseInterface\\:\\:getTranslation\\(\\)\\.$#"
             count: 1

phpstan-baseline.neon

@@ -7,6 +7,6 @@ parameters:
     checkMissingIterableValueType: false
     paths:
       - src
-    excludes_analyse:
+    excludePaths:
       - vendor
       - tests

phpstan.neon.dist

@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="./vendor/autoload.php"
-        >
+             backupStaticAttributes="false"
+             colors="false"
+             convertErrorsToExceptions="true"
+             convertNoticesToExceptions="true"
+             convertWarningsToExceptions="true"
+             processIsolation="false"
+             stopOnFailure="false"
+             bootstrap="./vendor/autoload.php"
+    >
 
-    <testsuites>
-        <testsuite name="Tests">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
+        <testsuites>
+            <testsuite name="Tests">
+                <directory>./tests</directory>
+            </testsuite>
+        </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./</directory>
-            <exclude>
-                <directory>vendor</directory>
-                <directory>Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        <filter>
+            <whitelist>
+                <directory suffix=".php">./</directory>
+                <exclude>
+                    <directory>vendor</directory>
+                    <directory>Tests</directory>
+                </exclude>
+            </whitelist>
+        </filter>
 </phpunit>

phpunit.xml.dist

@@ -29,7 +29,7 @@ class TranslationAdapterLocoExtension extends Extension
     /**
      * {@inheritdoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);