thecodingmachine / database.tdbm

src/views/installStep2.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 <input type="hidden" id="selfedit" name="selfedit" value="<?php echo plainstring_to_htmlprotected($this->selfedit) ?>" />
 
 <?php if (!$this->autoloadDetected) {
-    ?>
+	?>
 <div class="alert">Warning! TDBM could not detect the autoload section of your composer.json file.
 Unless you are developing your own autoload system, you should configure <strong>composer.json</strong> to <a href="http://getcomposer.org/doc/01-basic-usage.md#autoloading" target="_blank">define a source directory and a root namespace using PSR-0</a>.</div>
 <?php 

src/Mouf/Database/TDBM/ResultIterator.php

Indentation +215 added lines, -215 removed lines

@@ -30,219 +30,219 @@
  */
 class ResultIterator implements Result, \ArrayAccess, \JsonSerializable
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
-
-    protected $fetchStarted = false;
-    private $objectStorage;
-    private $className;
-
-    private $tdbmService;
-    private $magicSql;
-    private $magicSqlCount;
-    private $parameters;
-    private $columnDescriptors;
-    private $magicQuery;
-
-    /**
-     * @var InnerResultIterator
-     */
-    private $innerResultIterator;
-
-    /**
-     * The key of the current retrieved object.
-     *
-     * @var int
-     */
-    protected $key = -1;
-
-    protected $current = null;
-
-    private $databasePlatform;
-
-    private $totalCount;
-
-    private $mode;
-
-    public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
-    {
-        $this->magicSql = $magicSql;
-        $this->magicSqlCount = $magicSqlCount;
-        $this->objectStorage = $objectStorage;
-        $this->className = $className;
-        $this->tdbmService = $tdbmService;
-        $this->parameters = $parameters;
-        $this->columnDescriptors = $columnDescriptors;
-        $this->magicQuery = $magicQuery;
-        $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
-        $this->mode = $mode;
-    }
-
-    protected function executeCountQuery()
-    {
-        $sql = $this->magicQuery->build($this->magicSqlCount, $this->parameters);
-        $this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters);
-    }
-
-    /**
-     * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
-     *
-     * @return int
-     */
-    public function count()
-    {
-        if ($this->totalCount === null) {
-            $this->executeCountQuery();
-        }
-
-        return $this->totalCount;
-    }
-
-    /**
-     * Casts the result set to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return iterator_to_array($this->getIterator());
-    }
-
-    /**
-     * Returns a new iterator mapping any call using the $callable function.
-     *
-     * @param callable $callable
-     *
-     * @return MapIterator
-     */
-    public function map(callable $callable)
-    {
-        return new MapIterator($this->getIterator(), $callable);
-    }
-
-    /**
-     * Retrieve an external iterator.
-     *
-     * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
-     *
-     * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or
-     *                             <b>Traversable</b>
-     *
-     * @since 5.0.0
-     */
-    public function getIterator()
-    {
-        if ($this->innerResultIterator === null) {
-            if ($this->mode === TDBMService::MODE_CURSOR) {
-                $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
-            } else {
-                $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
-            }
-        }
-
-        return $this->innerResultIterator;
-    }
-
-    /**
-     * @param int $offset
-     *
-     * @return PageIterator
-     */
-    public function take($offset, $limit)
-    {
-        return new PageIterator($this, $this->magicSql, $this->parameters, $limit, $offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode);
-    }
-
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned.
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        return $this->getIterator()->offsetExists($offset);
-    }
-
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types.
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getIterator()->offsetGet($offset);
-    }
-
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        return $this->getIterator()->offsetSet($offset, $value);
-    }
-
-    /**
-     * Offset to unset.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetUnset($offset)
-    {
-        return $this->getIterator()->offsetUnset($offset);
-    }
-
-    /**
-     * 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()
-    {
-        return array_map(function (AbstractTDBMObject $item) {
-            return $item->jsonSerialize();
-        }, $this->toArray());
-    }
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
+
+	protected $fetchStarted = false;
+	private $objectStorage;
+	private $className;
+
+	private $tdbmService;
+	private $magicSql;
+	private $magicSqlCount;
+	private $parameters;
+	private $columnDescriptors;
+	private $magicQuery;
+
+	/**
+	 * @var InnerResultIterator
+	 */
+	private $innerResultIterator;
+
+	/**
+	 * The key of the current retrieved object.
+	 *
+	 * @var int
+	 */
+	protected $key = -1;
+
+	protected $current = null;
+
+	private $databasePlatform;
+
+	private $totalCount;
+
+	private $mode;
+
+	public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
+	{
+		$this->magicSql = $magicSql;
+		$this->magicSqlCount = $magicSqlCount;
+		$this->objectStorage = $objectStorage;
+		$this->className = $className;
+		$this->tdbmService = $tdbmService;
+		$this->parameters = $parameters;
+		$this->columnDescriptors = $columnDescriptors;
+		$this->magicQuery = $magicQuery;
+		$this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
+		$this->mode = $mode;
+	}
+
+	protected function executeCountQuery()
+	{
+		$sql = $this->magicQuery->build($this->magicSqlCount, $this->parameters);
+		$this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters);
+	}
+
+	/**
+	 * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		if ($this->totalCount === null) {
+			$this->executeCountQuery();
+		}
+
+		return $this->totalCount;
+	}
+
+	/**
+	 * Casts the result set to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return iterator_to_array($this->getIterator());
+	}
+
+	/**
+	 * Returns a new iterator mapping any call using the $callable function.
+	 *
+	 * @param callable $callable
+	 *
+	 * @return MapIterator
+	 */
+	public function map(callable $callable)
+	{
+		return new MapIterator($this->getIterator(), $callable);
+	}
+
+	/**
+	 * Retrieve an external iterator.
+	 *
+	 * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
+	 *
+	 * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or
+	 *                             <b>Traversable</b>
+	 *
+	 * @since 5.0.0
+	 */
+	public function getIterator()
+	{
+		if ($this->innerResultIterator === null) {
+			if ($this->mode === TDBMService::MODE_CURSOR) {
+				$this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
+			} else {
+				$this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, null, null, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
+			}
+		}
+
+		return $this->innerResultIterator;
+	}
+
+	/**
+	 * @param int $offset
+	 *
+	 * @return PageIterator
+	 */
+	public function take($offset, $limit)
+	{
+		return new PageIterator($this, $this->magicSql, $this->parameters, $limit, $offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode);
+	}
+
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->getIterator()->offsetExists($offset);
+	}
+
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->getIterator()->offsetGet($offset);
+	}
+
+	/**
+	 * Offset to set.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to assign the value to.
+	 *                      </p>
+	 * @param mixed $value  <p>
+	 *                      The value to set.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		return $this->getIterator()->offsetSet($offset, $value);
+	}
+
+	/**
+	 * Offset to unset.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to unset.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetUnset($offset)
+	{
+		return $this->getIterator()->offsetUnset($offset);
+	}
+
+	/**
+	 * 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()
+	{
+		return array_map(function (AbstractTDBMObject $item) {
+			return $item->jsonSerialize();
+		}, $this->toArray());
+	}
 }

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

Indentation +146 added lines, -146 removed lines

@@ -16,150 +16,150 @@
  */
 class TdbmController extends AbstractMoufInstanceController
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $daoFactoryName;
-    protected $daoFactoryInstanceName;
-    protected $autoloadDetected;
-    protected $storeInUtc;
-
-    /**
-     * Admin page used to display the DAO generation form.
-     *
-     * @Action
-     * //@Admin
-     */
-    public function defaultAction($name, $selfedit = 'false')
-    {
-        $this->initController($name, $selfedit);
-
-        // Fill variables
-        if ($this->moufManager->getVariable('tdbmDefaultSourceDirectory_'.$name) != null) {
-            $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_'.$name);
-            $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_'.$name);
-            $this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName_'.$name);
-            $this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName_'.$name);
-            $this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc_'.$name);
-        } else {
-            $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace');
-            $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace');
-            $this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName');
-            $this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName');
-            $this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc');
-        }
-
-        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(dirname(__FILE__).'/../../../../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, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = 'false')
-    {
-        $this->initController($name, $selfedit);
-
-        self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc);
-
-        // 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
-     * @param bool        $storeInUtc
-     *
-     * @throws \Mouf\MoufException
-     */
-    public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = 'false', $storeInUtc = null)
-    {
-        $moufManager->setVariable('tdbmDefaultDaoNamespace_'.$name, $daonamespace);
-        $moufManager->setVariable('tdbmDefaultBeanNamespace_'.$name, $beannamespace);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryName_'.$name, $daofactoryclassname);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName_'.$name, $daofactoryinstancename);
-        $moufManager->setVariable('tdbmDefaultStoreInUtc_'.$name, $storeInUtc);
-
-        // In case of instance renaming, let's use the last used settings
-        $moufManager->setVariable('tdbmDefaultDaoNamespace', $daonamespace);
-        $moufManager->setVariable('tdbmDefaultBeanNamespace', $beannamespace);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryName', $daofactoryclassname);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName', $daofactoryinstancename);
-        $moufManager->setVariable('tdbmDefaultStoreInUtc', $storeInUtc);
-
-        // Remove first and last slash in namespace.
-        if (strpos($daonamespace, '\\') === 0) {
-            $daonamespace = substr($daonamespace, 1);
-        }
-        if (strpos($daonamespace, '\\') === strlen($daonamespace) - 1) {
-            $daonamespace = substr($daonamespace, 0, strlen($daonamespace) - 1);
-        }
-        if (strpos($beannamespace, '\\') === 0) {
-            $beannamespace = substr($beannamespace, 1);
-        }
-        if (strpos($beannamespace, '\\') === strlen($beannamespace) - 1) {
-            $beannamespace = substr($beannamespace, 0, strlen($beannamespace) - 1);
-        }
-
-        $tdbmService = new InstanceProxy($name);
-        /* @var $tdbmService TDBMService */
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
-
-        $moufManager->declareComponent($daofactoryinstancename, $daonamespace.'\\'.$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
-
-        $tableToBeanMap = [];
-
-        //$tdbmServiceDescriptor = $moufManager->getInstanceDescriptor('tdbmService');
-
-        foreach ($tables as $table) {
-            $daoName = TDBMDaoGenerator::getDaoNameFromTableName($table);
-
-            $instanceName = TDBMDaoGenerator::toVariableName($daoName);
-            if (!$moufManager->instanceExists($instanceName)) {
-                $moufManager->declareComponent($instanceName, $daonamespace.'\\'.$daoName);
-            }
-            $moufManager->setParameterViaConstructor($instanceName, 0, $name, 'object');
-            $moufManager->bindComponentViaSetter($daofactoryinstancename, 'set'.$daoName, $instanceName);
-
-            $tableToBeanMap[$table] = $beannamespace.'\\'.TDBMDaoGenerator::getBeanNameFromTableName($table);
-        }
-        $tdbmServiceDescriptor = $moufManager->getInstanceDescriptor($name);
-        $tdbmServiceDescriptor->getSetterProperty('setTableToBeanMap')->setValue($tableToBeanMap);
-        $moufManager->rewriteMouf();
-    }
+	/**
+	 * @var HtmlBlock
+	 */
+	public $content;
+
+	protected $daoNamespace;
+	protected $beanNamespace;
+	protected $daoFactoryName;
+	protected $daoFactoryInstanceName;
+	protected $autoloadDetected;
+	protected $storeInUtc;
+
+	/**
+	 * Admin page used to display the DAO generation form.
+	 *
+	 * @Action
+	 * //@Admin
+	 */
+	public function defaultAction($name, $selfedit = 'false')
+	{
+		$this->initController($name, $selfedit);
+
+		// Fill variables
+		if ($this->moufManager->getVariable('tdbmDefaultSourceDirectory_'.$name) != null) {
+			$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_'.$name);
+			$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_'.$name);
+			$this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName_'.$name);
+			$this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName_'.$name);
+			$this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc_'.$name);
+		} else {
+			$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace');
+			$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace');
+			$this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName');
+			$this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName');
+			$this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc');
+		}
+
+		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(dirname(__FILE__).'/../../../../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, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = 'false')
+	{
+		$this->initController($name, $selfedit);
+
+		self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc);
+
+		// 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
+	 * @param bool        $storeInUtc
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = 'false', $storeInUtc = null)
+	{
+		$moufManager->setVariable('tdbmDefaultDaoNamespace_'.$name, $daonamespace);
+		$moufManager->setVariable('tdbmDefaultBeanNamespace_'.$name, $beannamespace);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryName_'.$name, $daofactoryclassname);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName_'.$name, $daofactoryinstancename);
+		$moufManager->setVariable('tdbmDefaultStoreInUtc_'.$name, $storeInUtc);
+
+		// In case of instance renaming, let's use the last used settings
+		$moufManager->setVariable('tdbmDefaultDaoNamespace', $daonamespace);
+		$moufManager->setVariable('tdbmDefaultBeanNamespace', $beannamespace);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryName', $daofactoryclassname);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName', $daofactoryinstancename);
+		$moufManager->setVariable('tdbmDefaultStoreInUtc', $storeInUtc);
+
+		// Remove first and last slash in namespace.
+		if (strpos($daonamespace, '\\') === 0) {
+			$daonamespace = substr($daonamespace, 1);
+		}
+		if (strpos($daonamespace, '\\') === strlen($daonamespace) - 1) {
+			$daonamespace = substr($daonamespace, 0, strlen($daonamespace) - 1);
+		}
+		if (strpos($beannamespace, '\\') === 0) {
+			$beannamespace = substr($beannamespace, 1);
+		}
+		if (strpos($beannamespace, '\\') === strlen($beannamespace) - 1) {
+			$beannamespace = substr($beannamespace, 0, strlen($beannamespace) - 1);
+		}
+
+		$tdbmService = new InstanceProxy($name);
+		/* @var $tdbmService TDBMService */
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
+
+		$moufManager->declareComponent($daofactoryinstancename, $daonamespace.'\\'.$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
+
+		$tableToBeanMap = [];
+
+		//$tdbmServiceDescriptor = $moufManager->getInstanceDescriptor('tdbmService');
+
+		foreach ($tables as $table) {
+			$daoName = TDBMDaoGenerator::getDaoNameFromTableName($table);
+
+			$instanceName = TDBMDaoGenerator::toVariableName($daoName);
+			if (!$moufManager->instanceExists($instanceName)) {
+				$moufManager->declareComponent($instanceName, $daonamespace.'\\'.$daoName);
+			}
+			$moufManager->setParameterViaConstructor($instanceName, 0, $name, 'object');
+			$moufManager->bindComponentViaSetter($daofactoryinstancename, 'set'.$daoName, $instanceName);
+
+			$tableToBeanMap[$table] = $beannamespace.'\\'.TDBMDaoGenerator::getBeanNameFromTableName($table);
+		}
+		$tdbmServiceDescriptor = $moufManager->getInstanceDescriptor($name);
+		$tdbmServiceDescriptor->getSetterProperty('setTableToBeanMap')->setValue($tableToBeanMap);
+		$moufManager->rewriteMouf();
+	}
 }

src/Mouf/Database/TDBM/TDBMSchemaAnalyzer.php

Indentation +132 added lines, -132 removed lines

@@ -14,136 +14,136 @@
  */
 class TDBMSchemaAnalyzer
 {
-    private $connection;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * @var string
-     */
-    private $cachePrefix;
-
-    /**
-     * @var Cache
-     */
-    private $cache;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @param Connection     $connection     The DBAL DB connection to use
-     * @param Cache          $cache          A cache service to be used
-     * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
-     *                                       Will be automatically created if not passed.
-     */
-    public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer)
-    {
-        $this->connection = $connection;
-        $this->cache = $cache;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-    }
-
-    /**
-     * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
-     *
-     * @return string
-     */
-    public function getCachePrefix()
-    {
-        if ($this->cachePrefix === null) {
-            $this->cachePrefix = hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
-        }
-
-        return $this->cachePrefix;
-    }
-
-    /**
-     * Returns the (cached) schema.
-     *
-     * @return Schema
-     */
-    public function getSchema()
-    {
-        if ($this->schema === null) {
-            $cacheKey = $this->getCachePrefix().'_schema';
-            if ($this->cache->contains($cacheKey)) {
-                $this->schema = $this->cache->fetch($cacheKey);
-            } else {
-                $this->schema = $this->connection->getSchemaManager()->createSchema();
-                $this->cache->save($cacheKey, $this->schema);
-            }
-        }
-
-        return $this->schema;
-    }
-
-    /**
-     * Returns the list of pivot tables linked to table $tableName.
-     *
-     * @param string $tableName
-     *
-     * @return array|string[]
-     */
-    public function getPivotTableLinkedToTable($tableName)
-    {
-        $cacheKey = $this->getCachePrefix().'_pivottables_link';
-        if ($this->cache->contains($cacheKey)) {
-            return $this->cache->fetch($cacheKey);
-        }
-
-        $pivotTables = [];
-
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        foreach ($junctionTables as $table) {
-            $fks = $table->getForeignKeys();
-            foreach ($fks as $fk) {
-                if ($fk->getForeignTableName() == $tableName) {
-                    $pivotTables[] = $table->getName();
-                    break;
-                }
-            }
-        }
-
-        $this->cache->save($cacheKey, $pivotTables);
-
-        return $pivotTables;
-    }
-
-    /**
-     * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys
-     * from junction tables and from inheritance.
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    public function getIncomingForeignKeys($tableName)
-    {
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        $junctionTableNames = array_map(function (Table $table) { return $table->getName(); }, $junctionTables);
-        $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName);
-
-        $fks = [];
-        foreach ($this->getSchema()->getTables() as $table) {
-            foreach ($table->getForeignKeys() as $fk) {
-                if ($fk->getForeignTableName() === $tableName) {
-                    if (in_array($fk->getLocalTableName(), $junctionTableNames)) {
-                        continue;
-                    }
-                    foreach ($childrenRelationships as $childFk) {
-                        if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) {
-                            continue 2;
-                        }
-                    }
-                    $fks[] = $fk;
-                }
-            }
-        }
-
-        return $fks;
-    }
+	private $connection;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
+
+	/**
+	 * @var Cache
+	 */
+	private $cache;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @param Connection     $connection     The DBAL DB connection to use
+	 * @param Cache          $cache          A cache service to be used
+	 * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
+	 *                                       Will be automatically created if not passed.
+	 */
+	public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer)
+	{
+		$this->connection = $connection;
+		$this->cache = $cache;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+	}
+
+	/**
+	 * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
+	 *
+	 * @return string
+	 */
+	public function getCachePrefix()
+	{
+		if ($this->cachePrefix === null) {
+			$this->cachePrefix = hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
+		}
+
+		return $this->cachePrefix;
+	}
+
+	/**
+	 * Returns the (cached) schema.
+	 *
+	 * @return Schema
+	 */
+	public function getSchema()
+	{
+		if ($this->schema === null) {
+			$cacheKey = $this->getCachePrefix().'_schema';
+			if ($this->cache->contains($cacheKey)) {
+				$this->schema = $this->cache->fetch($cacheKey);
+			} else {
+				$this->schema = $this->connection->getSchemaManager()->createSchema();
+				$this->cache->save($cacheKey, $this->schema);
+			}
+		}
+
+		return $this->schema;
+	}
+
+	/**
+	 * Returns the list of pivot tables linked to table $tableName.
+	 *
+	 * @param string $tableName
+	 *
+	 * @return array|string[]
+	 */
+	public function getPivotTableLinkedToTable($tableName)
+	{
+		$cacheKey = $this->getCachePrefix().'_pivottables_link';
+		if ($this->cache->contains($cacheKey)) {
+			return $this->cache->fetch($cacheKey);
+		}
+
+		$pivotTables = [];
+
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		foreach ($junctionTables as $table) {
+			$fks = $table->getForeignKeys();
+			foreach ($fks as $fk) {
+				if ($fk->getForeignTableName() == $tableName) {
+					$pivotTables[] = $table->getName();
+					break;
+				}
+			}
+		}
+
+		$this->cache->save($cacheKey, $pivotTables);
+
+		return $pivotTables;
+	}
+
+	/**
+	 * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys
+	 * from junction tables and from inheritance.
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	public function getIncomingForeignKeys($tableName)
+	{
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		$junctionTableNames = array_map(function (Table $table) { return $table->getName(); }, $junctionTables);
+		$childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName);
+
+		$fks = [];
+		foreach ($this->getSchema()->getTables() as $table) {
+			foreach ($table->getForeignKeys() as $fk) {
+				if ($fk->getForeignTableName() === $tableName) {
+					if (in_array($fk->getLocalTableName(), $junctionTableNames)) {
+						continue;
+					}
+					foreach ($childrenRelationships as $childFk) {
+						if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) {
+							continue 2;
+						}
+					}
+					$fks[] = $fk;
+				}
+			}
+		}
+
+		return $fks;
+	}
 }

src/Mouf/Database/TDBM/InnerResultIterator.php

Indentation +255 added lines, -255 removed lines

@@ -28,184 +28,184 @@ 
  */
 class InnerResultIterator implements \Iterator, \Countable, \ArrayAccess
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
-
-    protected $fetchStarted = false;
-    private $objectStorage;
-    private $className;
-
-    private $tdbmService;
-    private $magicSql;
-    private $parameters;
-    private $limit;
-    private $offset;
-    private $columnDescriptors;
-    private $magicQuery;
-
-    /**
-     * The key of the current retrieved object.
-     *
-     * @var int
-     */
-    protected $key = -1;
-
-    protected $current = null;
-
-    private $databasePlatform;
-
-    private $totalCount;
-
-    public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery)
-    {
-        $this->magicSql = $magicSql;
-        $this->objectStorage = $objectStorage;
-        $this->className = $className;
-        $this->tdbmService = $tdbmService;
-        $this->parameters = $parameters;
-        $this->limit = $limit;
-        $this->offset = $offset;
-        $this->columnDescriptors = $columnDescriptors;
-        $this->magicQuery = $magicQuery;
-        $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
-    }
-
-    protected function executeQuery()
-    {
-        $sql = $this->magicQuery->build($this->magicSql, $this->parameters);
-        $sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
-
-        $this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters);
-
-        $this->fetchStarted = true;
-    }
-
-    /**
-     * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
-     *
-     * @return int
-     */
-    public function count()
-    {
-        if (!$this->fetchStarted) {
-            $this->executeQuery();
-        }
-
-        return $this->statement->rowCount();
-    }
-
-    /**
-     * Fetches record at current cursor.
-     *
-     * @return AbstractTDBMObject|null
-     */
-    public function current()
-    {
-        return $this->current;
-    }
-
-    /**
-     * Returns the current result's key.
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Advances the cursor to the next result.
-     * Casts the database result into one (or several) beans.
-     */
-    public function next()
-    {
-        $row = $this->statement->fetch(\PDO::FETCH_NUM);
-        if ($row) {
-
-            // array<tablegroup, array<table, array<column, value>>>
-            $beansData = [];
-            foreach ($row as $i => $value) {
-                $columnDescriptor = $this->columnDescriptors[$i];
-                // Let's cast the value according to its type
-                $value = $columnDescriptor['type']->convertToPHPValue($value, $this->databasePlatform);
-
-                $beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
-            }
-
-            $firstBean = true;
-            foreach ($beansData as $beanData) {
-
-                // Let's find the bean class name associated to the bean.
-
-                list($actualClassName, $mainBeanTableName) = $this->tdbmService->_getClassNameFromBeanData($beanData);
-
-                if ($this->className !== null) {
-                    $actualClassName = $this->className;
-                }
-
-                // Must we create the bean? Let's see in the cache if we have a mapping DbRow?
-                // Let's get the first object mapping a row:
-                // We do this loop only for the first table
-
-                $primaryKeys = $this->tdbmService->_getPrimaryKeysFromObjectData($mainBeanTableName, $beanData[$mainBeanTableName]);
-                $hash = $this->tdbmService->getObjectHash($primaryKeys);
-
-                if ($this->objectStorage->has($mainBeanTableName, $hash)) {
-                    $dbRow = $this->objectStorage->get($mainBeanTableName, $hash);
-                    $bean = $dbRow->getTDBMObject();
-                } else {
-                    // Let's construct the bean
-                    if (!isset($reflectionClassCache[$actualClassName])) {
-                        $reflectionClassCache[$actualClassName] = new \ReflectionClass($actualClassName);
-                    }
-                    // Let's bypass the constructor when creating the bean!
-                    $bean = $reflectionClassCache[$actualClassName]->newInstanceWithoutConstructor();
-                    $bean->_constructFromData($beanData, $this->tdbmService);
-                }
-
-                // The first bean is the one containing the main table.
-                if ($firstBean) {
-                    $firstBean = false;
-                    $this->current = $bean;
-                }
-            }
-
-            ++$this->key;
-        } else {
-            $this->current = null;
-        }
-    }
-
-    /**
-     * Moves the cursor to the beginning of the result set.
-     */
-    public function rewind()
-    {
-        $this->executeQuery();
-        $this->key = -1;
-        $this->next();
-    }
-    /**
-     * Checks if the cursor is reading a valid result.
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return $this->current !== null;
-    }
-
-    /**
-     * Fetches all records (this could impact into your site performance) and rewinds the cursor.
-     *
-     * @param bool $asRecords Bind into record class?
-     *
-     * @return array[Record_PDO]|array[array] Array of records or arrays (depends on $asRecords)
-     */
-    /*public function getAll($asRecords = true)
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
+
+	protected $fetchStarted = false;
+	private $objectStorage;
+	private $className;
+
+	private $tdbmService;
+	private $magicSql;
+	private $parameters;
+	private $limit;
+	private $offset;
+	private $columnDescriptors;
+	private $magicQuery;
+
+	/**
+	 * The key of the current retrieved object.
+	 *
+	 * @var int
+	 */
+	protected $key = -1;
+
+	protected $current = null;
+
+	private $databasePlatform;
+
+	private $totalCount;
+
+	public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery)
+	{
+		$this->magicSql = $magicSql;
+		$this->objectStorage = $objectStorage;
+		$this->className = $className;
+		$this->tdbmService = $tdbmService;
+		$this->parameters = $parameters;
+		$this->limit = $limit;
+		$this->offset = $offset;
+		$this->columnDescriptors = $columnDescriptors;
+		$this->magicQuery = $magicQuery;
+		$this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
+	}
+
+	protected function executeQuery()
+	{
+		$sql = $this->magicQuery->build($this->magicSql, $this->parameters);
+		$sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
+
+		$this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters);
+
+		$this->fetchStarted = true;
+	}
+
+	/**
+	 * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		if (!$this->fetchStarted) {
+			$this->executeQuery();
+		}
+
+		return $this->statement->rowCount();
+	}
+
+	/**
+	 * Fetches record at current cursor.
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	public function current()
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Returns the current result's key.
+	 *
+	 * @return int
+	 */
+	public function key()
+	{
+		return $this->key;
+	}
+
+	/**
+	 * Advances the cursor to the next result.
+	 * Casts the database result into one (or several) beans.
+	 */
+	public function next()
+	{
+		$row = $this->statement->fetch(\PDO::FETCH_NUM);
+		if ($row) {
+
+			// array<tablegroup, array<table, array<column, value>>>
+			$beansData = [];
+			foreach ($row as $i => $value) {
+				$columnDescriptor = $this->columnDescriptors[$i];
+				// Let's cast the value according to its type
+				$value = $columnDescriptor['type']->convertToPHPValue($value, $this->databasePlatform);
+
+				$beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
+			}
+
+			$firstBean = true;
+			foreach ($beansData as $beanData) {
+
+				// Let's find the bean class name associated to the bean.
+
+				list($actualClassName, $mainBeanTableName) = $this->tdbmService->_getClassNameFromBeanData($beanData);
+
+				if ($this->className !== null) {
+					$actualClassName = $this->className;
+				}
+
+				// Must we create the bean? Let's see in the cache if we have a mapping DbRow?
+				// Let's get the first object mapping a row:
+				// We do this loop only for the first table
+
+				$primaryKeys = $this->tdbmService->_getPrimaryKeysFromObjectData($mainBeanTableName, $beanData[$mainBeanTableName]);
+				$hash = $this->tdbmService->getObjectHash($primaryKeys);
+
+				if ($this->objectStorage->has($mainBeanTableName, $hash)) {
+					$dbRow = $this->objectStorage->get($mainBeanTableName, $hash);
+					$bean = $dbRow->getTDBMObject();
+				} else {
+					// Let's construct the bean
+					if (!isset($reflectionClassCache[$actualClassName])) {
+						$reflectionClassCache[$actualClassName] = new \ReflectionClass($actualClassName);
+					}
+					// Let's bypass the constructor when creating the bean!
+					$bean = $reflectionClassCache[$actualClassName]->newInstanceWithoutConstructor();
+					$bean->_constructFromData($beanData, $this->tdbmService);
+				}
+
+				// The first bean is the one containing the main table.
+				if ($firstBean) {
+					$firstBean = false;
+					$this->current = $bean;
+				}
+			}
+
+			++$this->key;
+		} else {
+			$this->current = null;
+		}
+	}
+
+	/**
+	 * Moves the cursor to the beginning of the result set.
+	 */
+	public function rewind()
+	{
+		$this->executeQuery();
+		$this->key = -1;
+		$this->next();
+	}
+	/**
+	 * Checks if the cursor is reading a valid result.
+	 *
+	 * @return bool
+	 */
+	public function valid()
+	{
+		return $this->current !== null;
+	}
+
+	/**
+	 * Fetches all records (this could impact into your site performance) and rewinds the cursor.
+	 *
+	 * @param bool $asRecords Bind into record class?
+	 *
+	 * @return array[Record_PDO]|array[array] Array of records or arrays (depends on $asRecords)
+	 */
+	/*public function getAll($asRecords = true)
     {
         $all = array();
         $this->rewind();
@@ -217,85 +217,85 @@ 
         }
         return $all;
     }*/
-    /**
-     * @return PDOStatement
-     */
-    /*public function getPDOStatement()
+	/**
+	 * @return PDOStatement
+	 */
+	/*public function getPDOStatement()
     {
         return $this->pdoStatement;
     }*/
 
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned.
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
-    }
-
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types.
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
-    }
-
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        throw new TDBMInvalidOperationException('You can set values in a TDBM result set.');
-    }
-
-    /**
-     * Offset to unset.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetUnset($offset)
-    {
-        throw new TDBMInvalidOperationException('You can unset values in a TDBM result set.');
-    }
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
+	}
+
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
+	}
+
+	/**
+	 * Offset to set.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to assign the value to.
+	 *                      </p>
+	 * @param mixed $value  <p>
+	 *                      The value to set.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		throw new TDBMInvalidOperationException('You can set values in a TDBM result set.');
+	}
+
+	/**
+	 * Offset to unset.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to unset.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetUnset($offset)
+	{
+		throw new TDBMInvalidOperationException('You can unset values in a TDBM result set.');
+	}
 }

src/Mouf/Database/TDBM/WeakrefObjectStorage.php

Indentation +105 added lines, -105 removed lines

@@ -31,117 +31,117 @@
  */
 class WeakrefObjectStorage
 {
-    /**
-     * An array of fetched object, accessible via table name and primary key.
-     * If the primary key is split on several columns, access is done by an array of columns, serialized.
-     *
-     * @var array<string, WeakMap<string, TDBMObject>>
-     */
-    private $objects = array();
+	/**
+	 * An array of fetched object, accessible via table name and primary key.
+	 * If the primary key is split on several columns, access is done by an array of columns, serialized.
+	 *
+	 * @var array<string, WeakMap<string, TDBMObject>>
+	 */
+	private $objects = array();
 
-    /**
-     * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances
-     * are removed if they are no more valid.
-     * This is to avoid having memory used by dangling WeakRef instances.
-     *
-     * @var int
-     */
-    private $garbageCollectorCount = 0;
+	/**
+	 * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances
+	 * are removed if they are no more valid.
+	 * This is to avoid having memory used by dangling WeakRef instances.
+	 *
+	 * @var int
+	 */
+	private $garbageCollectorCount = 0;
 
-    /**
-     * Sets an object in the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     * @param DbRow  $dbRow
-     */
-    public function set($tableName, $id, DbRow $dbRow)
-    {
-        $this->objects[$tableName][$id] = new \WeakRef($dbRow);
-        ++$this->garbageCollectorCount;
-        if ($this->garbageCollectorCount == 10000) {
-            $this->garbageCollectorCount = 0;
-            $this->cleanupDanglingWeakRefs();
-        }
-    }
+	/**
+	 * Sets an object in the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 * @param DbRow  $dbRow
+	 */
+	public function set($tableName, $id, DbRow $dbRow)
+	{
+		$this->objects[$tableName][$id] = new \WeakRef($dbRow);
+		++$this->garbageCollectorCount;
+		if ($this->garbageCollectorCount == 10000) {
+			$this->garbageCollectorCount = 0;
+			$this->cleanupDanglingWeakRefs();
+		}
+	}
 
-    /**
-     * Checks if an object is in the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     *
-     * @return bool
-     */
-    public function has($tableName, $id)
-    {
-        if (isset($this->objects[$tableName][$id])) {
-            if ($this->objects[$tableName][$id]->valid()) {
-                return true;
-            } else {
-                unset($this->objects[$tableName][$id]);
-            }
-        }
+	/**
+	 * Checks if an object is in the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 *
+	 * @return bool
+	 */
+	public function has($tableName, $id)
+	{
+		if (isset($this->objects[$tableName][$id])) {
+			if ($this->objects[$tableName][$id]->valid()) {
+				return true;
+			} else {
+				unset($this->objects[$tableName][$id]);
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Returns an object from the storage (or null if no object is set).
-     *
-     * @param string $tableName
-     * @param string $id
-     *
-     * @return DbRow
-     */
-    public function get($tableName, $id)
-    {
-        if (isset($this->objects[$tableName][$id])) {
-            if ($this->objects[$tableName][$id]->valid()) {
-                return $this->objects[$tableName][$id]->get();
-            }
-        } else {
-            return;
-        }
-    }
+	/**
+	 * Returns an object from the storage (or null if no object is set).
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 *
+	 * @return DbRow
+	 */
+	public function get($tableName, $id)
+	{
+		if (isset($this->objects[$tableName][$id])) {
+			if ($this->objects[$tableName][$id]->valid()) {
+				return $this->objects[$tableName][$id]->get();
+			}
+		} else {
+			return;
+		}
+	}
 
-    /**
-     * Removes an object from the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     */
-    public function remove($tableName, $id)
-    {
-        unset($this->objects[$tableName][$id]);
-    }
+	/**
+	 * Removes an object from the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 */
+	public function remove($tableName, $id)
+	{
+		unset($this->objects[$tableName][$id]);
+	}
 
-    /**
-     * Applies the callback to all objects.
-     *
-     * @param callable $callback
-     */
-    public function apply(callable $callback)
-    {
-        foreach ($this->objects as $tableName => $table) {
-            foreach ($table as $id => $obj) {
-                if ($obj->valid()) {
-                    $callback($obj->get(), $tableName, $id);
-                } else {
-                    unset($this->objects[$tableName][$id]);
-                }
-            }
-        }
-    }
+	/**
+	 * Applies the callback to all objects.
+	 *
+	 * @param callable $callback
+	 */
+	public function apply(callable $callback)
+	{
+		foreach ($this->objects as $tableName => $table) {
+			foreach ($table as $id => $obj) {
+				if ($obj->valid()) {
+					$callback($obj->get(), $tableName, $id);
+				} else {
+					unset($this->objects[$tableName][$id]);
+				}
+			}
+		}
+	}
 
-    private function cleanupDanglingWeakRefs()
-    {
-        foreach ($this->objects as $tableName => $table) {
-            foreach ($table as $id => $obj) {
-                if (!$obj->valid()) {
-                    unset($this->objects[$tableName][$id]);
-                }
-            }
-        }
-    }
+	private function cleanupDanglingWeakRefs()
+	{
+		foreach ($this->objects as $tableName => $table) {
+			foreach ($table as $id => $obj) {
+				if (!$obj->valid()) {
+					unset($this->objects[$tableName][$id]);
+				}
+			}
+		}
+	}
 }

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

Indentation +111 added lines, -111 removed lines

@@ -9,115 +9,115 @@
  */
 abstract class AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var Table
-     */
-    protected $table;
-
-    /**
-     * Whether to use the more complex name in case of conflict.
-     *
-     * @var bool
-     */
-    protected $alternativeName = false;
-
-    /**
-     * @param Table $table
-     */
-    public function __construct(Table $table)
-    {
-        $this->table = $table;
-    }
-
-    /**
-     * Use the more complex name in case of conflict.
-     */
-    public function useAlternativeName()
-    {
-        $this->alternativeName = true;
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key.
-     *
-     * @return null|string
-     */
-    abstract public function getClassName();
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    abstract public function getParamAnnotation();
-
-    public function getVariableName()
-    {
-        return '$'.$this->getLowerCamelCaseName();
-    }
-
-    public function getLowerCamelCaseName()
-    {
-        return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
-    }
-
-    abstract public function getUpperCamelCaseName();
-
-    public function getSetterName()
-    {
-        return 'set'.$this->getUpperCamelCaseName();
-    }
-
-    public function getGetterName()
-    {
-        return 'get'.$this->getUpperCamelCaseName();
-    }
-
-    /**
-     * Returns the PHP code used in the ben constructor for this property.
-     *
-     * @return string
-     */
-    public function getConstructorAssignCode()
-    {
-        $str = '        $this->%s(%s);';
-
-        return sprintf($str, $this->getSetterName(), $this->getVariableName());
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    abstract public function isCompulsory();
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    abstract public function isPrimaryKey();
-
-    /**
-     * @return Table
-     */
-    public function getTable()
-    {
-        return $this->table;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    abstract public function getGetterSetterCode();
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    abstract public function getJsonSerializeCode();
+	/**
+	 * @var Table
+	 */
+	protected $table;
+
+	/**
+	 * Whether to use the more complex name in case of conflict.
+	 *
+	 * @var bool
+	 */
+	protected $alternativeName = false;
+
+	/**
+	 * @param Table $table
+	 */
+	public function __construct(Table $table)
+	{
+		$this->table = $table;
+	}
+
+	/**
+	 * Use the more complex name in case of conflict.
+	 */
+	public function useAlternativeName()
+	{
+		$this->alternativeName = true;
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key.
+	 *
+	 * @return null|string
+	 */
+	abstract public function getClassName();
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	abstract public function getParamAnnotation();
+
+	public function getVariableName()
+	{
+		return '$'.$this->getLowerCamelCaseName();
+	}
+
+	public function getLowerCamelCaseName()
+	{
+		return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
+	}
+
+	abstract public function getUpperCamelCaseName();
+
+	public function getSetterName()
+	{
+		return 'set'.$this->getUpperCamelCaseName();
+	}
+
+	public function getGetterName()
+	{
+		return 'get'.$this->getUpperCamelCaseName();
+	}
+
+	/**
+	 * Returns the PHP code used in the ben constructor for this property.
+	 *
+	 * @return string
+	 */
+	public function getConstructorAssignCode()
+	{
+		$str = '        $this->%s(%s);';
+
+		return sprintf($str, $this->getSetterName(), $this->getVariableName());
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	abstract public function isCompulsory();
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	abstract public function isPrimaryKey();
+
+	/**
+	 * @return Table
+	 */
+	public function getTable()
+	{
+		return $this->table;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	abstract public function getGetterSetterCode();
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	abstract public function getJsonSerializeCode();
 }

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

Indentation +440 added lines, -440 removed lines

@@ -15,214 +15,214 @@ 
  */
 class BeanDescriptor
 {
-    /**
-     * @var Table
-     */
-    private $table;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * @var AbstractBeanPropertyDescriptor[]
-     */
-    private $beanPropertyDescriptors = [];
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
-    {
-        $this->table = $table;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->initBeanPropertyDescriptors();
-    }
-
-    private function initBeanPropertyDescriptors()
-    {
-        $this->beanPropertyDescriptors = $this->getProperties($this->table);
-    }
-
-    /**
-     * Returns the foreignkey the column is part of, if any. null otherwise.
-     *
-     * @param Table  $table
-     * @param Column $column
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    private function isPartOfForeignKey(Table $table, Column $column)
-    {
-        $localColumnName = $column->getName();
-        foreach ($table->getForeignKeys() as $foreignKey) {
-            foreach ($foreignKey->getColumns() as $columnName) {
-                if ($columnName === $localColumnName) {
-                    return $foreignKey;
-                }
-            }
-        }
-
-        return;
-    }
-
-    /**
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getBeanPropertyDescriptors()
-    {
-        return $this->beanPropertyDescriptors;
-    }
-
-    /**
-     * Returns the list of columns that are not nullable and not autogenerated for a given table and its parent.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getConstructorProperties()
-    {
-        $constructorProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-           return $property->isCompulsory();
-        });
-
-        return $constructorProperties;
-    }
-
-    /**
-     * Returns the list of properties exposed as getters and setters in this class.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getExposedProperties()
-    {
-        $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->getTable()->getName() == $this->table->getName();
-        });
-
-        return $exposedProperties;
-    }
-
-    /**
-     * Returns the list of properties for this table (including parent tables).
-     *
-     * @param Table $table
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    private function getProperties(Table $table)
-    {
-        $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-        if ($parentRelationship) {
-            $parentTable = $this->schema->getTable($parentRelationship->getForeignTableName());
-            $properties = $this->getProperties($parentTable);
-            // we merge properties by overriding property names.
-            $localProperties = $this->getPropertiesForTable($table);
-            foreach ($localProperties as $name => $property) {
-                // We do not override properties if this is a primary key!
-                if ($property->isPrimaryKey()) {
-                    continue;
-                }
-                $properties[$name] = $property;
-            }
-            //$properties = array_merge($properties, $localProperties);
-        } else {
-            $properties = $this->getPropertiesForTable($table);
-        }
-
-        return $properties;
-    }
-
-    /**
-     * Returns the list of properties for this table (ignoring parent tables).
-     *
-     * @param Table $table
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    private function getPropertiesForTable(Table $table)
-    {
-        $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-        if ($parentRelationship) {
-            $ignoreColumns = $parentRelationship->getLocalColumns();
-        } else {
-            $ignoreColumns = [];
-        }
-
-        $beanPropertyDescriptors = [];
-
-        foreach ($table->getColumns() as $column) {
-            if (array_search($column->getName(), $ignoreColumns) !== false) {
-                continue;
-            }
-
-            $fk = $this->isPartOfForeignKey($table, $column);
-            if ($fk !== null) {
-                // Check that previously added descriptors are not added on same FK (can happen with multi key FK).
-                foreach ($beanPropertyDescriptors as $beanDescriptor) {
-                    if ($beanDescriptor instanceof ObjectBeanPropertyDescriptor && $beanDescriptor->getForeignKey() === $fk) {
-                        continue 2;
-                    }
-                }
-                // Check that this property is not an inheritance relationship
-                $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-                if ($parentRelationship === $fk) {
-                    continue;
-                }
-
-                $beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->schemaAnalyzer);
-            } else {
-                $beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column);
-            }
-        }
-
-        // Now, let's get the name of all properties and let's check there is no duplicate.
-        /** @var $names AbstractBeanPropertyDescriptor[] */
-        $names = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $name = $beanDescriptor->getUpperCamelCaseName();
-            if (isset($names[$name])) {
-                $names[$name]->useAlternativeName();
-                $beanDescriptor->useAlternativeName();
-            } else {
-                $names[$name] = $beanDescriptor;
-            }
-        }
-
-        // Final check (throw exceptions if problem arises)
-        $names = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $name = $beanDescriptor->getUpperCamelCaseName();
-            if (isset($names[$name])) {
-                throw new TDBMException('Unsolvable name conflict while generating method name');
-            } else {
-                $names[$name] = $beanDescriptor;
-            }
-        }
-
-        // Last step, let's rebuild the list with a map:
-        $beanPropertyDescriptorsMap = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $beanPropertyDescriptorsMap[$beanDescriptor->getLowerCamelCaseName()] = $beanDescriptor;
-        }
-
-        return $beanPropertyDescriptorsMap;
-    }
-
-    public function generateBeanConstructor()
-    {
-        $constructorProperties = $this->getConstructorProperties();
-
-        $constructorCode = '    /**
+	/**
+	 * @var Table
+	 */
+	private $table;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * @var AbstractBeanPropertyDescriptor[]
+	 */
+	private $beanPropertyDescriptors = [];
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
+	{
+		$this->table = $table;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->initBeanPropertyDescriptors();
+	}
+
+	private function initBeanPropertyDescriptors()
+	{
+		$this->beanPropertyDescriptors = $this->getProperties($this->table);
+	}
+
+	/**
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @param Table  $table
+	 * @param Column $column
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	private function isPartOfForeignKey(Table $table, Column $column)
+	{
+		$localColumnName = $column->getName();
+		foreach ($table->getForeignKeys() as $foreignKey) {
+			foreach ($foreignKey->getColumns() as $columnName) {
+				if ($columnName === $localColumnName) {
+					return $foreignKey;
+				}
+			}
+		}
+
+		return;
+	}
+
+	/**
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getBeanPropertyDescriptors()
+	{
+		return $this->beanPropertyDescriptors;
+	}
+
+	/**
+	 * Returns the list of columns that are not nullable and not autogenerated for a given table and its parent.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getConstructorProperties()
+	{
+		$constructorProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+		   return $property->isCompulsory();
+		});
+
+		return $constructorProperties;
+	}
+
+	/**
+	 * Returns the list of properties exposed as getters and setters in this class.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getExposedProperties()
+	{
+		$exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+			return $property->getTable()->getName() == $this->table->getName();
+		});
+
+		return $exposedProperties;
+	}
+
+	/**
+	 * Returns the list of properties for this table (including parent tables).
+	 *
+	 * @param Table $table
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	private function getProperties(Table $table)
+	{
+		$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+		if ($parentRelationship) {
+			$parentTable = $this->schema->getTable($parentRelationship->getForeignTableName());
+			$properties = $this->getProperties($parentTable);
+			// we merge properties by overriding property names.
+			$localProperties = $this->getPropertiesForTable($table);
+			foreach ($localProperties as $name => $property) {
+				// We do not override properties if this is a primary key!
+				if ($property->isPrimaryKey()) {
+					continue;
+				}
+				$properties[$name] = $property;
+			}
+			//$properties = array_merge($properties, $localProperties);
+		} else {
+			$properties = $this->getPropertiesForTable($table);
+		}
+
+		return $properties;
+	}
+
+	/**
+	 * Returns the list of properties for this table (ignoring parent tables).
+	 *
+	 * @param Table $table
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	private function getPropertiesForTable(Table $table)
+	{
+		$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+		if ($parentRelationship) {
+			$ignoreColumns = $parentRelationship->getLocalColumns();
+		} else {
+			$ignoreColumns = [];
+		}
+
+		$beanPropertyDescriptors = [];
+
+		foreach ($table->getColumns() as $column) {
+			if (array_search($column->getName(), $ignoreColumns) !== false) {
+				continue;
+			}
+
+			$fk = $this->isPartOfForeignKey($table, $column);
+			if ($fk !== null) {
+				// Check that previously added descriptors are not added on same FK (can happen with multi key FK).
+				foreach ($beanPropertyDescriptors as $beanDescriptor) {
+					if ($beanDescriptor instanceof ObjectBeanPropertyDescriptor && $beanDescriptor->getForeignKey() === $fk) {
+						continue 2;
+					}
+				}
+				// Check that this property is not an inheritance relationship
+				$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+				if ($parentRelationship === $fk) {
+					continue;
+				}
+
+				$beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->schemaAnalyzer);
+			} else {
+				$beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column);
+			}
+		}
+
+		// Now, let's get the name of all properties and let's check there is no duplicate.
+		/** @var $names AbstractBeanPropertyDescriptor[] */
+		$names = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$name = $beanDescriptor->getUpperCamelCaseName();
+			if (isset($names[$name])) {
+				$names[$name]->useAlternativeName();
+				$beanDescriptor->useAlternativeName();
+			} else {
+				$names[$name] = $beanDescriptor;
+			}
+		}
+
+		// Final check (throw exceptions if problem arises)
+		$names = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$name = $beanDescriptor->getUpperCamelCaseName();
+			if (isset($names[$name])) {
+				throw new TDBMException('Unsolvable name conflict while generating method name');
+			} else {
+				$names[$name] = $beanDescriptor;
+			}
+		}
+
+		// Last step, let's rebuild the list with a map:
+		$beanPropertyDescriptorsMap = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$beanPropertyDescriptorsMap[$beanDescriptor->getLowerCamelCaseName()] = $beanDescriptor;
+		}
+
+		return $beanPropertyDescriptorsMap;
+	}
+
+	public function generateBeanConstructor()
+	{
+		$constructorProperties = $this->getConstructorProperties();
+
+		$constructorCode = '    /**
      * The constructor takes all compulsory arguments.
      *
 %s
@@ -232,65 +232,65 @@ 
     }
     ';
 
-        $paramAnnotations = [];
-        $arguments = [];
-        $assigns = [];
-        $parentConstructorArguments = [];
-
-        foreach ($constructorProperties as $property) {
-            $className = $property->getClassName();
-            if ($className) {
-                $arguments[] = $className.' '.$property->getVariableName();
-            } else {
-                $arguments[] = $property->getVariableName();
-            }
-            $paramAnnotations[] = $property->getParamAnnotation();
-            if ($property->getTable()->getName() === $this->table->getName()) {
-                $assigns[] = $property->getConstructorAssignCode();
-            } else {
-                $parentConstructorArguments[] = $property->getVariableName();
-            }
-        }
-
-        $parentConstrutorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
-
-        return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstrutorCode, implode("\n", $assigns));
-    }
-
-    public function generateDirectForeignKeysCode()
-    {
-        $fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($this->table->getName());
-
-        $fksByTable = [];
-
-        foreach ($fks as $fk) {
-            $fksByTable[$fk->getLocalTableName()][] = $fk;
-        }
-
-        /* @var $fksByMethodName ForeignKeyConstraint[] */
-        $fksByMethodName = [];
-
-        foreach ($fksByTable as $tableName => $fksForTable) {
-            if (count($fksForTable) > 1) {
-                foreach ($fksForTable as $fk) {
-                    $methodName = 'get'.TDBMDaoGenerator::toCamelCase($fk->getLocalTableName()).'By';
-
-                    $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $fk->getLocalColumns());
-
-                    $methodName .= implode('And', $camelizedColumns);
-
-                    $fksByMethodName[$methodName] = $fk;
-                }
-            } else {
-                $methodName = 'get'.TDBMDaoGenerator::toCamelCase($fksForTable[0]->getLocalTableName());
-                $fksByMethodName[$methodName] = $fk;
-            }
-        }
-
-        $code = '';
-
-        foreach ($fksByMethodName as $methodName => $fk) {
-            $getterCode = '    /**
+		$paramAnnotations = [];
+		$arguments = [];
+		$assigns = [];
+		$parentConstructorArguments = [];
+
+		foreach ($constructorProperties as $property) {
+			$className = $property->getClassName();
+			if ($className) {
+				$arguments[] = $className.' '.$property->getVariableName();
+			} else {
+				$arguments[] = $property->getVariableName();
+			}
+			$paramAnnotations[] = $property->getParamAnnotation();
+			if ($property->getTable()->getName() === $this->table->getName()) {
+				$assigns[] = $property->getConstructorAssignCode();
+			} else {
+				$parentConstructorArguments[] = $property->getVariableName();
+			}
+		}
+
+		$parentConstrutorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
+
+		return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstrutorCode, implode("\n", $assigns));
+	}
+
+	public function generateDirectForeignKeysCode()
+	{
+		$fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($this->table->getName());
+
+		$fksByTable = [];
+
+		foreach ($fks as $fk) {
+			$fksByTable[$fk->getLocalTableName()][] = $fk;
+		}
+
+		/* @var $fksByMethodName ForeignKeyConstraint[] */
+		$fksByMethodName = [];
+
+		foreach ($fksByTable as $tableName => $fksForTable) {
+			if (count($fksForTable) > 1) {
+				foreach ($fksForTable as $fk) {
+					$methodName = 'get'.TDBMDaoGenerator::toCamelCase($fk->getLocalTableName()).'By';
+
+					$camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $fk->getLocalColumns());
+
+					$methodName .= implode('And', $camelizedColumns);
+
+					$fksByMethodName[$methodName] = $fk;
+				}
+			} else {
+				$methodName = 'get'.TDBMDaoGenerator::toCamelCase($fksForTable[0]->getLocalTableName());
+				$fksByMethodName[$methodName] = $fk;
+			}
+		}
+
+		$code = '';
+
+		foreach ($fksByMethodName as $methodName => $fk) {
+			$getterCode = '    /**
      * Returns the list of %s pointing to this bean via the %s column.
      *
      * @return %s[]|ResultIterator
@@ -302,111 +302,111 @@ 
 
 ';
 
-            list($sql, $parametersCode) = $this->getFilters($fk);
-
-            $beanClass = TDBMDaoGenerator::getBeanNameFromTableName($fk->getLocalTableName());
-            $code .= sprintf($getterCode,
-                $beanClass,
-                implode(', ', $fk->getColumns()),
-                $beanClass,
-                $methodName,
-                var_export($fk->getLocalTableName(), true),
-                $sql,
-                $parametersCode
-            );
-        }
-
-        return $code;
-    }
-
-    private function getFilters(ForeignKeyConstraint $fk)
-    {
-        $sqlParts = [];
-        $counter = 0;
-        $parameters = [];
-
-        $pkColumns = $this->table->getPrimaryKeyColumns();
-
-        foreach ($fk->getLocalColumns() as $columnName) {
-            $paramName = 'tdbmparam'.$counter;
-            $sqlParts[] = $fk->getLocalTableName().'.'.$columnName.' = :'.$paramName;
-
-            $pkColumn = $pkColumns[$counter];
-            $parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($paramName, true), var_export($pkColumn, true), var_export($this->table->getName(), true));
-            ++$counter;
-        }
-        $sql = "'".implode(' AND ', $sqlParts)."'";
-        $parametersCode = '[ '.implode(', ', $parameters).' ]';
-
-        return [$sql, $parametersCode];
-    }
-
-    /**
-     * Generate code section about pivot tables.
-     *
-     * @return string;
-     */
-    public function generatePivotTableCode()
-    {
-        $finalDescs = $this->getPivotTableDescriptors();
-
-        $code = '';
-
-        foreach ($finalDescs as $desc) {
-            $code .= $this->getPivotTableCode($desc['name'], $desc['table'], $desc['localFK'], $desc['remoteFK']);
-        }
-
-        return $code;
-    }
-
-    private function getPivotTableDescriptors()
-    {
-        $descs = [];
-        foreach ($this->schemaAnalyzer->detectJunctionTables() as $table) {
-            // There are exactly 2 FKs since this is a pivot table.
-            $fks = array_values($table->getForeignKeys());
-
-            if ($fks[0]->getForeignTableName() === $this->table->getName()) {
-                $localFK = $fks[0];
-                $remoteFK = $fks[1];
-            } elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
-                $localFK = $fks[1];
-                $remoteFK = $fks[0];
-            } else {
-                continue;
-            }
-
-            $descs[$remoteFK->getForeignTableName()][] = [
-                'table' => $table,
-                'localFK' => $localFK,
-                'remoteFK' => $remoteFK,
-            ];
-        }
-
-        $finalDescs = [];
-        foreach ($descs as $descArray) {
-            if (count($descArray) > 1) {
-                foreach ($descArray as $desc) {
-                    $desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($desc['table']->getName());
-                    $finalDescs[] = $desc;
-                }
-            } else {
-                $desc = $descArray[0];
-                $desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName());
-                $finalDescs[] = $desc;
-            }
-        }
-
-        return $finalDescs;
-    }
-
-    public function getPivotTableCode($name, Table $table, ForeignKeyConstraint $localFK, ForeignKeyConstraint $remoteFK)
-    {
-        $singularName = TDBMDaoGenerator::toSingular($name);
-        $remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($remoteFK->getForeignTableName());
-        $variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
-
-        $str = '    /**
+			list($sql, $parametersCode) = $this->getFilters($fk);
+
+			$beanClass = TDBMDaoGenerator::getBeanNameFromTableName($fk->getLocalTableName());
+			$code .= sprintf($getterCode,
+				$beanClass,
+				implode(', ', $fk->getColumns()),
+				$beanClass,
+				$methodName,
+				var_export($fk->getLocalTableName(), true),
+				$sql,
+				$parametersCode
+			);
+		}
+
+		return $code;
+	}
+
+	private function getFilters(ForeignKeyConstraint $fk)
+	{
+		$sqlParts = [];
+		$counter = 0;
+		$parameters = [];
+
+		$pkColumns = $this->table->getPrimaryKeyColumns();
+
+		foreach ($fk->getLocalColumns() as $columnName) {
+			$paramName = 'tdbmparam'.$counter;
+			$sqlParts[] = $fk->getLocalTableName().'.'.$columnName.' = :'.$paramName;
+
+			$pkColumn = $pkColumns[$counter];
+			$parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($paramName, true), var_export($pkColumn, true), var_export($this->table->getName(), true));
+			++$counter;
+		}
+		$sql = "'".implode(' AND ', $sqlParts)."'";
+		$parametersCode = '[ '.implode(', ', $parameters).' ]';
+
+		return [$sql, $parametersCode];
+	}
+
+	/**
+	 * Generate code section about pivot tables.
+	 *
+	 * @return string;
+	 */
+	public function generatePivotTableCode()
+	{
+		$finalDescs = $this->getPivotTableDescriptors();
+
+		$code = '';
+
+		foreach ($finalDescs as $desc) {
+			$code .= $this->getPivotTableCode($desc['name'], $desc['table'], $desc['localFK'], $desc['remoteFK']);
+		}
+
+		return $code;
+	}
+
+	private function getPivotTableDescriptors()
+	{
+		$descs = [];
+		foreach ($this->schemaAnalyzer->detectJunctionTables() as $table) {
+			// There are exactly 2 FKs since this is a pivot table.
+			$fks = array_values($table->getForeignKeys());
+
+			if ($fks[0]->getForeignTableName() === $this->table->getName()) {
+				$localFK = $fks[0];
+				$remoteFK = $fks[1];
+			} elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
+				$localFK = $fks[1];
+				$remoteFK = $fks[0];
+			} else {
+				continue;
+			}
+
+			$descs[$remoteFK->getForeignTableName()][] = [
+				'table' => $table,
+				'localFK' => $localFK,
+				'remoteFK' => $remoteFK,
+			];
+		}
+
+		$finalDescs = [];
+		foreach ($descs as $descArray) {
+			if (count($descArray) > 1) {
+				foreach ($descArray as $desc) {
+					$desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName()).'By'.TDBMDaoGenerator::toCamelCase($desc['table']->getName());
+					$finalDescs[] = $desc;
+				}
+			} else {
+				$desc = $descArray[0];
+				$desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName());
+				$finalDescs[] = $desc;
+			}
+		}
+
+		return $finalDescs;
+	}
+
+	public function getPivotTableCode($name, Table $table, ForeignKeyConstraint $localFK, ForeignKeyConstraint $remoteFK)
+	{
+		$singularName = TDBMDaoGenerator::toSingular($name);
+		$remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($remoteFK->getForeignTableName());
+		$variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
+
+		$str = '    /**
      * Returns the list of %s associated to this bean via the %s pivot table.
      *
      * @return %s[]
@@ -416,9 +416,9 @@ 
     }
 ';
 
-        $getterCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $name, var_export($remoteFK->getLocalTableName(), true));
+		$getterCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $name, var_export($remoteFK->getLocalTableName(), true));
 
-        $str = '    /**
+		$str = '    /**
      * Adds a relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -428,9 +428,9 @@ 
     }
 ';
 
-        $adderCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
+		$adderCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Deletes the relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -440,9 +440,9 @@ 
     }
 ';
 
-        $removerCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
+		$removerCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Returns whether this bean is associated with %s via the %s pivot table.
      *
      * @param %s %s
@@ -453,24 +453,24 @@ 
     }
 ';
 
-        $hasCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
+		$hasCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
 
-        $code = $getterCode.$adderCode.$removerCode.$hasCode;
+		$code = $getterCode.$adderCode.$removerCode.$hasCode;
 
-        return $code;
-    }
+		return $code;
+	}
 
-    public function generateJsonSerialize()
-    {
-        $tableName = $this->table->getName();
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
-        if ($parentFk !== null) {
-            $initializer = '$array = parent::jsonSerialize();';
-        } else {
-            $initializer = '$array = [];';
-        }
+	public function generateJsonSerialize()
+	{
+		$tableName = $this->table->getName();
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+		if ($parentFk !== null) {
+			$initializer = '$array = parent::jsonSerialize();';
+		} else {
+			$initializer = '$array = [];';
+		}
 
-        $str = '
+		$str = '
     /**
      * Serializes the object for JSON encoding
      *
@@ -486,54 +486,54 @@ 
     }
 ';
 
-        $propertiesCode = '';
-        foreach ($this->beanPropertyDescriptors as $beanPropertyDescriptor) {
-            $propertiesCode .= $beanPropertyDescriptor->getJsonSerializeCode();
-        }
+		$propertiesCode = '';
+		foreach ($this->beanPropertyDescriptors as $beanPropertyDescriptor) {
+			$propertiesCode .= $beanPropertyDescriptor->getJsonSerializeCode();
+		}
 
-        // Many to many relationships:
+		// Many to many relationships:
 
-        $descs = $this->getPivotTableDescriptors();
+		$descs = $this->getPivotTableDescriptors();
 
-        $many2manyCode = '';
+		$many2manyCode = '';
 
-        foreach ($descs as $desc) {
-            $remoteFK = $desc['remoteFK'];
-            $remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($remoteFK->getForeignTableName());
-            $variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
+		foreach ($descs as $desc) {
+			$remoteFK = $desc['remoteFK'];
+			$remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($remoteFK->getForeignTableName());
+			$variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
 
-            $many2manyCode .= '        if (!$stopRecursion) {
+			$many2manyCode .= '        if (!$stopRecursion) {
             $array[\''.lcfirst($desc['name']).'\'] = array_map(function('.$remoteBeanName.' '.$variableName.') {
                 return '.$variableName.'->jsonSerialize(true);
             }, $this->get'.$desc['name'].'());
         }
         ';
-        }
-
-        return sprintf($str, $initializer, $propertiesCode, $many2manyCode);
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param string $beannamespace The namespace of the bean
-     */
-    public function generatePhpCode($beannamespace)
-    {
-        $baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($this->table->getName());
-        $className = TDBMDaoGenerator::getBeanNameFromTableName($this->table->getName());
-        $tableName = $this->table->getName();
-
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
-        if ($parentFk !== null) {
-            $extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
-            $use = '';
-        } else {
-            $extends = 'AbstractTDBMObject';
-            $use = "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n\n";
-        }
-
-        $str = "<?php
+		}
+
+		return sprintf($str, $initializer, $propertiesCode, $many2manyCode);
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param string $beannamespace The namespace of the bean
+	 */
+	public function generatePhpCode($beannamespace)
+	{
+		$baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($this->table->getName());
+		$className = TDBMDaoGenerator::getBeanNameFromTableName($this->table->getName());
+		$tableName = $this->table->getName();
+
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+		if ($parentFk !== null) {
+			$extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
+			$use = '';
+		} else {
+			$extends = 'AbstractTDBMObject';
+			$use = "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n\n";
+		}
+
+		$str = "<?php
 namespace {$beannamespace};
 
 use Mouf\\Database\\TDBM\\ResultIterator;
@@ -551,19 +551,19 @@ 
 {
 ";
 
-        $str .= $this->generateBeanConstructor();
+		$str .= $this->generateBeanConstructor();
 
-        foreach ($this->getExposedProperties() as $property) {
-            $str .= $property->getGetterSetterCode();
-        }
+		foreach ($this->getExposedProperties() as $property) {
+			$str .= $property->getGetterSetterCode();
+		}
 
-        $str .= $this->generateDirectForeignKeysCode();
-        $str .= $this->generatePivotTableCode();
-        $str .= $this->generateJsonSerialize();
+		$str .= $this->generateDirectForeignKeysCode();
+		$str .= $this->generatePivotTableCode();
+		$str .= $this->generateJsonSerialize();
 
-        $str .= '}
+		$str .= '}
 ';
 
-        return $str;
-    }
+		return $str;
+	}
 }

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

Indentation +140 added lines, -140 removed lines

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