SF6 CI (#354)

* SF6
lexik · Dec 9, 2021 · ecea502 · ecea502
1 parent 7dfd928
commit ecea502
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,16 +11,17 @@ env:
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
-    name: PHP v${{ matrix.php }}, Symfony v${{ matrix.symfony }} with Mongo v${{ matrix.mongodb }}
+    runs-on: ubuntu-latest
+    name: PHP v${{ matrix.php }}, Symfony v${{ matrix.symfony }}} with Mongo v${{ matrix.mongodb }}
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - { os: ubuntu-latest, php: 7.3, mongodb: 3.6, symfony: "4.4.*"}
-          - { os: ubuntu-latest, php: 7.3, mongodb: 3.6, symfony: "5.1.*"}
-          - { os: ubuntu-latest, php: 7.4, mongodb: 3.6, symfony: "5.2.*"}
-          - { os: ubuntu-latest, php: 7.4, mongodb: 3.6, symfony: "5.3.*"}
-          - { os: ubuntu-latest, php: 8.0, mongodb: 3.6, symfony: "5.4.*@dev"}
+          - { php: 7.3, mongodb: 3.6, symfony: "4.4.*", composer-flags: '--prefer-stable'}
+          - { php: 7.4, mongodb: 3.6, symfony: "5.4.*", composer-flags: '--prefer-stable'}
+          - { php: 8.0, mongodb: 3.6, symfony: "5.4.*", composer-flags: '--prefer-stable'}
+          - { php: 8.0, mongodb: 3.6, symfony: "6.0.*", composer-flags: '--prefer-stable'}
+          - { php: 8.1, mongodb: 3.6, symfony: "6.1.*@dev", composer-flags: '' }
     services:
       mongo:
         image: mongo:${{ matrix.mongodb }}
@@ -58,6 +59,6 @@ jobs:
           perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json
           composer config platform.ext-mongo 1.6.16
           composer require alcaeus/mongo-php-adapter --no-update
-          composer install --no-interaction
+          composer update ${{ matrix.composer-flags }} --prefer-dist
       - name: "Run PHPUnit Tests"
         run: "composer test"
diff --git a/Filter/Form/FilterExtension.php b/Filter/Form/FilterExtension.php
@@ -36,10 +36,10 @@ protected function loadTypes()
     /**
      * {@inheritdoc}
      */
-    public function loadTypeExtensions()
+    public function loadTypeExtensions(): array
     {
-        return array(
+        return [
             new FilterTypeExtension(),
-        );
+        ];
     }
 }
diff --git a/composer.json b/composer.json
@@ -19,26 +19,21 @@
     "require": {
         "php": ">=7.1",
         "doctrine/orm": "^2.10",
-        "symfony/form": "^4.4|^5.1",
-        "symfony/framework-bundle": "^4.4|^5.1"
+        "symfony/form": "^4.4|^5.1|^6.0",
+        "symfony/framework-bundle": "^4.4|^5.1|^6.0"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
         "doctrine/mongodb-odm-bundle": "^4.1",
-        "symfony/phpunit-bridge": "^4.4|^5.1",
-        "symfony/var-dumper": "^4.4|^5.1"
+        "symfony/phpunit-bridge": "^4.4|^5.1|^6.0",
+        "symfony/var-dumper": "^4.4|^5.1|^6.0"
     },
     "autoload":     {
         "psr-4": { "Lexik\\Bundle\\FormFilterBundle\\": "" }
     },
     "config": {
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "5.x.x-dev"
-        }
-    },
     "suggest": {
         "alcaeus/mongo-php-adapter": "Install this package if using the PHP 7 MongoDB Driver"
     },