Merge 2.0 into master

.travis.yml

@@ -0,0 +1,30 @@
+language: php
+
+php:
+    - 5.6
+    - 7.0
+    - 7.1
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
+before_install:
+    - phpenv config-rm xdebug.ini
+    - phpenv config-add travis.php.ini
+    - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+    - composer self-update --no-interaction
+
+install:
+    - composer require php-http/guzzle6-adapter
+    - composer install --prefer-dist --no-interaction
+
+script:
+    - bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
+    - bin/phpspec run --no-interaction
+    - php -d error_reporting="E_ALL" bin/phpunit -c phpunit.xml.dist
+
+notifications:
+  email: false

CHANGELOG-2.0.md → CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.0.1 (2018-05-03)
+
+## Improvements
+
+- API-592: Handle error when the response is a redirection
+
 # 2.0.0 (2018-02-15)
 
 ## Improvements
@@ -10,3 +16,15 @@
 
 - Change the constructor of `Akeneo\Pim\ApiClient\Api\ProductMediaFileApi` to add `Akeneo\Pim\ApiClient\FileSystem\FileSystemInterface` 
 - Add method `Akeneo\Pim\ApiClient\Api\AttributeOptionApiInterface::upsertList`
+
+# 1.0.x
+
+## Bug Fixes
+
+- API-599: fix const not supported by PHP 5.6
+
+# 1.0.1 (2018-04-05)
+
+## Improvements
+
+- API-592: Handle error when the response is a redirection (https://github.com/akeneo/api-php-client/issues/72)

README.md

@@ -131,6 +131,20 @@ $client->getProductApi()->upsertList([
 ]);
 ```
 
+## Testing
+
+Do note that you have to delete the `composer.lock` because Doctrine dependencies are loaded.
+These dependencies are different in function of the PHP version running `composer install`.
+
+```
+cp docker-compose.yml.dist docker-compose.yml
+rm -rf composer.lock vendor/
+docker-compose run client_56 composer install
+docker-compose run client_56 bin/phpunit -c phpunit.xml.dist
+docker-compose run client_56 bin/phpspec run
+docker-compose run client_56 bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
+```
+
 ## Support
 
 The support of this client is made in best effort by our Akeneo team.

composer.json

@@ -33,7 +33,8 @@
     "friendsofphp/php-cs-fixer": "^v2.3",
     "phpunit/phpunit": "5.7.*",
     "phpspec/phpspec": "3.2.*",
-    "symfony/yaml": "^3.3"
+    "symfony/yaml": "^3.3",
+    "donatj/mock-webserver": "^2.0"
   },
   "config": {
     "bin-dir": "bin"