From fabd5154096700eebf6014ac40fca0ec1b9dc764 Mon Sep 17 00:00:00 2001 From: FXik Date: Thu, 12 Feb 2026 12:41:23 +0000 Subject: [PATCH 1/6] Upgrade skeleton to PHP 8.4 and align CI stack --- .github/workflows/codesniffer.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/tests.yml | 4 ++-- README.md | 2 +- composer.json | 10 +++++----- docker-compose.yml | 2 +- phpstan.neon | 2 +- ruleset.xml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/codesniffer.yml b/.github/workflows/codesniffer.yml index bfa9aea..cc1dc43 100644 --- a/.github/workflows/codesniffer.yml +++ b/.github/workflows/codesniffer.yml @@ -14,4 +14,4 @@ jobs: name: "Codesniffer" uses: contributte/.github/.github/workflows/codesniffer.yml@v1 with: - php: "8.2" + php: "8.4" diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index fec615d..c14f86e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,5 +14,5 @@ jobs: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester-coverage.yml@v1 with: - php: "8.2" + php: "8.4" make: "setup coverage" diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index bf47359..6fcc258 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -14,5 +14,5 @@ jobs: name: "Phpstan" uses: contributte/.github/.github/workflows/phpstan.yml@v1 with: - php: "8.2" + php: "8.4" make: "setup phpstan" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aec69a5..f245391 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,9 +10,9 @@ on: - cron: "0 8 * * 1" jobs: - test82: + test84: name: "Nette Tester" uses: contributte/.github/.github/workflows/nette-tester.yml@v1 with: - php: "8.2" + php: "8.4" make: "setup tests" diff --git a/README.md b/README.md index 45c329f..2aabf51 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Main goal is to try DDD with [Nette](https://nette.org). ## Installation -You will need `PHP 8.2+` and [Composer](https://getcomposer.org/). +You will need `PHP 8.4+` and [Composer](https://getcomposer.org/). Create project using composer. diff --git a/composer.json b/composer.json index de6f720..a47d313 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "license": "MIT", "type": "project", "require": { - "php": ">=8.2", + "php": ">=8.4", "contributte/nella": "^0.2", "contributte/messenger": "^0.2.0", @@ -19,13 +19,13 @@ "contributte/security": "^0.5.0", "contributte/event-dispatcher": "^0.9.0", - "nettrine/dbal": "^0.9.0", - "nettrine/orm": "^0.9.0", + "nettrine/dbal": "^0.10.0", + "nettrine/orm": "^0.10.0", "nettrine/cache": "^0.5.0", "nettrine/migrations": "^0.10.0", "nettrine/annotations": "^0.9.0", - "nettrine/fixtures": "^0.8.0", - "nettrine/extra": "^0.1.0", + "nettrine/fixtures": "^0.9.0", + "nettrine/extra": "^0.2.0", "symfony/redis-messenger": "^7.0.2", "symfony/doctrine-messenger": "^7.0.0" diff --git a/docker-compose.yml b/docker-compose.yml index 34f863d..773a0d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.6' services: app: - image: dockette/web:php-82 + image: dockette/web:php-84 volumes: - .:/srv ports: diff --git a/phpstan.neon b/phpstan.neon index 6c22f1f..46d183b 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -4,7 +4,7 @@ includes: parameters: level: 9 - phpVersion: 80100 + phpVersion: 80400 tmpDir: %currentWorkingDirectory%/var/tmp/phpstan diff --git a/ruleset.xml b/ruleset.xml index b0b7831..4be33a9 100644 --- a/ruleset.xml +++ b/ruleset.xml @@ -1,7 +1,7 @@ - + From 8d7b5acf293e125136c1fde669a1cc66761ab308 Mon Sep 17 00:00:00 2001 From: FXik Date: Thu, 12 Feb 2026 12:43:39 +0000 Subject: [PATCH 2/6] Remove obsolete DBAL console extension registration --- config/config.neon | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.neon b/config/config.neon index 1b16083..701ff6d 100644 --- a/config/config.neon +++ b/config/config.neon @@ -35,7 +35,6 @@ extensions: # Nettrine DBAL nettrine.dbal: Nettrine\DBAL\DI\DbalExtension - nettrine.dbal.console: Nettrine\DBAL\DI\DbalConsoleExtension(%consoleMode%) # Nettrine ORM nettrine.orm: Nettrine\ORM\DI\OrmExtension From 11fc11e5ebbc6007bd0e1b41fa7721470b0d2ebd Mon Sep 17 00:00:00 2001 From: FXik Date: Thu, 12 Feb 2026 12:47:54 +0000 Subject: [PATCH 3/6] Migrate Nettrine DBAL/ORM config to current format --- config/config.neon | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/config/config.neon b/config/config.neon index 701ff6d..eb9a4aa 100644 --- a/config/config.neon +++ b/config/config.neon @@ -38,33 +38,32 @@ extensions: # Nettrine ORM nettrine.orm: Nettrine\ORM\DI\OrmExtension - nettrine.orm.cache: Nettrine\ORM\DI\OrmCacheExtension - nettrine.orm.console: Nettrine\ORM\DI\OrmConsoleExtension(%consoleMode%) - nettrine.orm.attributes: Nettrine\ORM\DI\OrmAttributesExtension # ====================================== # Extensions (config) ================== nettrine.dbal: debug: panel: %debugMode% - configuration: - connection: - driver: %database.driver% - host: %database.host% - user: %database.user% - password: %database.password% - dbname: %database.dbname% - port: %database.port% - serverVersion: 15 + connections: + default: + driver: %database.driver% + host: %database.host% + user: %database.user% + password: %database.password% + dbname: %database.dbname% + port: %database.port% + serverVersion: 15 nettrine.orm: - entityManagerDecoratorClass: Nettrine\Extra\EntityManager - configuration: - autoGenerateProxyClasses: %debugMode% - -nettrine.orm.attributes: - mapping: - App\Domain: %appDir%/Domain + managers: + default: + connection: default + entityManagerDecoratorClass: Nettrine\Extra\EntityManager + autoGenerateProxyClasses: %debugMode% + mapping: + App\Domain: + directories: [%appDir%/Domain] + namespace: App\Domain nettrine.migrations: table: doctrine_migrations From d486081e2e0d964c84c0f080e38b74193bc0e03f Mon Sep 17 00:00:00 2001 From: FXik Date: Thu, 12 Feb 2026 12:49:29 +0000 Subject: [PATCH 4/6] Adjust Nettrine migrations config for current schema --- config/config.neon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.neon b/config/config.neon index eb9a4aa..6990e74 100644 --- a/config/config.neon +++ b/config/config.neon @@ -68,8 +68,8 @@ nettrine.orm: nettrine.migrations: table: doctrine_migrations column: version - directory: %appDir%/../db/Migrations - namespace: Database\Migrations + directories: + Database\Migrations: %appDir%/../db/Migrations versionsOrganization: null contributte.messenger: From ed7e4ec77b8079a1f69ff0cafcee379c77bf5dc8 Mon Sep 17 00:00:00 2001 From: FXik Date: Thu, 12 Feb 2026 12:50:27 +0000 Subject: [PATCH 5/6] Fix DBAL server version type in Nettrine config --- config/config.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.neon b/config/config.neon index 6990e74..e709a60 100644 --- a/config/config.neon +++ b/config/config.neon @@ -52,7 +52,7 @@ nettrine.dbal: password: %database.password% dbname: %database.dbname% port: %database.port% - serverVersion: 15 + serverVersion: "15" nettrine.orm: managers: From 603a8601a63b8ab5f38c0bd9b1313c9c69ce315d Mon Sep 17 00:00:00 2001 From: FXik Date: Thu, 12 Feb 2026 12:52:00 +0000 Subject: [PATCH 6/6] Require symfony var-exporter for ORM lazy objects --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a47d313..3f3682d 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ "nettrine/extra": "^0.2.0", "symfony/redis-messenger": "^7.0.2", - "symfony/doctrine-messenger": "^7.0.0" + "symfony/doctrine-messenger": "^7.0.0", + "symfony/var-exporter": "^7.0" }, "require-dev": { "contributte/qa": "^0.4",