Deport debug options in service provider

Fix data types declaration

Author: ElGigi

src/BerliozPackage.php

@@ -16,12 +16,9 @@
 
 use Berlioz\Config\Adapter\JsonAdapter;
 use Berlioz\Config\ConfigInterface;
-use Berlioz\Config\Exception\ConfigException;
 use Berlioz\Core\Core;
 use Berlioz\Core\Package\AbstractPackage;
 use Berlioz\Package\Hector\Container\ServiceProvider;
-use Berlioz\Package\Hector\Debug\HectorSection;
-use Berlioz\Package\Hector\Event\EventSubscriber;
 use Berlioz\ServiceContainer\Container;
 use Hector\Orm\Orm;
 
@@ -48,21 +45,9 @@ public static function register(Container $container): void
 
     /**
      * @inheritDoc
-     * @throws ConfigException
      */
     public static function boot(Core $core): void
     {
-        /** @var Orm $orm */
-        $orm = $core->getContainer()->get(Orm::class);
-
-        if (true === $core->getDebug()->isEnabled()) {
-            $loggers = iterator_to_array($orm->getConnections()->getLoggers(), false);
-            $core->getDebug()->addSection(new HectorSection(...$loggers));
-        }
-
-        // Dynamic events
-        if ($core->getConfig()->get('hector.dynamic_events', true)) {
-            $core->getEventDispatcher()->addSubscriber(new EventSubscriber($core->getContainer()));
-        }
+        $core->getContainer()->get(Orm::class);
     }
 }

src/Container/ServiceProvider.php

@@ -15,7 +15,9 @@
 namespace Berlioz\Package\Hector\Container;
 
 use Berlioz\Core\Core;
+use Berlioz\Package\Hector\Debug\HectorSection;
 use Berlioz\Package\Hector\DefaultCacheDriver;
+use Berlioz\Package\Hector\Event\EventSubscriber;
 use Berlioz\Package\Hector\Exception\HectorException;
 use Berlioz\Package\Hector\HectorAwareInterface;
 use Berlioz\ServiceContainer\Container;
@@ -50,7 +52,13 @@ function (Core $core) {
                     $options = $core->getConfig()->get('hector');
                     $options['log'] = $options['log'] ?? $core->getDebug()->isEnabled();
 
-                    return OrmFactory::connection($options);
+                    $connection = OrmFactory::connection($options);
+
+                    if (true === $core->getDebug()->isEnabled()) {
+                        $core->getDebug()->addSection(new HectorSection($connection->getLogger()));
+                    }
+
+                    return $connection;
                 }
             );
 
@@ -67,6 +75,11 @@ function (Core $core, Connection $connection) {
 
                     $this->setOrmTypes($orm, $core);
 
+                    // Dynamic events
+                    if ($core->getConfig()->get('hector.dynamic_events', true)) {
+                        $core->getEventDispatcher()->addSubscriber(new EventSubscriber($core->getContainer()));
+                    }
+
                     return $orm;
                 }
             )
@@ -92,30 +105,9 @@ public function boot(Container $container): void
     protected function setOrmTypes(Orm $orm, Core $core): void
     {
         try {
-            foreach ((array)$core->getConfig()->get('hector.types', []) as $typeConfig) {
-                if (is_string($typeConfig)) {
-                    $orm->getDataTypes()->addGlobalType($core->getContainer()->get($typeConfig));
-                    continue;
-                }
-
-                if (false === is_array($typeConfig)) {
-                    continue;
-                }
-
-                $columnInfo = explode('.', $typeConfig['column']);
-                $column = match (count($columnInfo)) {
-                    2 => $orm->getSchemaContainer()->getColumn($columnInfo[1], $columnInfo[0]),
-                    3 => $orm->getSchemaContainer()->getColumn($columnInfo[2], $columnInfo[1], $columnInfo[0]),
-                    default => throw HectorException::typesConfig(),
-                };
-
-                $orm->getDataTypes()->addColumnType(
-                    $column,
-                    $core->getContainer()->get(($typeConfig['column'] ?? null) ?: throw HectorException::typesConfig())
-                );
+            foreach ((array)$core->getConfig()->get('hector.types', []) as $type => $obj) {
+                $orm->getTypes()->add($type, $core->getContainer()->get($obj));
             }
-        } catch (HectorException $exception) {
-            throw $exception;
         } catch (Throwable $exception) {
             throw HectorException::typesConfig($exception);
         }