thecodingmachine / database.tdbm

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

Indentation +164 added lines, -164 removed lines

@@ -15,168 +15,168 @@
  */
 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();
-        }
-
-        $doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
-
-        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($doctrineCache);
-        }
-
-        $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();
+		}
+
+		$doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
+
+		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($doctrineCache);
+		}
+
+		$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/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().($castTo ? ($this->column->getNotnull() ? '' : ' = null') : ''),
-            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().($castTo ? ($this->column->getNotnull() ? '' : ' = null') : ''),
+			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();
+	}
 }