Merge pull request #2534 from acelaya-forks/8.5-docker-image

Update docker images to PHP 8.5

.github/workflows/ci-db-tests.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: './.github/actions/ci-setup'
         with:
           php-version: ${{ matrix.php-version }}
-          php-extensions: pdo_sqlsrv-5.12.0
+          php-extensions: pdo_sqlsrv-5.13.0
           extensions-cache-key: db-tests-extensions-${{ matrix.php-version }}-${{ inputs.platform }}
       - name: Create test database
         if: ${{ inputs.platform == 'ms' }}

CHANGELOG.md

@@ -13,7 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * [#2583](https://github.com/shlinkio/shlink/issues/2583) Support redis clusters with sentinels which have their own ACL authentication.
 
 ### Changed
-* *Nothing*
+* [#2555](https://github.com/shlinkio/shlink/issues/2555) Update docker image to PHP 8.5.
 
 ### Deprecated
 * *Nothing*

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.4-alpine3.22 AS base
+FROM php:8.5-alpine3.22 AS base
 
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION=${SHLINK_VERSION}
@@ -6,9 +6,9 @@ ARG SHLINK_RUNTIME=rr
 ENV SHLINK_RUNTIME=${SHLINK_RUNTIME}
 
 ENV USER_ID='1001'
-ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
-ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
+ENV PDO_SQLSRV_VERSION='5.13.0'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
+ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 ENV LC_ALL='C'
 
 WORKDIR /etc/shlink
@@ -25,15 +25,15 @@ RUN \
     apk add --no-cache postgresql icu libzip libpng
 
 # Install sqlsrv driver for x86_64 builds
-RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
-    if [ $(uname -m) == "x86_64" ]; then \
+RUN if [ $(uname -m) == "x86_64" ]; then \
+      apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
       wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
       apk add --allow-untrusted msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
       pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
       docker-php-ext-enable pdo_sqlsrv && \
-      rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \
-    fi; \
-    apk del .phpize-deps
+      rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
+      apk del .phpize-deps; \
+    fi
 
 # Install shlink
 FROM base AS builder

data/infra/frankenphp.Dockerfile

@@ -1,9 +1,9 @@
-FROM dunglas/frankenphp:1-php8.4-alpine
+FROM dunglas/frankenphp:1-php8.5-alpine
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
-ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
+ENV PDO_SQLSRV_VERSION='5.13.0'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
+ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 
 RUN apk update
 

data/infra/php.Dockerfile

@@ -1,10 +1,10 @@
-FROM php:8.4-fpm-alpine3.22
+FROM php:8.5-fpm-alpine3.22
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION='5.1.24'
-ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
-ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
+ENV PDO_SQLSRV_VERSION='5.13.0'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
+ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 
 RUN apk update
 

data/infra/roadrunner.Dockerfile

@@ -1,9 +1,9 @@
-FROM php:8.4-alpine3.22
+FROM php:8.5-alpine3.22
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
-ENV MS_ODBC_SQL_VERSION='18_18.4.1.1'
+ENV PDO_SQLSRV_VERSION='5.13.0'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
+ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 
 RUN apk update
 

module/Core/src/RedirectRule/Entity/RedirectCondition.php

@@ -147,7 +147,7 @@ class RedirectCondition extends AbstractEntity implements JsonSerializable
     private function matchesQueryParam(ServerRequestInterface $request): bool
     {
         $query = $request->getQueryParams();
-        $queryValue = $query[$this->matchKey] ?? null;
+        $queryValue = $this->matchKey !== null ? ($query[$this->matchKey] ?? null) : null;
 
         return $queryValue === $this->matchValue;
     }