Skip to content

Commit 2872748

Browse files
authored
Merge pull request #23 from nagels-tech/psalm-info-issues
Fix all psalm warnings
2 parents bc570db + 47de3a7 commit 2872748

32 files changed

+1179
-1236
lines changed

Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
# Use an official PHP image as the base image
2-
FROM php:8.2-fpm
2+
FROM php:8.1-cli
33

44
# Install necessary extensions (e.g., for Composer)
5-
RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libfreetype6-dev \
5+
RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libfreetype6-dev git libzip-dev zip \
66
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
7-
&& docker-php-ext-install gd
7+
&& docker-php-ext-install gd zip
88

99
# Set working directory
1010
WORKDIR /var/www
1111

1212
# Copy the composer.phar file to the container
1313
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
14-
15-
# Expose PHP-FPM port
16-
EXPOSE 9000
17-
18-
# Start PHP-FPM server
19-
CMD ["php-fpm"]

composer.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
"nyholm/psr7": "^1.8"
1111
},
1212
"require-dev": {
13-
"phpunit/phpunit": "^11.0",
13+
"phpunit/phpunit": "^10.0",
1414
"friendsofphp/php-cs-fixer": "^3.68",
15-
"vimeo/psalm": "^6.5"
15+
"vimeo/psalm": "^6.8",
16+
"dg/bypass-finals": "^1.9",
17+
"psalm/plugin-phpunit": "^0.19.2"
1618

1719
},
1820
"autoload": {
@@ -28,7 +30,15 @@
2830
"authors": [
2931
{
3032
"name": "p123-stack",
31-
"email": "[email protected]"
33+
"email": "[email protected]"
34+
},
35+
{
36+
"name": "123kiran17",
37+
"email": "[email protected]"
38+
},
39+
{
40+
"name": "Ghlen Nagels",
41+
"email": "[email protected]"
3242
}
3343
],
3444
"config": {
@@ -40,7 +50,7 @@
4050
"scripts": {
4151
"cs": "vendor/bin/php-cs-fixer fix --dry-run --diff --allow-risky=yes",
4252
"cs:fix": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
43-
"psalm": "vendor/bin/psalm"
53+
"psalm": "vendor/bin/psalm --no-cache --show-info=true"
4454
}
4555

4656
}

0 commit comments

Comments
 (0)