Skip to content

Commit 9fb3a91

Browse files
dominikzoggdominikzogg
committed
php85
1 parent 3f37ee7 commit 9fb3a91

File tree

24 files changed

+168
-94
lines changed

24 files changed

+168
-94
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
run: curl --insecure https://localhost/openapi -vvv
2323
- name: docker stop
2424
run: docker compose -f docker-compose.ci.yml stop
25-
php82:
26-
name: PHP 8.2
25+
php83:
26+
name: PHP 8.3
2727
runs-on: ubuntu-24.04
2828
services:
2929
postgres:
@@ -40,7 +40,7 @@ jobs:
4040
run: |
4141
while ! nc -z localhost 5432; do sleep 0.1; done
4242
- name: composer test
43-
uses: docker://ghcr.io/chubbyphp/ci-php82:latest
43+
uses: docker://ghcr.io/chubbyphp/ci-php83:latest
4444
env:
4545
APP_ENV: phpunit
4646
DATABASE_USER: root
@@ -50,8 +50,8 @@ jobs:
5050
DATABASE_PORT: 5432
5151
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
53-
php83:
54-
name: PHP 8.3
53+
php84:
54+
name: PHP 8.4
5555
runs-on: ubuntu-24.04
5656
services:
5757
postgres:
@@ -68,7 +68,7 @@ jobs:
6868
run: |
6969
while ! nc -z localhost 5432; do sleep 0.1; done
7070
- name: composer test
71-
uses: docker://ghcr.io/chubbyphp/ci-php83:latest
71+
uses: docker://ghcr.io/chubbyphp/ci-php84:latest
7272
env:
7373
APP_ENV: phpunit
7474
DATABASE_USER: root
@@ -78,9 +78,8 @@ jobs:
7878
DATABASE_PORT: 5432
7979
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8080
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
81-
82-
php84:
83-
name: PHP 8.4
81+
php85:
82+
name: PHP 8.5
8483
runs-on: ubuntu-24.04
8584
services:
8685
postgres:
@@ -97,7 +96,7 @@ jobs:
9796
run: |
9897
while ! nc -z localhost 5432; do sleep 0.1; done
9998
- name: composer test
100-
uses: docker://ghcr.io/chubbyphp/ci-php84:latest
99+
uses: docker://ghcr.io/chubbyphp/ci-php85:latest
101100
env:
102101
APP_ENV: phpunit
103102
DATABASE_USER: root

‎.php-cs-fixer.php‎

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

15-
$config['rules']['final_class'] = false;
16-
$config['rules']['final_internal_class'] = false;
17-
$config['rules']['final_public_method_for_abstract_class'] = false;
1815
$config['rules']['static_lambda'] = false;
1916

2017
return (new PhpCsFixer\Config)
18+
->setUnsupportedPhpVersionAllowed(true)
2119
->setIndent($config['indent'])
2220
->setLineEnding($config['lineEnding'])
2321
->setRules($config['rules'])

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ A simple skeleton to build api's based on the [slim][1] framework.
1010

1111
## Requirements
1212

13-
* php: ^8.2
14-
* [chubbyphp/chubbyphp-clean-directories][2]: ^1.4
15-
* [chubbyphp/chubbyphp-cors][3]: ^1.6
16-
* [chubbyphp/chubbyphp-decode-encode][4]: ^1.2
17-
* [chubbyphp/chubbyphp-http-exception][5]: ^1.2
18-
* [chubbyphp/chubbyphp-laminas-config][6]: ^1.4
19-
* [chubbyphp/chubbyphp-laminas-config-doctrine][7]: ^3.0.2
20-
* [chubbyphp/chubbyphp-laminas-config-factory][8]: ^1.4
21-
* [chubbyphp/chubbyphp-negotiation][9]: ^2.2
22-
* [chubbyphp/chubbyphp-parsing][10]: ^2.0
23-
* [doctrine/orm][11]: ^3.5.7
13+
* php: ^8.3
14+
* [chubbyphp/chubbyphp-clean-directories][2]: ^1.5
15+
* [chubbyphp/chubbyphp-cors][3]: ^1.7
16+
* [chubbyphp/chubbyphp-decode-encode][4]: ^1.3
17+
* [chubbyphp/chubbyphp-http-exception][5]: ^1.3
18+
* [chubbyphp/chubbyphp-laminas-config][6]: ^1.5
19+
* [chubbyphp/chubbyphp-laminas-config-doctrine][7]: ^3.1
20+
* [chubbyphp/chubbyphp-laminas-config-factory][8]: ^1.5
21+
* [chubbyphp/chubbyphp-negotiation][9]: ^2.3
22+
* [chubbyphp/chubbyphp-parsing][10]: ^2.1
23+
* [doctrine/orm][11]: ^3.5.8
2424
* [monolog/monolog][12]: ^3.9
2525
* [ramsey/uuid][13]: ^4.9.1
2626
* [slim/psr7][14]: ^1.8

‎composer.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^8.2",
19-
"chubbyphp/chubbyphp-clean-directories": "^1.4",
20-
"chubbyphp/chubbyphp-cors": "^1.6",
21-
"chubbyphp/chubbyphp-decode-encode": "^1.2",
22-
"chubbyphp/chubbyphp-http-exception": "^1.2",
23-
"chubbyphp/chubbyphp-laminas-config": "^1.4",
24-
"chubbyphp/chubbyphp-laminas-config-doctrine": "^3.0.2",
25-
"chubbyphp/chubbyphp-laminas-config-factory": "^1.4",
26-
"chubbyphp/chubbyphp-negotiation": "^2.2",
27-
"chubbyphp/chubbyphp-parsing": "^2.0",
28-
"doctrine/orm": "^3.5.7",
18+
"php": "^8.3",
19+
"chubbyphp/chubbyphp-clean-directories": "^1.5",
20+
"chubbyphp/chubbyphp-cors": "^1.7",
21+
"chubbyphp/chubbyphp-decode-encode": "^1.3",
22+
"chubbyphp/chubbyphp-http-exception": "^1.3",
23+
"chubbyphp/chubbyphp-laminas-config": "^1.5",
24+
"chubbyphp/chubbyphp-laminas-config-doctrine": "^3.1",
25+
"chubbyphp/chubbyphp-laminas-config-factory": "^1.5",
26+
"chubbyphp/chubbyphp-negotiation": "^2.3",
27+
"chubbyphp/chubbyphp-parsing": "^2.1",
28+
"doctrine/orm": "^3.5.8",
2929
"monolog/monolog": "^3.9",
3030
"ramsey/uuid": "^4.9.1",
3131
"slim/psr7": "^1.8",
@@ -35,13 +35,13 @@
3535
},
3636
"require-dev": {
3737
"chubbyphp/chubbyphp-dev-helper": "dev-master",
38-
"chubbyphp/chubbyphp-mock": "^2.0.1",
38+
"chubbyphp/chubbyphp-mock": "^2.1",
3939
"dg/bypass-finals": "^1.9",
4040
"infection/infection": "^0.31.9",
4141
"php-coveralls/php-coveralls": "^2.9",
4242
"phpstan/extension-installer": "^1.4.3",
43-
"phpstan/phpstan": "^2.1.32",
44-
"phpunit/phpunit": "^11.5.44"
43+
"phpstan/phpstan": "^2.1.33",
44+
"phpunit/phpunit": "^12.5"
4545
},
4646
"autoload": {
4747
"psr-4": {
@@ -66,7 +66,7 @@
6666
"database:drop": "bin/console dbal:database:drop --if-exists --force",
6767
"database:schema:update": "bin/console orm:schema-tool:update --complete --force --dump-sql",
6868
"database:schema:validate": "bin/console orm:validate-schema",
69-
"fix:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
69+
"fix:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
7070
"setup:dev": [
7171
"@database:drop --env=dev",
7272
"@database:create --env=dev",
@@ -89,7 +89,7 @@
8989
"@test:static-analysis",
9090
"@test:cs"
9191
],
92-
"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",
92+
"test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
9393
"test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=99 --verbose --coverage=build/phpunit",
9494
"test:integration": "vendor/bin/phpunit --configuration phpunit.integration.xml --cache-directory=build/phpunit/integration.cache",
9595
"test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",

‎config/prod.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use App\ServiceFactory\DecodeEncode\TypeDecodersFactory;
2222
use App\ServiceFactory\DecodeEncode\TypeEncodersFactory;
2323
use App\ServiceFactory\Framework\CallableResolverFactory;
24+
use App\ServiceFactory\Framework\InvocationStrategyFactory;
2425
use App\ServiceFactory\Framework\RouteCollectorFactory;
2526
use App\ServiceFactory\Framework\RouteParserFactory;
2627
use App\ServiceFactory\Http\ResponseFactoryFactory;
@@ -75,6 +76,7 @@
7576
use Psr\Http\Message\StreamFactoryInterface;
7677
use Psr\Log\LoggerInterface;
7778
use Slim\Interfaces\CallableResolverInterface;
79+
use Slim\Interfaces\InvocationStrategyInterface;
7880
use Slim\Interfaces\RouteCollectorInterface;
7981
use Slim\Interfaces\RouteParserInterface;
8082
use Symfony\Component\Console\Command\Command;
@@ -118,6 +120,7 @@
118120
EncoderInterface::class => EncoderFactory::class,
119121
EntityManagerInterface::class => EntityManagerFactory::class,
120122
EntityManagerProvider::class => ContainerEntityManagerProviderFactory::class,
123+
InvocationStrategyInterface::class => InvocationStrategyFactory::class,
121124
LoggerInterface::class => LoggerFactory::class,
122125
MappingDriver::class => ClassMapDriverFactory::class,
123126
OpenapiRequestHandler::class => OpenapiRequestHandlerFactory::class,

‎docker/development/php/Dockerfile‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@ 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-pgsql \
26-
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-pgsql \
26+
php85-php-xml \
2727
procps-ng \
2828
sudo \
2929
supervisor \
3030
unzip \
3131
vim \
3232
zsh
3333

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

3838
ENV TZ=Europe/Zurich
3939

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: 16 additions & 16 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-pgsql \
26-
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-pgsql \
26+
php85-php-xml \
2727
procps-ng \
2828
sudo \
2929
supervisor \
3030
unzip \
3131
vim \
3232
zsh
3333

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

3737
ENV TZ=Europe/Zurich
3838

@@ -62,4 +62,4 @@ WORKDIR /app
6262

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

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

0 commit comments

Comments
 (0)