From 30aeff31cf0cdcc65ec5458791e99625d8a778b3 Mon Sep 17 00:00:00 2001 From: Thomas Beaujean Date: Tue, 23 Dec 2025 21:58:55 +0100 Subject: [PATCH 1/2] Fix: use entityClasspath instead of rootEntityName for return type --- .../views/Generator/TopRepositoryTemplate.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Resources/views/Generator/TopRepositoryTemplate.html.twig b/src/Resources/views/Generator/TopRepositoryTemplate.html.twig index 783e6da..561cb32 100644 --- a/src/Resources/views/Generator/TopRepositoryTemplate.html.twig +++ b/src/Resources/views/Generator/TopRepositoryTemplate.html.twig @@ -95,7 +95,7 @@ class {{ entityClassname }}Base extends {{ extendClass }}{% if useInterfaces %} } /** - * @return \{{rootEntityName}}[] + * @return \{{entityClasspath}}[] */ public function getQueryBuilderResult( QueryBuilder $qb, @@ -113,7 +113,7 @@ class {{ entityClassname }}Base extends {{ extendClass }}{% if useInterfaces %} } /** - * @return \{{rootEntityName}} + * @return \{{entityClasspath}} */ public function getQueryBuilderSingleResult( QueryBuilder $qb, @@ -131,7 +131,7 @@ class {{ entityClassname }}Base extends {{ extendClass }}{% if useInterfaces %} } /** - * @return ?\{{rootEntityName}} + * @return ?\{{entityClasspath}} */ public function getQueryBuilderOneOrNullResult( QueryBuilder $qb, From 9069479fa81d5148dfe53e5a0dcab4168f89edd3 Mon Sep 17 00:00:00 2001 From: Thomas Beaujean Date: Tue, 23 Dec 2025 22:04:40 +0100 Subject: [PATCH 2/2] CI: test only SF7.4 and SF8 --- .github/workflows/php.yml | 8 ++++---- Makefile | 7 +++++-- composer.json | 8 ++++---- src/Command/GenerateCommand.php | 2 +- .../QueryBuilderRepositoryGeneratorExtension.php | 2 +- tests/config.yml | 1 - 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 8df328a..57a04ce 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,11 +11,11 @@ jobs: strategy: matrix: operating-system: [ ubuntu-latest ] - php: [ '8.1','8.2'] - symfony: ['5.4.*', '6.3.*', '7.0.*'] + php: [ '8.3','8.4'] + symfony: ['7.4.*', '8.0.*'] exclude: - - php: '8.1' - symfony: '7.0.*' + - php: '8.3' + symfony: '8.0.*' steps: - uses: actions/checkout@main diff --git a/Makefile b/Makefile index 9b7d40c..545ca51 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,10 @@ help: @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' composer-install: ## composer install - docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $${SSH_AUTH_SOCK}:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent --volume $$(pwd):/srv/app prooph/composer:8.1 install + docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $${SSH_AUTH_SOCK}:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent --volume $$(pwd):/srv/app composer:2.9.2 install + +composer-update: ## composer update + docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $${SSH_AUTH_SOCK}:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent --volume $$(pwd):/srv/app composer:2.9.2 update phpunit: ## phpunit - docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $${SSH_AUTH_SOCK}:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent --volume $$(pwd):/srv/app --entrypoint="" prooph/composer:8.1 vendor/bin/phpunit + docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $${SSH_AUTH_SOCK}:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent --volume $$(pwd):/srv/app --entrypoint="" composer:2.9.2 vendor/bin/phpunit diff --git a/composer.json b/composer.json index ec0f845..f3aa3fc 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,11 @@ "phpunit/phpunit": "^10.3" }, "require": { - "php": "^8.1", + "php": "^8.3", "symfony/maker-bundle": "^1.7", - "symfony/framework-bundle": "^5.4|^6.0|^7.0", - "doctrine/doctrine-bundle": "^2.12", - "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^5.4|^6.0|^7.0|^8.0", + "doctrine/doctrine-bundle": "^2.12|^3.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0|^8.0", "doctrine/orm": "^3.0" } } diff --git a/src/Command/GenerateCommand.php b/src/Command/GenerateCommand.php index 5850b8c..6c187e3 100644 --- a/src/Command/GenerateCommand.php +++ b/src/Command/GenerateCommand.php @@ -22,7 +22,7 @@ public function __construct(RepositoryGenerator $repositoryGenerator) $this->repositoryGenerator = $repositoryGenerator; } - protected function configure() + protected function configure(): void { $this->setDescription('Regenerate the Base Repository with the Query Builder Repository Generator'); } diff --git a/src/DependencyInjection/QueryBuilderRepositoryGeneratorExtension.php b/src/DependencyInjection/QueryBuilderRepositoryGeneratorExtension.php index b611bb1..f67730f 100644 --- a/src/DependencyInjection/QueryBuilderRepositoryGeneratorExtension.php +++ b/src/DependencyInjection/QueryBuilderRepositoryGeneratorExtension.php @@ -9,7 +9,7 @@ class QueryBuilderRepositoryGeneratorExtension extends Extension { - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); diff --git a/tests/config.yml b/tests/config.yml index d791e80..bbbe585 100644 --- a/tests/config.yml +++ b/tests/config.yml @@ -3,7 +3,6 @@ doctrine: driver: pdo_pgsql server_version: "15" orm: - auto_generate_proxy_classes: true auto_mapping: true mappings: App: