Merge pull request #43 from answear/support-symfony6

Support Symfony6

Author: lukasz-falda

.github/workflows/phpunit.yml

@@ -11,13 +11,14 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "7.3"
                     - "7.4"
+                    - "8.0"
+                    - "8.1"
                 deps:
                     - "normal"
                 include:
                     - deps: "low"
-                      php-version: "7.3"
+                      php-version: "7.4"
 
         steps:
             - name: "Checkout"

.github/workflows/static-analysis.yml

@@ -12,6 +12,8 @@ jobs:
             matrix:
                 php-version:
                     - "7.4"
+                    - "8.0"
+                    - "8.1"
 
         steps:
             -   name: "Checkout"

.gitignore

@@ -1,5 +1,5 @@
 /vendor/
-\.php_cs\.cache
+*.cache
 .phpunit.result.cache
 composer.lock
 /composer.phar

.php_cs renamed to .php-cs-fixer.php

@@ -1,14 +1,19 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+declare(strict_types=1);
+
+$config = new PhpCsFixer\Config();
+
+$finder = $config->getFinder()
     ->exclude(
         [
             'vendor',
         ]
     )
     ->in(__DIR__);
 
-return PhpCsFixer\Config::create()
+return $config
+    ->registerCustomFixers([])
     ->setRules(
         [
             '@Symfony' => true,
@@ -21,6 +26,15 @@
             'phpdoc_var_without_name' => false,
             'phpdoc_to_comment' => false,
             'single_line_throw' => false,
+            'modernize_types_casting' => true,
+            'function_declaration' => false,
+            'ordered_imports' => [
+                'imports_order' => [
+                    'class',
+                    'function',
+                    'const',
+                ],
+                'sort_algorithm' => 'alpha',
+            ],
         ]
-    )
-    ->setFinder($finder);
+    );

composer.json

@@ -4,24 +4,24 @@
   "type": "symfony-bundle",
   "license": "MIT",
   "require": {
-    "php": ">=7.3",
+    "php": ">=7.4|^8.0",
     "ext-json": "*",
     "marc-mabe/php-enum": "^3.0|^4.3",
     "webmozart/assert": "^1.3",
-    "symfony/validator": "^4.1 || ^5.0",
-    "symfony/http-kernel": "^4.1 || ^5.0",
+    "symfony/validator": "^5.4|^6.0",
+    "symfony/http-kernel": "^5.4|^6.0",
     "guzzlehttp/guzzle": "^6.0 || ^7.0",
-    "symfony/serializer": "^4.4 || ^5.0",
-    "symfony/property-access": "^4.1 || ^5.0"
+    "symfony/serializer": "^5.4|^6.0",
+    "symfony/property-access": "^5.4|^6.0"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master",
-    "phpunit/phpunit": "^8.0",
-    "symfony/phpunit-bridge": "^5.0",
-    "phpro/grumphp": "^1.3.0",
-    "friendsofphp/php-cs-fixer": "^2.16",
-    "phpstan/phpstan": "^0.12.32",
-    "phpstan/phpstan-webmozart-assert": "^0.12.2",
+    "phpunit/phpunit": "^9.5",
+    "symfony/phpunit-bridge": "6.1.*",
+    "phpro/grumphp": "^1.5.0",
+    "friendsofphp/php-cs-fixer": "^3.4",
+    "phpstan/phpstan": "^1.4",
+    "phpstan/phpstan-webmozart-assert": "^1.0",
     "matthiasnoback/symfony-config-test": "^4.2"
   },
   "autoload": {
@@ -46,5 +46,10 @@
     "grumphp": {
       "config-default-path": "grumphp.yaml"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "phpro/grumphp": true
+    }
   }
 }

grumphp.yaml

@@ -19,7 +19,7 @@ grumphp:
         phpcsfixer2:
             allow_risky: true
             cache_file: ~
-            config: './.php_cs'
+            config: './.php-cs-fixer.php'
             using_cache: true
             verbose: true
         phpstan: