increase php minimal version to 8.1, fixes #3805

Closes #3805 Merge request studip/studip!2814

increase php minimal version to 8.1, fixes #3805
d066e349 · Jan-Hendrik Willms · 2b25082b · d066e349 · d066e349 · d066e349
Commit d066e349 authored 1 year ago by Jan-Hendrik Willms
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: studip/studip:tests-php8.3
+image: studip/studip:tests-php8.1

 variables:
  FF_NETWORK_PER_BUILD: 1
@@ -115,14 +115,14 @@ lint-php:
    reports:
      codequality: $PHPLINT_CODE_QUALITY_REPORT

-lint-php-7.4:
-  image: studip/studip:tests-php8.2
+lint-php-8.3:
+  image: studip/studip:tests-php8.3
  stage: checks
  needs: [build-composer]
  variables:
    CACHE_LOCATION: $CACHE_DIR/phplint-cache
-    PHPLINT_JSON_REPORT: $REPORT_DIR/phplint-report-7.4.json
-    PHPLINT_CODE_QUALITY_REPORT: $REPORT_DIR/phplint-codequality-7.4.json
+    PHPLINT_JSON_REPORT: $REPORT_DIR/phplint-report-8.3.json
+    PHPLINT_CODE_QUALITY_REPORT: $REPORT_DIR/phplint-codequality-8.3.json
  interruptible: true
  cache:
    - *composer-cache

--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
    "config": {
        "vendor-dir": "composer",
        "platform": {
-            "php": "7.4"
+            "php": "8.1"
        }
    },
    "require-dev": {
@@ -12,12 +12,12 @@
        "woohoolabs/yang": "2.3.2",
        "codeception/codeception": "^4.2",
        "codeception/module-asserts": "^1.3",
-        "overtrue/phplint": "^3.0",
+        "overtrue/phplint": "3.1.1",
        "phpstan/phpstan": "^1.8",
        "symfony/var-dumper": "^5.4"
    },
    "require": {
-        "php": "^7.2",
+        "php": "^8.1",
        "guzzlehttp/psr7": "^2.3",
        "neomerx/json-api": "4.0.1",
        "spomky-labs/otphp": "^10",
@@ -51,27 +51,22 @@
        "symfony/console": "^5.3.16",
        "symfony/process": "^5.4",
        "jumbojett/openid-connect-php": "^0.9.2",
-        "league/oauth2-server": "^8.3",
+        "league/oauth2-server": "8.5.4",
        "willdurand/negotiation": "^3.1",
        "monolog/monolog": "^2.8",
-        "symfony/polyfill-php80": "^1.27",
-        "symfony/polyfill-php81": "^1.27",
        "phpowermove/docblock": "^2.0",
        "ksubileau/color-thief-php": "^2.0",
        "symfony/polyfill-php82": "^1.28",
        "symfony/polyfill-php83": "^1.28",
        "phpoffice/phpspreadsheet": "^1.19",
-        "psy/psysh": "^0.12.2"
+        "psy/psysh": "^0.12.2",
+        "okvpn/clock-lts": "^1.0"
    },
    "replace": {
-        "symfony/polyfill-php54": "*",
-        "symfony/polyfill-php55": "*",
-        "symfony/polyfill-php56": "*",
-        "symfony/polyfill-php70": "*",
-        "symfony/polyfill-php71": "*",
-        "symfony/polyfill-php72": "*",
        "symfony/polyfill-php73": "*",
        "symfony/polyfill-php74": "*",
+        "symfony/polyfill-php80": "*",
+        "symfony/polyfill-php81": "*",
        "symfony/polyfill-mbstring": "*"
    }
 }
--- a/composer.lock
+++ b/composer.lock
--- a/docker/build_images.sh
+++ b/docker/build_images.sh
@@ -11,7 +11,7 @@ build_image () {

 build_image tests/php83 studip:tests-php8.3 &
 build_image tests/php82 studip:tests-php8.2 &
-build_image tests/php74 studip:tests-php7.4 &
+build_image tests/php81 studip:tests-php8.1 &
 build_image release-cli release-cli &
 wait


--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
 # Setup php, apache and stud.ip
-FROM php:7.4-apache as base
+FROM php:8.1-apache as base

 # Install system requirements
 RUN apt update && apt install -y --no-install-recommends \
@@ -17,7 +17,7 @@ RUN apt update && apt install -y --no-install-recommends \

 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-webp
-RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
+RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl

 FROM node:16 as nodejs


--- a/docker/tests/php81/Dockerfile
+++ b/docker/tests/php81/Dockerfile
+# Setup php, apache and stud.ip
+FROM php:8.1-cli
+
+# Install system requirements
+RUN apt update && apt install -y  --no-install-recommends \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    lsb-release \
+    zip \
+    tar \
+    libwebp-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install php extensions
+RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
+
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin
+
+# Install composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -3,7 +3,8 @@ FROM php:8.2-cli

 # Install system requirements
 RUN apt update && apt install -y  --no-install-recommends \
-    default-mysql-client default-libmysqlclient-dev libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
    lsb-release \
    zip \
    tar \
@@ -12,13 +13,10 @@ RUN apt update && apt install -y  --no-install-recommends \

 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
-RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip

-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt update && apt install -y --no-install-recommends nodejs \
-        curl apt-transport-https ca-certificates gnupg unzip git \
-    && rm -rf /var/lib/apt/lists/*
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin

 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
--- a/docker/tests/php83/Dockerfile
+++ b/docker/tests/php83/Dockerfile
@@ -3,7 +3,8 @@ FROM php:8.3-cli

 # Install system requirements
 RUN apt update && apt install -y  --no-install-recommends \
-    default-mysql-client default-libmysqlclient-dev libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
    lsb-release \
    zip \
    tar \
@@ -12,13 +13,10 @@ RUN apt update && apt install -y  --no-install-recommends \

 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
-RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql zip

-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt update && apt install -y --no-install-recommends nodejs \
-        curl apt-transport-https ca-certificates gnupg unzip git \
-    && rm -rf /var/lib/apt/lists/*
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin

 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer