Upgrade PHP version to 8.2

akeneo · Sep 24, 2024 · f2ef753 · f2ef753
1 parent 8b2a907
commit f2ef753
Show file tree

Hide file tree

Showing 6 changed files with 565 additions and 629 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 jobs:
     build:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2204:2024.01.2
         steps:
             - run:
                 name: Change rights on project dir
@@ -18,7 +18,7 @@ jobs:
                         - project
     test_php_unit:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2204:2024.01.2
         steps:
             -   attach_workspace:
                     at: ~/
@@ -28,7 +28,7 @@ jobs:
 
     test_php_spec:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2204:2024.01.2
         steps:
             -   attach_workspace:
                     at: ~/
@@ -38,7 +38,7 @@ jobs:
 
     test_php_code_style:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2204:2024.01.2
         steps:
             -   attach_workspace:
                     at: ~/
@@ -51,7 +51,7 @@ jobs:
 
     workflow_success:
         machine:
-            image: ubuntu-2004:202111-01
+            image: ubuntu-2204:2024.01.2
         steps:
             -   run:
                     name: Success

diff --git a/Dockerfile b/Dockerfile
@@ -24,22 +24,22 @@ RUN apt-get update && \
             /usr/share/doc/* /usr/share/groff/* /usr/share/info/* /usr/share/linda/* \
             /usr/share/lintian/* /usr/share/locale/* /usr/share/man/*
 
-# Install PHP with some extensions
+# Install PHP 8.2 with some extensions
 RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
     sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' && \
     apt-get update && \
     apt-get --no-install-recommends --no-install-suggests --yes --quiet install \
-        php8.0-cli \
-        php8.0-apcu \
-        php8.0-mbstring \
-        php8.0-curl \
-        php8.0-gd \
-        php8.0-imagick \
-        php8.0-intl \
-        php8.0-bcmath \
-        php8.0-xdebug \
-        php8.0-xml \
-        php8.0-zip && \
+        php8.2-cli \
+        php8.2-apcu \
+        php8.2-mbstring \
+        php8.2-curl \
+        php8.2-gd \
+        php8.2-imagick \
+        php8.2-intl \
+        php8.2-bcmath \
+        php8.2-xdebug \
+        php8.2-xml \
+        php8.2-zip && \
     apt-get clean && apt-get --yes --quiet autoremove --purge && \
     rm -rf  /var/lib/apt/lists/* /tmp/* /var/tmp/* \
             /usr/share/doc/* /usr/share/groff/* /usr/share/info/* /usr/share/linda/* \

diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
-DOCKER_RUN ?= DOCKER_BUILDKIT=1 docker-compose run php_client
+DOCKER_RUN ?= DOCKER_BUILDKIT=1 docker compose run php_client
 
 .PHONY: help
 help:
 	@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/'
 
 .PHONY: build-image
 build-image: ## Build docker image
-	DOCKER_BUILDKIT=1 docker-compose build
+	DOCKER_BUILDKIT=1 docker compose build
 
 .PHONY:
 .PHONY: dependencies

diff --git a/README.md b/README.md
@@ -11,15 +11,15 @@ Matrix compatibility:
 | 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)                        |
 | 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)                        |
 | v5.0           | v6.0                   | -                                                                                                                                                 |
-| v6.0           | >= v7.0           | -                                                                                                                                                 |
+| v6.0           | >= v7.0                | -                                                                                                                                                 |
 | -              | 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) |
 
 Note that our PHP client is backward compatible.
 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.
 
 ## Requirements
 
-* PHP >= 8.0
+* PHP >= 8.2
 * Composer 
 
 ## Installation

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     }
   },
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.2",
     "psr/http-message": "^2.0",
     "psr/http-client": "^1.0",
     "psr/http-factory": "^1.0",
@@ -44,13 +44,13 @@
   "config": {
     "bin-dir": "bin",
     "platform": {
-      "php": "8.0"
+      "php": "8.2"
     },
     "allow-plugins": {
       "php-http/discovery": false
     }
   },
   "suggest": {
-    "php-http/guzzle6-adapter": "In order to use Guzzle v6 as the HTTP client"
+    "php-http/guzzle7-adapter": "In order to use Guzzle v7 as the HTTP client"
   }
 }