thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/TDBMObject.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**

Indentation +113 added lines, -113 removed lines

@@ -35,117 +35,117 @@
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
 {
 
-    public function __get($var)
-    {
-        return $this->get($var);
-    }
-
-    /**
-     * Returns true if a column is set, false otherwise.
-     *
-     * @param string $var
-     * @return boolean
-     */
-    public function __isset($var)
-    {
-        return $this->has($var);
-    }
-
-    public function __set($var, $value)
-    {
-        $this->set($var, $value);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     * @param string $value
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->__set($offset, $value);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        $this->_dbLoadIfNotLoaded();
-        return isset($this->dbRow[$offset]);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     */
-    public function offsetUnset($offset)
-    {
-        $this->__set($offset, null);
-    }
-
-    /**
-     * Implements array behaviour for our object.
-     *
-     * @param string $offset
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        return $this->__get($offset);
-    }
-
-    private $_validIterator = false;
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function rewind()
-    {
-        $this->_dbLoadIfNotLoaded();
-        if (count($this->dbRow) > 0) {
-            $this->_validIterator = true;
-        } else {
-            $this->_validIterator = false;
-        }
-        reset($this->dbRow);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function next()
-    {
-        $val = next($this->dbRow);
-        $this->_validIterator = !($val === false);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function key()
-    {
-        return key($this->dbRow);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function current()
-    {
-        return current($this->dbRow);
-    }
-
-    /**
-     * Implements iterator behaviour for our object (so we can each column).
-     */
-    public function valid()
-    {
-        return $this->_validIterator;
-    }
+	public function __get($var)
+	{
+		return $this->get($var);
+	}
+
+	/**
+	 * Returns true if a column is set, false otherwise.
+	 *
+	 * @param string $var
+	 * @return boolean
+	 */
+	public function __isset($var)
+	{
+		return $this->has($var);
+	}
+
+	public function __set($var, $value)
+	{
+		$this->set($var, $value);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 * @param string $value
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->__set($offset, $value);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		$this->_dbLoadIfNotLoaded();
+		return isset($this->dbRow[$offset]);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 */
+	public function offsetUnset($offset)
+	{
+		$this->__set($offset, null);
+	}
+
+	/**
+	 * Implements array behaviour for our object.
+	 *
+	 * @param string $offset
+	 * @return mixed|null
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->__get($offset);
+	}
+
+	private $_validIterator = false;
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function rewind()
+	{
+		$this->_dbLoadIfNotLoaded();
+		if (count($this->dbRow) > 0) {
+			$this->_validIterator = true;
+		} else {
+			$this->_validIterator = false;
+		}
+		reset($this->dbRow);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function next()
+	{
+		$val = next($this->dbRow);
+		$this->_validIterator = !($val === false);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function key()
+	{
+		return key($this->dbRow);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function current()
+	{
+		return current($this->dbRow);
+	}
+
+	/**
+	 * Implements iterator behaviour for our object (so we can each column).
+	 */
+	public function valid()
+	{
+		return $this->_validIterator;
+	}
 }
\ No newline at end of file

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

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

@@ -20,178 +20,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 Table $table 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 Table $table 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.
@@ -206,44 +206,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.
@@ -330,9 +330,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.
@@ -347,8 +347,8 @@ 
         return \$this->tdbmService->findObjectByPk('$tableName', ['$primaryKeyColumn' => \$id], [], \$lazyLoading);
     }
     ";
-        }
-        $str .= "
+		}
+		$str .= "
     /**
      * Deletes the $beanClassWithoutNameSpace passed in parameter.
      *
@@ -410,29 +410,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.
@@ -449,23 +449,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.
@@ -482,12 +482,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.';
@@ -512,141 +512,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 Inflector::get('en')->singularize($str);
-    }
+	/**
+	 * Tries to put string to the singular form (if it is plural).
+	 * We assume the table names are in english.
+	 *
+	 * @param $str string
+	 * @return string
+	 */
+	public static function toSingular($str) {
+		return Inflector::get('en')->singularize($str);
+	}
     
-    /**
-     * Put the first letter of the string in lower case.
-     * Very useful to transform a class name into a variable name.
-     * 
-     * @param $str string
-     * @return string
-     */
-    public static function toVariableName($str) {
-        return strtolower(substr($str, 0, 1)).substr($str, 1);
-    }
-
-    /**
-     * Ensures the file passed in parameter can be written in its directory.
-     * @param string $fileName
-     * @throws TDBMException
-     */
-    private function ensureDirectoryExist($fileName) {
-        $dirName = dirname($fileName);
-        if (!file_exists($dirName)) {
-            $old = umask(0);
-            $result = mkdir($dirName, 0775, true);
-            umask($old);
-            if ($result === false) {
-                throw new TDBMException("Unable to create directory: '".$dirName."'.");
-            }
-        }
-    }
-
-    /**
-     * @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
+	 * @throws TDBMException
+	 */
+	private function ensureDirectoryExist($fileName) {
+		$dirName = dirname($fileName);
+		if (!file_exists($dirName)) {
+			$old = umask(0);
+			$result = mkdir($dirName, 0775, true);
+			umask($old);
+			if ($result === false) {
+				throw new TDBMException("Unable to create directory: '".$dirName."'.");
+			}
+		}
+	}
+
+	/**
+	 * @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;
+	}
 }

src/Mouf/Database/TDBM/TDBMSchemaAnalyzer.php

Indentation +79 added lines, -79 removed lines

@@ -15,96 +15,96 @@
 class TDBMSchemaAnalyzer
 {
 
-    private $connection;
+	private $connection;
 
-    /**
-     * @var Schema
-     */
-    private $schema;
+	/**
+	 * @var Schema
+	 */
+	private $schema;
 
-    /**
-     * @var string
-     */
-    private $cachePrefix;
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
 
-    /**
-     * @var Cache
-     */
-    private $cache;
+	/**
+	 * @var Cache
+	 */
+	private $cache;
 
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
 
-    /**
-     * @param Connection $connection The DBAL DB connection to use
-     * @param Cache $cache A cache service to be used
-     * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
-     * 										 Will be automatically created if not passed.
-     */
-    public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) {
-        $this->connection = $connection;
-        $this->cache = $cache;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-    }
+	/**
+	 * @param Connection $connection The DBAL DB connection to use
+	 * @param Cache $cache A cache service to be used
+	 * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
+	 * 										 Will be automatically created if not passed.
+	 */
+	public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) {
+		$this->connection = $connection;
+		$this->cache = $cache;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+	}
 
-    /**
-     * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
-     * @return string
-     */
-    public function getCachePrefix() {
-        if ($this->cachePrefix === null) {
-            $this->cachePrefix = hash('md4', $this->connection->getHost()."-".$this->connection->getPort()."-".$this->connection->getDatabase()."-".$this->connection->getDriver()->getName());
-        }
-        return $this->cachePrefix;
-    }
+	/**
+	 * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
+	 * @return string
+	 */
+	public function getCachePrefix() {
+		if ($this->cachePrefix === null) {
+			$this->cachePrefix = hash('md4', $this->connection->getHost()."-".$this->connection->getPort()."-".$this->connection->getDatabase()."-".$this->connection->getDriver()->getName());
+		}
+		return $this->cachePrefix;
+	}
 
-    /**
-     * Returns the (cached) schema.
-     *
-     * @return Schema
-     */
-    public function getSchema() {
-        if ($this->schema === null) {
-            $cacheKey = $this->getCachePrefix().'_schema';
-            if ($this->cache->contains($cacheKey)) {
-                $this->schema = $this->cache->fetch($cacheKey);
-            } else {
-                $this->schema = $this->connection->getSchemaManager()->createSchema();
-                $this->cache->save($cacheKey, $this->schema);
-            }
-        }
-        return $this->schema;
-    }
+	/**
+	 * Returns the (cached) schema.
+	 *
+	 * @return Schema
+	 */
+	public function getSchema() {
+		if ($this->schema === null) {
+			$cacheKey = $this->getCachePrefix().'_schema';
+			if ($this->cache->contains($cacheKey)) {
+				$this->schema = $this->cache->fetch($cacheKey);
+			} else {
+				$this->schema = $this->connection->getSchemaManager()->createSchema();
+				$this->cache->save($cacheKey, $this->schema);
+			}
+		}
+		return $this->schema;
+	}
 
-    /**
-     * Returns the list of pivot tables linked to table $tableName
-     * @param string $tableName
-     * @return array|string[]
-     */
-    public function getPivotTableLinkedToTable($tableName) {
-        $cacheKey = $this->getCachePrefix().'_pivottables_link';
-        if ($this->cache->contains($cacheKey)) {
-            return $this->cache->fetch($cacheKey);
-        }
+	/**
+	 * Returns the list of pivot tables linked to table $tableName
+	 * @param string $tableName
+	 * @return array|string[]
+	 */
+	public function getPivotTableLinkedToTable($tableName) {
+		$cacheKey = $this->getCachePrefix().'_pivottables_link';
+		if ($this->cache->contains($cacheKey)) {
+			return $this->cache->fetch($cacheKey);
+		}
 
-        $pivotTables = [];
+		$pivotTables = [];
 
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        foreach ($junctionTables as $table) {
-            $fks = $table->getForeignKeys();
-            foreach ($fks as $fk) {
-                if ($fk->getForeignTableName() == $tableName) {
-                    $pivotTables[] = $table->getName();
-                    break;
-                }
-            }
-        }
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		foreach ($junctionTables as $table) {
+			$fks = $table->getForeignKeys();
+			foreach ($fks as $fk) {
+				if ($fk->getForeignTableName() == $tableName) {
+					$pivotTables[] = $table->getName();
+					break;
+				}
+			}
+		}
 
-        $this->cache->save($cacheKey, $pivotTables);
-        return $pivotTables;
-    }
+		$this->cache->save($cacheKey, $pivotTables);
+		return $pivotTables;
+	}
 
 
 }

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

Indentation +3 added lines, -3 removed lines

@@ -59,10 +59,10 @@ 
 		}
 				
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
 
 			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
+			if ($autoloadNamespaces) {
 				$this->autoloadDetected = true;
 				$rootNamespace = $autoloadNamespaces[0];
 				$this->daoNamespace = $rootNamespace."Dao";
@@ -138,7 +138,7 @@ 
 		
 		$tdbmService = new InstanceProxy($name);
 		/* @var $tdbmService TDBMService */
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
 
 
 		$moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);

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

Indentation +4 added lines, -4 removed lines

@@ -109,12 +109,12 @@ 
 		$this->beanNamespace = $this->moufManager->getVariable("tdbmDefaultBeanNamespace_tdbmService");
 		
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
 
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
 			if ($autoloadNamespaces) {
 				$this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
+				$rootNamespace = $autoloadNamespaces[0];
 				$this->daoNamespace = $rootNamespace."Dao";
 				$this->beanNamespace = $rootNamespace."Dao\\Bean";
 			} else {
@@ -144,7 +144,7 @@ 
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
-    public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") {
+	public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") {
 		$this->selfedit = $selfedit;
 		
 		if ($selfedit == "true") {

src/Mouf/Database/TDBM/TDBMObjectStateEnum.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
  * @author David Negrier
  */
 final class TDBMObjectStateEnum extends AbstractTDBMObject {
-    const STATE_DETACHED = "detached";
-    const STATE_NEW = "new";
-    const STATE_NOT_LOADED = "not loaded";
-    const STATE_LOADED = "loaded";
-    const STATE_DIRTY = "dirty";
-    const STATE_DELETED = "deleted";
+	const STATE_DETACHED = "detached";
+	const STATE_NEW = "new";
+	const STATE_NOT_LOADED = "not loaded";
+	const STATE_LOADED = "loaded";
+	const STATE_DIRTY = "dirty";
+	const STATE_DELETED = "deleted";
 }

src/Mouf/Database/TDBM/InnerResultIterator.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**

src/Mouf/Database/TDBM/PageIterator.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**

src/Mouf/Database/TDBM/ResultIterator.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**