Skip to content

Commit 258c46f

Browse files
committed
Merge branch 'main' into implement_v2
# Conflicts: # .gitignore # composer.lock # src/FederatedSchema.php
2 parents fe7456c + c1bc216 commit 258c46f

File tree

8 files changed

+821
-484
lines changed

8 files changed

+821
-484
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.idea
2+
.vscode
23
composer.phar
34
/vendor/
45
/node_modules/

.vscode/extensions.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}
2828
},
2929
"require-dev": {
30-
"phpunit/phpunit": "^8.4",
30+
"phpunit/phpunit": "^9.5",
3131
"psr/http-message": "^1.0",
3232
"react/promise": "^2.7",
3333
"spatie/phpunit-snapshot-assertions": "^4.2"

0 commit comments

Comments
 (0)