Merge pull request #147 from Kharhamel/daoFactoryLazyload

WIP: edited the daoFactory generation code to lazyload from the container

Author: moufmouf

composer.json

@@ -35,6 +35,7 @@
         "ramsey/uuid": "^3.7",
         "doctrine/annotations": "^1.6",
         "zendframework/zend-code": "^3.3.1",
+        "psr/container": "^1",
         "ext-PDO": "*",
         "ext-json": "*",
         "ext-hash": "*",

src/Utils/TDBMDaoGenerator.php

@@ -299,6 +299,7 @@ private function generateFactory(array $tableList) : void
 
 namespace {$daoNamespace}\\Generated;
 
+use Psr\Container\ContainerInterface;
 ";
         foreach ($tableList as $table) {
             $tableName = $table->getName();
@@ -313,6 +314,14 @@ private function generateFactory(array $tableList) : void
  */
 class $daoFactoryClassName
 {
+    private \$container;
+
+    public function __construct(ContainerInterface \$container)
+    {
+        \$this->container = \$container;
+    }
+
+
 ";
 
         foreach ($tableList as $table) {
@@ -321,7 +330,7 @@ class $daoFactoryClassName
             $daoInstanceName = self::toVariableName($daoClassName);
 
             $str .= '    /**
-     * @var '.$daoClassName.'
+     * @var '.$daoClassName.'|null
      */
     private $'.$daoInstanceName.';
 
@@ -332,11 +341,15 @@ class $daoFactoryClassName
      */
     public function get'.$daoClassName.'() : '.$daoClassName.'
     {
+        if (!$this->'.$daoInstanceName.') {
+            $this->'.$daoInstanceName.' = $this->container->get('.$daoClassName.'::class);
+        }
+    
         return $this->'.$daoInstanceName.';
     }
 
     /**
-     * Sets the instance of the '.$daoClassName.' class that will be returned by the factory getter.
+     * Override the instance of the '.$daoClassName.' class that will be returned by the factory getter.
      *
      * @param '.$daoClassName.' $'.$daoInstanceName.'
      */