thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/Controllers/TdbmController.php

Doc Comments +3 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
      * @Action
      *
      * @param string $name
-     * @param bool   $selfedit
+     * @param string|boolean   $selfedit
      */
     public function generate($name, $daonamespace, $beannamespace, $daofactoryinstancename, /*$storeInUtc = 0,*/ $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
     {
@@ -95,9 +95,10 @@ 
      * @param string      $name
      * @param string      $daonamespace
      * @param string      $beannamespace
-     * @param string      $daofactoryclassname
      * @param string      $daofactoryinstancename
      * @param string      $selfedit
+     * @param boolean $useCustomComposer
+     * @param string $composerFile
      *
      * @throws \Mouf\MoufException
      */

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Mouf\Composer\ClassNameMapper;
 use Mouf\Controllers\AbstractMoufInstanceController;
 use Mouf\Database\TDBM\TDBMService;
-use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
 use Mouf\Html\HtmlElement\HtmlBlock;
 use Mouf\MoufManager;
 use Mouf\InstanceProxy;

Indentation +125 added lines, -125 removed lines

@@ -18,129 +18,129 @@
  */
 class TdbmController extends AbstractMoufInstanceController
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $daoFactoryInstanceName;
-    protected $autoloadDetected;
-    ///protected $storeInUtc;
-    protected $useCustomComposer;
-    protected $composerFile;
-
-    /**
-     * Admin page used to display the DAO generation form.
-     *
-     * @Action
-     */
-    public function defaultAction($name, $selfedit = 'false')
-    {
-        $this->initController($name, $selfedit);
-
-        // Fill variables
-        $this->daoNamespace = self::getFromConfiguration($this->moufManager, $name, 'daoNamespace');
-        $this->beanNamespace = self::getFromConfiguration($this->moufManager, $name, 'beanNamespace');
-        $this->daoFactoryInstanceName = self::getFromConfiguration($this->moufManager, $name, 'daoFactoryInstanceName');
-        //$this->storeInUtc = self::getFromConfiguration($this->moufManager, $name, 'storeInUtc');
-        $this->composerFile = self::getFromConfiguration($this->moufManager, $name, 'customComposerFile');
-        $this->useCustomComposer = $this->composerFile ? true : false;
-
-        if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
-
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
-                $this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
-                $this->daoNamespace = $rootNamespace.'Dao';
-                $this->beanNamespace = $rootNamespace.'Dao\\Bean';
-            } else {
-                $this->autoloadDetected = false;
-                $this->daoNamespace = 'YourApplication\\Dao';
-                $this->beanNamespace = 'YourApplication\\Dao\\Bean';
-            }
-        } else {
-            $this->autoloadDetected = true;
-        }
-
-        $this->content->addFile(__DIR__.'/../../../../views/tdbmGenerate.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * This action generates the DAOs and Beans for the TDBM service passed in parameter.
-     *
-     * @Action
-     *
-     * @param string $name
-     * @param bool   $selfedit
-     */
-    public function generate($name, $daonamespace, $beannamespace, $daofactoryinstancename, /*$storeInUtc = 0,*/ $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
-    {
-        $this->initController($name, $selfedit);
-
-        self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryinstancename, $selfedit, /*$storeInUtc,*/ $useCustomComposer, $composerFile);
-
-        // TODO: better: we should redirect to a screen that list the number of DAOs generated, etc...
-        header('Location: '.ROOT_URL.'ajaxinstance/?name='.urlencode($name).'&selfedit='.$selfedit);
-    }
-
-    /**
-     * This function generates the DAOs and Beans for the TDBM service passed in parameter.
-     *
-     * @param MoufManager $moufManager
-     * @param string      $name
-     * @param string      $daonamespace
-     * @param string      $beannamespace
-     * @param string      $daofactoryclassname
-     * @param string      $daofactoryinstancename
-     * @param string      $selfedit
-     *
-     * @throws \Mouf\MoufException
-     */
-    public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryinstancename, $selfedit = 'false', /*$storeInUtc = null,*/ $useCustomComposer = null, $composerFile = null)
-    {
-        self::setInConfiguration($moufManager, $name, 'daoNamespace', $daonamespace);
-        self::setInConfiguration($moufManager, $name, 'beanNamespace', $beannamespace);
-        self::setInConfiguration($moufManager, $name, 'daoFactoryInstanceName', $daofactoryinstancename);
-        //self::setInConfiguration($moufManager, $name, 'storeInUtc', $storeInUtc);
-        if ($useCustomComposer) {
-            self::setInConfiguration($moufManager, $name, 'customComposerFile', $composerFile);
-        } else {
-            self::setInConfiguration($moufManager, $name, 'customComposerFile', null);
-        }
-        // Let's rewrite before calling the DAO generator
-        $moufManager->rewriteMouf();
-
-
-        $tdbmService = new InstanceProxy($name);
-        /* @var $tdbmService TDBMService */
-        $tdbmService->generateAllDaosAndBeans(($useCustomComposer ? $composerFile : null));
-    }
-
-    private static function getConfigurationDescriptor(MoufManager $moufManager, string $tdbmInstanceName)
-    {
-        return $moufManager->getInstanceDescriptor($tdbmInstanceName)->getConstructorArgumentProperty('configuration')->getValue();
-    }
-
-    private static function getFromConfiguration(MoufManager $moufManager, string $tdbmInstanceName, string $property)
-    {
-        $configuration = self::getConfigurationDescriptor($moufManager, $tdbmInstanceName);
-        if ($configuration === null) {
-            throw new \RuntimeException('Unable to find the configuration object linked to TDBMService.');
-        }
-        return $configuration->getProperty($property)->getValue();
-    }
-
-    private static function setInConfiguration(MoufManager $moufManager, string $tdbmInstanceName, string $property, ?string $value)
-    {
-        $configuration = self::getConfigurationDescriptor($moufManager, $tdbmInstanceName);
-        if ($configuration === null) {
-            throw new \RuntimeException('Unable to find the configuration object linked to TDBMService.');
-        }
-        $configuration->getProperty($property)->setValue($value);
-    }
+	/**
+	 * @var HtmlBlock
+	 */
+	public $content;
+
+	protected $daoNamespace;
+	protected $beanNamespace;
+	protected $daoFactoryInstanceName;
+	protected $autoloadDetected;
+	///protected $storeInUtc;
+	protected $useCustomComposer;
+	protected $composerFile;
+
+	/**
+	 * Admin page used to display the DAO generation form.
+	 *
+	 * @Action
+	 */
+	public function defaultAction($name, $selfedit = 'false')
+	{
+		$this->initController($name, $selfedit);
+
+		// Fill variables
+		$this->daoNamespace = self::getFromConfiguration($this->moufManager, $name, 'daoNamespace');
+		$this->beanNamespace = self::getFromConfiguration($this->moufManager, $name, 'beanNamespace');
+		$this->daoFactoryInstanceName = self::getFromConfiguration($this->moufManager, $name, 'daoFactoryInstanceName');
+		//$this->storeInUtc = self::getFromConfiguration($this->moufManager, $name, 'storeInUtc');
+		$this->composerFile = self::getFromConfiguration($this->moufManager, $name, 'customComposerFile');
+		$this->useCustomComposer = $this->composerFile ? true : false;
+
+		if ($this->daoNamespace == null && $this->beanNamespace == null) {
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			if ($autoloadNamespaces) {
+				$this->autoloadDetected = true;
+				$rootNamespace = $autoloadNamespaces[0];
+				$this->daoNamespace = $rootNamespace.'Dao';
+				$this->beanNamespace = $rootNamespace.'Dao\\Bean';
+			} else {
+				$this->autoloadDetected = false;
+				$this->daoNamespace = 'YourApplication\\Dao';
+				$this->beanNamespace = 'YourApplication\\Dao\\Bean';
+			}
+		} else {
+			$this->autoloadDetected = true;
+		}
+
+		$this->content->addFile(__DIR__.'/../../../../views/tdbmGenerate.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * This action generates the DAOs and Beans for the TDBM service passed in parameter.
+	 *
+	 * @Action
+	 *
+	 * @param string $name
+	 * @param bool   $selfedit
+	 */
+	public function generate($name, $daonamespace, $beannamespace, $daofactoryinstancename, /*$storeInUtc = 0,*/ $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
+	{
+		$this->initController($name, $selfedit);
+
+		self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryinstancename, $selfedit, /*$storeInUtc,*/ $useCustomComposer, $composerFile);
+
+		// TODO: better: we should redirect to a screen that list the number of DAOs generated, etc...
+		header('Location: '.ROOT_URL.'ajaxinstance/?name='.urlencode($name).'&selfedit='.$selfedit);
+	}
+
+	/**
+	 * This function generates the DAOs and Beans for the TDBM service passed in parameter.
+	 *
+	 * @param MoufManager $moufManager
+	 * @param string      $name
+	 * @param string      $daonamespace
+	 * @param string      $beannamespace
+	 * @param string      $daofactoryclassname
+	 * @param string      $daofactoryinstancename
+	 * @param string      $selfedit
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryinstancename, $selfedit = 'false', /*$storeInUtc = null,*/ $useCustomComposer = null, $composerFile = null)
+	{
+		self::setInConfiguration($moufManager, $name, 'daoNamespace', $daonamespace);
+		self::setInConfiguration($moufManager, $name, 'beanNamespace', $beannamespace);
+		self::setInConfiguration($moufManager, $name, 'daoFactoryInstanceName', $daofactoryinstancename);
+		//self::setInConfiguration($moufManager, $name, 'storeInUtc', $storeInUtc);
+		if ($useCustomComposer) {
+			self::setInConfiguration($moufManager, $name, 'customComposerFile', $composerFile);
+		} else {
+			self::setInConfiguration($moufManager, $name, 'customComposerFile', null);
+		}
+		// Let's rewrite before calling the DAO generator
+		$moufManager->rewriteMouf();
+
+
+		$tdbmService = new InstanceProxy($name);
+		/* @var $tdbmService TDBMService */
+		$tdbmService->generateAllDaosAndBeans(($useCustomComposer ? $composerFile : null));
+	}
+
+	private static function getConfigurationDescriptor(MoufManager $moufManager, string $tdbmInstanceName)
+	{
+		return $moufManager->getInstanceDescriptor($tdbmInstanceName)->getConstructorArgumentProperty('configuration')->getValue();
+	}
+
+	private static function getFromConfiguration(MoufManager $moufManager, string $tdbmInstanceName, string $property)
+	{
+		$configuration = self::getConfigurationDescriptor($moufManager, $tdbmInstanceName);
+		if ($configuration === null) {
+			throw new \RuntimeException('Unable to find the configuration object linked to TDBMService.');
+		}
+		return $configuration->getProperty($property)->getValue();
+	}
+
+	private static function setInConfiguration(MoufManager $moufManager, string $tdbmInstanceName, string $property, ?string $value)
+	{
+		$configuration = self::getConfigurationDescriptor($moufManager, $tdbmInstanceName);
+		if ($configuration === null) {
+			throw new \RuntimeException('Unable to find the configuration object linked to TDBMService.');
+		}
+		$configuration->getProperty($property)->setValue($value);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
         return $configuration->getProperty($property)->getValue();
     }
 
-    private static function setInConfiguration(MoufManager $moufManager, string $tdbmInstanceName, string $property, ?string $value)
+    private static function setInConfiguration(MoufManager $moufManager, string $tdbmInstanceName, string $property, ? string $value)
     {
         $configuration = self::getConfigurationDescriptor($moufManager, $tdbmInstanceName);
         if ($configuration === null) {

src/Mouf/Database/TDBM/TDBMService.php

Unused Use Statements -2 removed lines

@@ -21,11 +21,9 @@
 namespace Mouf\Database\TDBM;
 
 use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\VoidCache;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
 use Mouf\Database\MagicQuery;

Indentation +1364 added lines, -1364 removed lines

@@ -48,384 +48,384 @@ 
  */
 class TDBMService
 {
-    const MODE_CURSOR = 1;
-    const MODE_ARRAY = 2;
-
-    /**
-     * The database connection.
-     *
-     * @var Connection
-     */
-    private $connection;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var MagicQuery
-     */
-    private $magicQuery;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * @var string
-     */
-    private $cachePrefix;
-
-    /**
-     * Cache of table of primary keys.
-     * Primary keys are stored by tables, as an array of column.
-     * For instance $primary_key['my_table'][0] will return the first column of the primary key of table 'my_table'.
-     *
-     * @var string[]
-     */
-    private $primaryKeysColumns;
-
-    /**
-     * Service storing objects in memory.
-     * Access is done by table name and then by primary key.
-     * If the primary key is split on several columns, access is done by an array of columns, serialized.
-     *
-     * @var StandardObjectStorage|WeakrefObjectStorage
-     */
-    private $objectStorage;
-
-    /**
-     * The fetch mode of the result sets returned by `getObjects`.
-     * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY or TDBMObjectArray::MODE_COMPATIBLE_ARRAY.
-     *
-     * In 'MODE_ARRAY' mode (default), the result is an array. Use this mode by default (unless the list returned is very big).
-     * In 'MODE_CURSOR' mode, the result is a Generator which is an iterable collection that can be scanned only once (only one "foreach") on it,
-     * and it cannot be accessed via key. Use this mode for large datasets processed by batch.
-     * In 'MODE_COMPATIBLE_ARRAY' mode, the result is an old TDBMObjectArray (used up to TDBM 3.2).
-     * You can access the array by key, or using foreach, several times.
-     *
-     * @var int
-     */
-    private $mode = self::MODE_ARRAY;
-
-    /**
-     * Table of new objects not yet inserted in database or objects modified that must be saved.
-     *
-     * @var \SplObjectStorage of DbRow objects
-     */
-    private $toSaveObjects;
-
-    /**
-     * A cache service to be used.
-     *
-     * @var Cache|null
-     */
-    private $cache;
-
-    /**
-     * Map associating a table name to a fully qualified Bean class name.
-     *
-     * @var array
-     */
-    private $tableToBeanMap = [];
-
-    /**
-     * @var \ReflectionClass[]
-     */
-    private $reflectionClassCache = array();
-
-    /**
-     * @var LoggerInterface
-     */
-    private $rootLogger;
-
-    /**
-     * @var LevelFilter|NullLogger
-     */
-    private $logger;
-
-    /**
-     * @var OrderByAnalyzer
-     */
-    private $orderByAnalyzer;
-
-    /**
-     * @var string
-     */
-    private $beanNamespace;
-
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-    /**
-     * @var ConfigurationInterface
-     */
-    private $configuration;
-
-    /**
-     * @param ConfigurationInterface $configuration The configuration object
-     */
-    public function __construct(ConfigurationInterface $configuration /*Connection $connection, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null*/)
-    {
-        if (extension_loaded('weakref')) {
-            $this->objectStorage = new WeakrefObjectStorage();
-        } else {
-            $this->objectStorage = new StandardObjectStorage();
-        }
-        $this->connection = $configuration->getConnection();
-        $this->cache = $configuration->getCache();
-        $this->schemaAnalyzer = $configuration->getSchemaAnalyzer();
-
-        $this->magicQuery = new MagicQuery($this->connection, $this->cache, $this->schemaAnalyzer);
-
-        $this->tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($this->connection, $this->cache, $this->schemaAnalyzer);
-        $this->cachePrefix = $this->tdbmSchemaAnalyzer->getCachePrefix();
-
-        $this->toSaveObjects = new \SplObjectStorage();
-        $logger = $configuration->getLogger();
-        if ($logger === null) {
-            $this->logger = new NullLogger();
-            $this->rootLogger = new NullLogger();
-        } else {
-            $this->rootLogger = $logger;
-            $this->setLogLevel(LogLevel::WARNING);
-        }
-        $this->orderByAnalyzer = new OrderByAnalyzer($this->cache, $this->cachePrefix);
-        $this->beanNamespace = $configuration->getBeanNamespace();
-        $this->namingStrategy = $configuration->getNamingStrategy();
-        $this->configuration = $configuration;
-    }
-
-    /**
-     * Returns the object used to connect to the database.
-     *
-     * @return Connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
-
-    /**
-     * Sets the default fetch mode of the result sets returned by `findObjects`.
-     * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY.
-     *
-     * In 'MODE_ARRAY' mode (default), the result is a ResultIterator object that behaves like an array. Use this mode by default (unless the list returned is very big).
-     * In 'MODE_CURSOR' mode, the result is a ResultIterator object. If you scan it many times (by calling several time a foreach loop), the query will be run
-     * several times. In cursor mode, you cannot access the result set by key. Use this mode for large datasets processed by batch.
-     *
-     * @param int $mode
-     *
-     * @return $this
-     *
-     * @throws TDBMException
-     */
-    public function setFetchMode($mode)
-    {
-        if ($mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
-            throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
-        }
-        $this->mode = $mode;
-
-        return $this;
-    }
-
-    /**
-     * Removes the given object from database.
-     * This cannot be called on an object that is not attached to this TDBMService
-     * (will throw a TDBMInvalidOperationException).
-     *
-     * @param AbstractTDBMObject $object the object to delete
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function delete(AbstractTDBMObject $object)
-    {
-        switch ($object->_getStatus()) {
-            case TDBMObjectStateEnum::STATE_DELETED:
-                // Nothing to do, object already deleted.
-                return;
-            case TDBMObjectStateEnum::STATE_DETACHED:
-                throw new TDBMInvalidOperationException('Cannot delete a detached object');
-            case TDBMObjectStateEnum::STATE_NEW:
-                $this->deleteManyToManyRelationships($object);
-                foreach ($object->_getDbRows() as $dbRow) {
-                    $this->removeFromToSaveObjectList($dbRow);
-                }
-                break;
-            case TDBMObjectStateEnum::STATE_DIRTY:
-                foreach ($object->_getDbRows() as $dbRow) {
-                    $this->removeFromToSaveObjectList($dbRow);
-                }
-                // And continue deleting...
-            case TDBMObjectStateEnum::STATE_NOT_LOADED:
-            case TDBMObjectStateEnum::STATE_LOADED:
-                $this->deleteManyToManyRelationships($object);
-                // Let's delete db rows, in reverse order.
-                foreach (array_reverse($object->_getDbRows()) as $dbRow) {
-                    $tableName = $dbRow->_getDbTableName();
-                    $primaryKeys = $dbRow->_getPrimaryKeys();
-                    $this->connection->delete($tableName, $primaryKeys);
-                    $this->objectStorage->remove($dbRow->_getDbTableName(), $this->getObjectHash($primaryKeys));
-                }
-                break;
-            // @codeCoverageIgnoreStart
-            default:
-                throw new TDBMInvalidOperationException('Unexpected status for bean');
-            // @codeCoverageIgnoreEnd
-        }
-
-        $object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
-    }
-
-    /**
-     * Removes all many to many relationships for this object.
-     *
-     * @param AbstractTDBMObject $object
-     */
-    private function deleteManyToManyRelationships(AbstractTDBMObject $object)
-    {
-        foreach ($object->_getDbRows() as $tableName => $dbRow) {
-            $pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
-            foreach ($pivotTables as $pivotTable) {
-                $remoteBeans = $object->_getRelationships($pivotTable);
-                foreach ($remoteBeans as $remoteBean) {
-                    $object->_removeRelationship($pivotTable, $remoteBean);
-                }
-            }
-        }
-        $this->persistManyToManyRelationships($object);
-    }
-
-    /**
-     * This function removes the given object from the database. It will also remove all objects relied to the one given
-     * by parameter before all.
-     *
-     * Notice: if the object has a multiple primary key, the function will not work.
-     *
-     * @param AbstractTDBMObject $objToDelete
-     */
-    public function deleteCascade(AbstractTDBMObject $objToDelete)
-    {
-        $this->deleteAllConstraintWithThisObject($objToDelete);
-        $this->delete($objToDelete);
-    }
-
-    /**
-     * This function is used only in TDBMService (private function)
-     * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter.
-     *
-     * @param AbstractTDBMObject $obj
-     */
-    private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj)
-    {
-        $dbRows = $obj->_getDbRows();
-        foreach ($dbRows as $dbRow) {
-            $tableName = $dbRow->_getDbTableName();
-            $pks = array_values($dbRow->_getPrimaryKeys());
-            if (!empty($pks)) {
-                $incomingFks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($tableName);
-
-                foreach ($incomingFks as $incomingFk) {
-                    $filter = array_combine($incomingFk->getLocalColumns(), $pks);
-
-                    $results = $this->findObjects($incomingFk->getLocalTableName(), $filter);
-
-                    foreach ($results as $bean) {
-                        $this->deleteCascade($bean);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * This function performs a save() of all the objects that have been modified.
-     */
-    public function completeSave()
-    {
-        foreach ($this->toSaveObjects as $dbRow) {
-            $this->save($dbRow->getTDBMObject());
-        }
-    }
-
-    /**
-     * Takes in input a filter_bag (which can be about anything from a string to an array of TDBMObjects... see above from documentation),
-     * and gives back a proper Filter object.
-     *
-     * @param mixed $filter_bag
-     * @param int   $counter
-     *
-     * @return array First item: filter string, second item: parameters
-     *
-     * @throws TDBMException
-     */
-    public function buildFilterFromFilterBag($filter_bag, $counter = 1)
-    {
-        if ($filter_bag === null) {
-            return ['', []];
-        } elseif (is_string($filter_bag)) {
-            return [$filter_bag, []];
-        } elseif (is_array($filter_bag)) {
-            $sqlParts = [];
-            $parameters = [];
-            foreach ($filter_bag as $column => $value) {
-                if (is_int($column)) {
-                    list($subSqlPart, $subParameters) = $this->buildFilterFromFilterBag($value, $counter);
-                    $sqlParts[] = $subSqlPart;
-                    $parameters += $subParameters;
-                } else {
-                    $paramName = 'tdbmparam'.$counter;
-                    if (is_array($value)) {
-                        $sqlParts[] = $this->connection->quoteIdentifier($column).' IN :'.$paramName;
-                    } else {
-                        $sqlParts[] = $this->connection->quoteIdentifier($column).' = :'.$paramName;
-                    }
-                    $parameters[$paramName] = $value;
-                    ++$counter;
-                }
-            }
-
-            return [implode(' AND ', $sqlParts), $parameters];
-        } elseif ($filter_bag instanceof AbstractTDBMObject) {
-            $sqlParts = [];
-            $parameters = [];
-            $dbRows = $filter_bag->_getDbRows();
-            $dbRow = reset($dbRows);
-            $primaryKeys = $dbRow->_getPrimaryKeys();
-
-            foreach ($primaryKeys as $column => $value) {
-                $paramName = 'tdbmparam'.$counter;
-                $sqlParts[] = $this->connection->quoteIdentifier($dbRow->_getDbTableName()).'.'.$this->connection->quoteIdentifier($column).' = :'.$paramName;
-                $parameters[$paramName] = $value;
-                ++$counter;
-            }
-
-            return [implode(' AND ', $sqlParts), $parameters];
-        } elseif ($filter_bag instanceof \Iterator) {
-            return $this->buildFilterFromFilterBag(iterator_to_array($filter_bag), $counter);
-        } else {
-            throw new TDBMException('Error in filter. An object has been passed that is neither a SQL string, nor an array, nor a bean, nor null.');
-        }
-    }
-
-    /**
-     * @param string $table
-     *
-     * @return string[]
-     */
-    public function getPrimaryKeyColumns($table)
-    {
-        if (!isset($this->primaryKeysColumns[$table])) {
-            $this->primaryKeysColumns[$table] = $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getPrimaryKeyColumns();
-
-            // TODO TDBM4: See if we need to improve error reporting if table name does not exist.
-
-            /*$arr = array();
+	const MODE_CURSOR = 1;
+	const MODE_ARRAY = 2;
+
+	/**
+	 * The database connection.
+	 *
+	 * @var Connection
+	 */
+	private $connection;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var MagicQuery
+	 */
+	private $magicQuery;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
+
+	/**
+	 * Cache of table of primary keys.
+	 * Primary keys are stored by tables, as an array of column.
+	 * For instance $primary_key['my_table'][0] will return the first column of the primary key of table 'my_table'.
+	 *
+	 * @var string[]
+	 */
+	private $primaryKeysColumns;
+
+	/**
+	 * Service storing objects in memory.
+	 * Access is done by table name and then by primary key.
+	 * If the primary key is split on several columns, access is done by an array of columns, serialized.
+	 *
+	 * @var StandardObjectStorage|WeakrefObjectStorage
+	 */
+	private $objectStorage;
+
+	/**
+	 * The fetch mode of the result sets returned by `getObjects`.
+	 * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY or TDBMObjectArray::MODE_COMPATIBLE_ARRAY.
+	 *
+	 * In 'MODE_ARRAY' mode (default), the result is an array. Use this mode by default (unless the list returned is very big).
+	 * In 'MODE_CURSOR' mode, the result is a Generator which is an iterable collection that can be scanned only once (only one "foreach") on it,
+	 * and it cannot be accessed via key. Use this mode for large datasets processed by batch.
+	 * In 'MODE_COMPATIBLE_ARRAY' mode, the result is an old TDBMObjectArray (used up to TDBM 3.2).
+	 * You can access the array by key, or using foreach, several times.
+	 *
+	 * @var int
+	 */
+	private $mode = self::MODE_ARRAY;
+
+	/**
+	 * Table of new objects not yet inserted in database or objects modified that must be saved.
+	 *
+	 * @var \SplObjectStorage of DbRow objects
+	 */
+	private $toSaveObjects;
+
+	/**
+	 * A cache service to be used.
+	 *
+	 * @var Cache|null
+	 */
+	private $cache;
+
+	/**
+	 * Map associating a table name to a fully qualified Bean class name.
+	 *
+	 * @var array
+	 */
+	private $tableToBeanMap = [];
+
+	/**
+	 * @var \ReflectionClass[]
+	 */
+	private $reflectionClassCache = array();
+
+	/**
+	 * @var LoggerInterface
+	 */
+	private $rootLogger;
+
+	/**
+	 * @var LevelFilter|NullLogger
+	 */
+	private $logger;
+
+	/**
+	 * @var OrderByAnalyzer
+	 */
+	private $orderByAnalyzer;
+
+	/**
+	 * @var string
+	 */
+	private $beanNamespace;
+
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+	/**
+	 * @var ConfigurationInterface
+	 */
+	private $configuration;
+
+	/**
+	 * @param ConfigurationInterface $configuration The configuration object
+	 */
+	public function __construct(ConfigurationInterface $configuration /*Connection $connection, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null*/)
+	{
+		if (extension_loaded('weakref')) {
+			$this->objectStorage = new WeakrefObjectStorage();
+		} else {
+			$this->objectStorage = new StandardObjectStorage();
+		}
+		$this->connection = $configuration->getConnection();
+		$this->cache = $configuration->getCache();
+		$this->schemaAnalyzer = $configuration->getSchemaAnalyzer();
+
+		$this->magicQuery = new MagicQuery($this->connection, $this->cache, $this->schemaAnalyzer);
+
+		$this->tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($this->connection, $this->cache, $this->schemaAnalyzer);
+		$this->cachePrefix = $this->tdbmSchemaAnalyzer->getCachePrefix();
+
+		$this->toSaveObjects = new \SplObjectStorage();
+		$logger = $configuration->getLogger();
+		if ($logger === null) {
+			$this->logger = new NullLogger();
+			$this->rootLogger = new NullLogger();
+		} else {
+			$this->rootLogger = $logger;
+			$this->setLogLevel(LogLevel::WARNING);
+		}
+		$this->orderByAnalyzer = new OrderByAnalyzer($this->cache, $this->cachePrefix);
+		$this->beanNamespace = $configuration->getBeanNamespace();
+		$this->namingStrategy = $configuration->getNamingStrategy();
+		$this->configuration = $configuration;
+	}
+
+	/**
+	 * Returns the object used to connect to the database.
+	 *
+	 * @return Connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * Sets the default fetch mode of the result sets returned by `findObjects`.
+	 * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY.
+	 *
+	 * In 'MODE_ARRAY' mode (default), the result is a ResultIterator object that behaves like an array. Use this mode by default (unless the list returned is very big).
+	 * In 'MODE_CURSOR' mode, the result is a ResultIterator object. If you scan it many times (by calling several time a foreach loop), the query will be run
+	 * several times. In cursor mode, you cannot access the result set by key. Use this mode for large datasets processed by batch.
+	 *
+	 * @param int $mode
+	 *
+	 * @return $this
+	 *
+	 * @throws TDBMException
+	 */
+	public function setFetchMode($mode)
+	{
+		if ($mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
+			throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
+		}
+		$this->mode = $mode;
+
+		return $this;
+	}
+
+	/**
+	 * Removes the given object from database.
+	 * This cannot be called on an object that is not attached to this TDBMService
+	 * (will throw a TDBMInvalidOperationException).
+	 *
+	 * @param AbstractTDBMObject $object the object to delete
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function delete(AbstractTDBMObject $object)
+	{
+		switch ($object->_getStatus()) {
+			case TDBMObjectStateEnum::STATE_DELETED:
+				// Nothing to do, object already deleted.
+				return;
+			case TDBMObjectStateEnum::STATE_DETACHED:
+				throw new TDBMInvalidOperationException('Cannot delete a detached object');
+			case TDBMObjectStateEnum::STATE_NEW:
+				$this->deleteManyToManyRelationships($object);
+				foreach ($object->_getDbRows() as $dbRow) {
+					$this->removeFromToSaveObjectList($dbRow);
+				}
+				break;
+			case TDBMObjectStateEnum::STATE_DIRTY:
+				foreach ($object->_getDbRows() as $dbRow) {
+					$this->removeFromToSaveObjectList($dbRow);
+				}
+				// And continue deleting...
+			case TDBMObjectStateEnum::STATE_NOT_LOADED:
+			case TDBMObjectStateEnum::STATE_LOADED:
+				$this->deleteManyToManyRelationships($object);
+				// Let's delete db rows, in reverse order.
+				foreach (array_reverse($object->_getDbRows()) as $dbRow) {
+					$tableName = $dbRow->_getDbTableName();
+					$primaryKeys = $dbRow->_getPrimaryKeys();
+					$this->connection->delete($tableName, $primaryKeys);
+					$this->objectStorage->remove($dbRow->_getDbTableName(), $this->getObjectHash($primaryKeys));
+				}
+				break;
+			// @codeCoverageIgnoreStart
+			default:
+				throw new TDBMInvalidOperationException('Unexpected status for bean');
+			// @codeCoverageIgnoreEnd
+		}
+
+		$object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
+	}
+
+	/**
+	 * Removes all many to many relationships for this object.
+	 *
+	 * @param AbstractTDBMObject $object
+	 */
+	private function deleteManyToManyRelationships(AbstractTDBMObject $object)
+	{
+		foreach ($object->_getDbRows() as $tableName => $dbRow) {
+			$pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
+			foreach ($pivotTables as $pivotTable) {
+				$remoteBeans = $object->_getRelationships($pivotTable);
+				foreach ($remoteBeans as $remoteBean) {
+					$object->_removeRelationship($pivotTable, $remoteBean);
+				}
+			}
+		}
+		$this->persistManyToManyRelationships($object);
+	}
+
+	/**
+	 * This function removes the given object from the database. It will also remove all objects relied to the one given
+	 * by parameter before all.
+	 *
+	 * Notice: if the object has a multiple primary key, the function will not work.
+	 *
+	 * @param AbstractTDBMObject $objToDelete
+	 */
+	public function deleteCascade(AbstractTDBMObject $objToDelete)
+	{
+		$this->deleteAllConstraintWithThisObject($objToDelete);
+		$this->delete($objToDelete);
+	}
+
+	/**
+	 * This function is used only in TDBMService (private function)
+	 * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter.
+	 *
+	 * @param AbstractTDBMObject $obj
+	 */
+	private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj)
+	{
+		$dbRows = $obj->_getDbRows();
+		foreach ($dbRows as $dbRow) {
+			$tableName = $dbRow->_getDbTableName();
+			$pks = array_values($dbRow->_getPrimaryKeys());
+			if (!empty($pks)) {
+				$incomingFks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($tableName);
+
+				foreach ($incomingFks as $incomingFk) {
+					$filter = array_combine($incomingFk->getLocalColumns(), $pks);
+
+					$results = $this->findObjects($incomingFk->getLocalTableName(), $filter);
+
+					foreach ($results as $bean) {
+						$this->deleteCascade($bean);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This function performs a save() of all the objects that have been modified.
+	 */
+	public function completeSave()
+	{
+		foreach ($this->toSaveObjects as $dbRow) {
+			$this->save($dbRow->getTDBMObject());
+		}
+	}
+
+	/**
+	 * Takes in input a filter_bag (which can be about anything from a string to an array of TDBMObjects... see above from documentation),
+	 * and gives back a proper Filter object.
+	 *
+	 * @param mixed $filter_bag
+	 * @param int   $counter
+	 *
+	 * @return array First item: filter string, second item: parameters
+	 *
+	 * @throws TDBMException
+	 */
+	public function buildFilterFromFilterBag($filter_bag, $counter = 1)
+	{
+		if ($filter_bag === null) {
+			return ['', []];
+		} elseif (is_string($filter_bag)) {
+			return [$filter_bag, []];
+		} elseif (is_array($filter_bag)) {
+			$sqlParts = [];
+			$parameters = [];
+			foreach ($filter_bag as $column => $value) {
+				if (is_int($column)) {
+					list($subSqlPart, $subParameters) = $this->buildFilterFromFilterBag($value, $counter);
+					$sqlParts[] = $subSqlPart;
+					$parameters += $subParameters;
+				} else {
+					$paramName = 'tdbmparam'.$counter;
+					if (is_array($value)) {
+						$sqlParts[] = $this->connection->quoteIdentifier($column).' IN :'.$paramName;
+					} else {
+						$sqlParts[] = $this->connection->quoteIdentifier($column).' = :'.$paramName;
+					}
+					$parameters[$paramName] = $value;
+					++$counter;
+				}
+			}
+
+			return [implode(' AND ', $sqlParts), $parameters];
+		} elseif ($filter_bag instanceof AbstractTDBMObject) {
+			$sqlParts = [];
+			$parameters = [];
+			$dbRows = $filter_bag->_getDbRows();
+			$dbRow = reset($dbRows);
+			$primaryKeys = $dbRow->_getPrimaryKeys();
+
+			foreach ($primaryKeys as $column => $value) {
+				$paramName = 'tdbmparam'.$counter;
+				$sqlParts[] = $this->connection->quoteIdentifier($dbRow->_getDbTableName()).'.'.$this->connection->quoteIdentifier($column).' = :'.$paramName;
+				$parameters[$paramName] = $value;
+				++$counter;
+			}
+
+			return [implode(' AND ', $sqlParts), $parameters];
+		} elseif ($filter_bag instanceof \Iterator) {
+			return $this->buildFilterFromFilterBag(iterator_to_array($filter_bag), $counter);
+		} else {
+			throw new TDBMException('Error in filter. An object has been passed that is neither a SQL string, nor an array, nor a bean, nor null.');
+		}
+	}
+
+	/**
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	public function getPrimaryKeyColumns($table)
+	{
+		if (!isset($this->primaryKeysColumns[$table])) {
+			$this->primaryKeysColumns[$table] = $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getPrimaryKeyColumns();
+
+			// TODO TDBM4: See if we need to improve error reporting if table name does not exist.
+
+			/*$arr = array();
             foreach ($this->connection->getPrimaryKey($table) as $col) {
                 $arr[] = $col->name;
             }
@@ -446,161 +446,161 @@ 
                     throw new TDBMException($str);
                 }
             }*/
-        }
-
-        return $this->primaryKeysColumns[$table];
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to add an object to the object cache.
-     *
-     * @param DbRow $dbRow
-     */
-    public function _addToCache(DbRow $dbRow)
-    {
-        $primaryKey = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-        $hash = $this->getObjectHash($primaryKey);
-        $this->objectStorage->set($dbRow->_getDbTableName(), $hash, $dbRow);
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to remove the object from the list of objects that have been
-     * created/updated but not saved yet.
-     *
-     * @param DbRow $myObject
-     */
-    private function removeFromToSaveObjectList(DbRow $myObject)
-    {
-        unset($this->toSaveObjects[$myObject]);
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to add an object to the list of objects that have been
-     * created/updated but not saved yet.
-     *
-     * @param DbRow $myObject
-     */
-    public function _addToToSaveObjectList(DbRow $myObject)
-    {
-        $this->toSaveObjects[$myObject] = true;
-    }
-
-    /**
-     * Generates all the daos and beans.
-     *
-     * @param string $composerFile        If it's set, location of custom Composer file. Relative to project root
-     *
-     * @return \string[] the list of tables (key) and bean name (value)
-     */
-    public function generateAllDaosAndBeans($composerFile = null)
-    {
-        // Purge cache before generating anything.
-        $this->cache->deleteAll();
-
-        $tdbmDaoGenerator = new TDBMDaoGenerator($this->configuration, $this->tdbmSchemaAnalyzer->getSchema(), $this->tdbmSchemaAnalyzer);
-        if (null !== $composerFile) {
-            $tdbmDaoGenerator->setComposerFile(__DIR__.'/../../../../../../../'.$composerFile);
-        }
-
-        $tdbmDaoGenerator->generateAllDaosAndBeans();
-    }
-
-    /**
-     * Returns the fully qualified class name of the bean associated with table $tableName.
-     *
-     *
-     * @param string $tableName
-     *
-     * @return string
-     */
-    public function getBeanClassName(string $tableName) : string
-    {
-        if (isset($this->tableToBeanMap[$tableName])) {
-            return $this->tableToBeanMap[$tableName];
-        } else {
-            $className = $this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($tableName);
-
-            if (!class_exists($className)) {
-                throw new TDBMInvalidArgumentException(sprintf('Could not find class "%s". Does table "%s" exist? If yes, consider regenerating the DAOs and beans.', $className, $tableName));
-            }
-
-            $this->tableToBeanMap[$tableName] = $className;
-            return $className;
-        }
-    }
-
-    /**
-     * Saves $object by INSERTing or UPDAT(E)ing it in the database.
-     *
-     * @param AbstractTDBMObject $object
-     *
-     * @throws TDBMException
-     */
-    public function save(AbstractTDBMObject $object)
-    {
-        $status = $object->_getStatus();
-
-        if ($status === null) {
-            throw new TDBMException(sprintf('Your bean for class %s has no status. It is likely that you overloaded the __construct method and forgot to call parent::__construct.', get_class($object)));
-        }
-
-        // Let's attach this object if it is in detached state.
-        if ($status === TDBMObjectStateEnum::STATE_DETACHED) {
-            $object->_attach($this);
-            $status = $object->_getStatus();
-        }
-
-        if ($status === TDBMObjectStateEnum::STATE_NEW) {
-            $dbRows = $object->_getDbRows();
-
-            $unindexedPrimaryKeys = array();
-
-            foreach ($dbRows as $dbRow) {
-                if ($dbRow->_getStatus() == TDBMObjectStateEnum::STATE_SAVING) {
-                    throw TDBMCyclicReferenceException::createCyclicReference($dbRow->_getDbTableName(), $object);
-                }
-                $dbRow->_setStatus(TDBMObjectStateEnum::STATE_SAVING);
-                $tableName = $dbRow->_getDbTableName();
-
-                $schema = $this->tdbmSchemaAnalyzer->getSchema();
-                $tableDescriptor = $schema->getTable($tableName);
-
-                $primaryKeyColumns = $this->getPrimaryKeyColumns($tableName);
-
-                $references = $dbRow->_getReferences();
-
-                // Let's save all references in NEW or DETACHED state (we need their primary key)
-                foreach ($references as $fkName => $reference) {
-                    if ($reference !== null) {
-                        $refStatus = $reference->_getStatus();
-                        if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
-                            try {
-                                $this->save($reference);
-                            } catch (TDBMCyclicReferenceException $e) {
-                                throw TDBMCyclicReferenceException::extendCyclicReference($e, $dbRow->_getDbTableName(), $object, $fkName);
-                            }
-                        }
-                    }
-                }
-
-                if (empty($unindexedPrimaryKeys)) {
-                    $primaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-                } else {
-                    // First insert, the children must have the same primary key as the parent.
-                    $primaryKeys = $this->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $unindexedPrimaryKeys);
-                    $dbRow->_setPrimaryKeys($primaryKeys);
-                }
-
-                $dbRowData = $dbRow->_getDbRow();
-
-                // Let's see if the columns for primary key have been set before inserting.
-                // We assume that if one of the value of the PK has been set, the PK is set.
-                $isPkSet = !empty($primaryKeys);
-
-                /*if (!$isPkSet) {
+		}
+
+		return $this->primaryKeysColumns[$table];
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to add an object to the object cache.
+	 *
+	 * @param DbRow $dbRow
+	 */
+	public function _addToCache(DbRow $dbRow)
+	{
+		$primaryKey = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+		$hash = $this->getObjectHash($primaryKey);
+		$this->objectStorage->set($dbRow->_getDbTableName(), $hash, $dbRow);
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to remove the object from the list of objects that have been
+	 * created/updated but not saved yet.
+	 *
+	 * @param DbRow $myObject
+	 */
+	private function removeFromToSaveObjectList(DbRow $myObject)
+	{
+		unset($this->toSaveObjects[$myObject]);
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to add an object to the list of objects that have been
+	 * created/updated but not saved yet.
+	 *
+	 * @param DbRow $myObject
+	 */
+	public function _addToToSaveObjectList(DbRow $myObject)
+	{
+		$this->toSaveObjects[$myObject] = true;
+	}
+
+	/**
+	 * Generates all the daos and beans.
+	 *
+	 * @param string $composerFile        If it's set, location of custom Composer file. Relative to project root
+	 *
+	 * @return \string[] the list of tables (key) and bean name (value)
+	 */
+	public function generateAllDaosAndBeans($composerFile = null)
+	{
+		// Purge cache before generating anything.
+		$this->cache->deleteAll();
+
+		$tdbmDaoGenerator = new TDBMDaoGenerator($this->configuration, $this->tdbmSchemaAnalyzer->getSchema(), $this->tdbmSchemaAnalyzer);
+		if (null !== $composerFile) {
+			$tdbmDaoGenerator->setComposerFile(__DIR__.'/../../../../../../../'.$composerFile);
+		}
+
+		$tdbmDaoGenerator->generateAllDaosAndBeans();
+	}
+
+	/**
+	 * Returns the fully qualified class name of the bean associated with table $tableName.
+	 *
+	 *
+	 * @param string $tableName
+	 *
+	 * @return string
+	 */
+	public function getBeanClassName(string $tableName) : string
+	{
+		if (isset($this->tableToBeanMap[$tableName])) {
+			return $this->tableToBeanMap[$tableName];
+		} else {
+			$className = $this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($tableName);
+
+			if (!class_exists($className)) {
+				throw new TDBMInvalidArgumentException(sprintf('Could not find class "%s". Does table "%s" exist? If yes, consider regenerating the DAOs and beans.', $className, $tableName));
+			}
+
+			$this->tableToBeanMap[$tableName] = $className;
+			return $className;
+		}
+	}
+
+	/**
+	 * Saves $object by INSERTing or UPDAT(E)ing it in the database.
+	 *
+	 * @param AbstractTDBMObject $object
+	 *
+	 * @throws TDBMException
+	 */
+	public function save(AbstractTDBMObject $object)
+	{
+		$status = $object->_getStatus();
+
+		if ($status === null) {
+			throw new TDBMException(sprintf('Your bean for class %s has no status. It is likely that you overloaded the __construct method and forgot to call parent::__construct.', get_class($object)));
+		}
+
+		// Let's attach this object if it is in detached state.
+		if ($status === TDBMObjectStateEnum::STATE_DETACHED) {
+			$object->_attach($this);
+			$status = $object->_getStatus();
+		}
+
+		if ($status === TDBMObjectStateEnum::STATE_NEW) {
+			$dbRows = $object->_getDbRows();
+
+			$unindexedPrimaryKeys = array();
+
+			foreach ($dbRows as $dbRow) {
+				if ($dbRow->_getStatus() == TDBMObjectStateEnum::STATE_SAVING) {
+					throw TDBMCyclicReferenceException::createCyclicReference($dbRow->_getDbTableName(), $object);
+				}
+				$dbRow->_setStatus(TDBMObjectStateEnum::STATE_SAVING);
+				$tableName = $dbRow->_getDbTableName();
+
+				$schema = $this->tdbmSchemaAnalyzer->getSchema();
+				$tableDescriptor = $schema->getTable($tableName);
+
+				$primaryKeyColumns = $this->getPrimaryKeyColumns($tableName);
+
+				$references = $dbRow->_getReferences();
+
+				// Let's save all references in NEW or DETACHED state (we need their primary key)
+				foreach ($references as $fkName => $reference) {
+					if ($reference !== null) {
+						$refStatus = $reference->_getStatus();
+						if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
+							try {
+								$this->save($reference);
+							} catch (TDBMCyclicReferenceException $e) {
+								throw TDBMCyclicReferenceException::extendCyclicReference($e, $dbRow->_getDbTableName(), $object, $fkName);
+							}
+						}
+					}
+				}
+
+				if (empty($unindexedPrimaryKeys)) {
+					$primaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+				} else {
+					// First insert, the children must have the same primary key as the parent.
+					$primaryKeys = $this->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $unindexedPrimaryKeys);
+					$dbRow->_setPrimaryKeys($primaryKeys);
+				}
+
+				$dbRowData = $dbRow->_getDbRow();
+
+				// Let's see if the columns for primary key have been set before inserting.
+				// We assume that if one of the value of the PK has been set, the PK is set.
+				$isPkSet = !empty($primaryKeys);
+
+				/*if (!$isPkSet) {
                     // if there is no autoincrement and no pk set, let's go in error.
                     $isAutoIncrement = true;
 
@@ -618,30 +618,30 @@ 
 
                 }*/
 
-                $types = [];
-                $escapedDbRowData = [];
+				$types = [];
+				$escapedDbRowData = [];
 
-                foreach ($dbRowData as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                    $escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
-                }
+				foreach ($dbRowData as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+					$escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
+				}
 
-                $this->connection->insert($tableName, $escapedDbRowData, $types);
+				$this->connection->insert($tableName, $escapedDbRowData, $types);
 
-                if (!$isPkSet && count($primaryKeyColumns) == 1) {
-                    $id = $this->connection->lastInsertId();
-                    $pkColumn = $primaryKeyColumns[0];
-                    // lastInsertId returns a string but the column type is usually a int. Let's convert it back to the correct type.
-                    $id = $tableDescriptor->getColumn($pkColumn)->getType()->convertToPHPValue($id, $this->getConnection()->getDatabasePlatform());
-                    $primaryKeys[$pkColumn] = $id;
-                }
+				if (!$isPkSet && count($primaryKeyColumns) == 1) {
+					$id = $this->connection->lastInsertId();
+					$pkColumn = $primaryKeyColumns[0];
+					// lastInsertId returns a string but the column type is usually a int. Let's convert it back to the correct type.
+					$id = $tableDescriptor->getColumn($pkColumn)->getType()->convertToPHPValue($id, $this->getConnection()->getDatabasePlatform());
+					$primaryKeys[$pkColumn] = $id;
+				}
 
-                // TODO: change this to some private magic accessor in future
-                $dbRow->_setPrimaryKeys($primaryKeys);
-                $unindexedPrimaryKeys = array_values($primaryKeys);
+				// TODO: change this to some private magic accessor in future
+				$dbRow->_setPrimaryKeys($primaryKeys);
+				$unindexedPrimaryKeys = array_values($primaryKeys);
 
-                /*
+				/*
                  * When attached, on "save", we check if the column updated is part of a primary key
                  * If this is part of a primary key, we call the _update_id method that updates the id in the list of known objects.
                  * This method should first verify that the id is not already used (and is not auto-incremented)
@@ -651,7 +651,7 @@ 
                  *
                  */
 
-                /*try {
+				/*try {
                     $this->db_connection->exec($sql);
                 } catch (TDBMException $e) {
                     $this->db_onerror = true;
@@ -670,405 +670,405 @@ 
                     }
                 }*/
 
-                // Let's remove this object from the $new_objects static table.
-                $this->removeFromToSaveObjectList($dbRow);
-
-                // TODO: change this behaviour to something more sensible performance-wise
-                // Maybe a setting to trigger this globally?
-                //$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-                //$this->db_modified_state = false;
-                //$dbRow = array();
-
-                // Let's add this object to the list of objects in cache.
-                $this->_addToCache($dbRow);
-            }
-
-            $object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
-        } elseif ($status === TDBMObjectStateEnum::STATE_DIRTY) {
-            $dbRows = $object->_getDbRows();
-
-            foreach ($dbRows as $dbRow) {
-                $references = $dbRow->_getReferences();
-
-                // Let's save all references in NEW state (we need their primary key)
-                foreach ($references as $fkName => $reference) {
-                    if ($reference !== null && $reference->_getStatus() === TDBMObjectStateEnum::STATE_NEW) {
-                        $this->save($reference);
-                    }
-                }
-
-                // Let's first get the primary keys
-                $tableName = $dbRow->_getDbTableName();
-                $dbRowData = $dbRow->_getDbRow();
-
-                $schema = $this->tdbmSchemaAnalyzer->getSchema();
-                $tableDescriptor = $schema->getTable($tableName);
-
-                $primaryKeys = $dbRow->_getPrimaryKeys();
-
-                $types = [];
-                $escapedDbRowData = [];
-                $escapedPrimaryKeys = [];
-
-                foreach ($dbRowData as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                    $escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
-                }
-                foreach ($primaryKeys as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                    $escapedPrimaryKeys[$this->connection->quoteIdentifier($columnName)] = $value;
-                }
-
-                $this->connection->update($tableName, $escapedDbRowData, $escapedPrimaryKeys, $types);
-
-                // Let's check if the primary key has been updated...
-                $needsUpdatePk = false;
-                foreach ($primaryKeys as $column => $value) {
-                    if (!isset($dbRowData[$column]) || $dbRowData[$column] != $value) {
-                        $needsUpdatePk = true;
-                        break;
-                    }
-                }
-                if ($needsUpdatePk) {
-                    $this->objectStorage->remove($tableName, $this->getObjectHash($primaryKeys));
-                    $newPrimaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-                    $dbRow->_setPrimaryKeys($newPrimaryKeys);
-                    $this->objectStorage->set($tableName, $this->getObjectHash($primaryKeys), $dbRow);
-                }
-
-                // Let's remove this object from the list of objects to save.
-                $this->removeFromToSaveObjectList($dbRow);
-            }
-
-            $object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
-        } elseif ($status === TDBMObjectStateEnum::STATE_DELETED) {
-            throw new TDBMInvalidOperationException('This object has been deleted. It cannot be saved.');
-        }
-
-        // Finally, let's save all the many to many relationships to this bean.
-        $this->persistManyToManyRelationships($object);
-    }
-
-    private function persistManyToManyRelationships(AbstractTDBMObject $object)
-    {
-        foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
-            $tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
-            list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
-
-            $toRemoveFromStorage = [];
-
-            foreach ($storage as $remoteBean) {
-                /* @var $remoteBean AbstractTDBMObject */
-                $statusArr = $storage[$remoteBean];
-                $status = $statusArr['status'];
-                $reverse = $statusArr['reverse'];
-                if ($reverse) {
-                    continue;
-                }
-
-                if ($status === 'new') {
-                    $remoteBeanStatus = $remoteBean->_getStatus();
-                    if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
-                        // Let's save remote bean if needed.
-                        $this->save($remoteBean);
-                    }
-
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
-
-                    $types = [];
-                    $escapedFilters = [];
-
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                        $escapedFilters[$this->connection->quoteIdentifier($columnName)] = $value;
-                    }
-
-                    $this->connection->insert($pivotTableName, $escapedFilters, $types);
-
-                    // Finally, let's mark relationships as saved.
-                    $statusArr['status'] = 'loaded';
-                    $storage[$remoteBean] = $statusArr;
-                    $remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
-                    $remoteStatusArr = $remoteStorage[$object];
-                    $remoteStatusArr['status'] = 'loaded';
-                    $remoteStorage[$object] = $remoteStatusArr;
-                } elseif ($status === 'delete') {
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
-
-                    $types = [];
-
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                    }
-
-                    $this->connection->delete($pivotTableName, $filters, $types);
-
-                    // Finally, let's remove relationships completely from bean.
-                    $toRemoveFromStorage[] = $remoteBean;
-
-                    $remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
-                }
-            }
-
-            // Note: due to https://bugs.php.net/bug.php?id=65629, we cannot delete an element inside a foreach loop on a SplStorageObject.
-            // Therefore, we cache elements in the $toRemoveFromStorage to remove them at a later stage.
-            foreach ($toRemoveFromStorage as $remoteBean) {
-                $storage->detach($remoteBean);
-            }
-        }
-    }
-
-    private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
-    {
-        $localBeanPk = $this->getPrimaryKeyValues($localBean);
-        $remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
-        $localColumns = $localFk->getLocalColumns();
-        $remoteColumns = $remoteFk->getLocalColumns();
-
-        $localFilters = array_combine($localColumns, $localBeanPk);
-        $remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
-
-        return array_merge($localFilters, $remoteFilters);
-    }
-
-    /**
-     * Returns the "values" of the primary key.
-     * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
-     *
-     * @param AbstractTDBMObject $bean
-     *
-     * @return array numerically indexed array of values
-     */
-    private function getPrimaryKeyValues(AbstractTDBMObject $bean)
-    {
-        $dbRows = $bean->_getDbRows();
-        $dbRow = reset($dbRows);
-
-        return array_values($dbRow->_getPrimaryKeys());
-    }
-
-    /**
-     * Returns a unique hash used to store the object based on its primary key.
-     * If the array contains only one value, then the value is returned.
-     * Otherwise, a hash representing the array is returned.
-     *
-     * @param array $primaryKeys An array of columns => values forming the primary key
-     *
-     * @return string
-     */
-    public function getObjectHash(array $primaryKeys)
-    {
-        if (count($primaryKeys) === 1) {
-            return reset($primaryKeys);
-        } else {
-            ksort($primaryKeys);
-
-            return md5(json_encode($primaryKeys));
-        }
-    }
-
-    /**
-     * Returns an array of primary keys from the object.
-     * The primary keys are extracted from the object columns and not from the primary keys stored in the
-     * $primaryKeys variable of the object.
-     *
-     * @param DbRow $dbRow
-     *
-     * @return array Returns an array of column => value
-     */
-    public function getPrimaryKeysForObjectFromDbRow(DbRow $dbRow)
-    {
-        $table = $dbRow->_getDbTableName();
-        $dbRowData = $dbRow->_getDbRow();
-
-        return $this->_getPrimaryKeysFromObjectData($table, $dbRowData);
-    }
-
-    /**
-     * Returns an array of primary keys for the given row.
-     * The primary keys are extracted from the object columns.
-     *
-     * @param $table
-     * @param array $columns
-     *
-     * @return array
-     */
-    public function _getPrimaryKeysFromObjectData($table, array $columns)
-    {
-        $primaryKeyColumns = $this->getPrimaryKeyColumns($table);
-        $values = array();
-        foreach ($primaryKeyColumns as $column) {
-            if (isset($columns[$column])) {
-                $values[$column] = $columns[$column];
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Attaches $object to this TDBMService.
-     * The $object must be in DETACHED state and will pass in NEW state.
-     *
-     * @param AbstractTDBMObject $object
-     *
-     * @throws TDBMInvalidOperationException
-     */
-    public function attach(AbstractTDBMObject $object)
-    {
-        $object->_attach($this);
-    }
-
-    /**
-     * Returns an associative array (column => value) for the primary keys from the table name and an
-     * indexed array of primary key values.
-     *
-     * @param string $tableName
-     * @param array  $indexedPrimaryKeys
-     */
-    public function _getPrimaryKeysFromIndexedPrimaryKeys($tableName, array $indexedPrimaryKeys)
-    {
-        $primaryKeyColumns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getPrimaryKeyColumns();
-
-        if (count($primaryKeyColumns) !== count($indexedPrimaryKeys)) {
-            throw new TDBMException(sprintf('Wrong number of columns passed for primary key. Expected %s columns for table "%s",
+				// Let's remove this object from the $new_objects static table.
+				$this->removeFromToSaveObjectList($dbRow);
+
+				// TODO: change this behaviour to something more sensible performance-wise
+				// Maybe a setting to trigger this globally?
+				//$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+				//$this->db_modified_state = false;
+				//$dbRow = array();
+
+				// Let's add this object to the list of objects in cache.
+				$this->_addToCache($dbRow);
+			}
+
+			$object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
+		} elseif ($status === TDBMObjectStateEnum::STATE_DIRTY) {
+			$dbRows = $object->_getDbRows();
+
+			foreach ($dbRows as $dbRow) {
+				$references = $dbRow->_getReferences();
+
+				// Let's save all references in NEW state (we need their primary key)
+				foreach ($references as $fkName => $reference) {
+					if ($reference !== null && $reference->_getStatus() === TDBMObjectStateEnum::STATE_NEW) {
+						$this->save($reference);
+					}
+				}
+
+				// Let's first get the primary keys
+				$tableName = $dbRow->_getDbTableName();
+				$dbRowData = $dbRow->_getDbRow();
+
+				$schema = $this->tdbmSchemaAnalyzer->getSchema();
+				$tableDescriptor = $schema->getTable($tableName);
+
+				$primaryKeys = $dbRow->_getPrimaryKeys();
+
+				$types = [];
+				$escapedDbRowData = [];
+				$escapedPrimaryKeys = [];
+
+				foreach ($dbRowData as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+					$escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
+				}
+				foreach ($primaryKeys as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+					$escapedPrimaryKeys[$this->connection->quoteIdentifier($columnName)] = $value;
+				}
+
+				$this->connection->update($tableName, $escapedDbRowData, $escapedPrimaryKeys, $types);
+
+				// Let's check if the primary key has been updated...
+				$needsUpdatePk = false;
+				foreach ($primaryKeys as $column => $value) {
+					if (!isset($dbRowData[$column]) || $dbRowData[$column] != $value) {
+						$needsUpdatePk = true;
+						break;
+					}
+				}
+				if ($needsUpdatePk) {
+					$this->objectStorage->remove($tableName, $this->getObjectHash($primaryKeys));
+					$newPrimaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+					$dbRow->_setPrimaryKeys($newPrimaryKeys);
+					$this->objectStorage->set($tableName, $this->getObjectHash($primaryKeys), $dbRow);
+				}
+
+				// Let's remove this object from the list of objects to save.
+				$this->removeFromToSaveObjectList($dbRow);
+			}
+
+			$object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
+		} elseif ($status === TDBMObjectStateEnum::STATE_DELETED) {
+			throw new TDBMInvalidOperationException('This object has been deleted. It cannot be saved.');
+		}
+
+		// Finally, let's save all the many to many relationships to this bean.
+		$this->persistManyToManyRelationships($object);
+	}
+
+	private function persistManyToManyRelationships(AbstractTDBMObject $object)
+	{
+		foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
+			$tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
+			list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
+
+			$toRemoveFromStorage = [];
+
+			foreach ($storage as $remoteBean) {
+				/* @var $remoteBean AbstractTDBMObject */
+				$statusArr = $storage[$remoteBean];
+				$status = $statusArr['status'];
+				$reverse = $statusArr['reverse'];
+				if ($reverse) {
+					continue;
+				}
+
+				if ($status === 'new') {
+					$remoteBeanStatus = $remoteBean->_getStatus();
+					if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
+						// Let's save remote bean if needed.
+						$this->save($remoteBean);
+					}
+
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+
+					$types = [];
+					$escapedFilters = [];
+
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+						$escapedFilters[$this->connection->quoteIdentifier($columnName)] = $value;
+					}
+
+					$this->connection->insert($pivotTableName, $escapedFilters, $types);
+
+					// Finally, let's mark relationships as saved.
+					$statusArr['status'] = 'loaded';
+					$storage[$remoteBean] = $statusArr;
+					$remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
+					$remoteStatusArr = $remoteStorage[$object];
+					$remoteStatusArr['status'] = 'loaded';
+					$remoteStorage[$object] = $remoteStatusArr;
+				} elseif ($status === 'delete') {
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+
+					$types = [];
+
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+					}
+
+					$this->connection->delete($pivotTableName, $filters, $types);
+
+					// Finally, let's remove relationships completely from bean.
+					$toRemoveFromStorage[] = $remoteBean;
+
+					$remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
+				}
+			}
+
+			// Note: due to https://bugs.php.net/bug.php?id=65629, we cannot delete an element inside a foreach loop on a SplStorageObject.
+			// Therefore, we cache elements in the $toRemoveFromStorage to remove them at a later stage.
+			foreach ($toRemoveFromStorage as $remoteBean) {
+				$storage->detach($remoteBean);
+			}
+		}
+	}
+
+	private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
+	{
+		$localBeanPk = $this->getPrimaryKeyValues($localBean);
+		$remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
+		$localColumns = $localFk->getLocalColumns();
+		$remoteColumns = $remoteFk->getLocalColumns();
+
+		$localFilters = array_combine($localColumns, $localBeanPk);
+		$remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
+
+		return array_merge($localFilters, $remoteFilters);
+	}
+
+	/**
+	 * Returns the "values" of the primary key.
+	 * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
+	 *
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return array numerically indexed array of values
+	 */
+	private function getPrimaryKeyValues(AbstractTDBMObject $bean)
+	{
+		$dbRows = $bean->_getDbRows();
+		$dbRow = reset($dbRows);
+
+		return array_values($dbRow->_getPrimaryKeys());
+	}
+
+	/**
+	 * Returns a unique hash used to store the object based on its primary key.
+	 * If the array contains only one value, then the value is returned.
+	 * Otherwise, a hash representing the array is returned.
+	 *
+	 * @param array $primaryKeys An array of columns => values forming the primary key
+	 *
+	 * @return string
+	 */
+	public function getObjectHash(array $primaryKeys)
+	{
+		if (count($primaryKeys) === 1) {
+			return reset($primaryKeys);
+		} else {
+			ksort($primaryKeys);
+
+			return md5(json_encode($primaryKeys));
+		}
+	}
+
+	/**
+	 * Returns an array of primary keys from the object.
+	 * The primary keys are extracted from the object columns and not from the primary keys stored in the
+	 * $primaryKeys variable of the object.
+	 *
+	 * @param DbRow $dbRow
+	 *
+	 * @return array Returns an array of column => value
+	 */
+	public function getPrimaryKeysForObjectFromDbRow(DbRow $dbRow)
+	{
+		$table = $dbRow->_getDbTableName();
+		$dbRowData = $dbRow->_getDbRow();
+
+		return $this->_getPrimaryKeysFromObjectData($table, $dbRowData);
+	}
+
+	/**
+	 * Returns an array of primary keys for the given row.
+	 * The primary keys are extracted from the object columns.
+	 *
+	 * @param $table
+	 * @param array $columns
+	 *
+	 * @return array
+	 */
+	public function _getPrimaryKeysFromObjectData($table, array $columns)
+	{
+		$primaryKeyColumns = $this->getPrimaryKeyColumns($table);
+		$values = array();
+		foreach ($primaryKeyColumns as $column) {
+			if (isset($columns[$column])) {
+				$values[$column] = $columns[$column];
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Attaches $object to this TDBMService.
+	 * The $object must be in DETACHED state and will pass in NEW state.
+	 *
+	 * @param AbstractTDBMObject $object
+	 *
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function attach(AbstractTDBMObject $object)
+	{
+		$object->_attach($this);
+	}
+
+	/**
+	 * Returns an associative array (column => value) for the primary keys from the table name and an
+	 * indexed array of primary key values.
+	 *
+	 * @param string $tableName
+	 * @param array  $indexedPrimaryKeys
+	 */
+	public function _getPrimaryKeysFromIndexedPrimaryKeys($tableName, array $indexedPrimaryKeys)
+	{
+		$primaryKeyColumns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getPrimaryKeyColumns();
+
+		if (count($primaryKeyColumns) !== count($indexedPrimaryKeys)) {
+			throw new TDBMException(sprintf('Wrong number of columns passed for primary key. Expected %s columns for table "%s",
 			got %s instead.', count($primaryKeyColumns), $tableName, count($indexedPrimaryKeys)));
-        }
-
-        return array_combine($primaryKeyColumns, $indexedPrimaryKeys);
-    }
-
-    /**
-     * Return the list of tables (from child to parent) joining the tables passed in parameter.
-     * Tables must be in a single line of inheritance. The method will find missing tables.
-     *
-     * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
-     * we must be able to find all other tables.
-     *
-     * @param string[] $tables
-     *
-     * @return string[]
-     */
-    public function _getLinkBetweenInheritedTables(array $tables)
-    {
-        sort($tables);
-
-        return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
-            function () use ($tables) {
-                return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
-            });
-    }
-
-    /**
-     * Return the list of tables (from child to parent) joining the tables passed in parameter.
-     * Tables must be in a single line of inheritance. The method will find missing tables.
-     *
-     * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
-     * we must be able to find all other tables.
-     *
-     * @param string[] $tables
-     *
-     * @return string[]
-     */
-    private function _getLinkBetweenInheritedTablesWithoutCache(array $tables)
-    {
-        $schemaAnalyzer = $this->schemaAnalyzer;
-
-        foreach ($tables as $currentTable) {
-            $allParents = [$currentTable];
-            while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
-                $currentTable = $currentFk->getForeignTableName();
-                $allParents[] = $currentTable;
-            }
-
-            // Now, does the $allParents contain all the tables we want?
-            $notFoundTables = array_diff($tables, $allParents);
-            if (empty($notFoundTables)) {
-                // We have a winner!
-                return $allParents;
-            }
-        }
-
-        throw TDBMInheritanceException::create($tables);
-    }
-
-    /**
-     * Returns the list of tables related to this table (via a parent or child inheritance relationship).
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    public function _getRelatedTablesByInheritance($table)
-    {
-        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
-            return $this->_getRelatedTablesByInheritanceWithoutCache($table);
-        });
-    }
-
-    /**
-     * Returns the list of tables related to this table (via a parent or child inheritance relationship).
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    private function _getRelatedTablesByInheritanceWithoutCache($table)
-    {
-        $schemaAnalyzer = $this->schemaAnalyzer;
-
-        // Let's scan the parent tables
-        $currentTable = $table;
-
-        $parentTables = [];
-
-        // Get parent relationship
-        while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
-            $currentTable = $currentFk->getForeignTableName();
-            $parentTables[] = $currentTable;
-        }
-
-        // Let's recurse in children
-        $childrenTables = $this->exploreChildrenTablesRelationships($schemaAnalyzer, $table);
-
-        return array_merge(array_reverse($parentTables), $childrenTables);
-    }
-
-    /**
-     * Explore all the children and descendant of $table and returns ForeignKeyConstraints on those.
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    private function exploreChildrenTablesRelationships(SchemaAnalyzer $schemaAnalyzer, $table)
-    {
-        $tables = [$table];
-        $keys = $schemaAnalyzer->getChildrenRelationships($table);
-
-        foreach ($keys as $key) {
-            $tables = array_merge($tables, $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName()));
-        }
-
-        return $tables;
-    }
-
-    /**
-     * Casts a foreign key into SQL, assuming table name is used with no alias.
-     * The returned value does contain only one table. For instance:.
-     *
-     * " LEFT JOIN table2 ON table1.id = table2.table1_id"
-     *
-     * @param ForeignKeyConstraint $fk
-     * @param bool                 $leftTableIsLocal
-     *
-     * @return string
-     */
-    /*private function foreignKeyToSql(ForeignKeyConstraint $fk, $leftTableIsLocal) {
+		}
+
+		return array_combine($primaryKeyColumns, $indexedPrimaryKeys);
+	}
+
+	/**
+	 * Return the list of tables (from child to parent) joining the tables passed in parameter.
+	 * Tables must be in a single line of inheritance. The method will find missing tables.
+	 *
+	 * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
+	 * we must be able to find all other tables.
+	 *
+	 * @param string[] $tables
+	 *
+	 * @return string[]
+	 */
+	public function _getLinkBetweenInheritedTables(array $tables)
+	{
+		sort($tables);
+
+		return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
+			function () use ($tables) {
+				return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
+			});
+	}
+
+	/**
+	 * Return the list of tables (from child to parent) joining the tables passed in parameter.
+	 * Tables must be in a single line of inheritance. The method will find missing tables.
+	 *
+	 * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
+	 * we must be able to find all other tables.
+	 *
+	 * @param string[] $tables
+	 *
+	 * @return string[]
+	 */
+	private function _getLinkBetweenInheritedTablesWithoutCache(array $tables)
+	{
+		$schemaAnalyzer = $this->schemaAnalyzer;
+
+		foreach ($tables as $currentTable) {
+			$allParents = [$currentTable];
+			while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
+				$currentTable = $currentFk->getForeignTableName();
+				$allParents[] = $currentTable;
+			}
+
+			// Now, does the $allParents contain all the tables we want?
+			$notFoundTables = array_diff($tables, $allParents);
+			if (empty($notFoundTables)) {
+				// We have a winner!
+				return $allParents;
+			}
+		}
+
+		throw TDBMInheritanceException::create($tables);
+	}
+
+	/**
+	 * Returns the list of tables related to this table (via a parent or child inheritance relationship).
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	public function _getRelatedTablesByInheritance($table)
+	{
+		return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
+			return $this->_getRelatedTablesByInheritanceWithoutCache($table);
+		});
+	}
+
+	/**
+	 * Returns the list of tables related to this table (via a parent or child inheritance relationship).
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	private function _getRelatedTablesByInheritanceWithoutCache($table)
+	{
+		$schemaAnalyzer = $this->schemaAnalyzer;
+
+		// Let's scan the parent tables
+		$currentTable = $table;
+
+		$parentTables = [];
+
+		// Get parent relationship
+		while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
+			$currentTable = $currentFk->getForeignTableName();
+			$parentTables[] = $currentTable;
+		}
+
+		// Let's recurse in children
+		$childrenTables = $this->exploreChildrenTablesRelationships($schemaAnalyzer, $table);
+
+		return array_merge(array_reverse($parentTables), $childrenTables);
+	}
+
+	/**
+	 * Explore all the children and descendant of $table and returns ForeignKeyConstraints on those.
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	private function exploreChildrenTablesRelationships(SchemaAnalyzer $schemaAnalyzer, $table)
+	{
+		$tables = [$table];
+		$keys = $schemaAnalyzer->getChildrenRelationships($table);
+
+		foreach ($keys as $key) {
+			$tables = array_merge($tables, $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName()));
+		}
+
+		return $tables;
+	}
+
+	/**
+	 * Casts a foreign key into SQL, assuming table name is used with no alias.
+	 * The returned value does contain only one table. For instance:.
+	 *
+	 * " LEFT JOIN table2 ON table1.id = table2.table1_id"
+	 *
+	 * @param ForeignKeyConstraint $fk
+	 * @param bool                 $leftTableIsLocal
+	 *
+	 * @return string
+	 */
+	/*private function foreignKeyToSql(ForeignKeyConstraint $fk, $leftTableIsLocal) {
         $onClauses = [];
         $foreignTableName = $this->connection->quoteIdentifier($fk->getForeignTableName());
         $foreignColumns = $fk->getForeignColumns();
@@ -1094,417 +1094,417 @@ 
         }
     }*/
 
-    /**
-     * Returns a `ResultIterator` object representing filtered records of "$mainTable" .
-     *
-     * The findObjects method should be the most used query method in TDBM if you want to query the database for objects.
-     * (Note: if you want to query the database for an object by its primary key, use the findObjectByPk method).
-     *
-     * The findObjects method takes in parameter:
-     * 	- mainTable: the kind of bean you want to retrieve. In TDBM, a bean matches a database row, so the
-     * 			`$mainTable` parameter should be the name of an existing table in database.
-     *  - filter: The filter is a filter bag. It is what you use to filter your request (the WHERE part in SQL).
-     *          It can be a string (SQL Where clause), or even a bean or an associative array (key = column to filter, value = value to find)
-     *  - parameters: The parameters used in the filter. If you pass a SQL string as a filter, be sure to avoid
-     *          concatenating parameters in the string (this leads to SQL injection and also to poor caching performance).
-     *          Instead, please consider passing parameters (see documentation for more details).
-     *  - additionalTablesFetch: An array of SQL tables names. The beans related to those tables will be fetched along
-     *          the main table. This is useful to avoid hitting the database with numerous subqueries.
-     *  - mode: The fetch mode of the result. See `setFetchMode()` method for more details.
-     *
-     * The `findObjects` method will return a `ResultIterator`. A `ResultIterator` is an object that behaves as an array
-     * (in ARRAY mode) at least. It can be iterated using a `foreach` loop.
-     *
-     * Finally, if filter_bag is null, the whole table is returned.
-     *
-     * @param string                       $mainTable             The name of the table queried
-     * @param string|array|null            $filter                The SQL filters to apply to the query (the WHERE part). Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
-     * @param array                        $parameters
-     * @param string|UncheckedOrderBy|null $orderString           The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
-     * @param array                        $additionalTablesFetch
-     * @param int                          $mode
-     * @param string                       $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return ResultIterator An object representing an array of results
-     *
-     * @throws TDBMException
-     */
-    public function findObjects(string $mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, string $className = null)
-    {
-        // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
-        if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
-            throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
-        }
-
-        $mode = $mode ?: $this->mode;
-
-        list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
-
-        $parameters = array_merge($parameters, $additionalParameters);
-
-        $queryFactory = new FindObjectsQueryFactory($mainTable, $additionalTablesFetch, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer);
-
-        return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
-    }
-
-    /**
-     * @param string                       $mainTable   The name of the table queried
-     * @param string                       $from        The from sql statement
-     * @param string|array|null            $filter      The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array                        $parameters
-     * @param string|UncheckedOrderBy|null $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column)
-     * @param int                          $mode
-     * @param string                       $className   Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return ResultIterator An object representing an array of results
-     *
-     * @throws TDBMException
-     */
-    public function findObjectsFromSql(string $mainTable, string $from, $filter = null, array $parameters = array(), $orderString = null, $mode = null, string $className = null)
-    {
-        // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
-        if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
-            throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
-        }
-
-        $mode = $mode ?: $this->mode;
-
-        list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
-
-        $parameters = array_merge($parameters, $additionalParameters);
-
-        $queryFactory = new FindObjectsFromSqlQueryFactory($mainTable, $from, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer, $this->schemaAnalyzer, $this->cache, $this->cachePrefix);
-
-        return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
-    }
-
-    /**
-     * @param $table
-     * @param array  $primaryKeys
-     * @param array  $additionalTablesFetch
-     * @param bool   $lazy                  Whether to perform lazy loading on this object or not
-     * @param string $className
-     *
-     * @return AbstractTDBMObject
-     *
-     * @throws TDBMException
-     */
-    public function findObjectByPk(string $table, array $primaryKeys, array $additionalTablesFetch = array(), bool $lazy = false, string $className = null)
-    {
-        $primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
-        $hash = $this->getObjectHash($primaryKeys);
-
-        if ($this->objectStorage->has($table, $hash)) {
-            $dbRow = $this->objectStorage->get($table, $hash);
-            $bean = $dbRow->getTDBMObject();
-            if ($className !== null && !is_a($bean, $className)) {
-                throw new TDBMException("TDBM cannot create a bean of class '".$className."'. The requested object was already loaded and its class is '".get_class($bean)."'");
-            }
-
-            return $bean;
-        }
-
-        // Are we performing lazy fetching?
-        if ($lazy === true) {
-            // Can we perform lazy fetching?
-            $tables = $this->_getRelatedTablesByInheritance($table);
-            // Only allowed if no inheritance.
-            if (count($tables) === 1) {
-                if ($className === null) {
-                    try {
-                        $className = $this->getBeanClassName($table);
-                    } catch (TDBMInvalidArgumentException $e) {
-                        $className = TDBMObject::class;
-                    }
-                }
-
-                // Let's construct the bean
-                if (!isset($this->reflectionClassCache[$className])) {
-                    $this->reflectionClassCache[$className] = new \ReflectionClass($className);
-                }
-                // Let's bypass the constructor when creating the bean!
-                $bean = $this->reflectionClassCache[$className]->newInstanceWithoutConstructor();
-                /* @var $bean AbstractTDBMObject */
-                $bean->_constructLazy($table, $primaryKeys, $this);
-
-                return $bean;
-            }
-        }
-
-        // Did not find the object in cache? Let's query it!
-        return $this->findObjectOrFail($table, $primaryKeys, [], $additionalTablesFetch, $className);
-    }
-
-    /**
-     * Returns a unique bean (or null) according to the filters passed in parameter.
-     *
-     * @param string            $mainTable             The name of the table queried
-     * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $parameters
-     * @param array             $additionalTablesFetch
-     * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
-     *
-     * @throws TDBMException
-     */
-    public function findObject(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
-    {
-        $objects = $this->findObjects($mainTable, $filter, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
-        $page = $objects->take(0, 2);
-        $count = $page->count();
-        if ($count > 1) {
-            throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
-        } elseif ($count === 0) {
-            return;
-        }
-
-        return $page[0];
-    }
-
-    /**
-     * Returns a unique bean (or null) according to the filters passed in parameter.
-     *
-     * @param string            $mainTable  The name of the table queried
-     * @param string            $from       The from sql statement
-     * @param string|array|null $filter     The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $parameters
-     * @param string            $className  Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
-     *
-     * @throws TDBMException
-     */
-    public function findObjectFromSql($mainTable, $from, $filter = null, array $parameters = array(), $className = null)
-    {
-        $objects = $this->findObjectsFromSql($mainTable, $from, $filter, $parameters, null, self::MODE_ARRAY, $className);
-        $page = $objects->take(0, 2);
-        $count = $page->count();
-        if ($count > 1) {
-            throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
-        } elseif ($count === 0) {
-            return;
-        }
-
-        return $page[0];
-    }
-
-    /**
-     * Returns a unique bean according to the filters passed in parameter.
-     * Throws a NoBeanFoundException if no bean was found for the filter passed in parameter.
-     *
-     * @param string            $mainTable             The name of the table queried
-     * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $parameters
-     * @param array             $additionalTablesFetch
-     * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return AbstractTDBMObject The object we want
-     *
-     * @throws TDBMException
-     */
-    public function findObjectOrFail(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
-    {
-        $bean = $this->findObject($mainTable, $filter, $parameters, $additionalTablesFetch, $className);
-        if ($bean === null) {
-            throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");
-        }
-
-        return $bean;
-    }
-
-    /**
-     * @param array $beanData An array of data: array<table, array<column, value>>
-     *
-     * @return array an array with first item = class name, second item = table name and third item = list of tables needed
-     *
-     * @throws TDBMInheritanceException
-     */
-    public function _getClassNameFromBeanData(array $beanData)
-    {
-        if (count($beanData) === 1) {
-            $tableName = array_keys($beanData)[0];
-            $allTables = [$tableName];
-        } else {
-            $tables = [];
-            foreach ($beanData as $table => $row) {
-                $primaryKeyColumns = $this->getPrimaryKeyColumns($table);
-                $pkSet = false;
-                foreach ($primaryKeyColumns as $columnName) {
-                    if ($row[$columnName] !== null) {
-                        $pkSet = true;
-                        break;
-                    }
-                }
-                if ($pkSet) {
-                    $tables[] = $table;
-                }
-            }
-
-            // $tables contains the tables for this bean. Let's view the top most part of the hierarchy
-            try {
-                $allTables = $this->_getLinkBetweenInheritedTables($tables);
-            } catch (TDBMInheritanceException $e) {
-                throw TDBMInheritanceException::extendException($e, $this, $beanData);
-            }
-            $tableName = $allTables[0];
-        }
-
-        // Only one table in this bean. Life is sweat, let's look at its type:
-        try {
-            $className = $this->getBeanClassName($tableName);
-        } catch (TDBMInvalidArgumentException $e) {
-            $className = 'Mouf\\Database\\TDBM\\TDBMObject';
-        }
-
-        return [$className, $tableName, $allTables];
-    }
-
-    /**
-     * Returns an item from cache or computes it using $closure and puts it in cache.
-     *
-     * @param string   $key
-     * @param callable $closure
-     *
-     * @return mixed
-     */
-    private function fromCache(string $key, callable $closure)
-    {
-        $item = $this->cache->fetch($key);
-        if ($item === false) {
-            $item = $closure();
-            $this->cache->save($key, $item);
-        }
-
-        return $item;
-    }
-
-    /**
-     * Returns the foreign key object.
-     *
-     * @param string $table
-     * @param string $fkName
-     *
-     * @return ForeignKeyConstraint
-     */
-    public function _getForeignKeyByName(string $table, string $fkName)
-    {
-        return $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getForeignKey($fkName);
-    }
-
-    /**
-     * @param $pivotTableName
-     * @param AbstractTDBMObject $bean
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getRelatedBeans(string $pivotTableName, AbstractTDBMObject $bean)
-    {
-        list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
-        /* @var $localFk ForeignKeyConstraint */
-        /* @var $remoteFk ForeignKeyConstraint */
-        $remoteTable = $remoteFk->getForeignTableName();
-
-        $primaryKeys = $this->getPrimaryKeyValues($bean);
-        $columnNames = array_map(function ($name) use ($pivotTableName) {
-            return $pivotTableName.'.'.$name;
-        }, $localFk->getLocalColumns());
-
-        $filter = array_combine($columnNames, $primaryKeys);
-
-        return $this->findObjects($remoteTable, $filter);
-    }
-
-    /**
-     * @param $pivotTableName
-     * @param AbstractTDBMObject $bean The LOCAL bean
-     *
-     * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean
-     *
-     * @throws TDBMException
-     */
-    private function getPivotTableForeignKeys(string $pivotTableName, AbstractTDBMObject $bean)
-    {
-        $fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
-        $table1 = $fks[0]->getForeignTableName();
-        $table2 = $fks[1]->getForeignTableName();
-
-        $beanTables = array_map(function (DbRow $dbRow) {
-            return $dbRow->_getDbTableName();
-        }, $bean->_getDbRows());
-
-        if (in_array($table1, $beanTables)) {
-            return [$fks[0], $fks[1]];
-        } elseif (in_array($table2, $beanTables)) {
-            return [$fks[1], $fks[0]];
-        } else {
-            throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
-        }
-    }
-
-    /**
-     * Returns a list of pivot tables linked to $bean.
-     *
-     * @param AbstractTDBMObject $bean
-     *
-     * @return string[]
-     */
-    public function _getPivotTablesLinkedToBean(AbstractTDBMObject $bean)
-    {
-        $junctionTables = [];
-        $allJunctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
-        foreach ($bean->_getDbRows() as $dbRow) {
-            foreach ($allJunctionTables as $table) {
-                // There are exactly 2 FKs since this is a pivot table.
-                $fks = array_values($table->getForeignKeys());
-
-                if ($fks[0]->getForeignTableName() === $dbRow->_getDbTableName() || $fks[1]->getForeignTableName() === $dbRow->_getDbTableName()) {
-                    $junctionTables[] = $table->getName();
-                }
-            }
-        }
-
-        return $junctionTables;
-    }
-
-    /**
-     * Array of types for tables.
-     * Key: table name
-     * Value: array of types indexed by column.
-     *
-     * @var array[]
-     */
-    private $typesForTable = [];
-
-    /**
-     * @internal
-     *
-     * @param string $tableName
-     *
-     * @return Type[]
-     */
-    public function _getColumnTypesForTable(string $tableName)
-    {
-        if (!isset($typesForTable[$tableName])) {
-            $columns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getColumns();
-            $typesForTable[$tableName] = array_map(function (Column $column) {
-                return $column->getType();
-            }, $columns);
-        }
-
-        return $typesForTable[$tableName];
-    }
-
-    /**
-     * Sets the minimum log level.
-     * $level must be one of Psr\Log\LogLevel::xxx.
-     *
-     * Defaults to LogLevel::WARNING
-     *
-     * @param string $level
-     */
-    public function setLogLevel(string $level)
-    {
-        $this->logger = new LevelFilter($this->rootLogger, $level);
-    }
+	/**
+	 * Returns a `ResultIterator` object representing filtered records of "$mainTable" .
+	 *
+	 * The findObjects method should be the most used query method in TDBM if you want to query the database for objects.
+	 * (Note: if you want to query the database for an object by its primary key, use the findObjectByPk method).
+	 *
+	 * The findObjects method takes in parameter:
+	 * 	- mainTable: the kind of bean you want to retrieve. In TDBM, a bean matches a database row, so the
+	 * 			`$mainTable` parameter should be the name of an existing table in database.
+	 *  - filter: The filter is a filter bag. It is what you use to filter your request (the WHERE part in SQL).
+	 *          It can be a string (SQL Where clause), or even a bean or an associative array (key = column to filter, value = value to find)
+	 *  - parameters: The parameters used in the filter. If you pass a SQL string as a filter, be sure to avoid
+	 *          concatenating parameters in the string (this leads to SQL injection and also to poor caching performance).
+	 *          Instead, please consider passing parameters (see documentation for more details).
+	 *  - additionalTablesFetch: An array of SQL tables names. The beans related to those tables will be fetched along
+	 *          the main table. This is useful to avoid hitting the database with numerous subqueries.
+	 *  - mode: The fetch mode of the result. See `setFetchMode()` method for more details.
+	 *
+	 * The `findObjects` method will return a `ResultIterator`. A `ResultIterator` is an object that behaves as an array
+	 * (in ARRAY mode) at least. It can be iterated using a `foreach` loop.
+	 *
+	 * Finally, if filter_bag is null, the whole table is returned.
+	 *
+	 * @param string                       $mainTable             The name of the table queried
+	 * @param string|array|null            $filter                The SQL filters to apply to the query (the WHERE part). Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
+	 * @param array                        $parameters
+	 * @param string|UncheckedOrderBy|null $orderString           The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
+	 * @param array                        $additionalTablesFetch
+	 * @param int                          $mode
+	 * @param string                       $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return ResultIterator An object representing an array of results
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjects(string $mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, string $className = null)
+	{
+		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
+		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
+			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
+		}
+
+		$mode = $mode ?: $this->mode;
+
+		list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
+
+		$parameters = array_merge($parameters, $additionalParameters);
+
+		$queryFactory = new FindObjectsQueryFactory($mainTable, $additionalTablesFetch, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer);
+
+		return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
+	}
+
+	/**
+	 * @param string                       $mainTable   The name of the table queried
+	 * @param string                       $from        The from sql statement
+	 * @param string|array|null            $filter      The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array                        $parameters
+	 * @param string|UncheckedOrderBy|null $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column)
+	 * @param int                          $mode
+	 * @param string                       $className   Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return ResultIterator An object representing an array of results
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectsFromSql(string $mainTable, string $from, $filter = null, array $parameters = array(), $orderString = null, $mode = null, string $className = null)
+	{
+		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
+		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
+			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
+		}
+
+		$mode = $mode ?: $this->mode;
+
+		list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
+
+		$parameters = array_merge($parameters, $additionalParameters);
+
+		$queryFactory = new FindObjectsFromSqlQueryFactory($mainTable, $from, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer, $this->schemaAnalyzer, $this->cache, $this->cachePrefix);
+
+		return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
+	}
+
+	/**
+	 * @param $table
+	 * @param array  $primaryKeys
+	 * @param array  $additionalTablesFetch
+	 * @param bool   $lazy                  Whether to perform lazy loading on this object or not
+	 * @param string $className
+	 *
+	 * @return AbstractTDBMObject
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectByPk(string $table, array $primaryKeys, array $additionalTablesFetch = array(), bool $lazy = false, string $className = null)
+	{
+		$primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
+		$hash = $this->getObjectHash($primaryKeys);
+
+		if ($this->objectStorage->has($table, $hash)) {
+			$dbRow = $this->objectStorage->get($table, $hash);
+			$bean = $dbRow->getTDBMObject();
+			if ($className !== null && !is_a($bean, $className)) {
+				throw new TDBMException("TDBM cannot create a bean of class '".$className."'. The requested object was already loaded and its class is '".get_class($bean)."'");
+			}
+
+			return $bean;
+		}
+
+		// Are we performing lazy fetching?
+		if ($lazy === true) {
+			// Can we perform lazy fetching?
+			$tables = $this->_getRelatedTablesByInheritance($table);
+			// Only allowed if no inheritance.
+			if (count($tables) === 1) {
+				if ($className === null) {
+					try {
+						$className = $this->getBeanClassName($table);
+					} catch (TDBMInvalidArgumentException $e) {
+						$className = TDBMObject::class;
+					}
+				}
+
+				// Let's construct the bean
+				if (!isset($this->reflectionClassCache[$className])) {
+					$this->reflectionClassCache[$className] = new \ReflectionClass($className);
+				}
+				// Let's bypass the constructor when creating the bean!
+				$bean = $this->reflectionClassCache[$className]->newInstanceWithoutConstructor();
+				/* @var $bean AbstractTDBMObject */
+				$bean->_constructLazy($table, $primaryKeys, $this);
+
+				return $bean;
+			}
+		}
+
+		// Did not find the object in cache? Let's query it!
+		return $this->findObjectOrFail($table, $primaryKeys, [], $additionalTablesFetch, $className);
+	}
+
+	/**
+	 * Returns a unique bean (or null) according to the filters passed in parameter.
+	 *
+	 * @param string            $mainTable             The name of the table queried
+	 * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $parameters
+	 * @param array             $additionalTablesFetch
+	 * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObject(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
+	{
+		$objects = $this->findObjects($mainTable, $filter, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
+		$page = $objects->take(0, 2);
+		$count = $page->count();
+		if ($count > 1) {
+			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
+		} elseif ($count === 0) {
+			return;
+		}
+
+		return $page[0];
+	}
+
+	/**
+	 * Returns a unique bean (or null) according to the filters passed in parameter.
+	 *
+	 * @param string            $mainTable  The name of the table queried
+	 * @param string            $from       The from sql statement
+	 * @param string|array|null $filter     The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $parameters
+	 * @param string            $className  Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectFromSql($mainTable, $from, $filter = null, array $parameters = array(), $className = null)
+	{
+		$objects = $this->findObjectsFromSql($mainTable, $from, $filter, $parameters, null, self::MODE_ARRAY, $className);
+		$page = $objects->take(0, 2);
+		$count = $page->count();
+		if ($count > 1) {
+			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
+		} elseif ($count === 0) {
+			return;
+		}
+
+		return $page[0];
+	}
+
+	/**
+	 * Returns a unique bean according to the filters passed in parameter.
+	 * Throws a NoBeanFoundException if no bean was found for the filter passed in parameter.
+	 *
+	 * @param string            $mainTable             The name of the table queried
+	 * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $parameters
+	 * @param array             $additionalTablesFetch
+	 * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return AbstractTDBMObject The object we want
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectOrFail(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
+	{
+		$bean = $this->findObject($mainTable, $filter, $parameters, $additionalTablesFetch, $className);
+		if ($bean === null) {
+			throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");
+		}
+
+		return $bean;
+	}
+
+	/**
+	 * @param array $beanData An array of data: array<table, array<column, value>>
+	 *
+	 * @return array an array with first item = class name, second item = table name and third item = list of tables needed
+	 *
+	 * @throws TDBMInheritanceException
+	 */
+	public function _getClassNameFromBeanData(array $beanData)
+	{
+		if (count($beanData) === 1) {
+			$tableName = array_keys($beanData)[0];
+			$allTables = [$tableName];
+		} else {
+			$tables = [];
+			foreach ($beanData as $table => $row) {
+				$primaryKeyColumns = $this->getPrimaryKeyColumns($table);
+				$pkSet = false;
+				foreach ($primaryKeyColumns as $columnName) {
+					if ($row[$columnName] !== null) {
+						$pkSet = true;
+						break;
+					}
+				}
+				if ($pkSet) {
+					$tables[] = $table;
+				}
+			}
+
+			// $tables contains the tables for this bean. Let's view the top most part of the hierarchy
+			try {
+				$allTables = $this->_getLinkBetweenInheritedTables($tables);
+			} catch (TDBMInheritanceException $e) {
+				throw TDBMInheritanceException::extendException($e, $this, $beanData);
+			}
+			$tableName = $allTables[0];
+		}
+
+		// Only one table in this bean. Life is sweat, let's look at its type:
+		try {
+			$className = $this->getBeanClassName($tableName);
+		} catch (TDBMInvalidArgumentException $e) {
+			$className = 'Mouf\\Database\\TDBM\\TDBMObject';
+		}
+
+		return [$className, $tableName, $allTables];
+	}
+
+	/**
+	 * Returns an item from cache or computes it using $closure and puts it in cache.
+	 *
+	 * @param string   $key
+	 * @param callable $closure
+	 *
+	 * @return mixed
+	 */
+	private function fromCache(string $key, callable $closure)
+	{
+		$item = $this->cache->fetch($key);
+		if ($item === false) {
+			$item = $closure();
+			$this->cache->save($key, $item);
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Returns the foreign key object.
+	 *
+	 * @param string $table
+	 * @param string $fkName
+	 *
+	 * @return ForeignKeyConstraint
+	 */
+	public function _getForeignKeyByName(string $table, string $fkName)
+	{
+		return $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getForeignKey($fkName);
+	}
+
+	/**
+	 * @param $pivotTableName
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getRelatedBeans(string $pivotTableName, AbstractTDBMObject $bean)
+	{
+		list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
+		/* @var $localFk ForeignKeyConstraint */
+		/* @var $remoteFk ForeignKeyConstraint */
+		$remoteTable = $remoteFk->getForeignTableName();
+
+		$primaryKeys = $this->getPrimaryKeyValues($bean);
+		$columnNames = array_map(function ($name) use ($pivotTableName) {
+			return $pivotTableName.'.'.$name;
+		}, $localFk->getLocalColumns());
+
+		$filter = array_combine($columnNames, $primaryKeys);
+
+		return $this->findObjects($remoteTable, $filter);
+	}
+
+	/**
+	 * @param $pivotTableName
+	 * @param AbstractTDBMObject $bean The LOCAL bean
+	 *
+	 * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean
+	 *
+	 * @throws TDBMException
+	 */
+	private function getPivotTableForeignKeys(string $pivotTableName, AbstractTDBMObject $bean)
+	{
+		$fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
+		$table1 = $fks[0]->getForeignTableName();
+		$table2 = $fks[1]->getForeignTableName();
+
+		$beanTables = array_map(function (DbRow $dbRow) {
+			return $dbRow->_getDbTableName();
+		}, $bean->_getDbRows());
+
+		if (in_array($table1, $beanTables)) {
+			return [$fks[0], $fks[1]];
+		} elseif (in_array($table2, $beanTables)) {
+			return [$fks[1], $fks[0]];
+		} else {
+			throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
+		}
+	}
+
+	/**
+	 * Returns a list of pivot tables linked to $bean.
+	 *
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return string[]
+	 */
+	public function _getPivotTablesLinkedToBean(AbstractTDBMObject $bean)
+	{
+		$junctionTables = [];
+		$allJunctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
+		foreach ($bean->_getDbRows() as $dbRow) {
+			foreach ($allJunctionTables as $table) {
+				// There are exactly 2 FKs since this is a pivot table.
+				$fks = array_values($table->getForeignKeys());
+
+				if ($fks[0]->getForeignTableName() === $dbRow->_getDbTableName() || $fks[1]->getForeignTableName() === $dbRow->_getDbTableName()) {
+					$junctionTables[] = $table->getName();
+				}
+			}
+		}
+
+		return $junctionTables;
+	}
+
+	/**
+	 * Array of types for tables.
+	 * Key: table name
+	 * Value: array of types indexed by column.
+	 *
+	 * @var array[]
+	 */
+	private $typesForTable = [];
+
+	/**
+	 * @internal
+	 *
+	 * @param string $tableName
+	 *
+	 * @return Type[]
+	 */
+	public function _getColumnTypesForTable(string $tableName)
+	{
+		if (!isset($typesForTable[$tableName])) {
+			$columns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getColumns();
+			$typesForTable[$tableName] = array_map(function (Column $column) {
+				return $column->getType();
+			}, $columns);
+		}
+
+		return $typesForTable[$tableName];
+	}
+
+	/**
+	 * Sets the minimum log level.
+	 * $level must be one of Psr\Log\LogLevel::xxx.
+	 *
+	 * Defaults to LogLevel::WARNING
+	 *
+	 * @param string $level
+	 */
+	public function setLogLevel(string $level)
+	{
+		$this->logger = new LevelFilter($this->rootLogger, $level);
+	}
 }

src/Mouf/Database/TDBM/Utils/TDBMDaoGenerator.php

Doc Comments +1 added lines, -1 removed lines

@@ -616,7 +616,7 @@
      * Tries to put string to the singular form (if it is plural).
      * We assume the table names are in english.
      *
-     * @param $str string
+     * @param string $str string
      *
      * @return string
      */

Unused Use Statements -2 removed lines

@@ -3,12 +3,10 @@
 namespace Mouf\Database\TDBM\Utils;
 
 use Doctrine\Common\Inflector\Inflector;
-use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
 use Mouf\Composer\ClassNameMapper;
-use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
 use Mouf\Database\TDBM\ConfigurationInterface;
 use Mouf\Database\TDBM\TDBMException;
 use Mouf\Database\TDBM\TDBMSchemaAnalyzer;

Indentation +416 added lines, -416 removed lines

@@ -19,157 +19,157 @@ 
  */
 class TDBMDaoGenerator
 {
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * The root directory of the project.
-     *
-     * @var string
-     */
-    private $rootPath;
-
-    /**
-     * Name of composer file.
-     *
-     * @var string
-     */
-    private $composerFile;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $eventDispatcher;
-
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-    /**
-     * @var ConfigurationInterface
-     */
-    private $configuration;
-
-    /**
-     * Constructor.
-     *
-     * @param ConfigurationInterface $configuration
-     * @param Schema $schema
-     * @param TDBMSchemaAnalyzer $tdbmSchemaAnalyzer
-     */
-    public function __construct(ConfigurationInterface $configuration, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
-    {
-        $this->configuration = $configuration;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->rootPath = __DIR__.'/../../../../../../../../';
-        $this->composerFile = 'composer.json';
-        $this->namingStrategy = $configuration->getNamingStrategy();
-        $this->eventDispatcher = $configuration->getGeneratorEventDispatcher();
-    }
-
-    /**
-     * Generates all the daos and beans.
-     *
-     * @throws TDBMException
-     */
-    public function generateAllDaosAndBeans(): void
-    {
-        $classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.$this->composerFile);
-        // TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
-
-        $tableList = $this->schema->getTables();
-
-        // Remove all beans and daos from junction tables
-        $junctionTables = $this->configuration->getSchemaAnalyzer()->detectJunctionTables(true);
-        $junctionTableNames = array_map(function (Table $table) {
-            return $table->getName();
-        }, $junctionTables);
-
-        $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
-            return !in_array($table->getName(), $junctionTableNames);
-        });
-
-        $beanDescriptors = [];
-
-        foreach ($tableList as $table) {
-            $beanDescriptors[] = $this->generateDaoAndBean($table, $classNameMapper);
-        }
-
-
-        $this->generateFactory($tableList, $classNameMapper);
-
-        // Let's call the list of listeners
-        $this->eventDispatcher->onGenerate($this->configuration, $beanDescriptors);
-    }
-
-    /**
-     * Generates in one method call the daos and the beans for one table.
-     *
-     * @param Table $table
-     * @param ClassNameMapper $classNameMapper
-     *
-     * @return BeanDescriptor
-     * @throws TDBMException
-     */
-    private function generateDaoAndBean(Table $table, ClassNameMapper $classNameMapper) : BeanDescriptor
-    {
-        // TODO: $storeInUtc is NOT USED.
-        $tableName = $table->getName();
-        $daoName = $this->namingStrategy->getDaoClassName($tableName);
-        $beanName = $this->namingStrategy->getBeanClassName($tableName);
-        $baseBeanName = $this->namingStrategy->getBaseBeanClassName($tableName);
-        $baseDaoName = $this->namingStrategy->getBaseDaoClassName($tableName);
-
-        $beanDescriptor = new BeanDescriptor($table, $this->configuration->getSchemaAnalyzer(), $this->schema, $this->tdbmSchemaAnalyzer, $this->namingStrategy);
-        $this->generateBean($beanDescriptor, $beanName, $baseBeanName, $table, $classNameMapper);
-        $this->generateDao($beanDescriptor, $daoName, $baseDaoName, $beanName, $table, $classNameMapper);
-        return $beanDescriptor;
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param BeanDescriptor  $beanDescriptor
-     * @param string          $className       The name of the class
-     * @param string          $baseClassName   The name of the base class which will be extended (name only, no directory)
-     * @param Table           $table           The table
-     * @param ClassNameMapper $classNameMapper
-     *
-     * @throws TDBMException
-     */
-    public function generateBean(BeanDescriptor $beanDescriptor, $className, $baseClassName, Table $table, ClassNameMapper $classNameMapper)
-    {
-        $beannamespace = $this->configuration->getBeanNamespace();
-        $str = $beanDescriptor->generatePhpCode($beannamespace);
-
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\Generated\\'.$baseClassName);
-        if (empty($possibleBaseFileNames)) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$baseClassName.'" is not autoloadable.');
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName, $str);
-        @chmod($possibleBaseFileName, 0664);
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$className);
-        if (empty($possibleFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-        if (!file_exists($possibleFileName)) {
-            $tableName = $table->getName();
-            $str = "<?php
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * The root directory of the project.
+	 *
+	 * @var string
+	 */
+	private $rootPath;
+
+	/**
+	 * Name of composer file.
+	 *
+	 * @var string
+	 */
+	private $composerFile;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * @var EventDispatcherInterface
+	 */
+	private $eventDispatcher;
+
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+	/**
+	 * @var ConfigurationInterface
+	 */
+	private $configuration;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param ConfigurationInterface $configuration
+	 * @param Schema $schema
+	 * @param TDBMSchemaAnalyzer $tdbmSchemaAnalyzer
+	 */
+	public function __construct(ConfigurationInterface $configuration, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
+	{
+		$this->configuration = $configuration;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->rootPath = __DIR__.'/../../../../../../../../';
+		$this->composerFile = 'composer.json';
+		$this->namingStrategy = $configuration->getNamingStrategy();
+		$this->eventDispatcher = $configuration->getGeneratorEventDispatcher();
+	}
+
+	/**
+	 * Generates all the daos and beans.
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateAllDaosAndBeans(): void
+	{
+		$classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.$this->composerFile);
+		// TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
+
+		$tableList = $this->schema->getTables();
+
+		// Remove all beans and daos from junction tables
+		$junctionTables = $this->configuration->getSchemaAnalyzer()->detectJunctionTables(true);
+		$junctionTableNames = array_map(function (Table $table) {
+			return $table->getName();
+		}, $junctionTables);
+
+		$tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
+			return !in_array($table->getName(), $junctionTableNames);
+		});
+
+		$beanDescriptors = [];
+
+		foreach ($tableList as $table) {
+			$beanDescriptors[] = $this->generateDaoAndBean($table, $classNameMapper);
+		}
+
+
+		$this->generateFactory($tableList, $classNameMapper);
+
+		// Let's call the list of listeners
+		$this->eventDispatcher->onGenerate($this->configuration, $beanDescriptors);
+	}
+
+	/**
+	 * Generates in one method call the daos and the beans for one table.
+	 *
+	 * @param Table $table
+	 * @param ClassNameMapper $classNameMapper
+	 *
+	 * @return BeanDescriptor
+	 * @throws TDBMException
+	 */
+	private function generateDaoAndBean(Table $table, ClassNameMapper $classNameMapper) : BeanDescriptor
+	{
+		// TODO: $storeInUtc is NOT USED.
+		$tableName = $table->getName();
+		$daoName = $this->namingStrategy->getDaoClassName($tableName);
+		$beanName = $this->namingStrategy->getBeanClassName($tableName);
+		$baseBeanName = $this->namingStrategy->getBaseBeanClassName($tableName);
+		$baseDaoName = $this->namingStrategy->getBaseDaoClassName($tableName);
+
+		$beanDescriptor = new BeanDescriptor($table, $this->configuration->getSchemaAnalyzer(), $this->schema, $this->tdbmSchemaAnalyzer, $this->namingStrategy);
+		$this->generateBean($beanDescriptor, $beanName, $baseBeanName, $table, $classNameMapper);
+		$this->generateDao($beanDescriptor, $daoName, $baseDaoName, $beanName, $table, $classNameMapper);
+		return $beanDescriptor;
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param BeanDescriptor  $beanDescriptor
+	 * @param string          $className       The name of the class
+	 * @param string          $baseClassName   The name of the base class which will be extended (name only, no directory)
+	 * @param Table           $table           The table
+	 * @param ClassNameMapper $classNameMapper
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateBean(BeanDescriptor $beanDescriptor, $className, $baseClassName, Table $table, ClassNameMapper $classNameMapper)
+	{
+		$beannamespace = $this->configuration->getBeanNamespace();
+		$str = $beanDescriptor->generatePhpCode($beannamespace);
+
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\Generated\\'.$baseClassName);
+		if (empty($possibleBaseFileNames)) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$baseClassName.'" is not autoloadable.');
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName, $str);
+		@chmod($possibleBaseFileName, 0664);
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$className);
+		if (empty($possibleFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+		if (!file_exists($possibleFileName)) {
+			$tableName = $table->getName();
+			$str = "<?php
 /*
  * This file has been automatically generated by TDBM.
  * You can edit this file as it will not be overwritten.
@@ -186,76 +186,76 @@ 
 {
 }
 ";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName, $str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Tries to find a @defaultSort annotation in one of the columns.
-     *
-     * @param Table $table
-     *
-     * @return array First item: column name, Second item: column order (asc/desc)
-     */
-    private function getDefaultSortColumnFromAnnotation(Table $table)
-    {
-        $defaultSort = null;
-        $defaultSortDirection = null;
-        foreach ($table->getColumns() as $column) {
-            $comments = $column->getComment();
-            $matches = [];
-            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
-                $defaultSort = $column->getName();
-                if (count($matches) === 3) {
-                    $defaultSortDirection = $matches[2];
-                } else {
-                    $defaultSortDirection = 'ASC';
-                }
-            }
-        }
-
-        return [$defaultSort, $defaultSortDirection];
-    }
-
-    /**
-     * Writes the PHP bean DAO with simple functions to create/get/save objects.
-     *
-     * @param BeanDescriptor  $beanDescriptor
-     * @param string          $className       The name of the class
-     * @param string          $baseClassName
-     * @param string          $beanClassName
-     * @param Table           $table
-     * @param ClassNameMapper $classNameMapper
-     *
-     * @throws TDBMException
-     */
-    private function generateDao(BeanDescriptor $beanDescriptor, string $className, string $baseClassName, string $beanClassName, Table $table, ClassNameMapper $classNameMapper)
-    {
-        $daonamespace = $this->configuration->getDaoNamespace();
-        $beannamespace = $this->configuration->getBeanNamespace();
-        $tableName = $table->getName();
-        $primaryKeyColumns = $table->getPrimaryKeyColumns();
-
-        list($defaultSort, $defaultSortDirection) = $this->getDefaultSortColumnFromAnnotation($table);
-
-        // FIXME: lowercase tables with _ in the name should work!
-        $tableCamel = self::toSingular(self::toCamelCase($tableName));
-
-        $beanClassWithoutNameSpace = $beanClassName;
-        $beanClassName = $beannamespace.'\\'.$beanClassName;
-
-        list($usedBeans, $findByDaoCode) = $beanDescriptor->generateFindByDaoCode($beannamespace, $beanClassWithoutNameSpace);
-
-        $usedBeans[] = $beanClassName;
-        // Let's suppress duplicates in used beans (if any)
-        $usedBeans = array_flip(array_flip($usedBeans));
-        $useStatements = array_map(function ($usedBean) {
-            return "use $usedBean;\n";
-        }, $usedBeans);
-
-        $str = "<?php
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName, $str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Tries to find a @defaultSort annotation in one of the columns.
+	 *
+	 * @param Table $table
+	 *
+	 * @return array First item: column name, Second item: column order (asc/desc)
+	 */
+	private function getDefaultSortColumnFromAnnotation(Table $table)
+	{
+		$defaultSort = null;
+		$defaultSortDirection = null;
+		foreach ($table->getColumns() as $column) {
+			$comments = $column->getComment();
+			$matches = [];
+			if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
+				$defaultSort = $column->getName();
+				if (count($matches) === 3) {
+					$defaultSortDirection = $matches[2];
+				} else {
+					$defaultSortDirection = 'ASC';
+				}
+			}
+		}
+
+		return [$defaultSort, $defaultSortDirection];
+	}
+
+	/**
+	 * Writes the PHP bean DAO with simple functions to create/get/save objects.
+	 *
+	 * @param BeanDescriptor  $beanDescriptor
+	 * @param string          $className       The name of the class
+	 * @param string          $baseClassName
+	 * @param string          $beanClassName
+	 * @param Table           $table
+	 * @param ClassNameMapper $classNameMapper
+	 *
+	 * @throws TDBMException
+	 */
+	private function generateDao(BeanDescriptor $beanDescriptor, string $className, string $baseClassName, string $beanClassName, Table $table, ClassNameMapper $classNameMapper)
+	{
+		$daonamespace = $this->configuration->getDaoNamespace();
+		$beannamespace = $this->configuration->getBeanNamespace();
+		$tableName = $table->getName();
+		$primaryKeyColumns = $table->getPrimaryKeyColumns();
+
+		list($defaultSort, $defaultSortDirection) = $this->getDefaultSortColumnFromAnnotation($table);
+
+		// FIXME: lowercase tables with _ in the name should work!
+		$tableCamel = self::toSingular(self::toCamelCase($tableName));
+
+		$beanClassWithoutNameSpace = $beanClassName;
+		$beanClassName = $beannamespace.'\\'.$beanClassName;
+
+		list($usedBeans, $findByDaoCode) = $beanDescriptor->generateFindByDaoCode($beannamespace, $beanClassWithoutNameSpace);
+
+		$usedBeans[] = $beanClassName;
+		// Let's suppress duplicates in used beans (if any)
+		$usedBeans = array_flip(array_flip($usedBeans));
+		$useStatements = array_map(function ($usedBean) {
+			return "use $usedBean;\n";
+		}, $usedBeans);
+
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -331,10 +331,10 @@ 
     }
     ";
 
-        if (count($primaryKeyColumns) === 1) {
-            $primaryKeyColumn = $primaryKeyColumns[0];
-            $primaryKeyPhpType = self::dbalTypeToPhpType($table->getColumn($primaryKeyColumn)->getType());
-            $str .= "
+		if (count($primaryKeyColumns) === 1) {
+			$primaryKeyColumn = $primaryKeyColumns[0];
+			$primaryKeyPhpType = self::dbalTypeToPhpType($table->getColumn($primaryKeyColumn)->getType());
+			$str .= "
     /**
      * Get $beanClassWithoutNameSpace specified by its ID (its primary key)
      * If the primary key does not exist, an exception is thrown.
@@ -349,8 +349,8 @@ 
         return \$this->tdbmService->findObjectByPk('$tableName', ['$primaryKeyColumn' => \$id], [], \$lazyLoading);
     }
     ";
-        }
-        $str .= "
+		}
+		$str .= "
     /**
      * Deletes the $beanClassWithoutNameSpace passed in parameter.
      *
@@ -450,33 +450,33 @@ 
     }
 ";
 
-        $str .= $findByDaoCode;
-        $str .= '}
+		$str .= $findByDaoCode;
+		$str .= '}
 ';
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\Generated\\'.$baseClassName);
-        if (empty($possibleBaseFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daonamespace.'\\Generated\\'.$baseClassName.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName, $str);
-        @chmod($possibleBaseFileName, 0664);
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$className);
-        if (empty($possibleFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daonamespace.'\\'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        // Now, let's generate the "editable" class
-        if (!file_exists($possibleFileName)) {
-            $str = "<?php
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\Generated\\'.$baseClassName);
+		if (empty($possibleBaseFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daonamespace.'\\Generated\\'.$baseClassName.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName, $str);
+		@chmod($possibleBaseFileName, 0664);
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$className);
+		if (empty($possibleFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daonamespace.'\\'.$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		// Now, let's generate the "editable" class
+		if (!file_exists($possibleFileName)) {
+			$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -494,27 +494,27 @@ 
 {
 }
 ";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName, $str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Generates the factory bean.
-     *
-     * @param Table[] $tableList
-     * @param ClassNameMapper $classNameMapper
-     * @throws TDBMException
-     */
-    private function generateFactory(array $tableList, ClassNameMapper $classNameMapper) : void
-    {
-        $daoNamespace = $this->configuration->getDaoNamespace();
-        $daoFactoryClassName = $this->namingStrategy->getDaoFactoryClassName();
-
-        // For each table, let's write a property.
-
-        $str = "<?php
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName, $str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Generates the factory bean.
+	 *
+	 * @param Table[] $tableList
+	 * @param ClassNameMapper $classNameMapper
+	 * @throws TDBMException
+	 */
+	private function generateFactory(array $tableList, ClassNameMapper $classNameMapper) : void
+	{
+		$daoNamespace = $this->configuration->getDaoNamespace();
+		$daoFactoryClassName = $this->namingStrategy->getDaoFactoryClassName();
+
+		// For each table, let's write a property.
+
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -524,13 +524,13 @@ 
 namespace {$daoNamespace}\\Generated;
 
 ";
-        foreach ($tableList as $table) {
-            $tableName = $table->getName();
-            $daoClassName = $this->namingStrategy->getDaoClassName($tableName);
-            $str .= "use {$daoNamespace}\\".$daoClassName.";\n";
-        }
+		foreach ($tableList as $table) {
+			$tableName = $table->getName();
+			$daoClassName = $this->namingStrategy->getDaoClassName($tableName);
+			$str .= "use {$daoNamespace}\\".$daoClassName.";\n";
+		}
 
-        $str .= "
+		$str .= "
 /**
  * The $daoFactoryClassName provides an easy access to all DAOs generated by TDBM.
  *
@@ -539,12 +539,12 @@ 
 {
 ";
 
-        foreach ($tableList as $table) {
-            $tableName = $table->getName();
-            $daoClassName = $this->namingStrategy->getDaoClassName($tableName);
-            $daoInstanceName = self::toVariableName($daoClassName);
+		foreach ($tableList as $table) {
+			$tableName = $table->getName();
+			$daoClassName = $this->namingStrategy->getDaoClassName($tableName);
+			$daoInstanceName = self::toVariableName($daoClassName);
 
-            $str .= '    /**
+			$str .= '    /**
      * @var '.$daoClassName.'
      */
     private $'.$daoInstanceName.';
@@ -568,140 +568,140 @@ 
     {
         $this->'.$daoInstanceName.' = $'.$daoInstanceName.';
     }';
-        }
+		}
 
-        $str .= '
+		$str .= '
 }
 ';
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace.'\\Generated\\'.$daoFactoryClassName);
-        if (empty($possibleFileNames)) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace.'\\'.$daoFactoryClassName.'" is not autoloadable.');
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        $this->ensureDirectoryExist($possibleFileName);
-        file_put_contents($possibleFileName, $str);
-        @chmod($possibleFileName, 0664);
-    }
-
-    /**
-     * Transforms a string to camelCase (except the first letter will be uppercase too).
-     * Underscores and spaces are removed and the first letter after the underscore is uppercased.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toCamelCase($str)
-    {
-        $str = strtoupper(substr($str, 0, 1)).substr($str, 1);
-        while (true) {
-            if (strpos($str, '_') === false && strpos($str, ' ') === false) {
-                break;
-            }
-
-            $pos = strpos($str, '_');
-            if ($pos === false) {
-                $pos = strpos($str, ' ');
-            }
-            $before = substr($str, 0, $pos);
-            $after = substr($str, $pos + 1);
-            $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
-        }
-
-        return $str;
-    }
-
-    /**
-     * Tries to put string to the singular form (if it is plural).
-     * We assume the table names are in english.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toSingular($str)
-    {
-        return Inflector::singularize($str);
-    }
-
-    /**
-     * Put the first letter of the string in lower case.
-     * Very useful to transform a class name into a variable name.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toVariableName($str)
-    {
-        return strtolower(substr($str, 0, 1)).substr($str, 1);
-    }
-
-    /**
-     * Ensures the file passed in parameter can be written in its directory.
-     *
-     * @param string $fileName
-     *
-     * @throws TDBMException
-     */
-    private function ensureDirectoryExist($fileName)
-    {
-        $dirName = dirname($fileName);
-        if (!file_exists($dirName)) {
-            $old = umask(0);
-            $result = mkdir($dirName, 0775, true);
-            umask($old);
-            if ($result === false) {
-                throw new TDBMException("Unable to create directory: '".$dirName."'.");
-            }
-        }
-    }
-
-    /**
-     * Absolute path to composer json file.
-     *
-     * @param string $composerFile
-     */
-    public function setComposerFile($composerFile)
-    {
-        $this->rootPath = dirname($composerFile).'/';
-        $this->composerFile = basename($composerFile);
-    }
-
-    /**
-     * Transforms a DBAL type into a PHP type (for PHPDoc purpose).
-     *
-     * @param Type $type The DBAL type
-     *
-     * @return string The PHP type
-     */
-    public static function dbalTypeToPhpType(Type $type)
-    {
-        $map = [
-            Type::TARRAY => 'array',
-            Type::SIMPLE_ARRAY => 'array',
-            'json' => 'array',  // 'json' is supported from Doctrine DBAL 2.6 only.
-            Type::JSON_ARRAY => 'array',
-            Type::BIGINT => 'string',
-            Type::BOOLEAN => 'bool',
-            Type::DATETIME => '\DateTimeInterface',
-            Type::DATETIMETZ => '\DateTimeInterface',
-            Type::DATE => '\DateTimeInterface',
-            Type::TIME => '\DateTimeInterface',
-            Type::DECIMAL => 'float',
-            Type::INTEGER => 'int',
-            Type::OBJECT => 'string',
-            Type::SMALLINT => 'int',
-            Type::STRING => 'string',
-            Type::TEXT => 'string',
-            Type::BINARY => 'string',
-            Type::BLOB => 'string',
-            Type::FLOAT => 'float',
-            Type::GUID => 'string',
-        ];
-
-        return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
-    }
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace.'\\Generated\\'.$daoFactoryClassName);
+		if (empty($possibleFileNames)) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace.'\\'.$daoFactoryClassName.'" is not autoloadable.');
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		$this->ensureDirectoryExist($possibleFileName);
+		file_put_contents($possibleFileName, $str);
+		@chmod($possibleFileName, 0664);
+	}
+
+	/**
+	 * Transforms a string to camelCase (except the first letter will be uppercase too).
+	 * Underscores and spaces are removed and the first letter after the underscore is uppercased.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toCamelCase($str)
+	{
+		$str = strtoupper(substr($str, 0, 1)).substr($str, 1);
+		while (true) {
+			if (strpos($str, '_') === false && strpos($str, ' ') === false) {
+				break;
+			}
+
+			$pos = strpos($str, '_');
+			if ($pos === false) {
+				$pos = strpos($str, ' ');
+			}
+			$before = substr($str, 0, $pos);
+			$after = substr($str, $pos + 1);
+			$str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Tries to put string to the singular form (if it is plural).
+	 * We assume the table names are in english.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toSingular($str)
+	{
+		return Inflector::singularize($str);
+	}
+
+	/**
+	 * Put the first letter of the string in lower case.
+	 * Very useful to transform a class name into a variable name.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toVariableName($str)
+	{
+		return strtolower(substr($str, 0, 1)).substr($str, 1);
+	}
+
+	/**
+	 * Ensures the file passed in parameter can be written in its directory.
+	 *
+	 * @param string $fileName
+	 *
+	 * @throws TDBMException
+	 */
+	private function ensureDirectoryExist($fileName)
+	{
+		$dirName = dirname($fileName);
+		if (!file_exists($dirName)) {
+			$old = umask(0);
+			$result = mkdir($dirName, 0775, true);
+			umask($old);
+			if ($result === false) {
+				throw new TDBMException("Unable to create directory: '".$dirName."'.");
+			}
+		}
+	}
+
+	/**
+	 * Absolute path to composer json file.
+	 *
+	 * @param string $composerFile
+	 */
+	public function setComposerFile($composerFile)
+	{
+		$this->rootPath = dirname($composerFile).'/';
+		$this->composerFile = basename($composerFile);
+	}
+
+	/**
+	 * Transforms a DBAL type into a PHP type (for PHPDoc purpose).
+	 *
+	 * @param Type $type The DBAL type
+	 *
+	 * @return string The PHP type
+	 */
+	public static function dbalTypeToPhpType(Type $type)
+	{
+		$map = [
+			Type::TARRAY => 'array',
+			Type::SIMPLE_ARRAY => 'array',
+			'json' => 'array',  // 'json' is supported from Doctrine DBAL 2.6 only.
+			Type::JSON_ARRAY => 'array',
+			Type::BIGINT => 'string',
+			Type::BOOLEAN => 'bool',
+			Type::DATETIME => '\DateTimeInterface',
+			Type::DATETIMETZ => '\DateTimeInterface',
+			Type::DATE => '\DateTimeInterface',
+			Type::TIME => '\DateTimeInterface',
+			Type::DECIMAL => 'float',
+			Type::INTEGER => 'int',
+			Type::OBJECT => 'string',
+			Type::SMALLINT => 'int',
+			Type::STRING => 'string',
+			Type::TEXT => 'string',
+			Type::BINARY => 'string',
+			Type::BLOB => 'string',
+			Type::FLOAT => 'float',
+			Type::GUID => 'string',
+		];
+
+		return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -89,11 +89,11 @@ 
 
         // Remove all beans and daos from junction tables
         $junctionTables = $this->configuration->getSchemaAnalyzer()->detectJunctionTables(true);
-        $junctionTableNames = array_map(function (Table $table) {
+        $junctionTableNames = array_map(function(Table $table) {
             return $table->getName();
         }, $junctionTables);
 
-        $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
+        $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) {
             return !in_array($table->getName(), $junctionTableNames);
         });
 
@@ -251,7 +251,7 @@ 
         $usedBeans[] = $beanClassName;
         // Let's suppress duplicates in used beans (if any)
         $usedBeans = array_flip(array_flip($usedBeans));
-        $useStatements = array_map(function ($usedBean) {
+        $useStatements = array_map(function($usedBean) {
             return "use $usedBean;\n";
         }, $usedBeans);
 
@@ -606,7 +606,7 @@ 
                 $pos = strpos($str, ' ');
             }
             $before = substr($str, 0, $pos);
-            $after = substr($str, $pos + 1);
+            $after = substr($str, $pos+1);
             $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
         }
 
@@ -682,7 +682,7 @@ 
         $map = [
             Type::TARRAY => 'array',
             Type::SIMPLE_ARRAY => 'array',
-            'json' => 'array',  // 'json' is supported from Doctrine DBAL 2.6 only.
+            'json' => 'array', // 'json' is supported from Doctrine DBAL 2.6 only.
             Type::JSON_ARRAY => 'array',
             Type::BIGINT => 'string',
             Type::BOOLEAN => 'bool',

src/Mouf/Database/TDBM/Utils/ScalarBeanPropertyDescriptor.php

Indentation +180 added lines, -180 removed lines

@@ -11,136 +11,136 @@ 
  */
 class ScalarBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var Column
-     */
-    private $column;
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-
-    /**
-     * ScalarBeanPropertyDescriptor constructor.
-     * @param Table $table
-     * @param Column $column
-     * @param NamingStrategyInterface $namingStrategy
-     */
-    public function __construct(Table $table, Column $column, NamingStrategyInterface $namingStrategy)
-    {
-        parent::__construct($table);
-        $this->table = $table;
-        $this->column = $column;
-        $this->namingStrategy = $namingStrategy;
-    }
-
-    /**
-     * Returns the foreign-key the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation()
-    {
-        $className = $this->getClassName();
-        $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
-
-        $str = '     * @param %s %s';
-
-        return sprintf($str, $paramType, $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName()
-    {
-        return TDBMDaoGenerator::toCamelCase($this->column->getName());
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key.
-     *
-     * @return null|string
-     */
-    public function getClassName()
-    {
-        return;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    public function isCompulsory()
-    {
-        return $this->column->getNotnull() && !$this->column->getAutoincrement() && $this->column->getDefault() === null;
-    }
-
-    /**
-     * Returns true if the property has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefault()
-    {
-        return $this->column->getDefault() !== null;
-    }
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     */
-    public function assignToDefaultCode()
-    {
-        $str = '        $this->%s(%s);';
-
-        $default = $this->column->getDefault();
-
-        if (strtoupper($default) === 'CURRENT_TIMESTAMP') {
-            $defaultCode = 'new \DateTimeImmutable()';
-        } else {
-            $defaultCode = var_export($this->column->getDefault(), true);
-        }
-
-        return sprintf($str, $this->getSetterName(), $defaultCode);
-    }
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    public function isPrimaryKey()
-    {
-        return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    public function getGetterSetterCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        $columnGetterName = $this->getGetterName();
-        $columnSetterName = $this->getSetterName();
-
-        // A column type can be forced if it is not nullable and not auto-incrementable (for auto-increment columns, we can get "null" as long as the bean is not saved).
-        $isNullable = !$this->column->getNotnull() || $this->column->getAutoincrement();
-
-        $getterAndSetterCode = '    /**
+	/**
+	 * @var Column
+	 */
+	private $column;
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+
+	/**
+	 * ScalarBeanPropertyDescriptor constructor.
+	 * @param Table $table
+	 * @param Column $column
+	 * @param NamingStrategyInterface $namingStrategy
+	 */
+	public function __construct(Table $table, Column $column, NamingStrategyInterface $namingStrategy)
+	{
+		parent::__construct($table);
+		$this->table = $table;
+		$this->column = $column;
+		$this->namingStrategy = $namingStrategy;
+	}
+
+	/**
+	 * Returns the foreign-key the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation()
+	{
+		$className = $this->getClassName();
+		$paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
+
+		$str = '     * @param %s %s';
+
+		return sprintf($str, $paramType, $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName()
+	{
+		return TDBMDaoGenerator::toCamelCase($this->column->getName());
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key.
+	 *
+	 * @return null|string
+	 */
+	public function getClassName()
+	{
+		return;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	public function isCompulsory()
+	{
+		return $this->column->getNotnull() && !$this->column->getAutoincrement() && $this->column->getDefault() === null;
+	}
+
+	/**
+	 * Returns true if the property has a default value.
+	 *
+	 * @return bool
+	 */
+	public function hasDefault()
+	{
+		return $this->column->getDefault() !== null;
+	}
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 */
+	public function assignToDefaultCode()
+	{
+		$str = '        $this->%s(%s);';
+
+		$default = $this->column->getDefault();
+
+		if (strtoupper($default) === 'CURRENT_TIMESTAMP') {
+			$defaultCode = 'new \DateTimeImmutable()';
+		} else {
+			$defaultCode = var_export($this->column->getDefault(), true);
+		}
+
+		return sprintf($str, $this->getSetterName(), $defaultCode);
+	}
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	public function isPrimaryKey()
+	{
+		return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	public function getGetterSetterCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		$columnGetterName = $this->getGetterName();
+		$columnSetterName = $this->getSetterName();
+
+		// A column type can be forced if it is not nullable and not auto-incrementable (for auto-increment columns, we can get "null" as long as the bean is not saved).
+		$isNullable = !$this->column->getNotnull() || $this->column->getAutoincrement();
+
+		$getterAndSetterCode = '    /**
      * The getter for the "%s" column.
      *
      * @return %s
@@ -162,54 +162,54 @@ 
 
 ';
 
-        return sprintf($getterAndSetterCode,
-            // Getter
-            $this->column->getName(),
-            $normalizedType.($isNullable ? '|null' : ''),
-            $columnGetterName,
-            ($isNullable ? '?' : ''),
-            $normalizedType,
-            var_export($this->column->getName(), true),
-            var_export($this->table->getName(), true),
-            // Setter
-            $this->column->getName(),
-            $normalizedType,
-            $this->column->getName(),
-            $columnSetterName,
-            $this->column->getNotnull() ? '' : '?',
-            $normalizedType,
-                //$castTo,
-            $this->column->getName(),
-            var_export($this->column->getName(), true),
-            $this->column->getName(),
-            var_export($this->table->getName(), true)
-        );
-    }
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        if ($normalizedType == '\\DateTimeInterface') {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = ($this->'.$this->getGetterName().'() === null) ? null : $this->'.$this->getGetterName()."()->format('c');\n";
-        } else {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
-        }
-    }
-
-    /**
-     * Returns the column name.
-     *
-     * @return string
-     */
-    public function getColumnName()
-    {
-        return $this->column->getName();
-    }
+		return sprintf($getterAndSetterCode,
+			// Getter
+			$this->column->getName(),
+			$normalizedType.($isNullable ? '|null' : ''),
+			$columnGetterName,
+			($isNullable ? '?' : ''),
+			$normalizedType,
+			var_export($this->column->getName(), true),
+			var_export($this->table->getName(), true),
+			// Setter
+			$this->column->getName(),
+			$normalizedType,
+			$this->column->getName(),
+			$columnSetterName,
+			$this->column->getNotnull() ? '' : '?',
+			$normalizedType,
+				//$castTo,
+			$this->column->getName(),
+			var_export($this->column->getName(), true),
+			$this->column->getName(),
+			var_export($this->table->getName(), true)
+		);
+	}
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		if ($normalizedType == '\\DateTimeInterface') {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = ($this->'.$this->getGetterName().'() === null) ? null : $this->'.$this->getGetterName()."()->format('c');\n";
+		} else {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
+		}
+	}
+
+	/**
+	 * Returns the column name.
+	 *
+	 * @return string
+	 */
+	public function getColumnName()
+	{
+		return $this->column->getName();
+	}
 }

src/Mouf/Database/TDBM/Utils/PivotTableMethodsDescriptor.php

Indentation +136 added lines, -136 removed lines

@@ -7,105 +7,105 @@ 
 
 class PivotTableMethodsDescriptor implements MethodDescriptorInterface
 {
-    /**
-     * @var Table
-     */
-    private $pivotTable;
-
-    private $useAlternateName = false;
-
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $localFk;
-
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $remoteFk;
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-
-    /**
-     * @param Table $pivotTable The pivot table
-     * @param ForeignKeyConstraint $localFk
-     * @param ForeignKeyConstraint $remoteFk
-     * @param NamingStrategyInterface $namingStrategy
-     */
-    public function __construct(Table $pivotTable, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk, NamingStrategyInterface $namingStrategy)
-    {
-        $this->pivotTable = $pivotTable;
-        $this->localFk = $localFk;
-        $this->remoteFk = $remoteFk;
-        $this->namingStrategy = $namingStrategy;
-    }
-
-    /**
-     * Requests the use of an alternative name for this method.
-     */
-    public function useAlternativeName()
-    {
-        $this->useAlternateName = true;
-    }
-
-    /**
-     * Returns the name of the method to be generated.
-     *
-     * @return string
-     */
-    public function getName() : string
-    {
-        if (!$this->useAlternateName) {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
-        } else {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
-        }
-    }
-
-    /**
-     * Returns the plural name.
-     *
-     * @return string
-     */
-    private function getPluralName() : string
-    {
-        if (!$this->useAlternateName) {
-            return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
-        } else {
-            return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
-        }
-    }
-
-    /**
-     * Returns the singular name.
-     *
-     * @return string
-     */
-    private function getSingularName() : string
-    {
-        if (!$this->useAlternateName) {
-            return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName()));
-        } else {
-            return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName())).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
-        }
-    }
-
-    /**
-     * Returns the code of the method.
-     *
-     * @return string
-     */
-    public function getCode() : string
-    {
-        $singularName = $this->getSingularName();
-        $pluralName = $this->getPluralName();
-        $remoteBeanName = $this->namingStrategy->getBeanClassName($this->remoteFk->getForeignTableName());
-        $variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
-        $pluralVariableName = $variableName.'s';
-
-        $str = '    /**
+	/**
+	 * @var Table
+	 */
+	private $pivotTable;
+
+	private $useAlternateName = false;
+
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $localFk;
+
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $remoteFk;
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+
+	/**
+	 * @param Table $pivotTable The pivot table
+	 * @param ForeignKeyConstraint $localFk
+	 * @param ForeignKeyConstraint $remoteFk
+	 * @param NamingStrategyInterface $namingStrategy
+	 */
+	public function __construct(Table $pivotTable, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk, NamingStrategyInterface $namingStrategy)
+	{
+		$this->pivotTable = $pivotTable;
+		$this->localFk = $localFk;
+		$this->remoteFk = $remoteFk;
+		$this->namingStrategy = $namingStrategy;
+	}
+
+	/**
+	 * Requests the use of an alternative name for this method.
+	 */
+	public function useAlternativeName()
+	{
+		$this->useAlternateName = true;
+	}
+
+	/**
+	 * Returns the name of the method to be generated.
+	 *
+	 * @return string
+	 */
+	public function getName() : string
+	{
+		if (!$this->useAlternateName) {
+			return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
+		} else {
+			return 'get'.TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
+		}
+	}
+
+	/**
+	 * Returns the plural name.
+	 *
+	 * @return string
+	 */
+	private function getPluralName() : string
+	{
+		if (!$this->useAlternateName) {
+			return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName());
+		} else {
+			return TDBMDaoGenerator::toCamelCase($this->remoteFk->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
+		}
+	}
+
+	/**
+	 * Returns the singular name.
+	 *
+	 * @return string
+	 */
+	private function getSingularName() : string
+	{
+		if (!$this->useAlternateName) {
+			return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName()));
+		} else {
+			return TDBMDaoGenerator::toCamelCase(TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName())).'By'.TDBMDaoGenerator::toCamelCase($this->pivotTable->getName());
+		}
+	}
+
+	/**
+	 * Returns the code of the method.
+	 *
+	 * @return string
+	 */
+	public function getCode() : string
+	{
+		$singularName = $this->getSingularName();
+		$pluralName = $this->getPluralName();
+		$remoteBeanName = $this->namingStrategy->getBeanClassName($this->remoteFk->getForeignTableName());
+		$variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
+		$pluralVariableName = $variableName.'s';
+
+		$str = '    /**
      * Returns the list of %s associated to this bean via the %s pivot table.
      *
      * @return %s[]
@@ -116,9 +116,9 @@ 
     }
 ';
 
-        $getterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralName, var_export($this->remoteFk->getLocalTableName(), true));
+		$getterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralName, var_export($this->remoteFk->getLocalTableName(), true));
 
-        $str = '    /**
+		$str = '    /**
      * Adds a relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -129,9 +129,9 @@ 
     }
 ';
 
-        $adderCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
+		$adderCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Deletes the relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -142,9 +142,9 @@ 
     }
 ';
 
-        $removerCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
+		$removerCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Returns whether this bean is associated with %s via the %s pivot table.
      *
      * @param %s %s
@@ -156,9 +156,9 @@ 
     }
 ';
 
-        $hasCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
+		$hasCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($this->remoteFk->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Sets all relationships with %s associated to this bean via the %s pivot table.
      * Exiting relationships will be removed and replaced by the provided relationships.
      *
@@ -170,38 +170,38 @@ 
     }
 ';
 
-        $setterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralVariableName, $pluralName, $pluralVariableName, var_export($this->remoteFk->getLocalTableName(), true), $pluralVariableName);
-
-        $code = $getterCode.$adderCode.$removerCode.$hasCode.$setterCode;
-
-        return $code;
-    }
-
-    /**
-     * Returns an array of classes that needs a "use" for this method.
-     *
-     * @return string[]
-     */
-    public function getUsedClasses() : array
-    {
-        return [$this->namingStrategy->getBeanClassName($this->remoteFk->getForeignTableName())];
-    }
-
-    /**
-     * Returns the code to past in jsonSerialize.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode() : string
-    {
-        $remoteBeanName = $this->namingStrategy->getBeanClassName($this->remoteFk->getForeignTableName());
-        $variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
-
-        return '        if (!$stopRecursion) {
+		$setterCode = sprintf($str, $remoteBeanName, $this->pivotTable->getName(), $remoteBeanName, $pluralVariableName, $pluralName, $pluralVariableName, var_export($this->remoteFk->getLocalTableName(), true), $pluralVariableName);
+
+		$code = $getterCode.$adderCode.$removerCode.$hasCode.$setterCode;
+
+		return $code;
+	}
+
+	/**
+	 * Returns an array of classes that needs a "use" for this method.
+	 *
+	 * @return string[]
+	 */
+	public function getUsedClasses() : array
+	{
+		return [$this->namingStrategy->getBeanClassName($this->remoteFk->getForeignTableName())];
+	}
+
+	/**
+	 * Returns the code to past in jsonSerialize.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode() : string
+	{
+		$remoteBeanName = $this->namingStrategy->getBeanClassName($this->remoteFk->getForeignTableName());
+		$variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
+
+		return '        if (!$stopRecursion) {
             $array[\''.lcfirst($this->getPluralName()).'\'] = array_map(function ('.$remoteBeanName.' '.$variableName.') {
                 return '.$variableName.'->jsonSerialize(true);
             }, $this->'.$this->getName().'());
         }
 ';
-    }
+	}
 }

src/Mouf/Database/TDBM/Utils/GeneratorEventDispatcher.php

Indentation +22 added lines, -22 removed lines

@@ -7,28 +7,28 @@
 
 class GeneratorEventDispatcher implements GeneratorListenerInterface
 {
-    /**
-     * @var GeneratorListenerInterface[]
-     */
-    private $listeners;
+	/**
+	 * @var GeneratorListenerInterface[]
+	 */
+	private $listeners;
 
-    /**
-     * GeneratorEventDispatcher constructor.
-     * @param GeneratorListenerInterface[] $listeners
-     */
-    public function __construct(array $listeners)
-    {
-        $this->listeners = $listeners;
-    }
+	/**
+	 * GeneratorEventDispatcher constructor.
+	 * @param GeneratorListenerInterface[] $listeners
+	 */
+	public function __construct(array $listeners)
+	{
+		$this->listeners = $listeners;
+	}
 
-    /**
-     * @param ConfigurationInterface $configuration
-     * @param BeanDescriptorInterface[] $beanDescriptors
-     */
-    public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
-    {
-        foreach ($this->listeners as $listener) {
-            $listener->onGenerate($configuration, $beanDescriptors);
-        }
-    }
+	/**
+	 * @param ConfigurationInterface $configuration
+	 * @param BeanDescriptorInterface[] $beanDescriptors
+	 */
+	public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
+	{
+		foreach ($this->listeners as $listener) {
+			$listener->onGenerate($configuration, $beanDescriptors);
+		}
+	}
 }

src/Mouf/Database/TDBM/Utils/DirectForeignKeyMethodDescriptor.php

Indentation +116 added lines, -116 removed lines

@@ -12,71 +12,71 @@ 
  */
 class DirectForeignKeyMethodDescriptor implements MethodDescriptorInterface
 {
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $fk;
-
-    private $useAlternateName = false;
-    /**
-     * @var Table
-     */
-    private $mainTable;
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-
-    /**
-     * @param ForeignKeyConstraint $fk The foreign key pointing to our bean
-     * @param Table $mainTable The main table that is pointed to
-     * @param NamingStrategyInterface $namingStrategy
-     */
-    public function __construct(ForeignKeyConstraint $fk, Table $mainTable, NamingStrategyInterface $namingStrategy)
-    {
-        $this->fk = $fk;
-        $this->mainTable = $mainTable;
-        $this->namingStrategy = $namingStrategy;
-    }
-
-    /**
-     * Returns the name of the method to be generated.
-     *
-     * @return string
-     */
-    public function getName() : string
-    {
-        if (!$this->useAlternateName) {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName());
-        } else {
-            $methodName = 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName()).'By';
-
-            $camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->fk->getLocalColumns());
-
-            $methodName .= implode('And', $camelizedColumns);
-
-            return $methodName;
-        }
-    }
-
-    /**
-     * Requests the use of an alternative name for this method.
-     */
-    public function useAlternativeName()
-    {
-        $this->useAlternateName = true;
-    }
-
-    /**
-     * Returns the code of the method.
-     *
-     * @return string
-     */
-    public function getCode() : string
-    {
-        $code = '';
-
-        $getterCode = '    /**
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $fk;
+
+	private $useAlternateName = false;
+	/**
+	 * @var Table
+	 */
+	private $mainTable;
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+
+	/**
+	 * @param ForeignKeyConstraint $fk The foreign key pointing to our bean
+	 * @param Table $mainTable The main table that is pointed to
+	 * @param NamingStrategyInterface $namingStrategy
+	 */
+	public function __construct(ForeignKeyConstraint $fk, Table $mainTable, NamingStrategyInterface $namingStrategy)
+	{
+		$this->fk = $fk;
+		$this->mainTable = $mainTable;
+		$this->namingStrategy = $namingStrategy;
+	}
+
+	/**
+	 * Returns the name of the method to be generated.
+	 *
+	 * @return string
+	 */
+	public function getName() : string
+	{
+		if (!$this->useAlternateName) {
+			return 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName());
+		} else {
+			$methodName = 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName()).'By';
+
+			$camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->fk->getLocalColumns());
+
+			$methodName .= implode('And', $camelizedColumns);
+
+			return $methodName;
+		}
+	}
+
+	/**
+	 * Requests the use of an alternative name for this method.
+	 */
+	public function useAlternativeName()
+	{
+		$this->useAlternateName = true;
+	}
+
+	/**
+	 * Returns the code of the method.
+	 *
+	 * @return string
+	 */
+	public function getCode() : string
+	{
+		$code = '';
+
+		$getterCode = '    /**
      * Returns the list of %s pointing to this bean via the %s column.
      *
      * @return %s[]|AlterableResultIterator
@@ -88,55 +88,55 @@ 
 
 ';
 
-        $beanClass = $this->namingStrategy->getBeanClassName($this->fk->getLocalTableName());
-        $code .= sprintf($getterCode,
-            $beanClass,
-            implode(', ', $this->fk->getColumns()),
-            $beanClass,
-            $this->getName(),
-            var_export($this->fk->getLocalTableName(), true),
-            var_export($this->fk->getName(), true),
-            var_export($this->fk->getLocalTableName(), true),
-            $this->getFilters($this->fk)
-        );
-
-        return $code;
-    }
-
-    private function getFilters(ForeignKeyConstraint $fk) : string
-    {
-        $counter = 0;
-        $parameters = [];
-
-        $pkColumns = $this->mainTable->getPrimaryKeyColumns();
-
-        foreach ($fk->getLocalColumns() as $columnName) {
-            $pkColumn = $pkColumns[$counter];
-            $parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($pkColumn, true), var_export($this->fk->getForeignTableName(), true));
-            ++$counter;
-        }
-        $parametersCode = '['.implode(', ', $parameters).']';
-
-        return $parametersCode;
-    }
-
-    /**
-     * Returns an array of classes that needs a "use" for this method.
-     *
-     * @return string[]
-     */
-    public function getUsedClasses() : array
-    {
-        return [$this->namingStrategy->getBeanClassName($this->fk->getForeignTableName())];
-    }
-
-    /**
-     * Returns the code to past in jsonSerialize.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode() : string
-    {
-        return '';
-    }
+		$beanClass = $this->namingStrategy->getBeanClassName($this->fk->getLocalTableName());
+		$code .= sprintf($getterCode,
+			$beanClass,
+			implode(', ', $this->fk->getColumns()),
+			$beanClass,
+			$this->getName(),
+			var_export($this->fk->getLocalTableName(), true),
+			var_export($this->fk->getName(), true),
+			var_export($this->fk->getLocalTableName(), true),
+			$this->getFilters($this->fk)
+		);
+
+		return $code;
+	}
+
+	private function getFilters(ForeignKeyConstraint $fk) : string
+	{
+		$counter = 0;
+		$parameters = [];
+
+		$pkColumns = $this->mainTable->getPrimaryKeyColumns();
+
+		foreach ($fk->getLocalColumns() as $columnName) {
+			$pkColumn = $pkColumns[$counter];
+			$parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($pkColumn, true), var_export($this->fk->getForeignTableName(), true));
+			++$counter;
+		}
+		$parametersCode = '['.implode(', ', $parameters).']';
+
+		return $parametersCode;
+	}
+
+	/**
+	 * Returns an array of classes that needs a "use" for this method.
+	 *
+	 * @return string[]
+	 */
+	public function getUsedClasses() : array
+	{
+		return [$this->namingStrategy->getBeanClassName($this->fk->getForeignTableName())];
+	}
+
+	/**
+	 * Returns the code to past in jsonSerialize.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode() : string
+	{
+		return '';
+	}
 }

src/Mouf/Database/TDBM/Utils/VoidListener.php

Indentation +8 added lines, -8 removed lines

@@ -11,12 +11,12 @@
 class VoidListener implements GeneratorListenerInterface
 {
 
-    /**
-     * @param ConfigurationInterface $configuration
-     * @param BeanDescriptorInterface[] $beanDescriptors
-     */
-    public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
-    {
-        // Let's do nothing.
-    }
+	/**
+	 * @param ConfigurationInterface $configuration
+	 * @param BeanDescriptorInterface[] $beanDescriptors
+	 */
+	public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
+	{
+		// Let's do nothing.
+	}
 }

src/Mouf/Database/TDBM/Utils/ObjectBeanPropertyDescriptor.php

Indentation +175 added lines, -175 removed lines

@@ -12,169 +12,169 @@ 
  */
 class ObjectBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $foreignKey;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-
-    /**
-     * ObjectBeanPropertyDescriptor constructor.
-     * @param Table $table
-     * @param ForeignKeyConstraint $foreignKey
-     * @param SchemaAnalyzer $schemaAnalyzer
-     * @param NamingStrategyInterface $namingStrategy
-     */
-    public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer, NamingStrategyInterface $namingStrategy)
-    {
-        parent::__construct($table);
-        $this->foreignKey = $foreignKey;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->namingStrategy = $namingStrategy;
-    }
-
-    /**
-     * Returns the foreignkey the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey()
-    {
-        return $this->foreignKey;
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key.
-     *
-     * @return null|string
-     */
-    public function getClassName()
-    {
-        return $this->namingStrategy->getBeanClassName($this->foreignKey->getForeignTableName());
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation()
-    {
-        $str = '     * @param %s %s';
-
-        return sprintf($str, $this->getClassName(), $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName()
-    {
-        // First, are there many column or only one?
-        // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
-            $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
-            if ($this->alternativeName) {
-                $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
-
-                $name .= 'By'.implode('And', $camelizedColumns);
-            }
-        } else {
-            $column = $this->foreignKey->getLocalColumns()[0];
-            // Let's remove any _id or id_.
-            if (strpos(strtolower($column), 'id_') === 0) {
-                $column = substr($column, 3);
-            }
-            if (strrpos(strtolower($column), '_id') === strlen($column) - 3) {
-                $column = substr($column, 0, strlen($column) - 3);
-            }
-            $name = TDBMDaoGenerator::toCamelCase($column);
-            if ($this->alternativeName) {
-                $name .= 'Object';
-            }
-        }
-
-        return $name;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    public function isCompulsory()
-    {
-        // Are all columns nullable?
-        $localColumnNames = $this->foreignKey->getLocalColumns();
-
-        foreach ($localColumnNames as $name) {
-            $column = $this->table->getColumn($name);
-            if ($column->getNotnull()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true if the property has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefault()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     *
-     * @throws \TDBMException
-     */
-    public function assignToDefaultCode()
-    {
-        throw new \TDBMException('Foreign key based properties cannot be assigned a default value.');
-    }
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    public function isPrimaryKey()
-    {
-        $fkColumns = $this->foreignKey->getLocalColumns();
-        sort($fkColumns);
-
-        $pkColumns = $this->table->getPrimaryKeyColumns();
-        sort($pkColumns);
-
-        return $fkColumns == $pkColumns;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    public function getGetterSetterCode()
-    {
-        $tableName = $this->table->getName();
-        $getterName = $this->getGetterName();
-        $setterName = $this->getSetterName();
-        $isNullable = !$this->isCompulsory();
-
-        $referencedBeanName = $this->namingStrategy->getBeanClassName($this->foreignKey->getForeignTableName());
-
-        $str = '    /**
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $foreignKey;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+
+	/**
+	 * ObjectBeanPropertyDescriptor constructor.
+	 * @param Table $table
+	 * @param ForeignKeyConstraint $foreignKey
+	 * @param SchemaAnalyzer $schemaAnalyzer
+	 * @param NamingStrategyInterface $namingStrategy
+	 */
+	public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer, NamingStrategyInterface $namingStrategy)
+	{
+		parent::__construct($table);
+		$this->foreignKey = $foreignKey;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->namingStrategy = $namingStrategy;
+	}
+
+	/**
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey()
+	{
+		return $this->foreignKey;
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key.
+	 *
+	 * @return null|string
+	 */
+	public function getClassName()
+	{
+		return $this->namingStrategy->getBeanClassName($this->foreignKey->getForeignTableName());
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation()
+	{
+		$str = '     * @param %s %s';
+
+		return sprintf($str, $this->getClassName(), $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName()
+	{
+		// First, are there many column or only one?
+		// If one column, we name the setter after it. Otherwise, we name the setter after the table name
+		if (count($this->foreignKey->getLocalColumns()) > 1) {
+			$name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
+			if ($this->alternativeName) {
+				$camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
+
+				$name .= 'By'.implode('And', $camelizedColumns);
+			}
+		} else {
+			$column = $this->foreignKey->getLocalColumns()[0];
+			// Let's remove any _id or id_.
+			if (strpos(strtolower($column), 'id_') === 0) {
+				$column = substr($column, 3);
+			}
+			if (strrpos(strtolower($column), '_id') === strlen($column) - 3) {
+				$column = substr($column, 0, strlen($column) - 3);
+			}
+			$name = TDBMDaoGenerator::toCamelCase($column);
+			if ($this->alternativeName) {
+				$name .= 'Object';
+			}
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	public function isCompulsory()
+	{
+		// Are all columns nullable?
+		$localColumnNames = $this->foreignKey->getLocalColumns();
+
+		foreach ($localColumnNames as $name) {
+			$column = $this->table->getColumn($name);
+			if ($column->getNotnull()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns true if the property has a default value.
+	 *
+	 * @return bool
+	 */
+	public function hasDefault()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 *
+	 * @throws \TDBMException
+	 */
+	public function assignToDefaultCode()
+	{
+		throw new \TDBMException('Foreign key based properties cannot be assigned a default value.');
+	}
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	public function isPrimaryKey()
+	{
+		$fkColumns = $this->foreignKey->getLocalColumns();
+		sort($fkColumns);
+
+		$pkColumns = $this->table->getPrimaryKeyColumns();
+		sort($pkColumns);
+
+		return $fkColumns == $pkColumns;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	public function getGetterSetterCode()
+	{
+		$tableName = $this->table->getName();
+		$getterName = $this->getGetterName();
+		$setterName = $this->getSetterName();
+		$isNullable = !$this->isCompulsory();
+
+		$referencedBeanName = $this->namingStrategy->getBeanClassName($this->foreignKey->getForeignTableName());
+
+		$str = '    /**
      * Returns the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getLocalColumns()).' column.
      *
      * @return '.$referencedBeanName.($isNullable?'|null':'').'
@@ -196,20 +196,20 @@ 
 
 ';
 
-        return $str;
-    }
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode()
-    {
-        return '        if (!$stopRecursion) {
+		return $str;
+	}
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode()
+	{
+		return '        if (!$stopRecursion) {
             $object = $this->'.$this->getGetterName().'();
             $array['.var_export($this->getLowerCamelCaseName(), true).'] = $object ? $object->jsonSerialize(true) : null;
         }
 ';
-    }
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
     {
         // First, are there many column or only one?
         // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
+        if (count($this->foreignKey->getLocalColumns())>1) {
             $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
             if ($this->alternativeName) {
                 $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
@@ -90,8 +90,8 @@ 
             if (strpos(strtolower($column), 'id_') === 0) {
                 $column = substr($column, 3);
             }
-            if (strrpos(strtolower($column), '_id') === strlen($column) - 3) {
-                $column = substr($column, 0, strlen($column) - 3);
+            if (strrpos(strtolower($column), '_id') === strlen($column)-3) {
+                $column = substr($column, 0, strlen($column)-3);
             }
             $name = TDBMDaoGenerator::toCamelCase($column);
             if ($this->alternativeName) {
@@ -177,9 +177,9 @@ 
         $str = '    /**
      * Returns the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getLocalColumns()).' column.
      *
-     * @return '.$referencedBeanName.($isNullable?'|null':'').'
+     * @return '.$referencedBeanName.($isNullable ? '|null' : '').'
      */
-    public function '.$getterName.'(): '.($isNullable?'?':'').$referencedBeanName.'
+    public function '.$getterName.'(): '.($isNullable ? '?' : '').$referencedBeanName.'
     {
         return $this->getRef('.var_export($this->foreignKey->getName(), true).', '.var_export($tableName, true).');
     }
@@ -187,9 +187,9 @@ 
     /**
      * The setter for the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getLocalColumns()).' column.
      *
-     * @param '.$referencedBeanName.($isNullable?'|null':'').' $object
+     * @param '.$referencedBeanName.($isNullable ? '|null' : '').' $object
      */
-    public function '.$setterName.'('.($isNullable?'?':'').$referencedBeanName.' $object) : void
+    public function '.$setterName.'('.($isNullable ? '?' : '').$referencedBeanName.' $object) : void
     {
         $this->setRef('.var_export($this->foreignKey->getName(), true).', $object, '.var_export($tableName, true).');
     }