Merge pull request #534 from thomasvargiu/feature/platform-service

Allow retrieving platform from container

Author: TomHAnderson

src/DoctrineORMModule/Service/DBALConnectionFactory.php

@@ -58,6 +58,14 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         ];
         $params = array_merge($params, $options->getParams());
 
+        if (
+            array_key_exists('platform', $params)
+            && is_string($params['platform'])
+            && $container->has($params['platform'])
+        ) {
+            $params['platform'] = $container->get($params['platform']);
+        }
+
         $configuration = $container->get($options->getConfiguration());
         $eventManager  = $container->get($options->getEventManager());
 

tests/DoctrineORMModuleTest/Service/DBALConnectionFactoryTest.php

@@ -19,8 +19,12 @@
 
 namespace DoctrineORMModuleTest\Service;
 
-use PHPUnit\Framework\TestCase;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
+use Doctrine\DBAL\Driver\PDOSqlite\Driver as PDOSqliteDriver;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\ORM\Configuration;
 use DoctrineORMModuleTest\Assets\Types\MoneyType;
+use PHPUnit\Framework\TestCase;
 use DoctrineORMModule\Service\DBALConnectionFactory;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\Common\Cache\ArrayCache;
@@ -59,15 +63,15 @@ public function testNoConnectWithoutCustomMappingsAndCommentedTypes()
             'doctrine' => [
                 'connection' => [
                     'orm_default' => [
-                        'driverClass'   => \Doctrine\DBAL\Driver\PDOSqlite\Driver::class,
+                        'driverClass'   => PDOSqliteDriver::class,
                         'params' => [
                             'memory' => true,
                         ],
                     ]
                 ],
             ],
         ];
-        $configurationMock = $this->getMockBuilder(\Doctrine\ORM\Configuration::class)
+        $configurationMock = $this->getMockBuilder(Configuration::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -85,7 +89,7 @@ public function testDoctrineMappingTypeReturnCorrectParent()
             'doctrine' => [
                 'connection' => [
                     'orm_default' => [
-                        'driverClass'   => \Doctrine\DBAL\Driver\PDOSqlite\Driver::class,
+                        'driverClass'   => PDOSqliteDriver::class,
                         'params' => [
                             'memory' => true,
                         ],
@@ -96,7 +100,7 @@ public function testDoctrineMappingTypeReturnCorrectParent()
                 ],
             ],
         ];
-        $configurationMock = $this->getMockBuilder(\Doctrine\ORM\Configuration::class)
+        $configurationMock = $this->getMockBuilder(Configuration::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -115,7 +119,7 @@ public function testDoctrineAddCustomCommentedType()
             'doctrine' => [
                 'connection' => [
                     'orm_default' => [
-                        'driverClass'   => \Doctrine\DBAL\Driver\PDOSqlite\Driver::class,
+                        'driverClass'   => PDOSqliteDriver::class,
                         'params' => [
                             'memory' => true,
                         ],
@@ -130,7 +134,7 @@ public function testDoctrineAddCustomCommentedType()
                 'configuration' => [
                     'orm_default' => [
                         'types' => [
-                            'money' => \DoctrineORMModuleTest\Assets\Types\MoneyType::class,
+                            'money' => MoneyType::class,
                         ],
                     ],
                 ],
@@ -140,7 +144,7 @@ public function testDoctrineAddCustomCommentedType()
         $this->serviceManager->setService('Configuration', $config);
         $this->serviceManager->setService(
             'doctrine.driver.orm_default',
-            $this->createMock(\Doctrine\Common\Persistence\Mapping\Driver\MappingDriver::class)
+            $this->createMock(MappingDriver::class)
         );
         $configurationFactory = new ConfigurationFactory('orm_default');
         $this->serviceManager->setService(
@@ -151,7 +155,39 @@ public function testDoctrineAddCustomCommentedType()
         $platform = $dbal->getDatabasePlatform();
         $type = Type::getType($platform->getDoctrineTypeMapping("money"));
 
-        $this->assertInstanceOf(\DoctrineORMModuleTest\Assets\Types\MoneyType::class, $type);
+        $this->assertInstanceOf(MoneyType::class, $type);
         $this->assertTrue($platform->isCommentedDoctrineType($type));
     }
+
+    public function testGettingPlatformFromContainer()
+    {
+        $config = [
+            'doctrine' => [
+                'connection' => [
+                    'orm_default' => [
+                        'driverClass'   => PDOSqliteDriver::class,
+                        'params' => [
+                            'platform' => 'platform_service',
+                        ],
+                    ]
+                ],
+            ],
+        ];
+        $configurationMock = $this->getMockBuilder(Configuration::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $platformMock = $this->getMockBuilder(AbstractPlatform::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->serviceManager->setService('doctrine.configuration.orm_default', $configurationMock);
+        $this->serviceManager->setService('config', $config);
+        $this->serviceManager->setService('Configuration', $config);
+        $this->serviceManager->setService('platform_service', $platformMock);
+
+        $dbal = $this->factory->createService($this->serviceManager);
+        $platform = $dbal->getDatabasePlatform();
+        $this->assertSame($platformMock, $platform);
+    }
 }