Skip to content

Commit 1f936c3

Browse files
authored
Merge pull request #167 from akeneo/merge-4.0-into-master
Merge 4.0 into master
2 parents 3f64881 + bdf0e17 commit 1f936c3

File tree

10 files changed

+749
-424
lines changed

10 files changed

+749
-424
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: php
22

33
php:
4+
- 7.1
45
- 7.2
56
- 7.3
67

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ For example, with Guzzle:
1515
$ php composer.phar require akeneo/api-php-client php-http/guzzle6-adapter:^2.0 http-interop/http-factory-guzzle:^1.0
1616
```
1717

18+
# 4.0.2 (2019-06-13)
19+
20+
- Add support for PHP 7.1. This is done for some connectors thar are still using it.
21+
22+
Be careful, this PHP version is EOL in december 2020.
23+
1824
# 4.0.0 (2019-02-15)
1925

2026
## BC Breaks

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ For example, if your PIM is currently a v2.3, you can still use a 1.0 version of
1717

1818
## Requirements
1919

20-
* PHP >= 7.2
20+
* PHP >= 7.1
2121
* Composer
2222

2323
## Installation

composer.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
"require": {
23-
"php": ">=7.2",
23+
"php": ">=7.1",
2424
"psr/http-message": "^1.0",
2525
"psr/http-client": "^1.0",
2626
"psr/http-factory": "^1.0",
@@ -31,15 +31,18 @@
3131
},
3232
"require-dev": {
3333
"friendsofphp/php-cs-fixer": "^2.14",
34-
"phpunit/phpunit": "^8.0",
34+
"phpunit/phpunit": "^7.0",
3535
"phpspec/phpspec": "^5.0",
3636
"symfony/yaml": "^4.2",
3737
"donatj/mock-webserver": "^2.0",
3838
"http-interop/http-factory-guzzle": "^1.0",
3939
"php-http/guzzle6-adapter": "^2.0"
4040
},
4141
"config": {
42-
"bin-dir": "bin"
42+
"bin-dir": "bin",
43+
"platform": {
44+
"php": "7.1.3"
45+
}
4346
},
4447
"suggest": {
4548
"php-http/guzzle6-adapter": "In order to use Guzzle v6 as the HTTP client"

0 commit comments

Comments
 (0)