Merge pull request #317 from janatjak/v3.3

Fix empty metadata (annotation driver)
Kdyby · Jan 18, 2018 · 5db2470 · 5db2470
2 parents d14c0b0 + f370e4f
commit 5db2470
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/Kdyby/Doctrine/DI/OrmExtension.php b/src/Kdyby/Doctrine/DI/OrmExtension.php
@@ -294,8 +294,8 @@ protected function processEntityManager($name, array $defaults)
 		if (empty($config['metadata'])) {
 			$metadataDriver->addSetup('setDefaultDriver', [
 				new Statement($this->metadataDriverClasses[self::ANNOTATION_DRIVER], [
-					[$builder->expand('%appDir%')],
-					2 => $this->prefix('@cache.' . $name . '.metadata')
+					'@' . Doctrine\Common\Annotations\Reader::class,
+					[$builder->expand('%appDir%')]
 				])
 			]);
 		}

diff --git a/tests/KdybyTests/Doctrine/Extension.phpt b/tests/KdybyTests/Doctrine/Extension.phpt
@@ -155,6 +155,21 @@ class ExtensionTest extends Tester\TestCase
 
 
 
+	public function testMetadataEmpty()
+	{
+		$container = $this->createContainer('metadata-empty');
+
+		/** @var Kdyby\Doctrine\EntityManager $default */
+		$default = $container->getByType(\Kdyby\Doctrine\EntityManager::class);
+		$entityClasses = array_map(function (ClassMetadata $class) {
+			return $class->getName();
+		}, $default->getMetadataFactory()->getAllMetadata());
+
+		Assert::contains(\KdybyTests\Doctrine\Models2\Foo::class, $entityClasses);
+	}
+
+
+
 	public function testProxyAutoloading()
 	{
 		$env = $_ENV + ['TEMP_DIR' => $scriptTempDir = TEMP_DIR . '/script'];

diff --git a/tests/KdybyTests/Doctrine/config/metadata-empty.neon b/tests/KdybyTests/Doctrine/config/metadata-empty.neon
@@ -0,0 +1,6 @@
+parameters:
+	appDir: %wwwDir%/Doctrine/models2
+
+kdyby.doctrine:
+	driver: pdo_sqlite
+	memory: true