Pass true to enableAnnotationMapping() (#7)

* Pass true to enableAnnotationMapping() * add setDoctrineAnnotationReader * Move setupMapping to beforeCompile() * default doctrine annotation reader if reader class not exists in DI * fix phpstan * bump symfony/validator dependency Co-authored-by: Jiří Pudil <[email protected]>
contributte · Dec 30, 2021 · b6ce363 · b6ce363
1 parent 57fd909
commit b6ce363
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "nette/di": "^3.0.1",
     "symfony/cache": "^5.0",
     "symfony/config": "^5.0",
-    "symfony/validator": "^5.0"
+    "symfony/validator": "^5.2"
   },
   "require-dev": {
     "doctrine/annotations": "^1.8",

diff --git a/src/DI/ValidatorExtension.php b/src/DI/ValidatorExtension.php
@@ -57,7 +57,6 @@ public function loadConfiguration(): void
 			->addSetup('setConstraintValidatorFactory', [new Statement(ContainerConstraintValidatorFactory::class)])
 			->setAutowired(false);
 
-		$this->setupMapping($validatorBuilder);
 		$this->setupCache($validatorBuilder);
 		$this->setupLoaders($validatorBuilder);
 		$this->setupObjectInitializers($validatorBuilder);
@@ -73,12 +72,19 @@ public function beforeCompile(): void
 		$validatorBuilder = $this->getContainerBuilder()->getDefinition($this->prefix('validatorBuilder'));
 		assert($validatorBuilder instanceof ServiceDefinition);
 		$this->setupTranslator($validatorBuilder);
+		$this->setupMapping($validatorBuilder);
 	}
 
 	private function setupMapping(ServiceDefinition $validatorBuilder): void
 	{
+		$validatorBuilder->addSetup('enableAnnotationMapping', [true]);
+
 		if ($this->config->mapping->annotations) {
-			$validatorBuilder->addSetup('enableAnnotationMapping');
+			if ((bool) $this->getContainerBuilder()->findByType(Reader::class)) {
+				$validatorBuilder->addSetup('setDoctrineAnnotationReader');
+			} else {
+				$validatorBuilder->addSetup('addDefaultDoctrineAnnotationReader');
+			}
 		}
 
 		$validatorBuilder->addSetup('addXmlMappings', [$this->config->mapping->xml]);