Fix: use entityClasspath instead of rootEntityName for return type

.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
 

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

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"
     }
 }

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');
     }

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);

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,

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: