Merge 8a9cc6b into 8a2142a

klarna · Jan 10, 2018 · 359a1fe · 359a1fe
2 parents 8a2142a + 8a9cc6b
commit 359a1fe
Show file tree

Hide file tree

Showing 22 changed files with 278 additions and 3,843 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /vendor/
 /build/
 /docs/reference
+/.idea
+/composer.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v3.0.0 - 2017-12-12
+
+- support for guzzle >6.0
+
 ## v2.2.0 - 2015-12-7
 - **NEW META-13** Allow for 201 response on refund - *Joakim.L*
 

diff --git a/composer.json b/composer.json
@@ -18,16 +18,16 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
-        "guzzlehttp/guzzle": ">=4.2,<6.0"
+        "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.2.*",
+        "phpunit/phpunit": "~5.0",
         "squizlabs/php_codesniffer": "1.5.*",
         "phpmd/phpmd": "2.1.*",
         "phploc/phploc": "2.0.*",
         "sebastian/phpcpd": "2.0.*",
         "satooshi/php-coveralls": "0.6.*",
-        "apigen/apigen": "4.0.*",
+        "apigen/apigen": "~4.0",
         "klarna/apigen-theme": "~1.0"
     },
     "scripts": {