Skip to content

Commit f2ef753

Browse files
authored
Upgrade PHP version to 8.2
1 parent 8b2a907 commit f2ef753

File tree

6 files changed

+565
-629
lines changed

6 files changed

+565
-629
lines changed

.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
jobs:
44
build:
55
machine:
6-
image: ubuntu-2004:202111-01
6+
image: ubuntu-2204:2024.01.2
77
steps:
88
- run:
99
name: Change rights on project dir
@@ -18,7 +18,7 @@ jobs:
1818
- project
1919
test_php_unit:
2020
machine:
21-
image: ubuntu-2004:202111-01
21+
image: ubuntu-2204:2024.01.2
2222
steps:
2323
- attach_workspace:
2424
at: ~/
@@ -28,7 +28,7 @@ jobs:
2828

2929
test_php_spec:
3030
machine:
31-
image: ubuntu-2004:202111-01
31+
image: ubuntu-2204:2024.01.2
3232
steps:
3333
- attach_workspace:
3434
at: ~/
@@ -38,7 +38,7 @@ jobs:
3838

3939
test_php_code_style:
4040
machine:
41-
image: ubuntu-2004:202111-01
41+
image: ubuntu-2204:2024.01.2
4242
steps:
4343
- attach_workspace:
4444
at: ~/
@@ -51,7 +51,7 @@ jobs:
5151

5252
workflow_success:
5353
machine:
54-
image: ubuntu-2004:202111-01
54+
image: ubuntu-2204:2024.01.2
5555
steps:
5656
- run:
5757
name: Success

Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ RUN apt-get update && \
2424
/usr/share/doc/* /usr/share/groff/* /usr/share/info/* /usr/share/linda/* \
2525
/usr/share/lintian/* /usr/share/locale/* /usr/share/man/*
2626

27-
# Install PHP with some extensions
27+
# Install PHP 8.2 with some extensions
2828
RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
2929
sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' && \
3030
apt-get update && \
3131
apt-get --no-install-recommends --no-install-suggests --yes --quiet install \
32-
php8.0-cli \
33-
php8.0-apcu \
34-
php8.0-mbstring \
35-
php8.0-curl \
36-
php8.0-gd \
37-
php8.0-imagick \
38-
php8.0-intl \
39-
php8.0-bcmath \
40-
php8.0-xdebug \
41-
php8.0-xml \
42-
php8.0-zip && \
32+
php8.2-cli \
33+
php8.2-apcu \
34+
php8.2-mbstring \
35+
php8.2-curl \
36+
php8.2-gd \
37+
php8.2-imagick \
38+
php8.2-intl \
39+
php8.2-bcmath \
40+
php8.2-xdebug \
41+
php8.2-xml \
42+
php8.2-zip && \
4343
apt-get clean && apt-get --yes --quiet autoremove --purge && \
4444
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
4545
/usr/share/doc/* /usr/share/groff/* /usr/share/info/* /usr/share/linda/* \

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
DOCKER_RUN ?= DOCKER_BUILDKIT=1 docker-compose run php_client
1+
DOCKER_RUN ?= DOCKER_BUILDKIT=1 docker compose run php_client
22

33
.PHONY: help
44
help:
55
@grep -E '(^[a-zA-Z_-]+:.*?##.*$$)|(^##)' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-25s\033[0m %s\n", $$1, $$2}' | sed -e 's/\[32m##/[33m/'
66

77
.PHONY: build-image
88
build-image: ## Build docker image
9-
DOCKER_BUILDKIT=1 docker-compose build
9+
DOCKER_BUILDKIT=1 docker compose build
1010

1111
.PHONY:
1212
.PHONY: dependencies

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ Matrix compatibility:
1111
| v2.3 | v3.0 | [![Build Status](https://travis-ci.org/akeneo/api-php-client.svg?branch=3.0)](https://travis-ci.org/akeneo/api-php-client) |
1212
| v3.0 - v4.0 | v4.0 - v5.0 | [![Build Status](https://travis-ci.org/akeneo/api-php-client.svg?branch=4.0)](https://travis-ci.org/akeneo/api-php-client) |
1313
| v5.0 | v6.0 | - |
14-
| v6.0 | >= v7.0 | - |
14+
| v6.0 | >= v7.0 | - |
1515
| - | master | [![CircleCI](https://circleci.com/gh/akeneo/api-php-client/tree/master.svg?style=svg)](https://circleci.com/gh/akeneo/api-php-client/tree/master) |
1616

1717
Note that our PHP client is backward compatible.
1818
For example, if your PIM is currently a v2.3, you can still use a 1.0 version of the PHP client. The new endpoints available in v2.3 will not be available in the v1.0 of the PHP client.
1919

2020
## Requirements
2121

22-
* PHP >= 8.0
22+
* PHP >= 8.2
2323
* Composer
2424

2525
## Installation

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
"require": {
23-
"php": ">=8.0",
23+
"php": ">=8.2",
2424
"psr/http-message": "^2.0",
2525
"psr/http-client": "^1.0",
2626
"psr/http-factory": "^1.0",
@@ -44,13 +44,13 @@
4444
"config": {
4545
"bin-dir": "bin",
4646
"platform": {
47-
"php": "8.0"
47+
"php": "8.2"
4848
},
4949
"allow-plugins": {
5050
"php-http/discovery": false
5151
}
5252
},
5353
"suggest": {
54-
"php-http/guzzle6-adapter": "In order to use Guzzle v6 as the HTTP client"
54+
"php-http/guzzle7-adapter": "In order to use Guzzle v7 as the HTTP client"
5555
}
5656
}

0 commit comments

Comments
 (0)