Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 7.1
- 7.2

sudo: false
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ For example, if your PIM is currently a v2.3, you can still use a 1.0 version of

## Requirements

* PHP >= 7.1
* PHP >= 7.2
* Composer

## Installation
Expand Down Expand Up @@ -148,10 +148,10 @@ These dependencies are different in function of the PHP version running `compose
```
cp docker-compose.yml.dist docker-compose.yml
rm -rf composer.lock vendor/
docker-compose run client_71 composer install
docker-compose run client_71 bin/phpunit -c phpunit.xml.dist
docker-compose run client_71 bin/phpspec run
docker-compose run client_71 bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
docker-compose run client_72 composer install
docker-compose run client_72 bin/phpunit -c phpunit.xml.dist
docker-compose run client_72 bin/phpspec run
docker-compose run client_72 bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
```

## Support
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
},
"require": {
"php": ">=7.1",
"php": ">=7.2",
"psr/http-message": "^1.0",
"php-http/httplug": "^2.0",
"php-http/message": "^1.7",
Expand Down
15 changes: 0 additions & 15 deletions docker-compose.yml.dist
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
version: '2'

services:
client_71:
image: akeneo/php:7.1
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_72:
image: akeneo/php:7.2
environment:
Expand Down