update soko-web

generate composer.lock
update phpunit
2023-09-28 14:30:59 +02:00 · 2023-09-28 14:30:58 +02:00 · 2023-09-28 14:30:58 +02:00 · 2023-09-28 14:30:58 +02:00
6 changed files with 392 additions and 594 deletions
--- a/composer.json
+++ b/composer.json
@ -10,11 +10,11 @@
    }
  ],
  "require": {
-    "esoko/soko-web": "0.14.1",
+    "esoko/soko-web": "0.15",
    "firebase/php-jwt": "^6.4"
  },
  "require-dev": {
-    "phpunit/phpunit": "^9.6",
+    "phpunit/phpunit": "^10.3",
    "phpstan/phpstan": "^1.10"
  },
  "autoload": {
--- a/composer.lock
+++ b/composer.lock
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,9 +1,9 @@
-FROM ubuntu:focal AS rvr_base
+FROM ubuntu:22.04 AS rvr_base

 ENV DEBIAN_FRONTEND noninteractive

 RUN apt update --fix-missing && apt install -y sudo curl git unzip mariadb-client nginx \
-    php-apcu php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
+    php-apcu php8.1-cli php8.1-curl php8.1-fpm php8.1-mbstring php8.1-mysql php8.1-zip php8.1-xml

 RUN mkdir -p /run/php
 COPY docker/configs/nginx.conf /etc/nginx/sites-available/default
@ -20,9 +20,9 @@ FROM rvr_base AS rvr_dev

 RUN apt update --fix-missing && apt install -y php-xdebug

-RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini &&\
-    echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini &&\
-    echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini
+RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_connect_back = 1" >> /etc/php/8.1/mods-available/xdebug.ini

 EXPOSE 80
 EXPOSE 5000
--- a/docker/configs/nginx.conf
+++ b/docker/configs/nginx.conf
@ -14,7 +14,7 @@ server {

        location ~ \.php$ {
                include snippets/fastcgi-php.conf;
-                fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
+                fastcgi_pass unix:/var/run/php/php8.1-fpm.sock;
        }

        location ~ /\.ht {
--- a/docker/scripts/entry-point-dev.sh
+++ b/docker/scripts/entry-point-dev.sh
@ -20,11 +20,11 @@ USER_UID=$(stat -c "%u" .env)
 USER_GID=$(stat -c "%g" .env)
 groupadd --gid $USER_GID rvr
 useradd --uid $USER_UID --gid $USER_GID rvr
-sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/7.4/fpm/pool.d/www.conf
+sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/8.1/fpm/pool.d/www.conf

 set +e

-/usr/sbin/php-fpm7.4 -F &
+/usr/sbin/php-fpm8.1 -F &
 /usr/sbin/nginx -g 'daemon off;' &

 wait -n
--- a/docker/scripts/entry-point.sh
+++ b/docker/scripts/entry-point.sh
@ -14,12 +14,12 @@ USER_GID=$(stat -c "%g" .env)
 groupadd --gid $USER_GID rvr
 useradd --uid $USER_UID --gid $USER_GID rvr
 chown -R rvr:rvr cache
-sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/7.4/fpm/pool.d/www.conf
+sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/8.1/fpm/pool.d/www.conf

 set +e

 /usr/sbin/cron -f &
-/usr/sbin/php-fpm7.4 -F &
+/usr/sbin/php-fpm8.1 -F &
 /usr/sbin/nginx -g 'daemon off;' &

 wait -n
Author	SHA1	Message	Date
Pőcze Bence	ed2b1c23ae	update soko-web All checks were successful rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-09-28 14:30:59 +02:00
Pőcze Bence	6ef45b8b6a	generate composer.lock	2023-09-28 14:30:58 +02:00
Pőcze Bence	b4c359e81d	update phpunit	2023-09-28 14:30:58 +02:00
Pőcze Bence	495a2fe910	update ubuntu to 22.04 and php to 8.1	2023-09-28 14:30:58 +02:00