Merge pull request #316 from Scalesoft/feature/annotation-extension-name

Add auto search for annotation extension name
Kdyby · Jan 15, 2018 · d14c0b0 · d14c0b0
2 parents 6adb732 + 017b50a
commit d14c0b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Kdyby/Doctrine/DI/OrmExtension.php b/src/Kdyby/Doctrine/DI/OrmExtension.php
@@ -623,7 +623,7 @@ protected function processMetadataDriver(Nette\DI\ServiceDefinition $metadataDri
 
 		if ($impl === self::ANNOTATION_DRIVER) {
 			$driver->arguments = [
-				'@' . self::ANNOTATION_DRIVER . '.reader',
+				'@' . Doctrine\Common\Annotations\Reader::class,
 				Nette\Utils\Arrays::flatten($driver->arguments)
 			];
 		}

diff --git a/tests/KdybyTests/Doctrine/config/proxiesSessionAutoloading.neon b/tests/KdybyTests/Doctrine/config/proxiesSessionAutoloading.neon
@@ -1,4 +1,4 @@
-console:
+kdyby.console:
 	disabled: true
 
 kdyby.doctrine:

diff --git a/tests/KdybyTests/nette-reset.neon b/tests/KdybyTests/nette-reset.neon
@@ -3,9 +3,9 @@ php:
 
 
 extensions:
-	events: Kdyby\Events\DI\EventsExtension
-	console: Kdyby\Console\DI\ConsoleExtension
-	annotations: Kdyby\Annotations\DI\AnnotationsExtension
+	kdyby.events: Kdyby\Events\DI\EventsExtension
+	kdyby.console: Kdyby\Console\DI\ConsoleExtension
+	kdyby.annotations: Kdyby\Annotations\DI\AnnotationsExtension
 	kdyby.doctrine: Kdyby\Doctrine\DI\OrmExtension
 
 
@@ -16,7 +16,7 @@ kdyby.doctrine:
 	hydrationCache: array
 
 
-console:
+kdyby.console:
 	url: http://www.kdyby.org/