Fix conflitti master

2021-07-09 10:04:19 +02:00
parent eaa390497e d97cf24ee2
commit 250bf77605
37 changed files with 1644 additions and 368 deletions
--- a/composer.json
+++ b/composer.json
@@ -3,13 +3,13 @@
  "description": "PHP binding for v4 of the Cloudflare Client API.",
  "type": "library",
  "require": {
-    "guzzlehttp/guzzle": "^6.2.2",
-    "php": ">=7.0.0",
+    "guzzlehttp/guzzle": "^7.0.1",
+    "php": ">=7.2.5",
    "psr/http-message": "~1.0",
    "ext-json": "*"
  },
  "require-dev": {
-    "phpunit/phpunit": "5.7.5",
+    "phpunit/phpunit": "^5.7",
    "phpmd/phpmd" : "@stable",
    "friendsofphp/php-cs-fixer": "^2.6"
  },