Merge commit '0e68e45cc7bb54b51246a37580a376084e5b04a4' into feature/…

…scaffold-document-editor # Conflicts: # src/Document.php # src/Document/MaxAge.php # wp-graphql-persisted-queries.php
wp-graphql · Jan 20, 2022 · f9b8da4 · f9b8da4
2 parents d6196a8 + 0e68e45
commit f9b8da4
Show file tree

Hide file tree

Showing 19 changed files with 42,522 additions and 955 deletions.
diff --git a/.github/workflows/tests-wordpress.yml b/.github/workflows/tests-wordpress.yml
@@ -16,7 +16,7 @@ jobs:
     name: WordPress ${{ matrix.wordpress }} Integration Tests on PHP ${{ matrix.php }}
     strategy:
       matrix:
-        php: [ '7.4' ]
+        php: [ '8.0', '7.4' ]
         wordpress: [ '5.7.2' ]
     steps:
       - name: Checkout

diff --git a/composer.json b/composer.json
@@ -24,7 +24,18 @@
         "php-webdriver/webdriver": "^1.11",
         "codeception/module-rest": "^1.3"
     },
-    "archive": {
+  "scripts": {
+    "phpcs-i": [
+      "php ./vendor/bin/phpcs -i"
+    ],
+    "check-cs": [
+      "php ./vendor/bin/phpcs"
+    ],
+    "fix-cs": [
+      "php ./vendor/bin/phpcbf"
+    ]
+  },
+  "archive": {
         "exclude": [
           "*.yml",
           ".env*",
@@ -33,5 +44,10 @@
           "tests/",
           "!.wordpress-org/"
         ]
-      }
+      },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }