Fix Docker and build failures (#61)

.gitlab-ci.yml

@@ -91,7 +91,7 @@ Codeception:
   services:
     - name: redis:4.0.10-alpine
       alias: redis
-    - name: bitnami/mariadb:10.3.20-debian-9-r4
+    - name: bitnamilegacy/mariadb:10.3.20-debian-9-r4
       alias: db
   variables:
     # App config

Dockerfile

@@ -42,7 +42,7 @@ CMD ["php-fpm"]
 
 # ================================================================================
 
-FROM fholzer/nginx-brotli:v1.19.1 AS web
+FROM fholzer/nginx-brotli:v1.31 AS web
 
 ENV PHP_SERVERS php:9000
 
@@ -61,7 +61,7 @@ RUN apk add --update --no-cache --virtual ".nginx-module-build-deps" \
     autoconf \
     git \
  && cd /opt \
- && git clone --depth 1 -b v0.33 --single-branch https://github.com/openresty/headers-more-nginx-module.git \
+ && git clone --depth 1 -b v0.39 --single-branch https://github.com/openresty/headers-more-nginx-module.git \
  && cd /opt/headers-more-nginx-module \
  && git submodule update --init \
  && cd /opt \
@@ -90,7 +90,7 @@ CMD ["nginx", "-g", "daemon off;"]
 
 # ================================================================================
 
-FROM bitnami/mariadb:10.6-debian-11 AS db
+FROM bitnamilegacy/mariadb:10.6-debian-11 AS db
 
 USER 0
 

composer.json

@@ -31,7 +31,6 @@
         "ext-simplexml": "*",
         "ext-sodium": "*",
         "bacon/bacon-qr-code": "^1.0",
-        "domnikl/statsd": "^3.0.0",
         "ely/mojang-api": "^0.2.0",
         "ely/yii2-tempmail-validator": "dev-master",
         "erickskrauch/phpstan-yii2": "dev-master",
@@ -46,6 +45,7 @@
         "phpstan/phpstan-webmozart-assert": "^1",
         "ramsey/uuid": "^4.0.0",
         "sam-it/yii2-mariadb": "^3",
+        "slickdeals/statsd": "^3.2",
         "spomky-labs/otphp": "^11",
         "webmozart/assert": "^1.2.0",
         "yiisoft/yii2": "~2.0.38",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b50434a13836bd5adf5d0083e8be7d73",
+    "content-hash": "4d149183d9b22be925238bb0b0ea74c5",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -517,61 +517,6 @@
             ],
             "time": "2024-02-05T11:56:58+00:00"
         },
-        {
-            "name": "domnikl/statsd",
-            "version": "3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/domnikl/statsd-php.git",
-                "reference": "393c6565efbfb23c8296ae3099a62fb6366c6ce3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/domnikl/statsd-php/zipball/393c6565efbfb23c8296ae3099a62fb6366c6ce3",
-                "reference": "393c6565efbfb23c8296ae3099a62fb6366c6ce3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">= 7.2"
-            },
-            "require-dev": {
-                "flyeralarm/php-code-validator": "^2.2",
-                "phpunit/phpunit": "~8.0",
-                "vimeo/psalm": "^3.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Domnikl\\Statsd\\": "src/",
-                    "Domnikl\\Test\\Statsd\\": "tests/unit"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dominik Liebler",
-                    "email": "liebler.dominik@gmail.com"
-                }
-            ],
-            "description": "a PHP client for statsd",
-            "homepage": "https://domnikl.github.com/statsd-php",
-            "keywords": [
-                "Metrics",
-                "monitoring",
-                "statistics",
-                "statsd",
-                "udp"
-            ],
-            "support": {
-                "issues": "https://github.com/domnikl/statsd-php/issues",
-                "source": "https://github.com/domnikl/statsd-php/tree/master"
-            },
-            "abandoned": "slickdeals/statsd",
-            "time": "2020-01-03T14:24:58+00:00"
-        },
         {
             "name": "egulias/email-validator",
             "version": "4.0.2",
@@ -3112,6 +3057,62 @@
             ],
             "time": "2024-11-06T07:44:19+00:00"
         },
+        {
+            "name": "slickdeals/statsd",
+            "version": "3.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Slickdeals/statsd-php.git",
+                "reference": "2a92aa0a251731adf1b12b0011ac458cccf42dcf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Slickdeals/statsd-php/zipball/2a92aa0a251731adf1b12b0011ac458cccf42dcf",
+                "reference": "2a92aa0a251731adf1b12b0011ac458cccf42dcf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">= 7.3 || ^8"
+            },
+            "replace": {
+                "domnikl/statsd": "<=3.0.2"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.0",
+                "phpunit/phpunit": "^9",
+                "vimeo/psalm": "^4.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Domnikl\\Statsd\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dominik Liebler",
+                    "email": "liebler.dominik@gmail.com"
+                }
+            ],
+            "description": "a PHP client for statsd",
+            "homepage": "https://github.com/Slickdeals/statsd-php",
+            "keywords": [
+                "Metrics",
+                "monitoring",
+                "statistics",
+                "statsd",
+                "udp"
+            ],
+            "support": {
+                "issues": "https://github.com/Slickdeals/statsd-php/issues",
+                "source": "https://github.com/Slickdeals/statsd-php/tree/3.2.3"
+            },
+            "time": "2026-02-09T04:11:22+00:00"
+        },
         {
             "name": "spomky-labs/otphp",
             "version": "11.3.0",
@@ -10893,5 +10894,5 @@
         "ext-sodium": "*"
     },
     "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }