thecodingmachine / database.tdbm

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

Doc Comments +3 added lines

@@ -181,6 +181,9 @@
 
     protected $errorMsg;
 
+    /**
+     * @param string $msg
+     */
     private function displayErrorMsg($msg)
     {
         $this->errorMsg = $msg;

Indentation +242 added lines, -242 removed lines

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

src/views/tdbmGenerate.php

Indentation +1 added lines, -1 removed lines

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

src/Mouf/Database/TDBM/MoufConfiguration.php

Indentation +15 added lines, -15 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

Doc Comments +3 added lines, -1 removed lines

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

Indentation +130 added lines, -130 removed lines

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

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Mouf\Controllers\AbstractMoufInstanceController;
 use TheCodingMachine\TDBM\TDBMService;
 use TheCodingMachine\TDBM\Utils\PathFinder\PathFinder;
-use TheCodingMachine\TDBM\Utils\TDBMDaoGenerator;
 use Mouf\Html\HtmlElement\HtmlBlock;
 use Mouf\MoufManager;
 use Mouf\InstanceProxy;

src/views/installStep2.php

Indentation +1 added lines, -1 removed lines

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

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

Indentation +44 added lines, -44 removed lines

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