Merge ed3c69d into f28c621

RikudouSage · Apr 8, 2022 · 0661e4f · 0661e4f
2 parents f28c621 + ed3c69d
commit 0661e4f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,26 +25,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        symfonyVersion: [ ^4.4, ^5.0 ]
+        symfonyVersion: [ ^4.4, ^5.0, ^6.0 ]
+        include:
+          - symfonyVersion: ^6.0
+            phpVersion: '8.1'
+          - symfonyVersion: ^4.4
+            phpVersion: '7.4'
+          - symfonyVersion: ^5.0
+            phpVersion: '7.4'
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: ${{ matrix.phpVersion }}
       - name: Checkout Code
         uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: composer install
       - name: Install Symfony
         run: composer require -W symfony/framework-bundle:${{ matrix.symfonyVersion }} symfony/cache:${{ matrix.symfonyVersion }} symfony/console:${{ matrix.symfonyVersion }}
+      - name: Install Dependencies
+        run: composer install
       - name: Run static analysis
         run: composer phpstan
   tests:
     name: Tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        symfonyVersion: [^4.4, ^5.0]
+        symfonyVersion: [^4.4, ^5.0, ^6.0]
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new \PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
@@ -10,7 +10,7 @@
         ],
         'cast_spaces' => true,
         'class_attributes_separation' => [
-            'elements' => ['method', 'property'],
+            'elements' => ['method' => 'one', 'property' => 'one'],
         ],
         'combine_consecutive_unsets' => true,
         'compact_nullable_typehint' => true,
@@ -70,7 +70,7 @@
         'single_quote' => true,
         'standardize_not_equals' => true,
         'ternary_operator_spaces' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => [
             'elements' => ['property', 'method', 'const'],

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "minimum-stability": "stable",
   "license": "MIT",
   "require": {
-    "symfony/framework-bundle": "^4.4 | ^5.0",
+    "symfony/framework-bundle": "^4.4 | ^5.0 | ^6.0",
     "rikudou/psr6-dynamo-db": "^2.0",
     "php": "^7.2 | ^8.0",
     "symfony/cache": "^4.4 | ^5.0",
@@ -17,7 +17,7 @@
     }
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^2.16",
+    "friendsofphp/php-cs-fixer": "^3.0",
     "phpstan/phpstan": "^0.12.44",
     "phpunit/phpunit": "^9.3"
   },