API-599: fix composer install by deleting composer.lock and add documentation to test with docker

Author: ahocquard

.travis.yml

@@ -17,7 +17,6 @@ before_install:
     - composer self-update --no-interaction
 
 install:
-    - composer --ansi require php-http/guzzle6-adapter guzzlehttp/psr7
     - composer install --prefer-dist --no-interaction
 
 script:

README.md

@@ -128,6 +128,19 @@ $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
+```
+
 ## Support
 
 If you find a bug or want to submit an improvement, don't hesitate to raise an issue on Github.

composer.json

@@ -27,14 +27,16 @@
     "php-http/discovery": "^1.0",
     "php-http/message-factory": "^v1.0",
     "php-http/multipart-stream-builder": "^1.0",
-    "php-http/client-implementation": "^1.0"
+    "php-http/client-implementation": "^1.0",
+    "php-http/guzzle6-adapter": "^1.1"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^v2.3",
     "phpunit/phpunit": "5.7.*",
     "phpspec/phpspec": "3.2.*",
     "symfony/yaml": "^3.3",
-    "donatj/mock-webserver": "^2.0"
+    "donatj/mock-webserver": "^2.0",
+    "php-http/guzzle6-adapter": "^1.1"
   },
   "config": {
     "bin-dir": "bin"

docker-compose.yml.dist

@@ -1,7 +1,37 @@
 version: '2'
 
 services:
-  client:
+  client_56:
+    image: akeneo/php:5.6
+    environment:
+      COMPOSER_HOME: /home/docker/.composer
+      PHP_IDE_CONFIG: 'serverName=akeneo-client'
+      PHP_XDEBUG_ENABLED: 0
+      PHP_XDEBUG_IDE_KEY: XDEBUG_IDE_KEY
+      PHP_XDEBUG_REMOTE_HOST: xxx.xxx.xxx.xxx
+      XDEBUG_CONFIG: 'remote_host=xxx.xxx.xxx.xxx'
+    user: docker
+    volumes:
+      - ./:/home/docker/client
+      - ~/.composer:/home/docker/.composer
+    working_dir: /home/docker/client
+
+  client_70:
+    image: akeneo/php:7.0
+    environment:
+      COMPOSER_HOME: /home/docker/.composer
+      PHP_IDE_CONFIG: 'serverName=akeneo-client'
+      PHP_XDEBUG_ENABLED: 0
+      PHP_XDEBUG_IDE_KEY: XDEBUG_IDE_KEY
+      PHP_XDEBUG_REMOTE_HOST: xxx.xxx.xxx.xxx
+      XDEBUG_CONFIG: 'remote_host=xxx.xxx.xxx.xxx'
+    user: docker
+    volumes:
+      - ./:/home/docker/client
+      - ~/.composer:/home/docker/.composer
+    working_dir: /home/docker/client
+
+  client_71:
     image: akeneo/php:7.1
     environment:
       COMPOSER_HOME: /home/docker/.composer
@@ -14,13 +44,5 @@ services:
     volumes:
       - ./:/home/docker/client
       - ~/.composer:/home/docker/.composer
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /usr/bin/docker:/usr/bin/docker
     working_dir: /home/docker/client
-    networks:
-      - client
 
-networks:
-  default:
-      external:
-        name: your-pim-network  # Replace with the Docker network your PIM is on