Skip to content

Commit 3285636

Browse files
committed
Upgrade required PHP version to 7.1
1 parent 6a23695 commit 3285636

File tree

4 files changed

+19
-36
lines changed

4 files changed

+19
-36
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: php
22

33
php:
4-
- 5.6
5-
- 7.0
64
- 7.1
5+
- 7.2
76

87
sudo: false
98

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ For example, if your PIM is currently a v2.3, you can still use a 1.0 version of
1616

1717
## Requirements
1818

19-
* PHP >= 5.6
19+
* PHP >= 7.1
2020
* Composer
2121

2222
## Installation
@@ -33,7 +33,7 @@ $ curl -s http://getcomposer.org/installer | php
3333

3434
Then, run the following command to require the library:
3535
```bash
36-
$ php composer.phar require akeneo/api-php-client php-http/guzzle6-adapter:^1.1
36+
$ php composer.phar require akeneo/api-php-client php-http/guzzle6-adapter:^2.0
3737
```
3838

3939
If you want to use another HTTP client implementation, you can check [here](https://packagist.org/providers/php-http/client-implementation) the full list of HTTP client implementations.
@@ -148,10 +148,10 @@ These dependencies are different in function of the PHP version running `compose
148148
```
149149
cp docker-compose.yml.dist docker-compose.yml
150150
rm -rf composer.lock vendor/
151-
docker-compose run client_56 composer install
152-
docker-compose run client_56 bin/phpunit -c phpunit.xml.dist
153-
docker-compose run client_56 bin/phpspec run
154-
docker-compose run client_56 bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
151+
docker-compose run client_71 composer install
152+
docker-compose run client_71 bin/phpunit -c phpunit.xml.dist
153+
docker-compose run client_71 bin/phpspec run
154+
docker-compose run client_71 bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
155155
```
156156

157157
## Support

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
}
2121
},
2222
"require": {
23-
"php": ">=5.6",
23+
"php": ">=7.1",
2424
"psr/http-message": "^1.0",
25-
"php-http/httplug": "^1.0",
26-
"php-http/message": "^1.0",
27-
"php-http/discovery": "^1.0",
25+
"php-http/httplug": "^2.0",
26+
"php-http/message": "^1.7",
27+
"php-http/discovery": "^1.5",
2828
"php-http/message-factory": "^v1.0",
2929
"php-http/multipart-stream-builder": "^1.0",
3030
"php-http/client-implementation": "^1.0"
3131
},
3232
"require-dev": {
33-
"friendsofphp/php-cs-fixer": "^v2.3",
34-
"phpunit/phpunit": "5.7.*",
35-
"phpspec/phpspec": "3.2.*",
36-
"symfony/yaml": "^3.3",
33+
"friendsofphp/php-cs-fixer": "^2.14",
34+
"phpunit/phpunit": "^5.7",
35+
"phpspec/phpspec": "^5.0",
36+
"symfony/yaml": "^4.2",
3737
"donatj/mock-webserver": "^2.0"
3838
},
3939
"config": {

docker-compose.yml.dist

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
version: '2'
22

33
services:
4-
client_56:
5-
image: akeneo/php:5.6
6-
environment:
7-
COMPOSER_HOME: /home/docker/.composer
8-
PHP_IDE_CONFIG: 'serverName=akeneo-client'
9-
PHP_XDEBUG_ENABLED: 0
10-
PHP_XDEBUG_IDE_KEY: XDEBUG_IDE_KEY
11-
PHP_XDEBUG_REMOTE_HOST: xxx.xxx.xxx.xxx
12-
XDEBUG_CONFIG: 'remote_host=xxx.xxx.xxx.xxx'
13-
user: docker
14-
volumes:
15-
- ./:/home/docker/client
16-
- ~/.composer:/home/docker/.composer
17-
working_dir: /home/docker/client
18-
19-
client_70:
20-
image: akeneo/php:7.0
4+
client_71:
5+
image: akeneo/php:7.1
216
environment:
227
COMPOSER_HOME: /home/docker/.composer
238
PHP_IDE_CONFIG: 'serverName=akeneo-client'
@@ -31,8 +16,8 @@ services:
3116
- ~/.composer:/home/docker/.composer
3217
working_dir: /home/docker/client
3318

34-
client_71:
35-
image: akeneo/php:7.1
19+
client_72:
20+
image: akeneo/php:7.2
3621
environment:
3722
COMPOSER_HOME: /home/docker/.composer
3823
PHP_IDE_CONFIG: 'serverName=akeneo-client'
@@ -45,4 +30,3 @@ services:
4530
- ./:/home/docker/client
4631
- ~/.composer:/home/docker/.composer
4732
working_dir: /home/docker/client
48-

0 commit comments

Comments
 (0)