Skip to content

Commit f7bfb9a

Browse files
dominikzoggdominikzogg
committed
php85
1 parent cc2f4a3 commit f7bfb9a

11 files changed

Lines changed: 68 additions & 69 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@ jobs:
2020
run: curl --insecure https://localhost/ping -vvv
2121
- name: docker stop
2222
run: docker compose -f docker-compose.ci.yml stop
23-
php82:
24-
name: PHP 8.2
25-
runs-on: ubuntu-22.04
26-
steps:
27-
- name: checkout
28-
uses: actions/checkout@v4
29-
- name: composer test
30-
uses: docker://ghcr.io/chubbyphp/ci-php82:latest
31-
env:
32-
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33-
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
3423
php83:
3524
name: PHP 8.3
3625
runs-on: ubuntu-24.04
@@ -53,6 +42,17 @@ jobs:
5342
env:
5443
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5544
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
45+
php85:
46+
name: PHP 8.5
47+
runs-on: ubuntu-22.04
48+
steps:
49+
- name: checkout
50+
uses: actions/checkout@v4
51+
- name: composer test
52+
uses: docker://ghcr.io/chubbyphp/ci-php85:latest
53+
env:
54+
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
5656
- name: sonarcloud.io
5757
uses: sonarsource/sonarqube-scan-action@v6.0.0
5858
env:

‎.php-cs-fixer.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
/** @var array $config */
1313
$config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
1414

15-
unset ($config['rules']['final_class']);
16-
1715
return (new PhpCsFixer\Config)
16+
->setUnsupportedPhpVersionAllowed(true)
1817
->setIndent($config['indent'])
1918
->setLineEnding($config['lineEnding'])
2019
->setRules($config['rules'])

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ A minimal skeleton to start with a minimal php project.
2222

2323
## Requirements
2424

25-
* php: ^8.2
26-
* [chubbyphp/chubbyphp-clean-directories][20]: ^1.4
27-
* [chubbyphp/chubbyphp-framework][21]: ^5.2
28-
* [chubbyphp/chubbyphp-framework-router-fastroute][22]: ^2.2
29-
* [chubbyphp/chubbyphp-laminas-config][23]: ^1.4
25+
* php: ^8.3
26+
* [chubbyphp/chubbyphp-clean-directories][20]: ^1.5
27+
* [chubbyphp/chubbyphp-framework][21]: ^5.3
28+
* [chubbyphp/chubbyphp-framework-router-fastroute][22]: ^2.3
29+
* [chubbyphp/chubbyphp-laminas-config][23]: ^1.5
3030
* [monolog/monolog][24]: ^3.9
31-
* [slim/psr7][25]: ^1.7.1
32-
* [symfony/console][26]: ^7.3.2
31+
* [slim/psr7][25]: ^1.8
32+
* [symfony/console][26]: ^7.4
3333

3434
## Environment
3535

‎composer.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.2",
13+
"php": "^8.3",
1414
"ext-json": "*",
15-
"chubbyphp/chubbyphp-clean-directories": "^1.4",
16-
"chubbyphp/chubbyphp-framework": "^5.2",
17-
"chubbyphp/chubbyphp-framework-router-fastroute": "^2.2",
18-
"chubbyphp/chubbyphp-laminas-config": "^1.4",
15+
"chubbyphp/chubbyphp-clean-directories": "^1.5",
16+
"chubbyphp/chubbyphp-framework": "^5.3",
17+
"chubbyphp/chubbyphp-framework-router-fastroute": "^2.3",
18+
"chubbyphp/chubbyphp-laminas-config": "^1.5",
1919
"monolog/monolog": "^3.9",
20-
"slim/psr7": "^1.7.1",
21-
"symfony/console": "^7.3.2"
20+
"slim/psr7": "^1.8",
21+
"symfony/console": "^7.4"
2222
},
2323
"require-dev": {
2424
"chubbyphp/chubbyphp-dev-helper": "dev-master",
25-
"chubbyphp/chubbyphp-mock": "^2.0",
26-
"infection/infection": "^0.31.1",
27-
"php-coveralls/php-coveralls": "^2.8",
25+
"chubbyphp/chubbyphp-mock": "^2.1",
26+
"infection/infection": "^0.31.9",
27+
"php-coveralls/php-coveralls": "^2.9",
2828
"phpstan/extension-installer": "^1.4.3",
29-
"phpstan/phpstan": "^2.1.22",
30-
"phpunit/phpunit": "^11.5.32"
29+
"phpstan/phpstan": "^2.1.33",
30+
"phpunit/phpunit": "^12.5"
3131
},
3232
"autoload": {
3333
"psr-4": { "App\\": "src/" }
@@ -44,7 +44,7 @@
4444
},
4545
"scripts": {
4646
"clean-directories": "bin/console clean-directories cache log",
47-
"fix:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
47+
"fix:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
4848
"setup-dev": [
4949
"@clean-directories"
5050
],
@@ -56,7 +56,7 @@
5656
"@test:static-analysis",
5757
"@test:cs"
5858
],
59-
"test:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
59+
"test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
6060
"test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
6161
"test:integration": "vendor/bin/phpunit --configuration phpunit.integration.xml --cache-directory=build/phpunit/integration.cache",
6262
"test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",

‎docker/development/php/Dockerfile‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@ RUN dnf install -y --nobest \
1111
glibc-langpack-de \
1212
langpacks-de \
1313
nmap-ncat \
14-
php84-php-ast \
15-
php84-php-cli \
16-
php84-php-devel \
17-
php84-php-fpm \
18-
php84-php-intl \
19-
php84-php-mbstring \
20-
php84-php-opcache \
21-
php84-php-pecl-apcu \
22-
php84-php-pecl-pcov \
23-
php84-php-pecl-xdebug3 \
24-
php84-php-pecl-zip \
25-
php84-php-xml \
14+
php85-php-ast \
15+
php85-php-cli \
16+
php85-php-devel \
17+
php85-php-fpm \
18+
php85-php-intl \
19+
php85-php-mbstring \
20+
php85-php-opcache \
21+
php85-php-pecl-apcu \
22+
php85-php-pecl-pcov \
23+
php85-php-pecl-xdebug3 \
24+
php85-php-pecl-zip \
25+
php85-php-xml \
2626
procps-ng \
2727
sudo \
2828
supervisor \
2929
unzip \
3030
vim \
3131
zsh
3232

33-
RUN ln -sf /usr/bin/php84 /usr/bin/php \
34-
&& rm /etc/opt/remi/php84/php.d/15-xdebug.ini \
35-
&& rm /etc/opt/remi/php84/php.d/40-pcov.ini
33+
RUN ln -sf /usr/bin/php85 /usr/bin/php \
34+
&& rm /etc/opt/remi/php85/php.d/15-xdebug.ini \
35+
&& rm /etc/opt/remi/php85/php.d/40-pcov.ini
3636

3737
ENV TZ=Europe/Zurich
3838

docker/development/php/files/etc/opt/remi/php84/php.d/99-development.ini renamed to docker/development/php/files/etc/opt/remi/php85/php.d/99-development.ini

File renamed without changes.

‎docker/development/php/files/etc/supervisord.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
1515
serverurl=unix:///tmp/supervisor.sock
1616

1717
[program:php-fpm]
18-
command=/opt/remi/php84/root/usr/sbin/php-fpm -c /etc/opt/remi/php84/php-fpm.conf -F
18+
command=/opt/remi/php85/root/usr/sbin/php-fpm -c /etc/opt/remi/php85/php-fpm.conf -F
1919
stdout_logfile=/tmp/supervisord.log
2020
stdout_syslog=true
2121
stderr_logfile=/tmp/supervisord.log

‎docker/development/php/files/home/php/.sharedrc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ alias rm='rm -i'
1515

1616
alias php-fpm-restart='/usr/bin/supervisorctl -c /etc/supervisord.conf restart php-fpm'
1717

18-
alias xdebug-on='echo "zend_extension=xdebug.so" | sudo tee /etc/opt/remi/php84/php.d/15-xdebug.ini && php-fpm-restart'
19-
alias xdebug-off='sudo rm /etc/opt/remi/php84/php.d/15-xdebug.ini && php-fpm-restart'
20-
alias pcov-on='echo "extension=pcov.so" | sudo tee /etc/opt/remi/php84/php.d/40-pcov.ini && php-fpm-restart'
21-
alias pcov-off='sudo rm /etc/opt/remi/php84/php.d/40-pcov.ini && php-fpm-restart'
18+
alias xdebug-on='echo "zend_extension=xdebug.so" | sudo tee /etc/opt/remi/php85/php.d/15-xdebug.ini && php-fpm-restart'
19+
alias xdebug-off='sudo rm /etc/opt/remi/php85/php.d/15-xdebug.ini && php-fpm-restart'
20+
alias pcov-on='echo "extension=pcov.so" | sudo tee /etc/opt/remi/php85/php.d/40-pcov.ini && php-fpm-restart'
21+
alias pcov-off='sudo rm /etc/opt/remi/php85/php.d/40-pcov.ini && php-fpm-restart'

‎docker/production/php/Dockerfile‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ RUN dnf install -y --nobest \
1111
glibc-langpack-de \
1212
langpacks-de \
1313
nmap-ncat \
14-
php84-php-ast \
15-
php84-php-cli \
16-
php84-php-devel \
17-
php84-php-fpm \
18-
php84-php-intl \
19-
php84-php-mbstring \
20-
php84-php-opcache \
21-
php84-php-pecl-apcu \
22-
php84-php-pecl-pcov \
23-
php84-php-pecl-xdebug3 \
24-
php84-php-pecl-zip \
25-
php84-php-xml \
14+
php85-php-ast \
15+
php85-php-cli \
16+
php85-php-devel \
17+
php85-php-fpm \
18+
php85-php-intl \
19+
php85-php-mbstring \
20+
php85-php-opcache \
21+
php85-php-pecl-apcu \
22+
php85-php-pecl-pcov \
23+
php85-php-pecl-xdebug3 \
24+
php85-php-pecl-zip \
25+
php85-php-xml \
2626
procps-ng \
2727
sudo \
2828
supervisor \
2929
unzip \
3030
vim \
3131
zsh
3232

33-
RUN ln -sf /usr/bin/php84 /usr/bin/php \
34-
&& echo "extension=pcov.so" > /etc/opt/remi/php84/php.d/40-pcov.ini
33+
RUN ln -sf /usr/bin/php85 /usr/bin/php \
34+
&& echo "extension=pcov.so" > /etc/opt/remi/php85/php.d/40-pcov.ini
3535

3636
ENV TZ=Europe/Zurich
3737

@@ -61,4 +61,4 @@ WORKDIR /app
6161

6262
RUN composer install --no-dev --optimize-autoloader
6363

64-
CMD /opt/remi/php84/root/usr/sbin/php-fpm -c /etc/opt/remi/php84/php-fpm.conf -F
64+
CMD /opt/remi/php85/root/usr/sbin/php-fpm -c /etc/opt/remi/php85/php-fpm.conf -F

docker/production/php/files/etc/opt/remi/php84/php-fpm.conf renamed to docker/production/php/files/etc/opt/remi/php85/php-fpm.conf

File renamed without changes.

0 commit comments

Comments
 (0)