From 52af9afe4a66c278e8e71ea488cd23be43f9dd66 Mon Sep 17 00:00:00 2001
From: Laurent Laville <laurent.laville@gmail.com>
Date: Wed, 3 Apr 2024 19:11:00 +0000
Subject: [PATCH] upgrade PHP 8.1 to 8.3

---
 Dockerfile                                    | 22 +++++++++----------
 flavors/php/Dockerfile                        | 22 +++++++++----------
 .../descriptors/php.megalinter-descriptor.yml | 22 +++++++++----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b9dc33d0587..6baabdfbfa7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
 FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
 FROM ghcr.io/assignuser/chktex-alpine:latest as chktex
 FROM mrtazz/checkmake:latest as checkmake
-FROM ghcr.io/phpstan/phpstan:latest-php8.1 as phpstan
+FROM ghcr.io/phpstan/phpstan:latest-php8.3 as phpstan
 FROM yoheimuta/protolint:latest as protolint
 FROM golang:alpine as dustilock
 RUN GOBIN=/usr/bin go install github.com/checkmarx/dustilock@v1.2.0
@@ -95,15 +95,15 @@ RUN apk add --no-cache \
                 perl \
                 perl-dev \
                 gnupg \
-                php81 \
-                php81-phar \
-                php81-mbstring \
-                php81-xmlwriter \
-                php81-tokenizer \
-                php81-ctype \
-                php81-curl \
-                php81-dom \
-                php81-simplexml \
+                php83 \
+                php83-phar \
+                php83-mbstring \
+                php83-xmlwriter \
+                php83-tokenizer \
+                php83-ctype \
+                php83-curl \
+                php83-dom \
+                php83-simplexml \
                 dpkg \
                 py3-pyflakes \
                 clang17-extra-tools \
@@ -457,7 +457,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GI
     && chmod +x phive.phar \
     && mv phive.phar /usr/local/bin/phive \
     && rm phive.phar.asc \
-    && update-alternatives --install /usr/bin/php php /usr/bin/php81 110
+    && update-alternatives --install /usr/bin/php php /usr/bin/php83 110
 
 
 # POWERSHELL installation
diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile
index c1e330aa98f..83ecd7a00fc 100644
--- a/flavors/php/Dockerfile
+++ b/flavors/php/Dockerfile
@@ -22,7 +22,7 @@ FROM mvdan/shfmt:latest-alpine as shfmt
 FROM hadolint/hadolint:v2.12.0-alpine as hadolint
 FROM mstruebing/editorconfig-checker:2.7.2 as editorconfig-checker
 FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
-FROM ghcr.io/phpstan/phpstan:latest-php8.1 as phpstan
+FROM ghcr.io/phpstan/phpstan:latest-php8.3 as phpstan
 FROM yoheimuta/protolint:latest as protolint
 FROM zricethezav/gitleaks:v8.18.2 as gitleaks
 FROM trufflesecurity/trufflehog:latest as trufflehog
@@ -66,15 +66,15 @@ RUN apk add --no-cache \
                 openssh \
                 openjdk17 \
                 gnupg \
-                php81 \
-                php81-phar \
-                php81-mbstring \
-                php81-xmlwriter \
-                php81-tokenizer \
-                php81-ctype \
-                php81-curl \
-                php81-dom \
-                php81-simplexml \
+                php83 \
+                php83-phar \
+                php83-mbstring \
+                php83-xmlwriter \
+                php83-tokenizer \
+                php83-ctype \
+                php83-curl \
+                php83-dom \
+                php83-simplexml \
                 dpkg \
                 py3-pyflakes \
                 nodejs \
@@ -259,7 +259,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GI
     && chmod +x phive.phar \
     && mv phive.phar /usr/local/bin/phive \
     && rm phive.phar.asc \
-    && update-alternatives --install /usr/bin/php php /usr/bin/php81 110
+    && update-alternatives --install /usr/bin/php php /usr/bin/php83 110
 
 
 # actionlint installation
diff --git a/megalinter/descriptors/php.megalinter-descriptor.yml b/megalinter/descriptors/php.megalinter-descriptor.yml
index 1539c9acfcb..041730f09a3 100644
--- a/megalinter/descriptors/php.megalinter-descriptor.yml
+++ b/megalinter/descriptors/php.megalinter-descriptor.yml
@@ -8,15 +8,15 @@ file_extensions:
 install:
   apk:
     - gnupg
-    - php81
-    - php81-phar
-    - php81-mbstring
-    - php81-xmlwriter
-    - php81-tokenizer
-    - php81-ctype
-    - php81-curl
-    - php81-dom
-    - php81-simplexml
+    - php83
+    - php83-phar
+    - php83-mbstring
+    - php83-xmlwriter
+    - php83-tokenizer
+    - php83-ctype
+    - php83-curl
+    - php83-dom
+    - php83-simplexml
     - dpkg
   dockerfile:
     - |
@@ -33,7 +33,7 @@ install:
           && chmod +x phive.phar \
           && mv phive.phar /usr/local/bin/phive \
           && rm phive.phar.asc \
-          && update-alternatives --install /usr/bin/php php /usr/bin/php81 110
+          && update-alternatives --install /usr/bin/php php /usr/bin/php83 110
 linters:
   # PHPCS
   - linter_name: phpcs
@@ -99,7 +99,7 @@ linters:
       - "phpstan analyse --no-progress --no-ansi mydir1/ mydir2/ myfile.php"
     install:
       dockerfile:
-        - FROM ghcr.io/phpstan/phpstan:latest-php8.1 as phpstan
+        - FROM ghcr.io/phpstan/phpstan:latest-php8.3 as phpstan
         - COPY --link --from=phpstan /composer/vendor/phpstan/phpstan/phpstan.phar /usr/bin/phpstan
         - RUN chmod +x /usr/bin/phpstan
       idea: