summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json5
1 files changed, 5 insertions, 0 deletions
diff --git a/composer.json b/composer.json
index dc24dda..5b0f97d 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,12 @@
],
"require-dev": {
"wp-phpunit/wp-phpunit": "^5.7",
+<<<<<<< HEAD
"vimeo/psalm": "^4.7"
+=======
+ "vimeo/psalm": "^4.7",
+ "humanmade/psalm-plugin-wordpress": "^2.0"
+>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d
},
"scripts": {
"test": "npm run wp-env run phpunit 'phpunit -c /var/www/html/wp-content/plugins/giglogadmin/phpunit.xml'"