thecodingmachine / database.tdbm

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

Doc Comments +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
     /**
      * Returns the foreignkey the column is part of, if any. null otherwise.
      *
-     * @param Column $column
-     * @return ForeignKeyConstraint|null
+     * @return boolean
      */
     public function getForeignKey() {
         return false;

Indentation +101 added lines, -101 removed lines

@@ -12,88 +12,88 @@ 
  */
 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 foreignkey the column is part of, if any. null otherwise.
-     *
-     * @param Column $column
-     * @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 null;
-    }
-
-    /**
-     * 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();
-    }
-
-    /**
-     * 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 foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @param Column $column
+	 * @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 null;
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * 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
@@ -112,23 +112,23 @@ 
     }
 
 ';
-        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)
-        );
-    }
+		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)
+		);
+	}
 }

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

Doc Comments +11 added lines, -6 removed lines

@@ -46,7 +46,6 @@ 
     /**
      * Constructor.
      *
-     * @param Connection $dbConnection The connection to the database.
      */
     public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer) {
         $this->schemaAnalyzer = $schemaAnalyzer;
@@ -99,6 +98,9 @@ 
      * Generates in one method call the daos and the beans for one table.
      * 
      * @param $tableName
+     * @param string $daonamespace
+     * @param string $beannamespace
+     * @param boolean $storeInUtc
      */
     public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
 		$tableName = $table->getName();
@@ -134,7 +136,7 @@ 
     /**
      * Returns the name of the base bean class from the table name.
      * 
-     * @param $tableName
+     * @param string $tableName
      * @return string
      */
     public static function getBaseBeanNameFromTableName($tableName) {
@@ -144,7 +146,7 @@ 
     /**
      * Returns the name of the base DAO class from the table name.
      *
-     * @param $tableName
+     * @param string $tableName
      * @return string
      */
     public static function getBaseDaoNameFromTableName($tableName) {
@@ -156,7 +158,7 @@ 
      *
      * @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 string $tableName The name of the table
+     * @param string $table The name of the table
      * @param string $beannamespace The namespace of the bean
      * @param ClassNameMapper $classNameMapper
      * @throws TDBMException
@@ -214,9 +216,10 @@ 
     /**
      * Writes the PHP bean DAO with simple functions to create/get/save objects.
      *
-     * @param string $fileName The file that will be written (without the directory)
      * @param string $className The name of the class
-     * @param string $tableName The name of the table
+     * @param string $table The name of the table
+     * @param string $baseClassName
+     * @param string $beanClassName
      */
     public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper) {
         $tableName = $table->getName();
@@ -458,6 +461,8 @@ 
      * Generates the factory bean.
      * 
      * @param Table[] $tableList
+     * @param string $daoFactoryClassName
+     * @param string $daoNamespace
      */
     private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper) {
         // For each table, let's write a property.

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 namespace Mouf\Database\TDBM\Utils;
 
 use Doctrine\DBAL\Driver\Connection;
-use Doctrine\DBAL\Schema\Column;
-use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;

Indentation +372 added lines, -372 removed lines

@@ -19,178 +19,178 @@ 
  */
 class TDBMDaoGenerator {
 
-    /**
-     * 
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     *
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * The root directory of the project.
-     *
-     * @var string
-     */
-    private $rootPath;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * Constructor.
-     *
-     * @param Connection $dbConnection The connection to the database.
-     */
-    public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer) {
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->rootPath = __DIR__."/../../../../../../../../";
-    }
-
-    /**
-     * 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) {
-        // TODO: extract ClassNameMapper in its own package!
-        $classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
-
-        // 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();
-        $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);
-        }
+	/**
+	 * 
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 *
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * The root directory of the project.
+	 *
+	 * @var string
+	 */
+	private $rootPath;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Connection $dbConnection The connection to the database.
+	 */
+	public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer) {
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->rootPath = __DIR__."/../../../../../../../../";
+	}
+
+	/**
+	 * 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) {
+		// TODO: extract ClassNameMapper in its own package!
+		$classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
+
+		// 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();
+		$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);
+		$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.
+		// 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);
-    }
+		return array_map(function(Table $table) { return $table->getName(); },$tableList);
+	}
     
-    /**
-     * Generates in one method call the daos and the beans for one table.
-     * 
-     * @param $tableName
-     */
-    public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
+	/**
+	 * Generates in one method call the daos and the beans for one table.
+	 * 
+	 * @param $tableName
+	 */
+	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);
-
-        $this->generateBean($beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
-        $this->generateDao($daoName, $baseDaoName, $beanName, $table, $daonamespace, $beannamespace, $classNameMapper);
-    }
+		$daoName = $this->getDaoNameFromTableName($tableName);
+		$beanName = $this->getBeanNameFromTableName($tableName);
+		$baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
+		$baseDaoName = $this->getBaseDaoNameFromTableName($tableName);
+
+		$this->generateBean($beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
+		$this->generateDao($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 TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."Bean";
-    }
+	/**
+	 * Returns the name of the bean class from the table name.
+	 * 
+	 * @param $tableName
+	 * @return string
+	 */
+	public static function getBeanNameFromTableName($tableName) {
+		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."Bean";
+	}
     
-    /**
-     * Returns the name of the DAO class from the table name.
-     * 
-     * @param $tableName
-     * @return string
-     */
-    public static function getDaoNameFromTableName($tableName) {
-        return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."Dao";
-    }
+	/**
+	 * Returns the name of the DAO class from the table name.
+	 * 
+	 * @param $tableName
+	 * @return string
+	 */
+	public static function getDaoNameFromTableName($tableName) {
+		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::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 TDBMDaoGenerator::toSingular(TDBMDaoGenerator::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 TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."BaseDao";
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @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 string $tableName The name of the table
-     * @param string $beannamespace The namespace of the bean
-     * @param ClassNameMapper $classNameMapper
-     * @throws TDBMException
-     */
-    public function generateBean($className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
-
-        $beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema);
-
-        $str = $beanDescriptor->generatePhpCode($beannamespace);
-
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$baseClassName);
-        if (!$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 (!$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
+	/**
+	 * Returns the name of the base bean class from the table name.
+	 * 
+	 * @param $tableName
+	 * @return string
+	 */
+	public static function getBaseBeanNameFromTableName($tableName) {
+		return TDBMDaoGenerator::toSingular(TDBMDaoGenerator::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 TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($tableName))."BaseDao";
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @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 string $tableName The name of the table
+	 * @param string $beannamespace The namespace of the bean
+	 * @param ClassNameMapper $classNameMapper
+	 * @throws TDBMException
+	 */
+	public function generateBean($className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc) {
+
+		$beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema);
+
+		$str = $beanDescriptor->generatePhpCode($beannamespace);
+
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace."\\".$baseClassName);
+		if (!$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 (!$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.
@@ -205,44 +205,44 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Writes the PHP bean DAO with simple functions to create/get/save objects.
-     *
-     * @param string $fileName The file that will be written (without the directory)
-     * @param string $className The name of the class
-     * @param string $tableName The name of the table
-     */
-    public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper) {
-        $tableName = $table->getName();
-        $primaryKeyColumns = $table->getPrimaryKeyColumns();
-
-        $defaultSort = null;
-        foreach ($table->getColumns() as $column) {
-            $comments = $column->getComment();
-            $matches = array();
-            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0){
-                $defaultSort = $data['column_name'];
-                if (count($matches == 3)){
-                    $defaultSortDirection = $matches[2];
-                }else{
-                    $defaultSortDirection = 'ASC';
-                }
-            }
-        }
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName ,$str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Writes the PHP bean DAO with simple functions to create/get/save objects.
+	 *
+	 * @param string $fileName The file that will be written (without the directory)
+	 * @param string $className The name of the class
+	 * @param string $tableName The name of the table
+	 */
+	public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper) {
+		$tableName = $table->getName();
+		$primaryKeyColumns = $table->getPrimaryKeyColumns();
+
+		$defaultSort = null;
+		foreach ($table->getColumns() as $column) {
+			$comments = $column->getComment();
+			$matches = array();
+			if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0){
+				$defaultSort = $data['column_name'];
+				if (count($matches == 3)){
+					$defaultSortDirection = $matches[2];
+				}else{
+					$defaultSortDirection = 'ASC';
+				}
+			}
+		}
 
-        // FIXME: lowercase tables with _ in the name should work!
-        $tableCamel = self::toSingular(self::toCamelCase($tableName));
+		// FIXME: lowercase tables with _ in the name should work!
+		$tableCamel = self::toSingular(self::toCamelCase($tableName));
         
-        $beanClassWithoutNameSpace = $beanClassName;
-        $beanClassName = $beannamespace."\\".$beanClassName;
+		$beanClassWithoutNameSpace = $beanClassName;
+		$beanClassName = $beannamespace."\\".$beanClassName;
         
-        $str = "<?php
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -329,9 +329,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.
@@ -346,8 +346,8 @@ 
         return \$this->tdbmService->findObjectByPk('$tableName', ['$primaryKeyColumn' => \$id], [], \$lazyLoading);
     }
     ";
-        }
-        $str .= "
+		}
+		$str .= "
     /**
      * Deletes the $beanClassWithoutNameSpace passed in parameter.
      *
@@ -407,29 +407,29 @@ 
 }
 ";
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$baseClassName);
-        if (!$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 (!$possibleFileNames) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$baseClassName);
+		if (!$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 (!$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
+		// Now, let's generate the "editable" class
+		if (!file_exists($possibleFileName)) {
+			$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -446,23 +446,23 @@ 
 
 }
 ";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
+			$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.
+	/**
+	 * 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
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -479,12 +479,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.';
@@ -509,141 +509,141 @@ 
     }
     
 ';
-        }
+		}
         
         
-        $str .= '
+		$str .= '
 }
 ';
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace."\\".$daoFactoryClassName);
-        if (!$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);
-    }
-
-    /**
-     * 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;
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace."\\".$daoFactoryClassName);
+		if (!$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);
+	}
+
+	/**
+	 * 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;
-    }
+			$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 \ICanBoogie\singularize($str, "en");
-    }
+	/**
+	 * 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 \ICanBoogie\singularize($str, "en");
+	}
     
-    /**
-     * 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
-     */
-    private function ensureDirectoryExist($fileName) {
-        $dirName = dirname($fileName);
-        if (!file_exists($dirName)) {
-            $old = umask(0);
-            $result = mkdir($dirName, 0775, true);
-            umask($old);
-            if ($result == false) {
-                echo "Unable to create directory: ".$dirName.".";
-                exit;
-            }
-        }
-    }
-
-    /**
-     * @param string $rootPath
-     */
-    public function setRootPath($rootPath)
-    {
-        $this->rootPath = $rootPath;
-    }
-
-    /**
-     * 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;
-    }
+	/**
+	 * 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
+	 */
+	private function ensureDirectoryExist($fileName) {
+		$dirName = dirname($fileName);
+		if (!file_exists($dirName)) {
+			$old = umask(0);
+			$result = mkdir($dirName, 0775, true);
+			umask($old);
+			if ($result == false) {
+				echo "Unable to create directory: ".$dirName.".";
+				exit;
+			}
+		}
+	}
+
+	/**
+	 * @param string $rootPath
+	 */
+	public function setRootPath($rootPath)
+	{
+		$this->rootPath = $rootPath;
+	}
+
+	/**
+	 * 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;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -206,7 +206,7 @@ 
 
 }";
             $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
+            file_put_contents($possibleFileName, $str);
             @chmod($possibleFileName, 0664);
         }
     }
@@ -226,11 +226,11 @@ 
         foreach ($table->getColumns() as $column) {
             $comments = $column->getComment();
             $matches = array();
-            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0){
+            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
                 $defaultSort = $data['column_name'];
-                if (count($matches == 3)){
+                if (count($matches == 3)) {
                     $defaultSortDirection = $matches[2];
-                }else{
+                } else {
                     $defaultSortDirection = 'ASC';
                 }
             }
@@ -416,7 +416,7 @@ 
         $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
 
         $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName ,$str);
+        file_put_contents($possibleBaseFileName, $str);
         @chmod($possibleBaseFileName, 0664);
 
         $possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$className);
@@ -447,7 +447,7 @@ 
 }
 ";
             $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName ,$str);
+            file_put_contents($possibleFileName, $str);
             @chmod($possibleFileName, 0664);
         }
     }
@@ -523,7 +523,7 @@ 
         $possibleFileName = $this->rootPath.$possibleFileNames[0];
 
         $this->ensureDirectoryExist($possibleFileName);
-        file_put_contents($possibleFileName ,$str);
+        file_put_contents($possibleFileName, $str);
     }
 
     /**
@@ -534,7 +534,7 @@ 
      * @return string
      */
     public static function toCamelCase($str) {
-        $str = strtoupper(substr($str,0,1)).substr($str,1);
+        $str = strtoupper(substr($str, 0, 1)).substr($str, 1);
         while (true) {
             if (strpos($str, "_") === false && strpos($str, " ") === false) {
                 break;
@@ -544,9 +544,9 @@ 
             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);
+            $before = substr($str, 0, $pos);
+            $after = substr($str, $pos+1);
+            $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
         }
         return $str;
     }
@@ -627,7 +627,7 @@ 
             Type::GUID => 'string'
         ];
 
-        return isset($map[$type->getName()])?$map[$type->getName()]:$type->getName();
+        return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
     }
 
     /**
@@ -642,7 +642,7 @@ 
 
         foreach ($tables as $table) {
             $tableName = $table->getName();
-            $tableToBeanMap[$tableName] = $beanNamespace . "\\" . self::getBeanNameFromTableName($tableName);
+            $tableToBeanMap[$tableName] = $beanNamespace."\\".self::getBeanNameFromTableName($tableName);
         }
         return $tableToBeanMap;
     }

Braces +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
                 $defaultSort = $data['column_name'];
                 if (count($matches == 3)){
                     $defaultSortDirection = $matches[2];
-                }else{
+                } else{
                     $defaultSortDirection = 'ASC';
                 }
             }

src/views/tdbmGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 <div class="control-group">
 	<label class="control-label">Store dates / timestamps in UTC:</label>
 	<div class="controls">
-		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc?'checked="checked"':"" ?>></input>
+		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc ? 'checked="checked"' : "" ?>></input>
 		<span class="help-block">Select this option if you want timestamps to be stored in UTC.
 		If your application supports several time zones, you should select this option to store all dates in
 		the same time zone.</span>

src/views/installStep2.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 <div class="control-group">
 	<label class="control-label">Store dates / timestamps in UTC:</label>
 	<div class="controls">
-		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc?'checked="checked"':"" ?>></input>
+		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc ? 'checked="checked"' : "" ?>></input>
 		<span class="help-block">Select this option if you want timestamps to be stored in UTC.
 		If your application supports several time zones, you should select this option to store all dates in
 		the same time zone.</span>

src/Mouf/Database/TDBM/Filters/GreaterOrEqualFilter.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	 * @param string $columnName
 	 * @param string $value
 	 */
-	public function __construct($tableName=null, $columnName=null, $value=null) {
+	public function __construct($tableName = null, $columnName = null, $value = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->value = $value;

src/Mouf/Database/TDBM/Filters/GreaterFilter.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 * @param string $columnName
 	 * @param string $value
 	 */
-	public function __construct($tableName=null, $columnName=null, $value=null) {
+	public function __construct($tableName = null, $columnName = null, $value = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->value = $value;

src/Mouf/Database/TDBM/Filters/InFilter.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * @param string $columnName
 	 * @param array<string> $values
 	 */
-	public function __construct($tableName=null, $columnName=null, $values=array()) {
+	public function __construct($tableName = null, $columnName = null, $values = array()) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->values = $values;
@@ -117,7 +117,7 @@ 
 			}
 		}
 
-		return $this->tableName.'.'.$this->columnName.' IN ('.implode(',',$values_sql).")";
+		return $this->tableName.'.'.$this->columnName.' IN ('.implode(',', $values_sql).")";
 	}
 
 	/**

src/Mouf/Database/TDBM/Filters/OrderByColumn.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	 * @param string $columnName
 	 * @param string $order
 	 */
-	public function __construct($tableName=null, $columnName=null, $order=null) {
+	public function __construct($tableName = null, $columnName = null, $order = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->order = $order;

src/Mouf/Database/TDBM/Filters/EqualFilter.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 * @param string $columnName
 	 * @param string $value
 	 */
-	public function __construct($tableName=null, $columnName=null, $value=null) {
+	public function __construct($tableName = null, $columnName = null, $value = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->value = $value;