Merge pull request #5 from autorusltd/release/v1.11.0

Register custom types

Author: fenric

src/ManagerRegistry.php

@@ -47,6 +47,7 @@ public function __construct(Container $container)
         $configuration = $container->get('doctrine.configuration');
         $connections = [];
         $managers = [];
+        $types = [];
 
         foreach ($configuration as $name => $params) {
             $connections[$name] = sprintf('doctrine.connection.%s', $name);
@@ -59,10 +60,15 @@ public function __construct(Container $container)
             $container->set($managers[$name], factory(function ($params) {
                 return $this->createManager($params);
             })->parameter('params', $params));
+
+            if (!empty($params['types'])) {
+                $types += $params['types'];
+            }
         }
 
         parent::__construct('ORM', $connections, $managers, key($connections), key($managers), Proxy::class);
 
+        $this->registerUserTypes($types);
         $this->registerUuidType();
 
         $this->container = $container;
@@ -194,6 +200,20 @@ private function createManager(array $params) : EntityManagerInterface
         return EntityManager::create($params['connection'], $config);
     }
 
+    /**
+     * @param array $types
+     *
+     * @return void
+     */
+    private function registerUserTypes(array $types) : void
+    {
+        foreach ($types as $name => $class) {
+            Type::hasType($name) ?
+            Type::overrideType($name, $class) :
+            Type::addType($name, $class);
+        }
+    }
+
     /**
      * @return void
      */

tests/Fixture/ContainerAwareTrait.php

@@ -47,6 +47,9 @@ private function getContainer() : Container
                     __DIR__ . '/Entity',
                 ],
                 'proxy_auto_generate' => false,
+                'types' => [
+                    Example1DbalType::NAME => Example1DbalType::class,
+                ],
             ],
             'bar' => [
                 'connection' => [
@@ -56,6 +59,9 @@ private function getContainer() : Container
                     __DIR__ . '/Entity',
                 ],
                 'proxy_auto_generate' => false,
+                'types' => [
+                    Example2DbalType::NAME => Example2DbalType::class,
+                ],
             ],
         ]);
 

tests/Fixture/Example1DbalType.php

@@ -0,0 +1,39 @@
+<?php declare(strict_types=1);
+
+namespace Arus\Doctrine\Bridge\Tests\Fixture;
+
+/**
+ * Import classes
+ */
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+/**
+ * Example1DbalType
+ */
+final class Example1DbalType extends Type
+{
+
+    /**
+     * Name of the type
+     *
+     * @var string
+     */
+    public const NAME = 'test:example:1';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSQLDeclaration(array $field, AbstractPlatform $platform)
+    {
+        return $platform->getVarcharTypeDeclarationSQL($field);
+    }
+}

tests/Fixture/Example2DbalType.php

@@ -0,0 +1,39 @@
+<?php declare(strict_types=1);
+
+namespace Arus\Doctrine\Bridge\Tests\Fixture;
+
+/**
+ * Import classes
+ */
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+/**
+ * Example2DbalType
+ */
+final class Example2DbalType extends Type
+{
+
+    /**
+     * Name of the type
+     *
+     * @var string
+     */
+    public const NAME = 'test:example:2';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSQLDeclaration(array $field, AbstractPlatform $platform)
+    {
+        return $platform->getVarcharTypeDeclarationSQL($field);
+    }
+}

tests/ManagerRegistryTest.php

@@ -7,6 +7,7 @@
  */
 use Arus\Doctrine\Bridge\RepositoryFactory;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityManager as Manager;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\ORMException;
@@ -215,4 +216,22 @@ public function testHydrator() : void
 
         $doctrine->getHydrator('undefined');
     }
+
+    /**
+     * @return void
+     */
+    public function testCustomTypes() : void
+    {
+        $container = $this->getContainer();
+
+        $doctrine = $container->get('doctrine');
+
+        $this->assertTrue(Type::hasType(
+            Fixture\Example1DbalType::NAME
+        ));
+
+        $this->assertTrue(Type::hasType(
+            Fixture\Example2DbalType::NAME
+        ));
+    }
 }