Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade PHP 8.1 to 8.3 #3464

Merged
merged 1 commit into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions flavors/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions megalinter/descriptors/php.megalinter-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- |
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading