thecodingmachine / database.tdbm

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

Indentation +169 added lines, -169 removed lines

@@ -15,173 +15,173 @@
  */
 class TdbmInstallController extends Controller
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    public $selfedit;
-
-    /**
-     * The active MoufManager to be edited/viewed.
-     *
-     * @var MoufManager
-     */
-    public $moufManager;
-
-    /**
-     * The template used by the main page for mouf.
-     *
-     * @Property
-     * @Compulsory
-     *
-     * @var TemplateInterface
-     */
-    public $template;
-
-    /**
-     * Displays the first install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function defaultAction($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * Skips the install process.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function skip($selfedit = 'false')
-    {
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $autoloadDetected;
-    protected $storeInUtc;
-    protected $useCustomComposer = false;
-
-    /**
-     * Displays the second install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function configure($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        // Let's start by performing basic checks about the instances we assume to exist.
-        if (!$this->moufManager->instanceExists('dbalConnection')) {
-            $this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
-
-            return;
-        }
-
-        $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
-        $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
-
-        if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
-
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
-                $this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
-                $this->daoNamespace = $rootNamespace.'Model\\Dao';
-                $this->beanNamespace = $rootNamespace.'Model\\Bean';
-            } else {
-                $this->autoloadDetected = false;
-                $this->daoNamespace = 'YourApplication\\Model\\Dao';
-                $this->beanNamespace = 'YourApplication\\Model\\Bean';
-            }
-        } else {
-            $this->autoloadDetected = true;
-        }
-        $this->defaultPath = true;
-        $this->storePath = '';
-
-        $this->castDatesToDateTime = true;
-
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep2.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * This action generates the TDBM instance, then the DAOs and Beans.
-     *
-     * @Action
-     *
-     * @param string $daonamespace
-     * @param string $beannamespace
-     * @param int    $storeInUtc
-     * @param string $selfedit
-     *
-     * @throws \Mouf\MoufException
-     */
-    public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = 'false', $defaultPath = false, $storePath = '')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        if (!$this->moufManager->instanceExists('doctrineApcCache')) {
-            $doctrineApcCache = $this->moufManager->createInstance('Doctrine\\Common\\Cache\\ApcCache')->setName('doctrineApcCache');
-            // TODO: set namespace
-        } else {
-            $doctrineApcCache = $this->moufManager->getInstanceDescriptor('doctrineApcCache');
-        }
-
-        if (!$this->moufManager->instanceExists('tdbmService')) {
-            $tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
-            $tdbmService->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
-            $tdbmService->getConstructorArgumentProperty('cache')->setValue($doctrineApcCache);
-        }
-
-        $this->moufManager->rewriteMouf();
-
-        TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'DaoFactory', 'daoFactory', $selfedit, $storeInUtc, $defaultPath, $storePath);
-
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $errorMsg;
-
-    private function displayErrorMsg($msg)
-    {
-        $this->errorMsg = $msg;
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installError.php', $this);
-        $this->template->toHtml();
-    }
+	/**
+	 * @var HtmlBlock
+	 */
+	public $content;
+
+	public $selfedit;
+
+	/**
+	 * The active MoufManager to be edited/viewed.
+	 *
+	 * @var MoufManager
+	 */
+	public $moufManager;
+
+	/**
+	 * The template used by the main page for mouf.
+	 *
+	 * @Property
+	 * @Compulsory
+	 *
+	 * @var TemplateInterface
+	 */
+	public $template;
+
+	/**
+	 * Displays the first install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function defaultAction($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * Skips the install process.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function skip($selfedit = 'false')
+	{
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $daoNamespace;
+	protected $beanNamespace;
+	protected $autoloadDetected;
+	protected $storeInUtc;
+	protected $useCustomComposer = false;
+
+	/**
+	 * Displays the second install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function configure($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		// Let's start by performing basic checks about the instances we assume to exist.
+		if (!$this->moufManager->instanceExists('dbalConnection')) {
+			$this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
+
+			return;
+		}
+
+		$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
+		$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
+
+		if ($this->daoNamespace == null && $this->beanNamespace == null) {
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			if ($autoloadNamespaces) {
+				$this->autoloadDetected = true;
+				$rootNamespace = $autoloadNamespaces[0];
+				$this->daoNamespace = $rootNamespace.'Model\\Dao';
+				$this->beanNamespace = $rootNamespace.'Model\\Bean';
+			} else {
+				$this->autoloadDetected = false;
+				$this->daoNamespace = 'YourApplication\\Model\\Dao';
+				$this->beanNamespace = 'YourApplication\\Model\\Bean';
+			}
+		} else {
+			$this->autoloadDetected = true;
+		}
+		$this->defaultPath = true;
+		$this->storePath = '';
+
+		$this->castDatesToDateTime = true;
+
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installStep2.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * This action generates the TDBM instance, then the DAOs and Beans.
+	 *
+	 * @Action
+	 *
+	 * @param string $daonamespace
+	 * @param string $beannamespace
+	 * @param int    $storeInUtc
+	 * @param string $selfedit
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = 'false', $defaultPath = false, $storePath = '')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		if (!$this->moufManager->instanceExists('doctrineApcCache')) {
+			$doctrineApcCache = $this->moufManager->createInstance('Doctrine\\Common\\Cache\\ApcCache')->setName('doctrineApcCache');
+			// TODO: set namespace
+		} else {
+			$doctrineApcCache = $this->moufManager->getInstanceDescriptor('doctrineApcCache');
+		}
+
+		if (!$this->moufManager->instanceExists('tdbmService')) {
+			$tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
+			$tdbmService->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
+			$tdbmService->getConstructorArgumentProperty('cache')->setValue($doctrineApcCache);
+		}
+
+		$this->moufManager->rewriteMouf();
+
+		TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'DaoFactory', 'daoFactory', $selfedit, $storeInUtc, $defaultPath, $storePath);
+
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $errorMsg;
+
+	private function displayErrorMsg($msg)
+	{
+		$this->errorMsg = $msg;
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installError.php', $this);
+		$this->template->toHtml();
+	}
 }

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

Indentation +144 added lines, -144 removed lines

@@ -18,148 +18,148 @@
  */
 class TdbmController extends AbstractMoufInstanceController
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $daoFactoryName;
-    protected $daoFactoryInstanceName;
-    protected $autoloadDetected;
-    protected $storeInUtc;
-    protected $useCustomComposer;
-
-    /**
-     * Admin page used to display the DAO generation form.
-     *
-     * @Action
-     */
-    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);
-            $this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer_'.$name);
-            $this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile_'.$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');
-            $this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer');
-            $this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile');
-        }
-
-        if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
-
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
-                $this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
-                $this->daoNamespace = $rootNamespace.'Dao';
-                $this->beanNamespace = $rootNamespace.'Dao\\Bean';
-            } else {
-                $this->autoloadDetected = false;
-                $this->daoNamespace = 'YourApplication\\Dao';
-                $this->beanNamespace = 'YourApplication\\Dao\\Bean';
-            }
-        } else {
-            $this->autoloadDetected = true;
-        }
-
-        $this->content->addFile(__DIR__.'/../../../../views/tdbmGenerate.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * This action generates the DAOs and Beans for the TDBM service passed in parameter.
-     *
-     * @Action
-     *
-     * @param string $name
-     * @param bool   $selfedit
-     */
-    public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
-    {
-        $this->initController($name, $selfedit);
-
-        self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc, $useCustomComposer, $composerFile);
-
-        // TODO: better: we should redirect to a screen that list the number of DAOs generated, etc...
-        header('Location: '.ROOT_URL.'ajaxinstance/?name='.urlencode($name).'&selfedit='.$selfedit);
-    }
-
-    /**
-     * This function generates the DAOs and Beans for the TDBM service passed in parameter.
-     *
-     * @param MoufManager $moufManager
-     * @param string      $name
-     * @param string      $daonamespace
-     * @param string      $beannamespace
-     * @param string      $daofactoryclassname
-     * @param string      $daofactoryinstancename
-     * @param string      $selfedit
-     * @param bool        $storeInUtc
-     *
-     * @throws \Mouf\MoufException
-     */
-    public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = 'false', $storeInUtc = null, $useCustomComposer = null, $composerFile = 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);
-        $moufManager->setVariable('tdbmDefaultUseCustomComposer_'.$name, $useCustomComposer);
-        $moufManager->setVariable('tdbmDefaultComposerFile_'.$name, $composerFile);
-
-        // 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);
-        $moufManager->setVariable('tdbmDefaultUseCustomComposer', $useCustomComposer);
-        $moufManager->setVariable('tdbmDefaultComposerFile', $composerFile);
-
-        // Remove first and last slash in namespace.
-        $daonamespace = trim($daonamespace, '\\');
-        $beannamespace = trim($beannamespace, '\\');
-
-        $tdbmService = new InstanceProxy($name);
-        /* @var $tdbmService TDBMService */
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc, ($useCustomComposer ? $composerFile : null));
-
-        $moufManager->declareComponent($daofactoryinstancename, $daonamespace.'\\Generated\\'.$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;
+	protected $useCustomComposer;
+
+	/**
+	 * Admin page used to display the DAO generation form.
+	 *
+	 * @Action
+	 */
+	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);
+			$this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer_'.$name);
+			$this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile_'.$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');
+			$this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer');
+			$this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile');
+		}
+
+		if ($this->daoNamespace == null && $this->beanNamespace == null) {
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			if ($autoloadNamespaces) {
+				$this->autoloadDetected = true;
+				$rootNamespace = $autoloadNamespaces[0];
+				$this->daoNamespace = $rootNamespace.'Dao';
+				$this->beanNamespace = $rootNamespace.'Dao\\Bean';
+			} else {
+				$this->autoloadDetected = false;
+				$this->daoNamespace = 'YourApplication\\Dao';
+				$this->beanNamespace = 'YourApplication\\Dao\\Bean';
+			}
+		} else {
+			$this->autoloadDetected = true;
+		}
+
+		$this->content->addFile(__DIR__.'/../../../../views/tdbmGenerate.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * This action generates the DAOs and Beans for the TDBM service passed in parameter.
+	 *
+	 * @Action
+	 *
+	 * @param string $name
+	 * @param bool   $selfedit
+	 */
+	public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
+	{
+		$this->initController($name, $selfedit);
+
+		self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc, $useCustomComposer, $composerFile);
+
+		// TODO: better: we should redirect to a screen that list the number of DAOs generated, etc...
+		header('Location: '.ROOT_URL.'ajaxinstance/?name='.urlencode($name).'&selfedit='.$selfedit);
+	}
+
+	/**
+	 * This function generates the DAOs and Beans for the TDBM service passed in parameter.
+	 *
+	 * @param MoufManager $moufManager
+	 * @param string      $name
+	 * @param string      $daonamespace
+	 * @param string      $beannamespace
+	 * @param string      $daofactoryclassname
+	 * @param string      $daofactoryinstancename
+	 * @param string      $selfedit
+	 * @param bool        $storeInUtc
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = 'false', $storeInUtc = null, $useCustomComposer = null, $composerFile = 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);
+		$moufManager->setVariable('tdbmDefaultUseCustomComposer_'.$name, $useCustomComposer);
+		$moufManager->setVariable('tdbmDefaultComposerFile_'.$name, $composerFile);
+
+		// 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);
+		$moufManager->setVariable('tdbmDefaultUseCustomComposer', $useCustomComposer);
+		$moufManager->setVariable('tdbmDefaultComposerFile', $composerFile);
+
+		// Remove first and last slash in namespace.
+		$daonamespace = trim($daonamespace, '\\');
+		$beannamespace = trim($beannamespace, '\\');
+
+		$tdbmService = new InstanceProxy($name);
+		/* @var $tdbmService TDBMService */
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc, ($useCustomComposer ? $composerFile : null));
+
+		$moufManager->declareComponent($daofactoryinstancename, $daonamespace.'\\Generated\\'.$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/Utils/AbstractBeanPropertyDescriptor.php

Indentation +127 added lines, -127 removed lines

@@ -9,131 +9,131 @@
  */
 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 has a default value.
-     *
-     * @return bool
-     */
-    abstract public function hasDefault();
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     *
-     * @throws \TDBMException
-     */
-    abstract public function assignToDefaultCode();
-
-    /**
-     * 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 has a default value.
+	 *
+	 * @return bool
+	 */
+	abstract public function hasDefault();
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 *
+	 * @throws \TDBMException
+	 */
+	abstract public function assignToDefaultCode();
+
+	/**
+	 * 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/ScalarBeanPropertyDescriptor.php

Indentation +168 added lines, -168 removed lines

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

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

Indentation +162 added lines, -162 removed lines

@@ -12,156 +12,156 @@ 
  */
 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 has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefault()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     *
-     * @throws \TDBMException
-     */
-    public function assignToDefaultCode()
-    {
-        throw new \TDBMException('Foreign key based properties cannot be assigned a default value.');
-    }
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    public function isPrimaryKey()
-    {
-        $fkColumns = $this->foreignKey->getLocalColumns();
-        sort($fkColumns);
-
-        $pkColumns = $this->table->getPrimaryKeyColumns();
-        sort($pkColumns);
-
-        return $fkColumns == $pkColumns;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    public function getGetterSetterCode()
-    {
-        $tableName = $this->table->getName();
-        $getterName = $this->getGetterName();
-        $setterName = $this->getSetterName();
-
-        $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 has a default value.
+	 *
+	 * @return bool
+	 */
+	public function hasDefault()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 *
+	 * @throws \TDBMException
+	 */
+	public function assignToDefaultCode()
+	{
+		throw new \TDBMException('Foreign key based properties cannot be assigned a default value.');
+	}
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	public function isPrimaryKey()
+	{
+		$fkColumns = $this->foreignKey->getLocalColumns();
+		sort($fkColumns);
+
+		$pkColumns = $this->table->getPrimaryKeyColumns();
+		sort($pkColumns);
+
+		return $fkColumns == $pkColumns;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	public function getGetterSetterCode()
+	{
+		$tableName = $this->table->getName();
+		$getterName = $this->getGetterName();
+		$setterName = $this->getSetterName();
+
+		$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.'
@@ -181,19 +181,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);
         }
 ';
-    }
+	}
 }

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

Indentation +471 added lines, -471 removed lines

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

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(true);
-        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(true);
-        $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(true);
+		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(true);
+		$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/ResultIterator.php

Indentation +211 added lines, -211 removed lines

@@ -30,239 +30,239 @@
  */
 class ResultIterator implements Result, \ArrayAccess, \JsonSerializable
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
 
-    protected $fetchStarted = false;
-    private $objectStorage;
-    private $className;
+	protected $fetchStarted = false;
+	private $objectStorage;
+	private $className;
 
-    private $tdbmService;
-    private $magicSql;
-    private $magicSqlCount;
-    private $parameters;
-    private $columnDescriptors;
-    private $magicQuery;
+	private $tdbmService;
+	private $magicSql;
+	private $magicSqlCount;
+	private $parameters;
+	private $columnDescriptors;
+	private $magicQuery;
 
-    /**
-     * @var InnerResultIterator
-     */
-    private $innerResultIterator;
+	/**
+	 * @var InnerResultIterator
+	 */
+	private $innerResultIterator;
 
-    /**
-     * The key of the current retrieved object.
-     *
-     * @var int
-     */
-    protected $key = -1;
+	/**
+	 * The key of the current retrieved object.
+	 *
+	 * @var int
+	 */
+	protected $key = -1;
 
-    protected $current = null;
+	protected $current = null;
 
-    private $databasePlatform;
+	private $databasePlatform;
 
-    private $totalCount;
+	private $totalCount;
 
-    private $mode;
+	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;
-    }
+	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);
-    }
+	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();
-        }
+	/**
+	 * 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;
-    }
+		return $this->totalCount;
+	}
 
-    /**
-     * Casts the result set to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return iterator_to_array($this->getIterator());
-    }
+	/**
+	 * 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);
-    }
+	/**
+	 * 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);
-            }
-        }
+	/**
+	 * 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;
-    }
+		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);
-    }
+	/**
+	 * @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);
-    }
+	/**
+	 * 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 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 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);
-    }
+	/**
+	 * 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
-     *
-     * @param bool $stopRecursion Parameter used internally by TDBM to
-     *                            stop embedded objects from embedding
-     *                            other objects.
-     *
-     * @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($stopRecursion = false)
-    {
-        return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
-            return $item->jsonSerialize($stopRecursion);
-        }, $this->toArray());
-    }
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @param bool $stopRecursion Parameter used internally by TDBM to
+	 *                            stop embedded objects from embedding
+	 *                            other objects.
+	 *
+	 * @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($stopRecursion = false)
+	{
+		return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
+			return $item->jsonSerialize($stopRecursion);
+		}, $this->toArray());
+	}
 
-    /**
-     * Returns only one value (the first) of the result set.
-     * Returns null if no value exists.
-     *
-     * @return mixed|null
-     */
-    public function first()
-    {
-        $page = $this->take(0, 1);
-        foreach ($page as $bean) {
-            return $bean;
-        }
+	/**
+	 * Returns only one value (the first) of the result set.
+	 * Returns null if no value exists.
+	 *
+	 * @return mixed|null
+	 */
+	public function first()
+	{
+		$page = $this->take(0, 1);
+		foreach ($page as $bean) {
+			return $bean;
+		}
 
-        return;
-    }
+		return;
+	}
 }

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

Indentation +594 added lines, -594 removed lines

@@ -16,228 +16,228 @@ 
  */
 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 foreign-key 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 columns that have default values for a given table.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getPropertiesWithDefault()
-    {
-        $properties = $this->getPropertiesForTable($this->table);
-        $defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->hasDefault();
-        });
-
-        return $defaultProperties;
-    }
-
-    /**
-     * 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;
-            }
-        } 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 foreign-key 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 columns that have default values for a given table.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getPropertiesWithDefault()
+	{
+		$properties = $this->getPropertiesForTable($this->table);
+		$defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
+			return $property->hasDefault();
+		});
+
+		return $defaultProperties;
+	}
+
+	/**
+	 * 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;
+			}
+		} 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
@@ -247,70 +247,70 @@ 
 %s    }
     ';
 
-        $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();
-            }
-        }
-
-        $parentConstructorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
-
-        $defaultAssigns = [];
-        foreach ($this->getPropertiesWithDefault() as $property) {
-            $defaultAssigns[] = $property->assignToDefaultCode();
-        }
-
-        return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstructorCode, implode("\n", $assigns), implode("\n", $defaultAssigns));
-    }
-
-    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] = $fksForTable[0];
-            }
-        }
-
-        $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();
+			}
+		}
+
+		$parentConstructorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
+
+		$defaultAssigns = [];
+		foreach ($this->getPropertiesWithDefault() as $property) {
+			$defaultAssigns[] = $property->assignToDefaultCode();
+		}
+
+		return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstructorCode, implode("\n", $assigns), implode("\n", $defaultAssigns));
+	}
+
+	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] = $fksForTable[0];
+			}
+		}
+
+		$code = '';
+
+		foreach ($fksByMethodName as $methodName => $fk) {
+			$getterCode = '    /**
      * Returns the list of %s pointing to this bean via the %s column.
      *
      * @return %s[]|ResultIterator
@@ -322,111 +322,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(true) 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(true) 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[]
@@ -436,9 +436,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
@@ -448,9 +448,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
@@ -460,9 +460,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
@@ -473,24 +473,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($stopRecursion);';
-        } else {
-            $initializer = '$array = [];';
-        }
+	public function generateJsonSerialize()
+	{
+		$tableName = $this->table->getName();
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+		if ($parentFk !== null) {
+			$initializer = '$array = parent::jsonSerialize($stopRecursion);';
+		} else {
+			$initializer = '$array = [];';
+		}
 
-        $str = '
+		$str = '
     /**
      * Serializes the object for JSON encoding
      *
@@ -506,89 +506,89 @@ 
     }
 ';
 
-        $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);
-    }
-
-    /**
-     * Returns as an array the class we need to extend from and the list of use statements.
-     *
-     * @return array
-     */
-    private function generateExtendsAndUseStatements(ForeignKeyConstraint $parentFk = null)
-    {
-        $classes = [];
-        if ($parentFk !== null) {
-            $extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
-            $classes[] = $extends;
-        }
-
-        foreach ($this->getBeanPropertyDescriptors() as $beanPropertyDescriptor) {
-            $className = $beanPropertyDescriptor->getClassName();
-            if (null !== $className) {
-                $classes[] = $beanPropertyDescriptor->getClassName();
-            }
-        }
-
-        foreach ($this->getPivotTableDescriptors() as $descriptor) {
-            /* @var $fk ForeignKeyConstraint */
-            $fk = $descriptor['remoteFK'];
-            $classes[] = TDBMDaoGenerator::getBeanNameFromTableName($fk->getForeignTableName());
-        }
-
-        $classes = array_flip(array_flip($classes));
-
-        return $classes;
-    }
-
-    /**
-     * 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)
-    {
-        $tableName = $this->table->getName();
-        $baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($tableName);
-        $className = TDBMDaoGenerator::getBeanNameFromTableName($tableName);
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
-
-        $classes = $this->generateExtendsAndUseStatements($parentFk);
-
-        $uses = array_map(function ($className) use ($beannamespace) { return 'use '.$beannamespace.'\\'.$className.";\n"; }, $classes);
-        $use = implode('', $uses);
-
-        if ($parentFk !== null) {
-            $extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
-        } else {
-            $extends = 'AbstractTDBMObject';
-            $use .= "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n";
-        }
-
-        $str = "<?php
+		}
+
+		return sprintf($str, $initializer, $propertiesCode, $many2manyCode);
+	}
+
+	/**
+	 * Returns as an array the class we need to extend from and the list of use statements.
+	 *
+	 * @return array
+	 */
+	private function generateExtendsAndUseStatements(ForeignKeyConstraint $parentFk = null)
+	{
+		$classes = [];
+		if ($parentFk !== null) {
+			$extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
+			$classes[] = $extends;
+		}
+
+		foreach ($this->getBeanPropertyDescriptors() as $beanPropertyDescriptor) {
+			$className = $beanPropertyDescriptor->getClassName();
+			if (null !== $className) {
+				$classes[] = $beanPropertyDescriptor->getClassName();
+			}
+		}
+
+		foreach ($this->getPivotTableDescriptors() as $descriptor) {
+			/* @var $fk ForeignKeyConstraint */
+			$fk = $descriptor['remoteFK'];
+			$classes[] = TDBMDaoGenerator::getBeanNameFromTableName($fk->getForeignTableName());
+		}
+
+		$classes = array_flip(array_flip($classes));
+
+		return $classes;
+	}
+
+	/**
+	 * 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)
+	{
+		$tableName = $this->table->getName();
+		$baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($tableName);
+		$className = TDBMDaoGenerator::getBeanNameFromTableName($tableName);
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+
+		$classes = $this->generateExtendsAndUseStatements($parentFk);
+
+		$uses = array_map(function ($className) use ($beannamespace) { return 'use '.$beannamespace.'\\'.$className.";\n"; }, $classes);
+		$use = implode('', $uses);
+
+		if ($parentFk !== null) {
+			$extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
+		} else {
+			$extends = 'AbstractTDBMObject';
+			$use .= "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n";
+		}
+
+		$str = "<?php
 namespace {$beannamespace}\\Generated;
 
 use Mouf\\Database\\TDBM\\ResultIterator;
@@ -606,122 +606,122 @@ 
 {
 ";
 
-        $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;
-    }
-
-    /**
-     * @param string $beanNamespace
-     * @param string $beanClassName
-     *
-     * @return array first element: list of used beans, second item: PHP code as a string
-     */
-    public function generateFindByDaoCode($beanNamespace, $beanClassName)
-    {
-        $code = '';
-        $usedBeans = [];
-        foreach ($this->table->getIndexes() as $index) {
-            if (!$index->isPrimary()) {
-                list($usedBeansForIndex, $codeForIndex) = $this->generateFindByDaoCodeForIndex($index, $beanNamespace, $beanClassName);
-                $code .= $codeForIndex;
-                $usedBeans = array_merge($usedBeans, $usedBeansForIndex);
-            }
-        }
-
-        return [$usedBeans, $code];
-    }
-
-    /**
-     * @param Index  $index
-     * @param string $beanNamespace
-     * @param string $beanClassName
-     *
-     * @return array first element: list of used beans, second item: PHP code as a string
-     */
-    private function generateFindByDaoCodeForIndex(Index $index, $beanNamespace, $beanClassName)
-    {
-        $columns = $index->getColumns();
-        $usedBeans = [];
-
-        /*
+		return $str;
+	}
+
+	/**
+	 * @param string $beanNamespace
+	 * @param string $beanClassName
+	 *
+	 * @return array first element: list of used beans, second item: PHP code as a string
+	 */
+	public function generateFindByDaoCode($beanNamespace, $beanClassName)
+	{
+		$code = '';
+		$usedBeans = [];
+		foreach ($this->table->getIndexes() as $index) {
+			if (!$index->isPrimary()) {
+				list($usedBeansForIndex, $codeForIndex) = $this->generateFindByDaoCodeForIndex($index, $beanNamespace, $beanClassName);
+				$code .= $codeForIndex;
+				$usedBeans = array_merge($usedBeans, $usedBeansForIndex);
+			}
+		}
+
+		return [$usedBeans, $code];
+	}
+
+	/**
+	 * @param Index  $index
+	 * @param string $beanNamespace
+	 * @param string $beanClassName
+	 *
+	 * @return array first element: list of used beans, second item: PHP code as a string
+	 */
+	private function generateFindByDaoCodeForIndex(Index $index, $beanNamespace, $beanClassName)
+	{
+		$columns = $index->getColumns();
+		$usedBeans = [];
+
+		/*
          * The list of elements building this index (expressed as columns or foreign keys)
          * @var AbstractBeanPropertyDescriptor[]
          */
-        $elements = [];
-
-        foreach ($columns as $column) {
-            $fk = $this->isPartOfForeignKey($this->table, $this->table->getColumn($column));
-            if ($fk !== null) {
-                if (!in_array($fk, $elements)) {
-                    $elements[] = new ObjectBeanPropertyDescriptor($this->table, $fk, $this->schemaAnalyzer);
-                }
-            } else {
-                $elements[] = new ScalarBeanPropertyDescriptor($this->table, $this->table->getColumn($column));
-            }
-        }
-
-        // If the index is actually only a foreign key, let's bypass it entirely.
-        if (count($elements) === 1 && $elements[0] instanceof ObjectBeanPropertyDescriptor) {
-            return [[], ''];
-        }
-
-        $methodNameComponent = [];
-        $functionParameters = [];
-        $first = true;
-        foreach ($elements as $element) {
-            $methodNameComponent[] = $element->getUpperCamelCaseName();
-            $functionParameter = $element->getClassName();
-            if ($functionParameter) {
-                $usedBeans[] = $beanNamespace.'\\'.$functionParameter;
-                $functionParameter .= ' ';
-            }
-            $functionParameter .= $element->getVariableName();
-            if ($first) {
-                $first = false;
-            } else {
-                $functionParameter .= ' = null';
-            }
-            $functionParameters[] = $functionParameter;
-        }
-        if ($index->isUnique()) {
-            $methodName = 'findOneBy'.implode('And', $methodNameComponent);
-            $calledMethod = 'findOne';
-        } else {
-            $methodName = 'findBy'.implode('And', $methodNameComponent);
-            $calledMethod = 'find';
-        }
-        $functionParametersString = implode(', ', $functionParameters);
-
-        $count = 0;
-
-        $params = [];
-        $filterArrayCode = '';
-        $commentArguments = [];
-        foreach ($elements as $element) {
-            $params[] = $element->getParamAnnotation();
-            if ($element instanceof ScalarBeanPropertyDescriptor) {
-                $filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getVariableName().",\n";
-            } else {
-                ++$count;
-                $filterArrayCode .= '            '.$count.' => '.$element->getVariableName().",\n";
-            }
-            $commentArguments[] = substr($element->getVariableName(), 1);
-        }
-        $paramsString = implode("\n", $params);
-
-        $code = "
+		$elements = [];
+
+		foreach ($columns as $column) {
+			$fk = $this->isPartOfForeignKey($this->table, $this->table->getColumn($column));
+			if ($fk !== null) {
+				if (!in_array($fk, $elements)) {
+					$elements[] = new ObjectBeanPropertyDescriptor($this->table, $fk, $this->schemaAnalyzer);
+				}
+			} else {
+				$elements[] = new ScalarBeanPropertyDescriptor($this->table, $this->table->getColumn($column));
+			}
+		}
+
+		// If the index is actually only a foreign key, let's bypass it entirely.
+		if (count($elements) === 1 && $elements[0] instanceof ObjectBeanPropertyDescriptor) {
+			return [[], ''];
+		}
+
+		$methodNameComponent = [];
+		$functionParameters = [];
+		$first = true;
+		foreach ($elements as $element) {
+			$methodNameComponent[] = $element->getUpperCamelCaseName();
+			$functionParameter = $element->getClassName();
+			if ($functionParameter) {
+				$usedBeans[] = $beanNamespace.'\\'.$functionParameter;
+				$functionParameter .= ' ';
+			}
+			$functionParameter .= $element->getVariableName();
+			if ($first) {
+				$first = false;
+			} else {
+				$functionParameter .= ' = null';
+			}
+			$functionParameters[] = $functionParameter;
+		}
+		if ($index->isUnique()) {
+			$methodName = 'findOneBy'.implode('And', $methodNameComponent);
+			$calledMethod = 'findOne';
+		} else {
+			$methodName = 'findBy'.implode('And', $methodNameComponent);
+			$calledMethod = 'find';
+		}
+		$functionParametersString = implode(', ', $functionParameters);
+
+		$count = 0;
+
+		$params = [];
+		$filterArrayCode = '';
+		$commentArguments = [];
+		foreach ($elements as $element) {
+			$params[] = $element->getParamAnnotation();
+			if ($element instanceof ScalarBeanPropertyDescriptor) {
+				$filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getVariableName().",\n";
+			} else {
+				++$count;
+				$filterArrayCode .= '            '.$count.' => '.$element->getVariableName().",\n";
+			}
+			$commentArguments[] = substr($element->getVariableName(), 1);
+		}
+		$paramsString = implode("\n", $params);
+
+		$code = "
     /**
      * Get a list of $beanClassName filtered by ".implode(', ', $commentArguments).".
      *
@@ -739,6 +739,6 @@ 
     }
 ";
 
-        return [$usedBeans, $code];
-    }
+		return [$usedBeans, $code];
+	}
 }