Skip to content

Commit db16413

Browse files
committed
update php in docker file
1 parent 639de57 commit db16413

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.docker/PHP83-Dockerfile renamed to .docker/PHP-Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3.3-fpm
1+
FROM php:8.3-fpm
22

33
RUN apt-get update
44
RUN apt-get --yes --no-install-recommends install \
@@ -32,7 +32,7 @@ RUN docker-php-ext-install -j$(nproc) \
3232
COPY build/php/opcache.ini /usr/local/etc/php/conf.d/
3333
COPY build/php/custom.ini /usr/local/etc/php/conf.d/
3434

35-
RUN pecl install xdebug-3.3.1 && docker-php-ext-enable xdebug
35+
RUN pecl install xdebug-3.4.0 && docker-php-ext-enable xdebug
3636

3737
RUN php --version
3838

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
operating-system: ["ubuntu-latest"]
16-
php: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
16+
php: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
1717

1818
steps:
1919
- name: Checkout

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
php:
33
build: # Info to build the Docker image
44
context: ./.docker # Specify where the Dockerfile is located (e.g. in the root directory of the project)
5-
dockerfile: PHP83-Dockerfile # Specify the name of the Dockerfile
5+
dockerfile: PHP-Dockerfile # Specify the name of the Dockerfile
66
ports:
77
- 8111:80
88
depends_on:

tests/RedmineExtension/RedmineInstance.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function shutdown(InstanceRegistration $tracer): void
149149
/**
150150
* Allows tests to prepare the database
151151
*/
152-
public function excecuteDatabaseQuery(string $query, array $options = [], array $params = null): void
152+
public function excecuteDatabaseQuery(string $query, array $options = [], ?array $params = null): void
153153
{
154154
$pdo = new PDO('sqlite:' . $this->dataPath . $this->workingDB);
155155
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

0 commit comments

Comments
 (0)