thecodingmachine / database.tdbm

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

Unused Use Statements -4 removed lines

@@ -2,12 +2,8 @@
 namespace Mouf\Database\TDBM\Controllers;
 
 use Mouf\Composer\ClassNameMapper;
-use Mouf\MoufUtils;
-
 use Mouf\Actions\InstallUtils;
-
 use Mouf\MoufManager;
-
 use Mouf\Html\HtmlElement\HtmlBlock;
 use Mouf\Mvc\Splash\Controllers\Controller;
 

Indentation +4 added lines, -4 removed lines

@@ -111,12 +111,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 {
@@ -146,7 +146,7 @@ 
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
-    public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $castDatesToDateTime = 1, $selfedit="false") {
+	public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $castDatesToDateTime = 1, $selfedit="false") {
 		$this->selfedit = $selfedit;
 		
 		if ($selfedit == "true") {

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

Indentation +3 added lines, -3 removed lines

@@ -133,14 +133,14 @@
 		$work_table = explode("'", $work_str);
 
 		if (count($work_table) == 0)
-		    return '';
+			return '';
 
 		// if we start with a ', let's remove the first text
 		if (strstr($work_str,"'") === 0)
-		    array_shift($work_table);
+			array_shift($work_table);
 			
 		if (count($work_table) == 0)
-		    return '';
+			return '';
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php
 namespace Mouf\Database\TDBM\Filters;
 
-use Mouf\Database\DBConnection\ConnectionInterface;
-
 /*
  Copyright (C) 2006-2011 David Négrier - THE CODING MACHINE
 

src/Mouf/Database/TDBM/AmbiguityException.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	}
 
 	private function getAllPossiblePaths() {
-        return AmbiguityException::getAllPossiblePathsRec($this->paths);
+		return AmbiguityException::getAllPossiblePathsRec($this->paths);
 	}
 
 	private static function getAllPossiblePathsRec($sub_table_paths)

src/Mouf/Database/TDBM/TDBMObjectArray.php

Indentation +2 added lines, -2 removed lines

@@ -65,9 +65,9 @@
 	 * @param string $func_name
 	 * @param $values
 	 * @return array|void
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    public function __call($func_name, $values) {
+	public function __call($func_name, $values) {
 
 		if (strpos($func_name,"getarray_") === 0) {
 			$column = substr($func_name, 9);

src/Mouf/Database/TDBM/TDBMService.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Mouf\Utils\Cache\CacheInterface;
 use Mouf\Database\TDBM\Filters\FilterInterface;
 use Mouf\Database\DBConnection\ConnectionInterface;
-use Mouf\Database\DBConnection\DBConnectionException;
 use Mouf\Database\TDBM\Filters\OrFilter;
 use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
 

Indentation +80 added lines, -80 removed lines

@@ -545,45 +545,45 @@ 
 		}
 	}
 
-    /**
-     * This function removes the given object from the database. It will also remove all objects relied to the one given
-     * by parameter before all.
-     *
-     * Notice: if the object has a multiple primary key, the function will not work.
-     *
-     * @param TDBMObject $objToDelete
-     */
-    public function deleteCascade(TDBMObject $objToDelete) {
-        $this->deleteAllConstraintWithThisObject($objToDelete);
-        $this->deleteObject($objToDelete);
-    }
-
-    /**
-     * This function is used only in TDBMService (private function)
-     * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter
-     *
-     * @param TDBMObject $obj
-     * @return TDBMObjectArray
-     */
-    private function deleteAllConstraintWithThisObject(TDBMObject $obj) {
-        $tableFrom = $this->dbConnection->escapeDBItem($obj->_getDbTableName());
-        $constraints = $this->dbConnection->getConstraintsFromTable($tableFrom);
-        foreach ($constraints as $constraint) {
-            $tableTo = $this->dbConnection->escapeDBItem($constraint["table1"]);
-            $colFrom = $this->dbConnection->escapeDBItem($constraint["col2"]);
-            $colTo = $this->dbConnection->escapeDBItem($constraint["col1"]);
-            $idVarName = $this->dbConnection->escapeDBItem($obj->getPrimaryKey()[0]);
-            $idValue = $this->dbConnection->quoteSmart($obj->TDBMObject_id);
-            $sql = "SELECT DISTINCT ".$tableTo.".*"
-                    ." FROM ".$tableFrom
-                    ." LEFT JOIN ".$tableTo." ON ".$tableFrom.".".$colFrom." = ".$tableTo.".".$colTo
-                    ." WHERE ".$tableFrom.".".$idVarName."=".$idValue;
-            $result = $this->getObjectsFromSQL($constraint["table1"], $sql);
-            foreach ($result as $tdbmObj) {
-                $this->deleteCascade($tdbmObj);
-            }
-        }
-    }
+	/**
+	 * This function removes the given object from the database. It will also remove all objects relied to the one given
+	 * by parameter before all.
+	 *
+	 * Notice: if the object has a multiple primary key, the function will not work.
+	 *
+	 * @param TDBMObject $objToDelete
+	 */
+	public function deleteCascade(TDBMObject $objToDelete) {
+		$this->deleteAllConstraintWithThisObject($objToDelete);
+		$this->deleteObject($objToDelete);
+	}
+
+	/**
+	 * This function is used only in TDBMService (private function)
+	 * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter
+	 *
+	 * @param TDBMObject $obj
+	 * @return TDBMObjectArray
+	 */
+	private function deleteAllConstraintWithThisObject(TDBMObject $obj) {
+		$tableFrom = $this->dbConnection->escapeDBItem($obj->_getDbTableName());
+		$constraints = $this->dbConnection->getConstraintsFromTable($tableFrom);
+		foreach ($constraints as $constraint) {
+			$tableTo = $this->dbConnection->escapeDBItem($constraint["table1"]);
+			$colFrom = $this->dbConnection->escapeDBItem($constraint["col2"]);
+			$colTo = $this->dbConnection->escapeDBItem($constraint["col1"]);
+			$idVarName = $this->dbConnection->escapeDBItem($obj->getPrimaryKey()[0]);
+			$idValue = $this->dbConnection->quoteSmart($obj->TDBMObject_id);
+			$sql = "SELECT DISTINCT ".$tableTo.".*"
+					." FROM ".$tableFrom
+					." LEFT JOIN ".$tableTo." ON ".$tableFrom.".".$colFrom." = ".$tableTo.".".$colTo
+					." WHERE ".$tableFrom.".".$idVarName."=".$idValue;
+			$result = $this->getObjectsFromSQL($constraint["table1"], $sql);
+			foreach ($result as $tdbmObj) {
+				$this->deleteCascade($tdbmObj);
+			}
+		}
+	}
 
 	/**
 	 * The getObjectsFromSQL is used to retrieve objects from the database using a full SQL query.
@@ -644,7 +644,7 @@ 
 			}
 			$keysStandardCased = array();
 			$firstLine = true;
-            $colsArray = null;
+			$colsArray = null;
 			while ($fullCaseRow = $result->fetch(\PDO::FETCH_ASSOC))
 			{
 				$row = array();
@@ -676,17 +676,17 @@ 
 					$id = serialize($ids);
 				}
 
-                $obj = $this->objectStorage->get($table_name,$id);
+				$obj = $this->objectStorage->get($table_name,$id);
 				if ($obj === null)
 				{
 					if (!is_a($className, "Mouf\\Database\\TDBM\\TDBMObject", true)) {
 						throw new TDBMException("Error while calling TDBM: The class ".$className." should extend TDBMObject.");
 					}
 					$obj = new $className($this, $table_name, $id);
-                    $obj->loadFromRow($row, $colsArray);
-                    $this->objectStorage->set($table_name, $id, $obj);
+					$obj->loadFromRow($row, $colsArray);
+					$this->objectStorage->set($table_name, $id, $obj);
 				} elseif ($obj->_getStatus() == "not loaded") {
-                    $obj->loadFromRow($row, $colsArray);
+					$obj->loadFromRow($row, $colsArray);
 					// Check that the object fetched from cache is from the requested class.
 					if (!is_a($obj, $className)) {
 						throw new TDBMException("Error while calling TDBM: An object fetched from database is already present in TDBM cache and they do not share the same class. You requested the object to be of the class ".$className." but the object available locally is of the class ".get_class($obj).".");
@@ -719,7 +719,7 @@ 
 	private function getObjectsFromSQLGenerator($result, $table_name, $className, $sql) {
 		$keysStandardCased = array();
 		$firstLine = true;
-        $colsArray = null;
+		$colsArray = null;
 		while ($fullCaseRow = $result->fetch(\PDO::FETCH_ASSOC))
 		{
 			$row = array();
@@ -750,7 +750,7 @@ 
 				}
 				$id = serialize($ids);
 			}
-            $obj = $this->objectStorage->get($table_name, $id);
+			$obj = $this->objectStorage->get($table_name, $id);
 			if ($obj === null)
 			{
 				if ($className == null) {
@@ -763,10 +763,10 @@ 
 				} else {
 					throw new TDBMException("Error while casting TDBMObject to class, the parameter passed is not a string. Value passed: ".$className);
 				}
-                $obj->loadFromRow($row, $colsArray);
-                $this->objectStorage->set($table_name, $id, $obj);
+				$obj->loadFromRow($row, $colsArray);
+				$this->objectStorage->set($table_name, $id, $obj);
 			} elseif ($obj->_getStatus() == "not loaded") {
-                $obj->loadFromRow($row, $colsArray);
+				$obj->loadFromRow($row, $colsArray);
 				// Check that the object fetched from cache is from the requested class.
 				if ($className != null) {
 					if (!is_subclass_of(get_class($obj), $className) && get_class($obj) != $className) {
@@ -1466,33 +1466,33 @@ 
 		}
 
 		//If no $hint_path is provided, check that a path exists
-        if($hint_path === null){
-            // Now, for each needed table to perform the order by, we must verify if the relationship between the order by and the object is indeed a 1* relationship
-            foreach ($needed_table_array_for_orderby as $target_table_table) {
-                // Get the path between the main table and the target group by table
+		if($hint_path === null){
+			// Now, for each needed table to perform the order by, we must verify if the relationship between the order by and the object is indeed a 1* relationship
+			foreach ($needed_table_array_for_orderby as $target_table_table) {
+				// Get the path between the main table and the target group by table
 
-                // TODO! Pas bon!!!! Faut le quérir, hélas!
-                // Mais comment gérer ça sans plomber les perfs et en utilisant le path fourni?????
+				// TODO! Pas bon!!!! Faut le quérir, hélas!
+				// Mais comment gérer ça sans plomber les perfs et en utilisant le path fourni?????
 
-                $path = $this->getPathFromCache($table_name, $target_table_table);
+				$path = $this->getPathFromCache($table_name, $target_table_table);
 
-                /**********************************
+				/**********************************
                  * Modifier par Marc de *1 vers 1*
                  * (sur les conseils de David !)
                  */
-                $is_ok = true;
-                foreach ($path as $step) {
-                    if ($step["type"]=="1*") {
-                        $is_ok = false;
-                        break;
-                    }
-                }
-
-                if (!$is_ok) {
-                    throw new TDBMException("Error in querying database from getObjectsByFilter. You tried to order your data according to a column of the '$target_table_table' table. However, the '$target_table_table' table has a many to 1 relationship with the '$table_name' table. This means that one '$table_name' object can contain many '$target_table_table' objects. Therefore, trying to order '$table_name' objects using '$target_table_table' objects is meaningless and cannot be performed.");
-                }
-            }
-        }
+				$is_ok = true;
+				foreach ($path as $step) {
+					if ($step["type"]=="1*") {
+						$is_ok = false;
+						break;
+					}
+				}
+
+				if (!$is_ok) {
+					throw new TDBMException("Error in querying database from getObjectsByFilter. You tried to order your data according to a column of the '$target_table_table' table. However, the '$target_table_table' table has a many to 1 relationship with the '$table_name' table. This means that one '$table_name' object can contain many '$target_table_table' objects. Therefore, trying to order '$table_name' objects using '$target_table_table' objects is meaningless and cannot be performed.");
+				}
+			}
+		}
 
 		// In a SELECT DISTINCT ... ORDER BY ... clause, the orderbyed columns must appear!
 		// Therefore, we must be able to parse the Orderby columns requested, give them dummy names and remove them afterward!
@@ -1667,9 +1667,9 @@ 
 	 * Throws a TDBMException if one of those table does not exist.
 	 *
 	 * @param array $tables
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    private function checkTablesExist($tables) {
+	private function checkTablesExist($tables) {
 		foreach ($tables as $table) {
 			$possible_tables = $this->dbConnection->checkTableExist($table);
 			if ($possible_tables !== true)
@@ -1742,12 +1742,12 @@ 
 	 * This function returns the HTML to draw a tree of DisplayNode.
 	 *
 	 * @param DisplayNode $tree
-     * @param int $x
-     * @param int $y
-     * @param int $ret_width
-     * @param int $ret_height
-     *
-     * @return string
+	 * @param int $x
+	 * @param int $y
+	 * @param int $ret_width
+	 * @param int $ret_height
+	 *
+	 * @return string
 	 */
 	public function drawTree($tree, $x, $y, &$ret_width=0, &$ret_height=0) {
 
@@ -1861,8 +1861,8 @@ 
 	}
 
 	/**
- 	* @param array<string, string> $tableToBeanMap
- 	*/
+	 * @param array<string, string> $tableToBeanMap
+	 */
 	public function setTableToBeanMap(array $tableToBeanMap) {
 		$this->tableToBeanMap = $tableToBeanMap;
 	}

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

Indentation +3 added lines, -3 removed lines

@@ -65,10 +65,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";
@@ -150,7 +150,7 @@ 
 		
 		$tdbmService = new InstanceProxy($name);
 		/* @var $tdbmService TDBMService */
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $keepSupport, $storeInUtc, $castDatesToDateTime);
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $keepSupport, $storeInUtc, $castDatesToDateTime);
 
 
 		$moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);

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

Indentation +4 added lines, -4 removed lines

@@ -98,8 +98,8 @@ 
 	 * 
 	 * @param string $tableName
 	 * @param string $columnName
-     * @param string $value1
-     * @param string $value2
+	 * @param string $value1
+	 * @param string $value2
 	 */
 	public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) {
 		$this->tableName = $tableName;
@@ -113,9 +113,9 @@ 
 	 *
 	 * @param ConnectionInterface $dbConnection
 	 * @return string
-     * @throws \Mouf\Database\TDBM\TDBMException
+	 * @throws \Mouf\Database\TDBM\TDBMException
 	 */
-    public function toSql(ConnectionInterface $dbConnection) {
+	public function toSql(ConnectionInterface $dbConnection) {
 		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
 			return "";
 		}

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

Indentation +10 added lines, -10 removed lines

@@ -9,14 +9,14 @@
  */
 class FilterUtils
 {
-    /**
-     * @param string|null|DateTimeInterface $value
-     */
-    public static function valueToSql($value, ConnectionInterface $dbConnection) {
-        if ($value instanceof DateTimeInterface) {
-            return "'".$value->format('Y-m-d H:i:s')."'";
-        } else {
-            return $dbConnection->quoteSmart($value);
-        }
-    }
+	/**
+	 * @param string|null|DateTimeInterface $value
+	 */
+	public static function valueToSql($value, ConnectionInterface $dbConnection) {
+		if ($value instanceof DateTimeInterface) {
+			return "'".$value->format('Y-m-d H:i:s')."'";
+		} else {
+			return $dbConnection->quoteSmart($value);
+		}
+	}
 }

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

Indentation +20 added lines, -20 removed lines

@@ -68,9 +68,9 @@ 
 	 *
 	 * @param ConnectionInterface $dbConnection
 	 * @return string
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    public function toSql(ConnectionInterface $dbConnection) {
+	public function toSql(ConnectionInterface $dbConnection) {
 		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
 			return "";
 		}
@@ -102,22 +102,22 @@ 
 	 *
 	 * @return array<string>
 	 */
-    public function getUsedTables() {
-        if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
-            return array();
-        }
-
-        $tables = array();
-        foreach ($this->filters as $filter) {
-
-            if (!$filter instanceof FilterInterface) {
-                throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
-            }
-
-            $tables = array_merge($tables,$filter->getUsedTables());
-        }
-        // Remove tables in double.
-        $tables = array_flip(array_flip($tables));
-        return $tables;
-    }
+	public function getUsedTables() {
+		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
+			return array();
+		}
+
+		$tables = array();
+		foreach ($this->filters as $filter) {
+
+			if (!$filter instanceof FilterInterface) {
+				throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
+			}
+
+			$tables = array_merge($tables,$filter->getUsedTables());
+		}
+		// Remove tables in double.
+		$tables = array_flip(array_flip($tables));
+		return $tables;
+	}
 }