Merge branch 'master' into 2.0

RubixML · Jan 9, 2022 · 5c46af2 · 5c46af2
2 parents 14ad073 + e6067b5
commit 5c46af2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1 +1 @@
-github: [rubixml, andrewdalpino]
+github: [andrewdalpino]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [windows-latest, ubuntu-latest, macos-latest]
-        php-versions: ['7.4', '8.0']
+        php-versions: ['7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout

diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "webonyx/graphql-php": "^14.4"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "3.1.*",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpstan/phpstan": "0.12.*",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan-phpunit": "0.12.*",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github: [rubixml, andrewdalpino]
		github: [andrewdalpino]