Merge Compatibility fix

baraja-core · Mar 2, 2022 · 5e29a0a · 5e29a0a
1 parent 2d4a44a
commit 5e29a0a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/DatabaseExtension.php b/src/DatabaseExtension.php
@@ -93,6 +93,7 @@ public function getConfigSchema(): Schema
 				'types' => Expect::array(),
 				'typesMapping' => Expect::array(),
 				'wrapperClass' => Expect::string()->nullable(),
+				'serverVersion' => Expect::string()->nullable(),
 			])->castTo('array')->required(),
 			'configuration' => Expect::structure([
 				'sqlLogger' => Expect::string()->nullable(),

diff --git a/src/Orm/DI/OrmExtension.php b/src/Orm/DI/OrmExtension.php
@@ -61,7 +61,7 @@ public function loadConfiguration(): void
 	public function loadDoctrineConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
-		$config = $this->defaults['configuration'] + $this->config;
+		$config = array_replace($this->defaults['configuration'], $this->config);
 		$config = Helpers::expand($config, $builder->parameters);
 
 		$configurationClass = $config['configurationClass'] ?? Configuration::class;

diff --git a/src/Orm/EntityManagerDecorator.php b/src/Orm/EntityManagerDecorator.php
@@ -9,7 +9,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Repository\RepositoryFactory;
 
-final class EntityManagerDecorator extends DoctrineEntityManagerDecorator
+class EntityManagerDecorator extends DoctrineEntityManagerDecorator
 {
 	private RepositoryFactory $repositoryFactory;