Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .docker/php85/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM php:8.5-fpm

USER root

# Install all system libs
RUN apt update && apt install -y --no-install-recommends \
git \
wget \
zlib1g-dev \
libzip-dev \
libpng-dev \
libjpeg62-turbo-dev \
libfreetype6-dev \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

# Configure GD
RUN docker-php-ext-configure gd --with-freetype --with-jpeg

# Install PHP reqs
RUN docker-php-ext-install zip iconv gd

# Install PIE
COPY --from=ghcr.io/php/pie:bin /pie /usr/local/bin/pie

# Install xdebug
RUN pie install xdebug/xdebug \
&& docker-php-ext-enable xdebug

COPY --from=composer:2.10 /usr/bin/composer /usr/local/bin/composer
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CONTAINER ?= php84
CONTAINER ?= php85
DOCKER_RUN=docker compose run --rm $(CONTAINER)

.PHONY: setup tests matrix-tests doc-images
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Please refer to [CONTRIBUTING](CONTRIBUTING.md)
## Docker development

You can use the env var CONTAINER to run the tests in a specific PHP version.
The default version if CONTAINER is omitted is php83.
The default version if CONTAINER is omitted is php85.

#### 1. Set up your Docker environment

Expand Down
5 changes: 5 additions & 0 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ services:
<<: *php-service
build:
context: .docker/php84

php85:
<<: *php-service
build:
context: .docker/php85
14 changes: 11 additions & 3 deletions psalm.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
<?xml version="1.0"?>
<psalm
errorLevel="2"
errorLevel="3"
resolveFromConfigFile="true"
ensureOverrideAttribute="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
>
<projectFiles>
<directory name="src" />
<directory name="features" />
<directory name="spec" />
<ignoreFiles>
<directory name="vendor" />
<directory name="spec" />
<directory name="features" />
</ignoreFiles>
</projectFiles>
<issueHandlers>
<FalsableReturnStatement errorLevel="suppress" />
<InvalidOperand errorLevel="suppress" />
<PossiblyInvalidArrayAccess errorLevel="suppress" />
<PossiblyNullArgument errorLevel="suppress" />
<PossiblyUnusedMethod errorLevel="suppress" />
<TypeDoesNotContainNull errorLevel="suppress" />
<UnusedClass errorLevel="suppress" />
</issueHandlers>
</psalm>