Composer: Mark conflicts with WordPress ^5.5

https://core.trac.wordpress.org/browser/trunk/src/wp-includes/PHPMailer/PHPMailer.php?rev=48033
ItinerisLtd · Aug 18, 2020 · 9dc06c1 · 9dc06c1
1 parent 831269c
commit 9dc06c1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,9 @@
     },
     "conflict": {
         "itinerisltd/phpmailer-mailhog": "*",
-        "wpackagist-plugin/sendgrid-email-delivery-simplified": "*"
+        "wpackagist-plugin/sendgrid-email-delivery-simplified": "*",
+        "johnpbloch/wordpress-core": "^5.5",
+        "roots/wordpress": "^5.5"
     },
     "require-dev": {
         "10up/wp_mock": "^0.4.2",

diff --git a/composer.lock b/composer.lock