thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/MoufConfiguration.php

Indentation +15 added lines, -15 removed lines

@@ -17,21 +17,21 @@
  */
 class MoufConfiguration extends Configuration
 {
-    private $daoFactoryInstanceName = 'daoFactory';
+	private $daoFactoryInstanceName = 'daoFactory';
 
-    /**
-     * @return string
-     */
-    public function getDaoFactoryInstanceName() : string
-    {
-        return $this->daoFactoryInstanceName;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDaoFactoryInstanceName() : string
+	{
+		return $this->daoFactoryInstanceName;
+	}
 
-    /**
-     * @param string $daoFactoryInstanceName
-     */
-    public function setDaoFactoryInstanceName(string $daoFactoryInstanceName)
-    {
-        $this->daoFactoryInstanceName = $daoFactoryInstanceName;
-    }
+	/**
+	 * @param string $daoFactoryInstanceName
+	 */
+	public function setDaoFactoryInstanceName(string $daoFactoryInstanceName)
+	{
+		$this->daoFactoryInstanceName = $daoFactoryInstanceName;
+	}
 }

src/Mouf/Database/TDBM/TDBMObject.php

Indentation +34 added lines, -34 removed lines

@@ -33,42 +33,42 @@
  */
 class TDBMObject extends AbstractTDBMObject
 {
-    public function getProperty($var, $tableName = null)
-    {
-        return $this->get($var, $tableName);
-    }
+	public function getProperty($var, $tableName = null)
+	{
+		return $this->get($var, $tableName);
+	}
 
-    public function setProperty($var, $value, $tableName = null)
-    {
-        $this->set($var, $value, $tableName);
-    }
+	public function setProperty($var, $value, $tableName = null)
+	{
+		$this->set($var, $value, $tableName);
+	}
 
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        throw new TDBMException('Json serialization is only implemented for generated beans.');
-    }
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *               which is a value of any type other than a resource
+	 *
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize()
+	{
+		throw new TDBMException('Json serialization is only implemented for generated beans.');
+	}
 
-    /**
-     * Returns an array of used tables by this bean (from parent to child relationship).
-     *
-     * @return string[]
-     */
-    protected function getUsedTables() : array
-    {
-        $tableNames = array_keys($this->dbRows);
-        $tableNames = $this->tdbmService->_getLinkBetweenInheritedTables($tableNames);
-        $tableNames = array_reverse($tableNames);
+	/**
+	 * Returns an array of used tables by this bean (from parent to child relationship).
+	 *
+	 * @return string[]
+	 */
+	protected function getUsedTables() : array
+	{
+		$tableNames = array_keys($this->dbRows);
+		$tableNames = $this->tdbmService->_getLinkBetweenInheritedTables($tableNames);
+		$tableNames = array_reverse($tableNames);
 
-        return $tableNames;
-    }
+		return $tableNames;
+	}
 }

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Indentation +606 added lines, -606 removed lines

@@ -31,615 +31,615 @@
  */
 abstract class AbstractTDBMObject implements JsonSerializable
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * An array of DbRow, indexed by table name.
-     *
-     * @var DbRow[]
-     */
-    protected $dbRows = [];
-
-    /**
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @var string
-     */
-    private $status;
-
-    /**
-     * Array storing beans related via many to many relationships (pivot tables).
-     *
-     * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
-     */
-    private $relationships = [];
-
-    /**
-     * @var bool[] Key: pivot table name, value: whether a query was performed to load the data
-     */
-    private $loadedRelationships = [];
-
-    /**
-     * Array storing beans related via many to one relationships (this bean is pointed by external beans).
-     *
-     * @var AlterableResultIterator[] Key: [external_table]___[external_column], value: SplObjectStorage
-     */
-    private $manyToOneRelationships = [];
-
-    /**
-     * Used with $primaryKeys when we want to retrieve an existing object
-     * and $primaryKeys=[] if we want a new object.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct($tableName = null, array $primaryKeys = [], TDBMService $tdbmService = null)
-    {
-        // FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
-        if (!empty($tableName)) {
-            $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-        }
-
-        if ($tdbmService === null) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
-        } else {
-            $this->_attach($tdbmService);
-            if (!empty($primaryKeys)) {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-            } else {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
-            }
-        }
-    }
-
-    /**
-     * Alternative constructor called when data is fetched from database via a SELECT.
-     *
-     * @param array       $beanData    array<table, array<column, value>>
-     * @param TDBMService $tdbmService
-     */
-    public function _constructFromData(array $beanData, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        foreach ($beanData as $table => $columns) {
-            $this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
-        }
-
-        $this->status = TDBMObjectStateEnum::STATE_LOADED;
-    }
-
-    /**
-     * Alternative constructor called when bean is lazily loaded.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     */
-    public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-
-        $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-    }
-
-    public function _attach(TDBMService $tdbmService)
-    {
-        if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
-        }
-        $this->tdbmService = $tdbmService;
-
-        // If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
-        $tableNames = $this->getUsedTables();
-
-        $newDbRows = [];
-
-        foreach ($tableNames as $table) {
-            if (!isset($this->dbRows[$table])) {
-                $this->registerTable($table);
-            }
-            $newDbRows[$table] = $this->dbRows[$table];
-        }
-        $this->dbRows = $newDbRows;
-
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_attach($tdbmService);
-        }
-    }
-
-    /**
-     * Sets the state of the TDBM Object
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @param string $state
-     */
-    public function _setStatus($state)
-    {
-        $this->status = $state;
-
-        // TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_setStatus($state);
-        }
-
-        if ($state === TDBMObjectStateEnum::STATE_DELETED) {
-            $this->onDelete();
-        }
-    }
-
-    /**
-     * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
-     * or throws an error.
-     *
-     * @param string $tableName
-     *
-     * @return string
-     */
-    private function checkTableName($tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            }
-        }
-
-        return $tableName;
-    }
-
-    protected function get($var, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        if (!isset($this->dbRows[$tableName])) {
-            return;
-        }
-
-        return $this->dbRows[$tableName]->get($var);
-    }
-
-    protected function set($var, $value, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $this->dbRows[$tableName]->set($var, $value);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    protected function setRef($foreignKeyName, AbstractTDBMObject $bean = null, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $oldLinkedBean = $this->dbRows[$tableName]->getRef($foreignKeyName);
-        if ($oldLinkedBean !== null) {
-            $oldLinkedBean->removeManyToOneRelationship($tableName, $foreignKeyName, $this);
-        }
-
-        $this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-
-        if ($bean !== null) {
-            $bean->setManyToOneRelationship($tableName, $foreignKeyName, $this);
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    protected function getRef($foreignKeyName, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        if (!isset($this->dbRows[$tableName])) {
-            return;
-        }
-
-        return $this->dbRows[$tableName]->getRef($foreignKeyName);
-    }
-
-    /**
-     * Adds a many to many relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $this->setRelationship($pivotTableName, $remoteBean, 'new');
-    }
-
-    /**
-     * Returns true if there is a relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     *
-     * @return bool
-     */
-    protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $storage = $this->retrieveRelationshipsStorage($pivotTableName);
-
-        if ($storage->contains($remoteBean)) {
-            if ($storage[$remoteBean]['status'] !== 'delete') {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Internal TDBM method. Removes a many to many relationship from this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
-            unset($this->relationships[$pivotTableName][$remoteBean]);
-            unset($remoteBean->relationships[$pivotTableName][$this]);
-        } else {
-            $this->setRelationship($pivotTableName, $remoteBean, 'delete');
-        }
-    }
-
-    /**
-     * Sets many to many relationships for this bean.
-     * Adds new relationships and removes unused ones.
-     *
-     * @param $pivotTableName
-     * @param array $remoteBeans
-     */
-    protected function setRelationships($pivotTableName, array $remoteBeans)
-    {
-        $storage = $this->retrieveRelationshipsStorage($pivotTableName);
-
-        foreach ($storage as $oldRemoteBean) {
-            if (!in_array($oldRemoteBean, $remoteBeans, true)) {
-                // $oldRemoteBean must be removed
-                $this->_removeRelationship($pivotTableName, $oldRemoteBean);
-            }
-        }
-
-        foreach ($remoteBeans as $remoteBean) {
-            if (!$storage->contains($remoteBean) || $storage[$remoteBean]['status'] === 'delete') {
-                // $remoteBean must be added
-                $this->addRelationship($pivotTableName, $remoteBean);
-            }
-        }
-    }
-
-    /**
-     * Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function retrieveRelationshipsStorage($pivotTableName)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName])) {
-            return $storage;
-        }
-
-        $beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
-        $this->loadedRelationships[$pivotTableName] = true;
-
-        foreach ($beans as $bean) {
-            if (isset($storage[$bean])) {
-                $oldStatus = $storage[$bean]['status'];
-                if ($oldStatus === 'delete') {
-                    // Keep deleted things deleted
-                    continue;
-                }
-            }
-            $this->setRelationship($pivotTableName, $bean, 'loaded');
-        }
-
-        return $storage;
-    }
-
-    /**
-     * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getRelationships($pivotTableName)
-    {
-        return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
-    }
-
-    private function relationshipStorageToArray(\SplObjectStorage $storage)
-    {
-        $beans = [];
-        foreach ($storage as $bean) {
-            $statusArr = $storage[$bean];
-            if ($statusArr['status'] !== 'delete') {
-                $beans[] = $bean;
-            }
-        }
-
-        return $beans;
-    }
-
-    /**
-     * Declares a relationship between.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     * @param string             $status
-     */
-    private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        $storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
-        if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
-        }
-
-        $remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
-        $remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
-    }
-
-    /**
-     * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
-     *
-     * @param string $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function getRelationshipStorage(string $pivotTableName) : \SplObjectStorage
-    {
-        return $this->relationships[$pivotTableName] ?? $this->relationships[$pivotTableName] = new \SplObjectStorage();
-    }
-
-    /**
-     * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
-     *
-     * @param string $tableName
-     * @param string $foreignKeyName
-     *
-     * @return AlterableResultIterator
-     */
-    private function getManyToOneAlterableResultIterator(string $tableName, string $foreignKeyName) : AlterableResultIterator
-    {
-        $key = $tableName.'___'.$foreignKeyName;
-
-        return $this->manyToOneRelationships[$key] ?? $this->manyToOneRelationships[$key] = new AlterableResultIterator();
-    }
-
-    /**
-     * Declares a relationship between this bean and the bean pointing to it.
-     *
-     * @param string             $tableName
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    private function setManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
-    {
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        $alterableResultIterator->add($remoteBean);
-    }
-
-    /**
-     * Declares a relationship between this bean and the bean pointing to it.
-     *
-     * @param string             $tableName
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    private function removeManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
-    {
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        $alterableResultIterator->remove($remoteBean);
-    }
-
-    /**
-     * Returns the list of objects linked to this bean via a given foreign key.
-     *
-     * @param string $tableName
-     * @param string $foreignKeyName
-     * @param string $searchTableName
-     * @param array  $searchFilter
-     * @param string $orderString     The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column). WARNING : This parameter is not kept when there is an additionnal or removal object !
-     *
-     * @return AlterableResultIterator
-     */
-    protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter, $orderString = null) : AlterableResultIterator
-    {
-        $key = $tableName.'___'.$foreignKeyName;
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {
-            return $alterableResultIterator;
-        }
-
-        $unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter, [], $orderString);
-
-        $alterableResultIterator->setResultIterator($unalteredResultIterator->getIterator());
-
-        return $alterableResultIterator;
-    }
-
-    /**
-     * Reverts any changes made to the object and resumes it to its DB state.
-     * This can only be called on objects that come from database and that have not been deleted.
-     * Otherwise, this will throw an exception.
-     *
-     * @throws TDBMException
-     */
-    public function discardChanges()
-    {
-        if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
-        }
-
-        if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
-            throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
-        }
-
-        $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-    }
-
-    /**
-     * Method used internally by TDBM. You should not use it directly.
-     * This method returns the status of the TDBMObject.
-     * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @return string
-     */
-    public function _getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Override the native php clone function for TDBMObjects.
-     */
-    public function __clone()
-    {
-        // Let's clone the many to many relationships
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            $pivotTableList = array_keys($this->relationships);
-        } else {
-            $pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
-        }
-
-        foreach ($pivotTableList as $pivotTable) {
-            $storage = $this->retrieveRelationshipsStorage($pivotTable);
-
-            // Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
-            /*foreach ($storage as $remoteBean) {
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * An array of DbRow, indexed by table name.
+	 *
+	 * @var DbRow[]
+	 */
+	protected $dbRows = [];
+
+	/**
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @var string
+	 */
+	private $status;
+
+	/**
+	 * Array storing beans related via many to many relationships (pivot tables).
+	 *
+	 * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
+	 */
+	private $relationships = [];
+
+	/**
+	 * @var bool[] Key: pivot table name, value: whether a query was performed to load the data
+	 */
+	private $loadedRelationships = [];
+
+	/**
+	 * Array storing beans related via many to one relationships (this bean is pointed by external beans).
+	 *
+	 * @var AlterableResultIterator[] Key: [external_table]___[external_column], value: SplObjectStorage
+	 */
+	private $manyToOneRelationships = [];
+
+	/**
+	 * Used with $primaryKeys when we want to retrieve an existing object
+	 * and $primaryKeys=[] if we want a new object.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct($tableName = null, array $primaryKeys = [], TDBMService $tdbmService = null)
+	{
+		// FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
+		if (!empty($tableName)) {
+			$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+		}
+
+		if ($tdbmService === null) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
+		} else {
+			$this->_attach($tdbmService);
+			if (!empty($primaryKeys)) {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+			} else {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
+			}
+		}
+	}
+
+	/**
+	 * Alternative constructor called when data is fetched from database via a SELECT.
+	 *
+	 * @param array       $beanData    array<table, array<column, value>>
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructFromData(array $beanData, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		foreach ($beanData as $table => $columns) {
+			$this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
+		}
+
+		$this->status = TDBMObjectStateEnum::STATE_LOADED;
+	}
+
+	/**
+	 * Alternative constructor called when bean is lazily loaded.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+
+		$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+	}
+
+	public function _attach(TDBMService $tdbmService)
+	{
+		if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
+		}
+		$this->tdbmService = $tdbmService;
+
+		// If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
+		$tableNames = $this->getUsedTables();
+
+		$newDbRows = [];
+
+		foreach ($tableNames as $table) {
+			if (!isset($this->dbRows[$table])) {
+				$this->registerTable($table);
+			}
+			$newDbRows[$table] = $this->dbRows[$table];
+		}
+		$this->dbRows = $newDbRows;
+
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_attach($tdbmService);
+		}
+	}
+
+	/**
+	 * Sets the state of the TDBM Object
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @param string $state
+	 */
+	public function _setStatus($state)
+	{
+		$this->status = $state;
+
+		// TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_setStatus($state);
+		}
+
+		if ($state === TDBMObjectStateEnum::STATE_DELETED) {
+			$this->onDelete();
+		}
+	}
+
+	/**
+	 * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
+	 * or throws an error.
+	 *
+	 * @param string $tableName
+	 *
+	 * @return string
+	 */
+	private function checkTableName($tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			}
+		}
+
+		return $tableName;
+	}
+
+	protected function get($var, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		if (!isset($this->dbRows[$tableName])) {
+			return;
+		}
+
+		return $this->dbRows[$tableName]->get($var);
+	}
+
+	protected function set($var, $value, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$this->dbRows[$tableName]->set($var, $value);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	protected function setRef($foreignKeyName, AbstractTDBMObject $bean = null, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$oldLinkedBean = $this->dbRows[$tableName]->getRef($foreignKeyName);
+		if ($oldLinkedBean !== null) {
+			$oldLinkedBean->removeManyToOneRelationship($tableName, $foreignKeyName, $this);
+		}
+
+		$this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+
+		if ($bean !== null) {
+			$bean->setManyToOneRelationship($tableName, $foreignKeyName, $this);
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	protected function getRef($foreignKeyName, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		if (!isset($this->dbRows[$tableName])) {
+			return;
+		}
+
+		return $this->dbRows[$tableName]->getRef($foreignKeyName);
+	}
+
+	/**
+	 * Adds a many to many relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$this->setRelationship($pivotTableName, $remoteBean, 'new');
+	}
+
+	/**
+	 * Returns true if there is a relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 *
+	 * @return bool
+	 */
+	protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$storage = $this->retrieveRelationshipsStorage($pivotTableName);
+
+		if ($storage->contains($remoteBean)) {
+			if ($storage[$remoteBean]['status'] !== 'delete') {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Internal TDBM method. Removes a many to many relationship from this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
+			unset($this->relationships[$pivotTableName][$remoteBean]);
+			unset($remoteBean->relationships[$pivotTableName][$this]);
+		} else {
+			$this->setRelationship($pivotTableName, $remoteBean, 'delete');
+		}
+	}
+
+	/**
+	 * Sets many to many relationships for this bean.
+	 * Adds new relationships and removes unused ones.
+	 *
+	 * @param $pivotTableName
+	 * @param array $remoteBeans
+	 */
+	protected function setRelationships($pivotTableName, array $remoteBeans)
+	{
+		$storage = $this->retrieveRelationshipsStorage($pivotTableName);
+
+		foreach ($storage as $oldRemoteBean) {
+			if (!in_array($oldRemoteBean, $remoteBeans, true)) {
+				// $oldRemoteBean must be removed
+				$this->_removeRelationship($pivotTableName, $oldRemoteBean);
+			}
+		}
+
+		foreach ($remoteBeans as $remoteBean) {
+			if (!$storage->contains($remoteBean) || $storage[$remoteBean]['status'] === 'delete') {
+				// $remoteBean must be added
+				$this->addRelationship($pivotTableName, $remoteBean);
+			}
+		}
+	}
+
+	/**
+	 * Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function retrieveRelationshipsStorage($pivotTableName)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName])) {
+			return $storage;
+		}
+
+		$beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
+		$this->loadedRelationships[$pivotTableName] = true;
+
+		foreach ($beans as $bean) {
+			if (isset($storage[$bean])) {
+				$oldStatus = $storage[$bean]['status'];
+				if ($oldStatus === 'delete') {
+					// Keep deleted things deleted
+					continue;
+				}
+			}
+			$this->setRelationship($pivotTableName, $bean, 'loaded');
+		}
+
+		return $storage;
+	}
+
+	/**
+	 * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getRelationships($pivotTableName)
+	{
+		return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
+	}
+
+	private function relationshipStorageToArray(\SplObjectStorage $storage)
+	{
+		$beans = [];
+		foreach ($storage as $bean) {
+			$statusArr = $storage[$bean];
+			if ($statusArr['status'] !== 'delete') {
+				$beans[] = $bean;
+			}
+		}
+
+		return $beans;
+	}
+
+	/**
+	 * Declares a relationship between.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 * @param string             $status
+	 */
+	private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		$storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
+		if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
+		}
+
+		$remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
+		$remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
+	}
+
+	/**
+	 * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
+	 *
+	 * @param string $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function getRelationshipStorage(string $pivotTableName) : \SplObjectStorage
+	{
+		return $this->relationships[$pivotTableName] ?? $this->relationships[$pivotTableName] = new \SplObjectStorage();
+	}
+
+	/**
+	 * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
+	 *
+	 * @param string $tableName
+	 * @param string $foreignKeyName
+	 *
+	 * @return AlterableResultIterator
+	 */
+	private function getManyToOneAlterableResultIterator(string $tableName, string $foreignKeyName) : AlterableResultIterator
+	{
+		$key = $tableName.'___'.$foreignKeyName;
+
+		return $this->manyToOneRelationships[$key] ?? $this->manyToOneRelationships[$key] = new AlterableResultIterator();
+	}
+
+	/**
+	 * Declares a relationship between this bean and the bean pointing to it.
+	 *
+	 * @param string             $tableName
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	private function setManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
+	{
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		$alterableResultIterator->add($remoteBean);
+	}
+
+	/**
+	 * Declares a relationship between this bean and the bean pointing to it.
+	 *
+	 * @param string             $tableName
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	private function removeManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
+	{
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		$alterableResultIterator->remove($remoteBean);
+	}
+
+	/**
+	 * Returns the list of objects linked to this bean via a given foreign key.
+	 *
+	 * @param string $tableName
+	 * @param string $foreignKeyName
+	 * @param string $searchTableName
+	 * @param array  $searchFilter
+	 * @param string $orderString     The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column). WARNING : This parameter is not kept when there is an additionnal or removal object !
+	 *
+	 * @return AlterableResultIterator
+	 */
+	protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter, $orderString = null) : AlterableResultIterator
+	{
+		$key = $tableName.'___'.$foreignKeyName;
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {
+			return $alterableResultIterator;
+		}
+
+		$unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter, [], $orderString);
+
+		$alterableResultIterator->setResultIterator($unalteredResultIterator->getIterator());
+
+		return $alterableResultIterator;
+	}
+
+	/**
+	 * Reverts any changes made to the object and resumes it to its DB state.
+	 * This can only be called on objects that come from database and that have not been deleted.
+	 * Otherwise, this will throw an exception.
+	 *
+	 * @throws TDBMException
+	 */
+	public function discardChanges()
+	{
+		if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
+		}
+
+		if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
+			throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
+		}
+
+		$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+	}
+
+	/**
+	 * Method used internally by TDBM. You should not use it directly.
+	 * This method returns the status of the TDBMObject.
+	 * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @return string
+	 */
+	public function _getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * Override the native php clone function for TDBMObjects.
+	 */
+	public function __clone()
+	{
+		// Let's clone the many to many relationships
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			$pivotTableList = array_keys($this->relationships);
+		} else {
+			$pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
+		}
+
+		foreach ($pivotTableList as $pivotTable) {
+			$storage = $this->retrieveRelationshipsStorage($pivotTable);
+
+			// Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
+			/*foreach ($storage as $remoteBean) {
                 $metadata = $storage[$remoteBean];
 
                 $remoteStorage = $remoteBean->getRelationshipStorage($pivotTable);
                 $remoteStorage->attach($this, ['status' => $metadata['status'], 'reverse' => !$metadata['reverse']]);
             }*/
-        }
-
-        // Let's clone each row
-        foreach ($this->dbRows as $key => &$dbRow) {
-            $dbRow = clone $dbRow;
-            $dbRow->setTDBMObject($this);
-        }
-
-        $this->manyToOneRelationships = [];
-
-        // Let's set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-    }
-
-    /**
-     * Returns raw database rows.
-     *
-     * @return DbRow[] Key: table name, Value: DbRow object
-     */
-    public function _getDbRows()
-    {
-        return $this->dbRows;
-    }
-
-    private function registerTable($tableName)
-    {
-        $dbRow = new DbRow($this, $tableName);
-
-        if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
-            // Let's get the primary key for the new table
-            $anotherDbRow = array_values($this->dbRows)[0];
-            /* @var $anotherDbRow DbRow */
-            $indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
-            $primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
-            $dbRow->_setPrimaryKeys($primaryKeys);
-        }
-
-        $dbRow->_setStatus($this->status);
-
-        $this->dbRows[$tableName] = $dbRow;
-        // TODO: look at status (if not new)=> get primary key from tdbmservice
-    }
-
-    /**
-     * Internal function: return the list of relationships.
-     *
-     * @return \SplObjectStorage[]
-     */
-    public function _getCachedRelationships()
-    {
-        return $this->relationships;
-    }
-
-    /**
-     * Returns an array of used tables by this bean (from parent to child relationship).
-     *
-     * @return string[]
-     */
-    abstract protected function getUsedTables() : array;
-
-    /**
-     * Method called when the bean is removed from database.
-     */
-    protected function onDelete() : void
-    {
-    }
+		}
+
+		// Let's clone each row
+		foreach ($this->dbRows as $key => &$dbRow) {
+			$dbRow = clone $dbRow;
+			$dbRow->setTDBMObject($this);
+		}
+
+		$this->manyToOneRelationships = [];
+
+		// Let's set the status to new (to enter the save function)
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+	}
+
+	/**
+	 * Returns raw database rows.
+	 *
+	 * @return DbRow[] Key: table name, Value: DbRow object
+	 */
+	public function _getDbRows()
+	{
+		return $this->dbRows;
+	}
+
+	private function registerTable($tableName)
+	{
+		$dbRow = new DbRow($this, $tableName);
+
+		if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
+			// Let's get the primary key for the new table
+			$anotherDbRow = array_values($this->dbRows)[0];
+			/* @var $anotherDbRow DbRow */
+			$indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
+			$primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
+			$dbRow->_setPrimaryKeys($primaryKeys);
+		}
+
+		$dbRow->_setStatus($this->status);
+
+		$this->dbRows[$tableName] = $dbRow;
+		// TODO: look at status (if not new)=> get primary key from tdbmservice
+	}
+
+	/**
+	 * Internal function: return the list of relationships.
+	 *
+	 * @return \SplObjectStorage[]
+	 */
+	public function _getCachedRelationships()
+	{
+		return $this->relationships;
+	}
+
+	/**
+	 * Returns an array of used tables by this bean (from parent to child relationship).
+	 *
+	 * @return string[]
+	 */
+	abstract protected function getUsedTables() : array;
+
+	/**
+	 * Method called when the bean is removed from database.
+	 */
+	protected function onDelete() : void
+	{
+	}
 }

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

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);
+	}
 }

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

Indentation +44 added lines, -44 removed lines

@@ -11,58 +11,58 @@
 class MoufDiListener implements GeneratorListenerInterface
 {
 
-    /**
-     * @param ConfigurationInterface $configuration
-     * @param BeanDescriptorInterface[] $beanDescriptors
-     */
-    public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
-    {
-        // Let's generate the needed instance in Mouf.
-        $moufManager = MoufManager::getMoufManager();
+	/**
+	 * @param ConfigurationInterface $configuration
+	 * @param BeanDescriptorInterface[] $beanDescriptors
+	 */
+	public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors): void
+	{
+		// Let's generate the needed instance in Mouf.
+		$moufManager = MoufManager::getMoufManager();
 
-        $daoFactoryInstanceName = null;
-        if ($configuration instanceof MoufConfiguration) {
-            $daoFactoryInstanceName = $configuration->getDaoFactoryInstanceName();
-            $daoFactoryClassName = $configuration->getDaoNamespace().'\\Generated\\'.$configuration->getNamingStrategy()->getDaoFactoryClassName();
-            $moufManager->declareComponent($daoFactoryInstanceName, $daoFactoryClassName, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
-        }
+		$daoFactoryInstanceName = null;
+		if ($configuration instanceof MoufConfiguration) {
+			$daoFactoryInstanceName = $configuration->getDaoFactoryInstanceName();
+			$daoFactoryClassName = $configuration->getDaoNamespace().'\\Generated\\'.$configuration->getNamingStrategy()->getDaoFactoryClassName();
+			$moufManager->declareComponent($daoFactoryInstanceName, $daoFactoryClassName, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
+		}
 
-        $tdbmServiceInstanceName = $this->getTdbmInstanceName($configuration);
+		$tdbmServiceInstanceName = $this->getTdbmInstanceName($configuration);
 
-        foreach ($beanDescriptors as $beanDescriptor) {
-            $daoName = $beanDescriptor->getDaoClassName();
+		foreach ($beanDescriptors as $beanDescriptor) {
+			$daoName = $beanDescriptor->getDaoClassName();
 
-            $instanceName = TDBMDaoGenerator::toVariableName($daoName);
-            if (!$moufManager->instanceExists($instanceName)) {
-                $moufManager->declareComponent($instanceName, $configuration->getDaoNamespace().'\\'.$daoName);
-            }
-            $moufManager->setParameterViaConstructor($instanceName, 0, $tdbmServiceInstanceName, 'object');
-            if ($daoFactoryInstanceName !== null) {
-                $moufManager->bindComponentViaSetter($daoFactoryInstanceName, 'set'.$daoName, $instanceName);
-            }
-        }
+			$instanceName = TDBMDaoGenerator::toVariableName($daoName);
+			if (!$moufManager->instanceExists($instanceName)) {
+				$moufManager->declareComponent($instanceName, $configuration->getDaoNamespace().'\\'.$daoName);
+			}
+			$moufManager->setParameterViaConstructor($instanceName, 0, $tdbmServiceInstanceName, 'object');
+			if ($daoFactoryInstanceName !== null) {
+				$moufManager->bindComponentViaSetter($daoFactoryInstanceName, 'set'.$daoName, $instanceName);
+			}
+		}
 
-        $moufManager->rewriteMouf();
-    }
+		$moufManager->rewriteMouf();
+	}
 
-    private function getTdbmInstanceName(ConfigurationInterface $configuration) : string
-    {
-        $moufManager = MoufManager::getMoufManager();
+	private function getTdbmInstanceName(ConfigurationInterface $configuration) : string
+	{
+		$moufManager = MoufManager::getMoufManager();
 
-        $configurationInstanceName = $moufManager->findInstanceName($configuration);
-        if (!$configurationInstanceName) {
-            throw new \TDBMException('Could not find TDBM instance for configuration object.');
-        }
+		$configurationInstanceName = $moufManager->findInstanceName($configuration);
+		if (!$configurationInstanceName) {
+			throw new \TDBMException('Could not find TDBM instance for configuration object.');
+		}
 
-        // Let's find the configuration
-        $tdbmServicesNames = $moufManager->findInstances(TDBMService::class);
+		// Let's find the configuration
+		$tdbmServicesNames = $moufManager->findInstances(TDBMService::class);
 
-        foreach ($tdbmServicesNames as $name) {
-            if ($moufManager->getInstanceDescriptor($name)->getConstructorArgumentProperty('configuration')->getValue()->getName() === $configurationInstanceName) {
-                return $name;
-            }
-        }
+		foreach ($tdbmServicesNames as $name) {
+			if ($moufManager->getInstanceDescriptor($name)->getConstructorArgumentProperty('configuration')->getValue()->getName() === $configurationInstanceName) {
+				return $name;
+			}
+		}
 
-        throw new \TDBMException('Could not find TDBMService instance.');
-    }
+		throw new \TDBMException('Could not find TDBMService instance.');
+	}
 }

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

Indentation +164 added lines, -164 removed lines

@@ -7,168 +7,168 @@
 
 class DefaultNamingStrategy implements NamingStrategyInterface
 {
-    private $beanPrefix = '';
-    private $beanSuffix = '';
-    private $baseBeanPrefix = 'Abstract';
-    private $baseBeanSuffix = '';
-    private $daoPrefix = '';
-    private $daoSuffix = 'Dao';
-    private $baseDaoPrefix = 'Abstract';
-    private $baseDaoSuffix = 'Dao';
-
-    /**
-     * Sets the string prefix to any bean class name.
-     *
-     * @param string $beanPrefix
-     */
-    public function setBeanPrefix(string $beanPrefix)
-    {
-        $this->beanPrefix = $beanPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any bean class name.
-     *
-     * @param string $beanSuffix
-     */
-    public function setBeanSuffix(string $beanSuffix)
-    {
-        $this->beanSuffix = $beanSuffix;
-    }
-
-    /**
-     * Sets the string prefix to any base bean class name.
-     *
-     * @param string $baseBeanPrefix
-     */
-    public function setBaseBeanPrefix(string $baseBeanPrefix)
-    {
-        $this->baseBeanPrefix = $baseBeanPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any base bean class name.
-     *
-     * @param string $baseBeanSuffix
-     */
-    public function setBaseBeanSuffix(string $baseBeanSuffix)
-    {
-        $this->baseBeanSuffix = $baseBeanSuffix;
-    }
-
-    /**
-     * Sets the string prefix to any DAO class name.
-     *
-     * @param string $daoPrefix
-     */
-    public function setDaoPrefix(string $daoPrefix)
-    {
-        $this->daoPrefix = $daoPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any DAO class name.
-     *
-     * @param string $daoSuffix
-     */
-    public function setDaoSuffix(string $daoSuffix)
-    {
-        $this->daoSuffix = $daoSuffix;
-    }
-
-    /**
-     * Sets the string prefix to any base DAO class name.
-     *
-     * @param string $baseDaoPrefix
-     */
-    public function setBaseDaoPrefix(string $baseDaoPrefix)
-    {
-        $this->baseDaoPrefix = $baseDaoPrefix;
-    }
-
-    /**
-     * Sets the string suffix to any base DAO class name.
-     *
-     * @param string $baseDaoSuffix
-     */
-    public function setBaseDaoSuffix(string $baseDaoSuffix)
-    {
-        $this->baseDaoSuffix = $baseDaoSuffix;
-    }
-
-
-    /**
-     * Returns the bean class name from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBeanClassName(string $tableName): string
-    {
-        return $this->beanPrefix.self::toSingularCamelCase($tableName).$this->beanSuffix;
-    }
-
-    /**
-     * Returns the base bean class name from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBaseBeanClassName(string $tableName): string
-    {
-        return $this->baseBeanPrefix.self::toSingularCamelCase($tableName).$this->baseBeanSuffix;
-    }
-
-    /**
-     * Returns the name of the DAO class from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getDaoClassName(string $tableName): string
-    {
-        return $this->daoPrefix.self::toSingularCamelCase($tableName).$this->daoSuffix;
-    }
-
-    /**
-     * Returns the name of the base DAO class from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBaseDaoClassName(string $tableName): string
-    {
-        return $this->baseDaoPrefix.self::toSingularCamelCase($tableName).$this->baseDaoSuffix;
-    }
-
-    /**
-     * Tries to put string to the singular form (if it is plural) and camel case form.
-     * We assume the table names are in english.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    private static function toSingularCamelCase(string $str): string
-    {
-        $tokens = preg_split("/[_ ]+/", $str);
-        $tokens = array_map([Inflector::class, 'singularize'], $tokens);
-
-        $str = '';
-        foreach ($tokens as $token) {
-            $str .= ucfirst(Inflector::singularize($token));
-        }
-
-        return $str;
-    }
-
-    /**
-     * Returns the class name for the DAO factory.
-     *
-     * @return string
-     */
-    public function getDaoFactoryClassName(): string
-    {
-        return 'DaoFactory';
-    }
+	private $beanPrefix = '';
+	private $beanSuffix = '';
+	private $baseBeanPrefix = 'Abstract';
+	private $baseBeanSuffix = '';
+	private $daoPrefix = '';
+	private $daoSuffix = 'Dao';
+	private $baseDaoPrefix = 'Abstract';
+	private $baseDaoSuffix = 'Dao';
+
+	/**
+	 * Sets the string prefix to any bean class name.
+	 *
+	 * @param string $beanPrefix
+	 */
+	public function setBeanPrefix(string $beanPrefix)
+	{
+		$this->beanPrefix = $beanPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any bean class name.
+	 *
+	 * @param string $beanSuffix
+	 */
+	public function setBeanSuffix(string $beanSuffix)
+	{
+		$this->beanSuffix = $beanSuffix;
+	}
+
+	/**
+	 * Sets the string prefix to any base bean class name.
+	 *
+	 * @param string $baseBeanPrefix
+	 */
+	public function setBaseBeanPrefix(string $baseBeanPrefix)
+	{
+		$this->baseBeanPrefix = $baseBeanPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any base bean class name.
+	 *
+	 * @param string $baseBeanSuffix
+	 */
+	public function setBaseBeanSuffix(string $baseBeanSuffix)
+	{
+		$this->baseBeanSuffix = $baseBeanSuffix;
+	}
+
+	/**
+	 * Sets the string prefix to any DAO class name.
+	 *
+	 * @param string $daoPrefix
+	 */
+	public function setDaoPrefix(string $daoPrefix)
+	{
+		$this->daoPrefix = $daoPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any DAO class name.
+	 *
+	 * @param string $daoSuffix
+	 */
+	public function setDaoSuffix(string $daoSuffix)
+	{
+		$this->daoSuffix = $daoSuffix;
+	}
+
+	/**
+	 * Sets the string prefix to any base DAO class name.
+	 *
+	 * @param string $baseDaoPrefix
+	 */
+	public function setBaseDaoPrefix(string $baseDaoPrefix)
+	{
+		$this->baseDaoPrefix = $baseDaoPrefix;
+	}
+
+	/**
+	 * Sets the string suffix to any base DAO class name.
+	 *
+	 * @param string $baseDaoSuffix
+	 */
+	public function setBaseDaoSuffix(string $baseDaoSuffix)
+	{
+		$this->baseDaoSuffix = $baseDaoSuffix;
+	}
+
+
+	/**
+	 * Returns the bean class name from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBeanClassName(string $tableName): string
+	{
+		return $this->beanPrefix.self::toSingularCamelCase($tableName).$this->beanSuffix;
+	}
+
+	/**
+	 * Returns the base bean class name from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBaseBeanClassName(string $tableName): string
+	{
+		return $this->baseBeanPrefix.self::toSingularCamelCase($tableName).$this->baseBeanSuffix;
+	}
+
+	/**
+	 * Returns the name of the DAO class from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getDaoClassName(string $tableName): string
+	{
+		return $this->daoPrefix.self::toSingularCamelCase($tableName).$this->daoSuffix;
+	}
+
+	/**
+	 * Returns the name of the base DAO class from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBaseDaoClassName(string $tableName): string
+	{
+		return $this->baseDaoPrefix.self::toSingularCamelCase($tableName).$this->baseDaoSuffix;
+	}
+
+	/**
+	 * Tries to put string to the singular form (if it is plural) and camel case form.
+	 * We assume the table names are in english.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	private static function toSingularCamelCase(string $str): string
+	{
+		$tokens = preg_split("/[_ ]+/", $str);
+		$tokens = array_map([Inflector::class, 'singularize'], $tokens);
+
+		$str = '';
+		foreach ($tokens as $token) {
+			$str .= ucfirst(Inflector::singularize($token));
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Returns the class name for the DAO factory.
+	 *
+	 * @return string
+	 */
+	public function getDaoFactoryClassName(): string
+	{
+		return 'DaoFactory';
+	}
 }

src/Mouf/Database/TDBM/Commands/GenerateCommand.php

Indentation +32 added lines, -32 removed lines

@@ -13,48 +13,48 @@
 class GenerateCommand extends Command
 {
 
-    /**
-     * @var TDBMService
-     */
-    private $configuration;
+	/**
+	 * @var TDBMService
+	 */
+	private $configuration;
 
-    public function __construct(ConfigurationInterface $configuration)
-    {
-        parent::__construct();
-        $this->configuration = $configuration;
-    }
+	public function __construct(ConfigurationInterface $configuration)
+	{
+		parent::__construct();
+		$this->configuration = $configuration;
+	}
 
-    protected function configure()
-    {
-        $this->setName('tdbm:generate')
-            ->setDescription('Generates DAOs and beans.')
-            ->setHelp('Use this command to generate or regenerate the DAOs and beans for your project.')
-        ;
-    }
+	protected function configure()
+	{
+		$this->setName('tdbm:generate')
+			->setDescription('Generates DAOs and beans.')
+			->setHelp('Use this command to generate or regenerate the DAOs and beans for your project.')
+		;
+	}
 
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        // TODO: externalize composer.json file for autoloading (no more parameters for generateAllDaosAndBeans)
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		// TODO: externalize composer.json file for autoloading (no more parameters for generateAllDaosAndBeans)
 
-        $alteredConf = new AlteredConfiguration($this->configuration);
+		$alteredConf = new AlteredConfiguration($this->configuration);
 
 
-        $loggers = [ new ConsoleLogger($output) ];
+		$loggers = [ new ConsoleLogger($output) ];
 
-        $logger = $alteredConf->getLogger();
-        if ($logger) {
-            $loggers[] = $logger;
-        }
+		$logger = $alteredConf->getLogger();
+		if ($logger) {
+			$loggers[] = $logger;
+		}
 
-        $multiLogger = new MultiLogger($loggers);
+		$multiLogger = new MultiLogger($loggers);
 
-        $alteredConf->setLogger($multiLogger);
+		$alteredConf->setLogger($multiLogger);
 
-        $multiLogger->notice('Starting regenerating DAOs and beans');
+		$multiLogger->notice('Starting regenerating DAOs and beans');
 
-        $tdbmService = new TDBMService($this->configuration);
-        $tdbmService->generateAllDaosAndBeans();
+		$tdbmService = new TDBMService($this->configuration);
+		$tdbmService->generateAllDaosAndBeans();
 
-        $multiLogger->notice('Finished regenerating DAOs and beans');
-    }
+		$multiLogger->notice('Finished regenerating DAOs and beans');
+	}
 }

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

Indentation +215 added lines, -215 removed lines

@@ -21,219 +21,219 @@
  */
 class TdbmInstallController extends Controller
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    public $selfedit;
-
-    /**
-     * The active MoufManager to be edited/viewed.
-     *
-     * @var MoufManager
-     */
-    public $moufManager;
-
-    /**
-     * The template used by the main page for mouf.
-     *
-     * @Property
-     * @Compulsory
-     *
-     * @var TemplateInterface
-     */
-    public $template;
-
-    /**
-     * Displays the first install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function defaultAction($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * Skips the install process.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function skip($selfedit = 'false')
-    {
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $autoloadDetected;
-    //protected $storeInUtc;
-    protected $useCustomComposer = false;
-    protected $composerFile;
-
-    /**
-     * Displays the second install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function configure($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        // Let's start by performing basic checks about the instances we assume to exist.
-        if (!$this->moufManager->instanceExists('dbalConnection')) {
-            $this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
-
-            return;
-        }
-
-        if ($this->moufManager->has('tdbmConfiguration')) {
-            $tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
-
-            $this->beanNamespace = $tdbmConfiguration->getConstructorArgumentProperty('beanNamespace')->getValue();
-            $this->daoNamespace = $tdbmConfiguration->getConstructorArgumentProperty('daoNamespace')->getValue();
-        } else {
-            // Old TDBM 4.2 fallback
-            $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
-            $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
-        }
-
-        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.'Model';
-            } else {
-                $this->autoloadDetected = false;
-                $this->daoNamespace = 'YourApplication\\Dao';
-                $this->beanNamespace = 'YourApplication\\Model';
-            }
-        } else {
-            $this->autoloadDetected = true;
-        }
-        $this->defaultPath = true;
-        $this->storePath = '';
-
-        $this->castDatesToDateTime = true;
-
-        $this->content->addFile(__DIR__.'/../../../../views/installStep2.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * This action generates the TDBM instance, then the DAOs and Beans.
-     *
-     * @Action
-     *
-     * @param string $daonamespace
-     * @param string $beannamespace
-     * @param string $selfedit
-     *
-     * @throws \Mouf\MoufException
-     */
-    public function generate($daonamespace, $beannamespace, /*$storeInUtc = 0,*/ $selfedit = 'false', $defaultPath = false, $storePath = '')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        $doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
-
-        $migratingFrom42 = false;
-        if ($this->moufManager->has('tdbmService') && !$this->moufManager->has('tdbmConfiguration')) {
-            $migratingFrom42 = true;
-        }
-
-        $namingStrategy = InstallUtils::getOrCreateInstance('namingStrategy', DefaultNamingStrategy::class, $this->moufManager);
-        if ($migratingFrom42) {
-            // Let's setup the naming strategy for compatibility
-            $namingStrategy->getSetterProperty('setBeanPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setBeanSuffix')->setValue('Bean');
-            $namingStrategy->getSetterProperty('setBaseBeanPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setBaseBeanSuffix')->setValue('BaseBean');
-            $namingStrategy->getSetterProperty('setDaoPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setDaoSuffix')->setValue('Dao');
-            $namingStrategy->getSetterProperty('setBaseDaoPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setBaseDaoSuffix')->setValue('BaseDao');
-        }
-
-        if (!$this->moufManager->instanceExists('tdbmConfiguration')) {
-            $moufListener = InstallUtils::getOrCreateInstance(MoufDiListener::class, MoufDiListener::class, $this->moufManager);
-
-            $tdbmConfiguration = $this->moufManager->createInstance(MoufConfiguration::class)->setName('tdbmConfiguration');
-            $tdbmConfiguration->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
-            $tdbmConfiguration->getConstructorArgumentProperty('cache')->setValue($doctrineCache);
-            $tdbmConfiguration->getConstructorArgumentProperty('namingStrategy')->setValue($namingStrategy);
-            $tdbmConfiguration->getProperty('daoFactoryInstanceName')->setValue('daoFactory');
-            $tdbmConfiguration->getConstructorArgumentProperty('generatorListeners')->setValue([$moufListener]);
-
-            // Let's also delete the tdbmService if migrating versions <= 4.2
-            if ($migratingFrom42) {
-                $this->moufManager->removeComponent('tdbmService');
-            }
-        } else {
-            $tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
-        }
-
-        if (!$this->moufManager->instanceExists('tdbmService')) {
-            $tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
-            $tdbmService->getConstructorArgumentProperty('configuration')->setValue($tdbmConfiguration);
-        }
-
-        // We declare our instance of the Symfony command as a Mouf instance
-        $generateCommand = InstallUtils::getOrCreateInstance('generateCommand', GenerateCommand::class, $this->moufManager);
-        $generateCommand->getConstructorArgumentProperty('tdbmConfiguration')->setValue($tdbmConfiguration);
-
-        // We register that instance descriptor using "ConsoleUtils"
-        $consoleUtils = new ConsoleUtils($this->moufManager);
-        $consoleUtils->registerCommand($generateCommand);
-
-        $this->moufManager->rewriteMouf();
-
-        TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'daoFactory', $selfedit, /*$storeInUtc,*/ $defaultPath, $storePath);
-
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $errorMsg;
-
-    private function displayErrorMsg($msg)
-    {
-        $this->errorMsg = $msg;
-        $this->content->addFile(__DIR__.'/../../../../views/installError.php', $this);
-        $this->template->toHtml();
-    }
+	/**
+	 * @var HtmlBlock
+	 */
+	public $content;
+
+	public $selfedit;
+
+	/**
+	 * The active MoufManager to be edited/viewed.
+	 *
+	 * @var MoufManager
+	 */
+	public $moufManager;
+
+	/**
+	 * The template used by the main page for mouf.
+	 *
+	 * @Property
+	 * @Compulsory
+	 *
+	 * @var TemplateInterface
+	 */
+	public $template;
+
+	/**
+	 * Displays the first install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function defaultAction($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * Skips the install process.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function skip($selfedit = 'false')
+	{
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $daoNamespace;
+	protected $beanNamespace;
+	protected $autoloadDetected;
+	//protected $storeInUtc;
+	protected $useCustomComposer = false;
+	protected $composerFile;
+
+	/**
+	 * Displays the second install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function configure($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		// Let's start by performing basic checks about the instances we assume to exist.
+		if (!$this->moufManager->instanceExists('dbalConnection')) {
+			$this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
+
+			return;
+		}
+
+		if ($this->moufManager->has('tdbmConfiguration')) {
+			$tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
+
+			$this->beanNamespace = $tdbmConfiguration->getConstructorArgumentProperty('beanNamespace')->getValue();
+			$this->daoNamespace = $tdbmConfiguration->getConstructorArgumentProperty('daoNamespace')->getValue();
+		} else {
+			// Old TDBM 4.2 fallback
+			$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
+			$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
+		}
+
+		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.'Model';
+			} else {
+				$this->autoloadDetected = false;
+				$this->daoNamespace = 'YourApplication\\Dao';
+				$this->beanNamespace = 'YourApplication\\Model';
+			}
+		} else {
+			$this->autoloadDetected = true;
+		}
+		$this->defaultPath = true;
+		$this->storePath = '';
+
+		$this->castDatesToDateTime = true;
+
+		$this->content->addFile(__DIR__.'/../../../../views/installStep2.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * This action generates the TDBM instance, then the DAOs and Beans.
+	 *
+	 * @Action
+	 *
+	 * @param string $daonamespace
+	 * @param string $beannamespace
+	 * @param string $selfedit
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public function generate($daonamespace, $beannamespace, /*$storeInUtc = 0,*/ $selfedit = 'false', $defaultPath = false, $storePath = '')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		$doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
+
+		$migratingFrom42 = false;
+		if ($this->moufManager->has('tdbmService') && !$this->moufManager->has('tdbmConfiguration')) {
+			$migratingFrom42 = true;
+		}
+
+		$namingStrategy = InstallUtils::getOrCreateInstance('namingStrategy', DefaultNamingStrategy::class, $this->moufManager);
+		if ($migratingFrom42) {
+			// Let's setup the naming strategy for compatibility
+			$namingStrategy->getSetterProperty('setBeanPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setBeanSuffix')->setValue('Bean');
+			$namingStrategy->getSetterProperty('setBaseBeanPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setBaseBeanSuffix')->setValue('BaseBean');
+			$namingStrategy->getSetterProperty('setDaoPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setDaoSuffix')->setValue('Dao');
+			$namingStrategy->getSetterProperty('setBaseDaoPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setBaseDaoSuffix')->setValue('BaseDao');
+		}
+
+		if (!$this->moufManager->instanceExists('tdbmConfiguration')) {
+			$moufListener = InstallUtils::getOrCreateInstance(MoufDiListener::class, MoufDiListener::class, $this->moufManager);
+
+			$tdbmConfiguration = $this->moufManager->createInstance(MoufConfiguration::class)->setName('tdbmConfiguration');
+			$tdbmConfiguration->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
+			$tdbmConfiguration->getConstructorArgumentProperty('cache')->setValue($doctrineCache);
+			$tdbmConfiguration->getConstructorArgumentProperty('namingStrategy')->setValue($namingStrategy);
+			$tdbmConfiguration->getProperty('daoFactoryInstanceName')->setValue('daoFactory');
+			$tdbmConfiguration->getConstructorArgumentProperty('generatorListeners')->setValue([$moufListener]);
+
+			// Let's also delete the tdbmService if migrating versions <= 4.2
+			if ($migratingFrom42) {
+				$this->moufManager->removeComponent('tdbmService');
+			}
+		} else {
+			$tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
+		}
+
+		if (!$this->moufManager->instanceExists('tdbmService')) {
+			$tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
+			$tdbmService->getConstructorArgumentProperty('configuration')->setValue($tdbmConfiguration);
+		}
+
+		// We declare our instance of the Symfony command as a Mouf instance
+		$generateCommand = InstallUtils::getOrCreateInstance('generateCommand', GenerateCommand::class, $this->moufManager);
+		$generateCommand->getConstructorArgumentProperty('tdbmConfiguration')->setValue($tdbmConfiguration);
+
+		// We register that instance descriptor using "ConsoleUtils"
+		$consoleUtils = new ConsoleUtils($this->moufManager);
+		$consoleUtils->registerCommand($generateCommand);
+
+		$this->moufManager->rewriteMouf();
+
+		TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'daoFactory', $selfedit, /*$storeInUtc,*/ $defaultPath, $storePath);
+
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $errorMsg;
+
+	private function displayErrorMsg($msg)
+	{
+		$this->errorMsg = $msg;
+		$this->content->addFile(__DIR__.'/../../../../views/installError.php', $this);
+		$this->template->toHtml();
+	}
 }

src/Mouf/Database/TDBM/Configuration.php

Indentation +167 added lines, -167 removed lines

@@ -17,171 +17,171 @@
 class Configuration implements ConfigurationInterface
 {
 
-    /**
-     * @var string
-     */
-    private $beanNamespace;
-    /**
-     * @var string
-     */
-    private $daoNamespace;
-    /**
-     * @var Connection
-     */
-    private $connection;
-    /**
-     * @var Cache
-     */
-    private $cache;
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-    /**
-     * @var GeneratorListenerInterface
-     */
-    private $generatorEventDispatcher;
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-    /**
-     * @var PathFinderInterface
-     */
-    private $pathFinder;
-    /**
-     * The Composer file used to detect the path where files should be written.
-     *
-     * @var string
-     */
-    private $composerFile;
-
-    /**
-     * @param string $beanNamespace The namespace hosting the beans
-     * @param string $daoNamespace The namespace hosting the DAOs
-     * @param Connection $connection The connection to the database
-     * @param Cache|null $cache The Doctrine cache to store database metadata
-     * @param SchemaAnalyzer|null $schemaAnalyzer The schema analyzer that will be used to find shortest paths... Will be automatically created if not passed
-     * @param LoggerInterface|null $logger The logger
-     * @param GeneratorListenerInterface[] $generatorListeners A list of listeners that will be triggered when beans/daos are generated
-     */
-    public function __construct(string $beanNamespace, string $daoNamespace, Connection $connection, NamingStrategyInterface $namingStrategy, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null, array $generatorListeners = [])
-    {
-        $this->beanNamespace = rtrim($beanNamespace, '\\');
-        $this->daoNamespace = rtrim($daoNamespace, '\\');
-        $this->connection = $connection;
-        $this->namingStrategy = $namingStrategy;
-        if ($cache !== null) {
-            $this->cache = $cache;
-        } else {
-            $this->cache = new VoidCache();
-        }
-        if ($schemaAnalyzer !== null) {
-            $this->schemaAnalyzer = $schemaAnalyzer;
-        } else {
-            $this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
-        }
-        $this->logger = $logger;
-        $this->generatorEventDispatcher = new GeneratorEventDispatcher($generatorListeners);
-        $this->pathFinder = new PathFinder();
-    }
-
-    /**
-     * @return string
-     */
-    public function getBeanNamespace(): string
-    {
-        return $this->beanNamespace;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDaoNamespace(): string
-    {
-        return $this->daoNamespace;
-    }
-
-    /**
-     * @return Connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
-
-    /**
-     * @return NamingStrategyInterface
-     */
-    public function getNamingStrategy(): NamingStrategyInterface
-    {
-        return $this->namingStrategy;
-    }
-
-    /**
-     * @return Cache
-     */
-    public function getCache(): Cache
-    {
-        return $this->cache;
-    }
-
-    /**
-     * @return SchemaAnalyzer
-     */
-    public function getSchemaAnalyzer(): SchemaAnalyzer
-    {
-        return $this->schemaAnalyzer;
-    }
-
-    /**
-     * @return LoggerInterface
-     */
-    public function getLogger(): ?LoggerInterface
-    {
-        return $this->logger;
-    }
-
-    /**
-     * @return GeneratorListenerInterface
-     */
-    public function getGeneratorEventDispatcher(): GeneratorListenerInterface
-    {
-        return $this->generatorEventDispatcher;
-    }
-
-
-
-    /**
-     * Creates a unique cache key for the current connection.
-     *
-     * @return string
-     */
-    private function getConnectionUniqueId(): string
-    {
-        return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
-    }
-
-    /**
-     * Returns a class able to find the place of a PHP file based on the class name.
-     * Useful to find the path where DAOs and beans should be written to.
-     *
-     * @return PathFinderInterface
-     */
-    public function getPathFinder(): PathFinderInterface
-    {
-        return $this->pathFinder;
-    }
-
-    /**
-     * @param PathFinderInterface $pathFinder
-     */
-    public function setPathFinder(PathFinderInterface $pathFinder)
-    {
-        $this->pathFinder = $pathFinder;
-    }
+	/**
+	 * @var string
+	 */
+	private $beanNamespace;
+	/**
+	 * @var string
+	 */
+	private $daoNamespace;
+	/**
+	 * @var Connection
+	 */
+	private $connection;
+	/**
+	 * @var Cache
+	 */
+	private $cache;
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
+	/**
+	 * @var GeneratorListenerInterface
+	 */
+	private $generatorEventDispatcher;
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+	/**
+	 * @var PathFinderInterface
+	 */
+	private $pathFinder;
+	/**
+	 * The Composer file used to detect the path where files should be written.
+	 *
+	 * @var string
+	 */
+	private $composerFile;
+
+	/**
+	 * @param string $beanNamespace The namespace hosting the beans
+	 * @param string $daoNamespace The namespace hosting the DAOs
+	 * @param Connection $connection The connection to the database
+	 * @param Cache|null $cache The Doctrine cache to store database metadata
+	 * @param SchemaAnalyzer|null $schemaAnalyzer The schema analyzer that will be used to find shortest paths... Will be automatically created if not passed
+	 * @param LoggerInterface|null $logger The logger
+	 * @param GeneratorListenerInterface[] $generatorListeners A list of listeners that will be triggered when beans/daos are generated
+	 */
+	public function __construct(string $beanNamespace, string $daoNamespace, Connection $connection, NamingStrategyInterface $namingStrategy, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null, array $generatorListeners = [])
+	{
+		$this->beanNamespace = rtrim($beanNamespace, '\\');
+		$this->daoNamespace = rtrim($daoNamespace, '\\');
+		$this->connection = $connection;
+		$this->namingStrategy = $namingStrategy;
+		if ($cache !== null) {
+			$this->cache = $cache;
+		} else {
+			$this->cache = new VoidCache();
+		}
+		if ($schemaAnalyzer !== null) {
+			$this->schemaAnalyzer = $schemaAnalyzer;
+		} else {
+			$this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
+		}
+		$this->logger = $logger;
+		$this->generatorEventDispatcher = new GeneratorEventDispatcher($generatorListeners);
+		$this->pathFinder = new PathFinder();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getBeanNamespace(): string
+	{
+		return $this->beanNamespace;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDaoNamespace(): string
+	{
+		return $this->daoNamespace;
+	}
+
+	/**
+	 * @return Connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * @return NamingStrategyInterface
+	 */
+	public function getNamingStrategy(): NamingStrategyInterface
+	{
+		return $this->namingStrategy;
+	}
+
+	/**
+	 * @return Cache
+	 */
+	public function getCache(): Cache
+	{
+		return $this->cache;
+	}
+
+	/**
+	 * @return SchemaAnalyzer
+	 */
+	public function getSchemaAnalyzer(): SchemaAnalyzer
+	{
+		return $this->schemaAnalyzer;
+	}
+
+	/**
+	 * @return LoggerInterface
+	 */
+	public function getLogger(): ?LoggerInterface
+	{
+		return $this->logger;
+	}
+
+	/**
+	 * @return GeneratorListenerInterface
+	 */
+	public function getGeneratorEventDispatcher(): GeneratorListenerInterface
+	{
+		return $this->generatorEventDispatcher;
+	}
+
+
+
+	/**
+	 * Creates a unique cache key for the current connection.
+	 *
+	 * @return string
+	 */
+	private function getConnectionUniqueId(): string
+	{
+		return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
+	}
+
+	/**
+	 * Returns a class able to find the place of a PHP file based on the class name.
+	 * Useful to find the path where DAOs and beans should be written to.
+	 *
+	 * @return PathFinderInterface
+	 */
+	public function getPathFinder(): PathFinderInterface
+	{
+		return $this->pathFinder;
+	}
+
+	/**
+	 * @param PathFinderInterface $pathFinder
+	 */
+	public function setPathFinder(PathFinderInterface $pathFinder)
+	{
+		$this->pathFinder = $pathFinder;
+	}
 }