thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Doc Comments +1 added lines, -1 removed lines

@@ -515,7 +515,7 @@
 	/**
 	 * Returns the tables used in the filter in an array.
 	 *
-	 * @return array<string>
+	 * @return integer[]
 	 */
 	public function getUsedTables() {
 		return array_keys($this->dbRows);

Indentation +17 added lines, -17 removed lines

@@ -547,23 +547,23 @@
 		return $sql_where;
 	}
 
-    /**
-     * Override the native php clone function for TDBMObjects
-     */
-    public function __clone(){
-        $this->_dbLoadIfNotLoaded();
-        //First lets set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-
-        // Add the current TDBMObject to the save object list
-        $this->tdbmService->_addToToSaveObjectList($this);
-
-        //Now unset the PK from the row
-        $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
-        foreach ($pk_array as $pk) {
-            $this->dbRow[$pk] = null;
-        }
-    }
+	/**
+	 * Override the native php clone function for TDBMObjects
+	 */
+	public function __clone(){
+		$this->_dbLoadIfNotLoaded();
+		//First lets set the status to new (to enter the save function)
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+
+		// Add the current TDBMObject to the save object list
+		$this->tdbmService->_addToToSaveObjectList($this);
+
+		//Now unset the PK from the row
+		$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
+		foreach ($pk_array as $pk) {
+			$this->dbRow[$pk] = null;
+		}
+	}
 
 	/**
 	 * Returns raw database rows.

Spacing +16 added lines, -16 removed lines

@@ -95,7 +95,7 @@ 
 	 * @throws TDBMException
 	 * @throws TDBMInvalidOperationException
 	 */
-	public function __construct($tableName=null, array $primaryKeys=array(), TDBMService $tdbmService=null) {
+	public function __construct($tableName = null, array $primaryKeys = array(), TDBMService $tdbmService = null) {
 		// FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
 		if (!empty($tableName)) {
 			$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
@@ -199,7 +199,7 @@ 
 	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
 	 * @param string $state
 	 */
-	public function _setStatus($state){
+	public function _setStatus($state) {
 		$this->status = $state;
 
 		// TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
@@ -210,7 +210,7 @@ 
 
 	public function get($var, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -236,7 +236,7 @@ 
 	 */
 	public function has($var, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -256,7 +256,7 @@ 
 	
 	public function set($var, $value, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -281,7 +281,7 @@ 
 	 */
 	public function setRef($foreignKeyName, AbstractTDBMObject $bean, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -306,7 +306,7 @@ 
 	 */
 	public function getRef($foreignKeyName, $tableName = null) {
 		if ($tableName === null) {
-			if (count($this->dbRows) > 1) {
+			if (count($this->dbRows)>1) {
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
 			} elseif (count($this->dbRows) === 1) {
 				$tableName = array_keys($this->dbRows)[0];
@@ -421,13 +421,13 @@ 
 	 */
 	private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status) {
 		$storage = $this->getRelationshipStorage($pivotTableName);
-		$storage->attach($remoteBean, [ 'status' => $status, 'reverse' => false ]);
+		$storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
 		if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
 			$this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
 		}
 
 		$remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
-		$remoteStorage->attach($this, [ 'status' => $status, 'reverse' => true ]);
+		$remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
 	}
 
 	/**
@@ -496,7 +496,7 @@ 
 	 * Implement the unique JsonSerializable method
 	 * @return array
 	 */
-	public function jsonSerialize(){
+	public function jsonSerialize() {
 		// FIXME
 		$this->_dbLoadIfNotLoaded();
 		return $this->dbRow;
@@ -526,23 +526,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function getPrimaryKeyWhereStatement () {
+	private function getPrimaryKeyWhereStatement() {
 		// Let's first get the primary keys
 		$pk_table = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
 		// Now for the object_id
 		$object_id = $this->TDBMObject_id;
 		// If there is only one primary key:
-		if (count($pk_table)==1) {
+		if (count($pk_table) == 1) {
 			$sql_where = $this->db_connection->escapeDBItem($this->dbTableName).'.'.$this->db_connection->escapeDBItem($pk_table[0])."=".$this->db_connection->quoteSmart($this->TDBMObject_id);
 		} else {
 			$ids = unserialize($object_id);
-			$i=0;
+			$i = 0;
 			$sql_where_array = array();
 			foreach ($pk_table as $pk) {
 				$sql_where_array[] = $this->db_connection->escapeDBItem($this->dbTableName).'.'.$this->db_connection->escapeDBItem($pk)."=".$this->db_connection->quoteSmart($ids[$i]);
 				$i++;
 			}
-			$sql_where = implode(" AND ",$sql_where_array);
+			$sql_where = implode(" AND ", $sql_where_array);
 		}
 		return $sql_where;
 	}
@@ -550,7 +550,7 @@ 
     /**
      * Override the native php clone function for TDBMObjects
      */
-    public function __clone(){
+    public function __clone() {
         $this->_dbLoadIfNotLoaded();
         //First lets set the status to new (to enter the save function)
         $this->status = TDBMObjectStateEnum::STATE_NEW;
@@ -577,7 +577,7 @@ 
 	private function registerTable($tableName) {
 		$dbRow = new DbRow($this, $tableName);
 
-		if (in_array($this->status, [ TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY ])) {
+		if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
 			// Let's get the primary key for the new table
 			$anotherDbRow = array_values($this->dbRows)[0];
 			/* @var $anotherDbRow DbRow */

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

Doc Comments +3 added lines, -2 removed lines

@@ -138,9 +138,7 @@ 
 	 * @Action
 	 * @param string $daonamespace
 	 * @param string $beannamespace
-	 * @param int $keepSupport
 	 * @param int $storeInUtc
-	 * @param int $castDatesToDateTime
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
@@ -168,6 +166,9 @@ 
 	
 	protected $errorMsg;
 	
+	/**
+	 * @param string $msg
+	 */
 	private function displayErrorMsg($msg) {
 		$this->errorMsg = $msg;
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);

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

@@ -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") {

Spacing +1 added lines, -1 removed lines

@@ -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/DbRow.php

Doc Comments +1 added lines, -1 removed lines

@@ -328,7 +328,7 @@
 	/**
 	 * Returns the tables used in the filter in an array.
 	 *
-	 * @return array<string>
+	 * @return string[]
 	 */
 	public function getUsedTables() {
 		return array($this->dbTableName);

Indentation +60 added lines, -60 removed lines

@@ -249,36 +249,36 @@ 
 	public function setRef($foreignKeyName, AbstractTDBMObject $bean = null) {
 		$this->references[$foreignKeyName] = $bean;
 
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
 	}
 
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     * @return AbstractTDBMObject|null
-     */
-    public function getRef($foreignKeyName) {
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 * @return AbstractTDBMObject|null
+	 */
+	public function getRef($foreignKeyName) {
 		if (isset($this->references[$foreignKeyName])) {
 			return $this->references[$foreignKeyName];
 		} elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
-            // If the object is new and has no property, then it has to be empty.
-            return null;
-        } else {
-            $this->_dbLoadIfNotLoaded();
+			// If the object is new and has no property, then it has to be empty.
+			return null;
+		} else {
+			$this->_dbLoadIfNotLoaded();
 
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
 
-            $values = [];
-            foreach ($fk->getLocalColumns() as $column) {
-                $values[] = $this->dbRow[$column];
-            }
+			$values = [];
+			foreach ($fk->getLocalColumns() as $column) {
+				$values[] = $this->dbRow[$column];
+			}
 
-            $filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
+			$filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
 
-            return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
+			return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
 		}
 	}
 
@@ -334,23 +334,23 @@ 
 		return array($this->dbTableName);
 	}
 
-    /**
-     * Override the native php clone function for TDBMObjects
-     */
-    public function __clone(){
-        $this->_dbLoadIfNotLoaded();
-        //First lets set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
+	/**
+	 * Override the native php clone function for TDBMObjects
+	 */
+	public function __clone(){
+		$this->_dbLoadIfNotLoaded();
+		//First lets set the status to new (to enter the save function)
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
 
-        // Add the current TDBMObject to the save object list
-        $this->tdbmService->_addToToSaveObjectList($this);
+		// Add the current TDBMObject to the save object list
+		$this->tdbmService->_addToToSaveObjectList($this);
 
-        //Now unset the PK from the row
-        $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
-        foreach ($pk_array as $pk) {
-            $this->dbRow[$pk] = null;
-        }
-    }
+		//Now unset the PK from the row
+		$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
+		foreach ($pk_array as $pk) {
+			$this->dbRow[$pk] = null;
+		}
+	}
 
 	/**
 	 * Returns raw database row.
@@ -358,35 +358,35 @@ 
 	 * @return array
 	 */
 	public function _getDbRow() {
-        // Let's merge $dbRow and $references
-        $dbRow = $this->dbRow;
-
-        foreach ($this->references as $foreignKeyName => $reference) {
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-            $refDbRows = $reference->_getDbRows();
-            $firstRefDbRow = reset($refDbRows);
-            $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
-            $localColumns = $fk->getLocalColumns();
-
-            for ($i=0, $count=count($localColumns); $i<$count; $i++) {
-                $dbRow[$localColumns[$i]] = $pkValues[$i];
-            }
-        }
+		// Let's merge $dbRow and $references
+		$dbRow = $this->dbRow;
+
+		foreach ($this->references as $foreignKeyName => $reference) {
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+			$refDbRows = $reference->_getDbRows();
+			$firstRefDbRow = reset($refDbRows);
+			$pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
+			$localColumns = $fk->getLocalColumns();
+
+			for ($i=0, $count=count($localColumns); $i<$count; $i++) {
+				$dbRow[$localColumns[$i]] = $pkValues[$i];
+			}
+		}
 
 		return $dbRow;
 	}
 
-    /**
-     * Returns references array.
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getReferences() {
-        return $this->references;
-    }
+	/**
+	 * Returns references array.
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getReferences() {
+		return $this->references;
+	}
 
-    /**
+	/**
 	 * @return array
 	 */
 	public function _getPrimaryKeys()

Spacing +6 added lines, -6 removed lines

@@ -94,7 +94,7 @@ 
 	 * @throws TDBMException
 	 * @throws TDBMInvalidOperationException
 	 */
-	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys=array(), TDBMService $tdbmService=null, array $dbRow = array()) {
+	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array()) {
 		$this->object = $object;
 		$this->dbTableName = $table_name;
 
@@ -141,7 +141,7 @@ 
 	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
 	 * @param string $state
 	 */
-	public function _setStatus($state){
+	public function _setStatus($state) {
 		$this->status = $state;
 	}
 
@@ -163,7 +163,7 @@ 
 			$sql = "SELECT * FROM ".$connection->quoteIdentifier($this->dbTableName)." WHERE ".$sql_where;
 			$result = $connection->executeQuery($sql, $parameters);
 
-			if ($result->rowCount()==0)
+			if ($result->rowCount() == 0)
 			{
 				throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" with ID \"".$this->TDBMObject_id."\".");
 			}
@@ -310,7 +310,7 @@ 
 	 * Implement the unique JsonSerializable method
 	 * @return array
 	 */
-	public function jsonSerialize(){
+	public function jsonSerialize() {
 		$this->_dbLoadIfNotLoaded();
 		return $this->dbRow;
 	}
@@ -337,7 +337,7 @@ 
     /**
      * Override the native php clone function for TDBMObjects
      */
-    public function __clone(){
+    public function __clone() {
         $this->_dbLoadIfNotLoaded();
         //First lets set the status to new (to enter the save function)
         $this->status = TDBMObjectStateEnum::STATE_NEW;
@@ -369,7 +369,7 @@ 
             $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
             $localColumns = $fk->getLocalColumns();
 
-            for ($i=0, $count=count($localColumns); $i<$count; $i++) {
+            for ($i = 0, $count = count($localColumns); $i<$count; $i++) {
                 $dbRow[$localColumns[$i]] = $pkValues[$i];
             }
         }

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

Unused Use Statements -2 removed lines

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

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 = '';

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
 	 * 
 	 * @param string $sqlString
 	 */
-	public function __construct($sqlString=null) {
+	public function __construct($sqlString = null) {
 		$this->sqlString = $sqlString;
 	}
 	
@@ -86,8 +86,8 @@ 
 			$result = -1;
 			while (true) {
 				$result = strrpos($phrase, "'", $result+1);
-				if ($result===false) {
-					if ($sentence!='')
+				if ($result === false) {
+					if ($sentence != '')
 					$sentence .= ',';
 					$sentence .= $phrase;
 
@@ -102,7 +102,7 @@ 
 				else
 				{
 					$valid_result = true;
-					if ($result>0 && $phrase{$result-1}=='\\') {
+					if ($result>0 && $phrase{$result-1} == '\\') {
 						$valid_result = false;
 					}
 					if ($valid_result)
@@ -128,7 +128,7 @@ 
 		// First, let's remove all the stuff in quotes:
 
 		// Let's remove all the \' found
-		$work_str = str_replace("\\'",'',$this->sqlString);
+		$work_str = str_replace("\\'", '', $this->sqlString);
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
@@ -136,7 +136,7 @@ 
 		    return '';
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'") === 0)
+		if (strstr($work_str, "'") === 0)
 		    array_shift($work_table);
 			
 		if (count($work_table) == 0)
@@ -147,13 +147,13 @@ 
 
 		$i = 0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
+			if (($i%2) == 0)
 			$work_str2 .= $str_fragment.' ';
 			$i++;
 		}
 
 		// Now, let's run a regexp to find all the strings matching the pattern xxx.yyy
-		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2,$capture_result);
+		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2, $capture_result);
 
 		$tables_used = $capture_result[1];
 		// remove doubles:

Braces +19 added lines, -14 removed lines

@@ -87,8 +87,9 @@ 
 			while (true) {
 				$result = strrpos($phrase, "'", $result+1);
 				if ($result===false) {
-					if ($sentence!='')
-					$sentence .= ',';
+					if ($sentence!='') {
+										$sentence .= ',';
+					}
 					$sentence .= $phrase;
 
 					if ($is_inside_quotes) {
@@ -98,15 +99,15 @@ 
 						$sentence = '';
 						break;
 					}
-				}
-				else
+				} else
 				{
 					$valid_result = true;
 					if ($result>0 && $phrase{$result-1}=='\\') {
 						$valid_result = false;
 					}
-					if ($valid_result)
-					$is_inside_quotes = !$is_inside_quotes;
+					if ($valid_result) {
+										$is_inside_quotes = !$is_inside_quotes;
+					}
 				}
 			}
 
@@ -132,23 +133,27 @@ 
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table) == 0)
-		    return '';
+		if (count($work_table) == 0) {
+				    return '';
+		}
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'") === 0)
-		    array_shift($work_table);
+		if (strstr($work_str,"'") === 0) {
+				    array_shift($work_table);
+		}
 			
-		if (count($work_table) == 0)
-		    return '';
+		if (count($work_table) == 0) {
+				    return '';
+		}
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
 		$i = 0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
-			$work_str2 .= $str_fragment.' ';
+			if (($i % 2) == 0) {
+						$work_str2 .= $str_fragment.' ';
+			}
 			$i++;
 		}
 

src/Mouf/Database/TDBM/InnerResultIterator.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace Mouf\Database\TDBM;
 
-use Doctrine\DBAL\Driver\Connection;
 use Doctrine\DBAL\Statement;
 use Mouf\Database\MagicQuery;
 

src/Mouf/Database/TDBM/MapIterator.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     protected $callable;
 
     /**
-     * @param $iterator Iterator|array
+     * @param InnerResultIterator $iterator Iterator|array
      * @param $callable callable This can have two parameters
      * @throws Exception
      */

Indentation +71 added lines, -71 removed lines

@@ -7,85 +7,85 @@
  */
 class MapIterator implements \Iterator {
 
-    /**
-     * @var Iterator
-     */
-    protected $iterator;
+	/**
+	 * @var Iterator
+	 */
+	protected $iterator;
 
-    /**
-     * @var callable Modifies the current item in iterator
-     */
-    protected $callable;
+	/**
+	 * @var callable Modifies the current item in iterator
+	 */
+	protected $callable;
 
-    /**
-     * @param $iterator Iterator|array
-     * @param $callable callable This can have two parameters
-     * @throws Exception
-     */
-    public function __construct($iterator, callable $callable) {
-        if (is_array($iterator)) {
-            $this->iterator = new \ArrayIterator($iterator);
-        }
-        elseif (!($iterator instanceof \Iterator))
-        {
-            throw new TDBMException("\$iterator parameter must be an instance of Iterator");
-        }
-        else
-        {
-            $this->iterator = $iterator;
-        }
+	/**
+	 * @param $iterator Iterator|array
+	 * @param $callable callable This can have two parameters
+	 * @throws Exception
+	 */
+	public function __construct($iterator, callable $callable) {
+		if (is_array($iterator)) {
+			$this->iterator = new \ArrayIterator($iterator);
+		}
+		elseif (!($iterator instanceof \Iterator))
+		{
+			throw new TDBMException("\$iterator parameter must be an instance of Iterator");
+		}
+		else
+		{
+			$this->iterator = $iterator;
+		}
 
-        if ($callable instanceof \Closure) {
-            // make sure there's one argument
-            $reflection = new \ReflectionObject($callable);
-            if ($reflection->hasMethod('__invoke')) {
-                $method = $reflection->getMethod('__invoke');
-                if ($method->getNumberOfParameters() !== 1) {
-                    throw new TDBMException("\$callable must accept one and only one parameter.");
-                }
-            }
-        }
+		if ($callable instanceof \Closure) {
+			// make sure there's one argument
+			$reflection = new \ReflectionObject($callable);
+			if ($reflection->hasMethod('__invoke')) {
+				$method = $reflection->getMethod('__invoke');
+				if ($method->getNumberOfParameters() !== 1) {
+					throw new TDBMException("\$callable must accept one and only one parameter.");
+				}
+			}
+		}
 
-        $this->callable = $callable;
-    }
+		$this->callable = $callable;
+	}
 
-    /**
-     * Alters the current item with $this->callable and returns a new item.
-     * Be careful with your types as we can't do static type checking here!
-     * @return mixed
-     */
-    public function current()
-    {
-        $callable = $this->callable;
-        return $callable($this->iterator->current());
-    }
+	/**
+	 * Alters the current item with $this->callable and returns a new item.
+	 * Be careful with your types as we can't do static type checking here!
+	 * @return mixed
+	 */
+	public function current()
+	{
+		$callable = $this->callable;
+		return $callable($this->iterator->current());
+	}
 
-    public function next()
-    {
-        $this->iterator->next();
-    }
+	public function next()
+	{
+		$this->iterator->next();
+	}
 
-    public function key()
-    {
-        return $this->iterator->key();
-    }
+	public function key()
+	{
+		return $this->iterator->key();
+	}
 
-    public function valid()
-    {
-        return $this->iterator->valid();
-    }
+	public function valid()
+	{
+		return $this->iterator->valid();
+	}
 
-    public function rewind()
-    {
-        $this->iterator->rewind();
-    }
+	public function rewind()
+	{
+		$this->iterator->rewind();
+	}
 
-    /**
-     * Casts the iterator to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray() {
-        return iterator_to_array($this);
-    }
+	/**
+	 * Casts the iterator to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray() {
+		return iterator_to_array($this);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -25,12 +25,10 @@
     public function __construct($iterator, callable $callable) {
         if (is_array($iterator)) {
             $this->iterator = new \ArrayIterator($iterator);
-        }
-        elseif (!($iterator instanceof \Iterator))
+        } elseif (!($iterator instanceof \Iterator))
         {
             throw new TDBMException("\$iterator parameter must be an instance of Iterator");
-        }
-        else
+        } else
         {
             $this->iterator = $iterator;
         }

src/Mouf/Database/TDBM/PageIterator.php

Doc Comments +4 added lines, -1 removed lines

@@ -63,6 +63,9 @@ 
 
 	private $innerResultIterator;
 
+	/**
+	 * @param integer $offset
+	 */
 	public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
 	{
 		$this->parentResult = $parentResult;
@@ -108,7 +111,7 @@ 
 	}
 
 	/**
-	 * @return int
+	 * @return double
 	 */
 	public function getCurrentPage()
 	{

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace Mouf\Database\TDBM;
 
-use Doctrine\DBAL\Driver\Connection;
 use Doctrine\DBAL\Statement;
 use Mouf\Database\MagicQuery;
 use Porpaginas\Page;

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	 */
 	public function getCurrentPage()
 	{
-		return floor($this->offset / $this->limit) + 1;
+		return floor($this->offset/$this->limit)+1;
 	}
 
 	/**

src/Mouf/Database/TDBM/ResultIterator.php

Doc Comments +7 added lines

@@ -70,6 +70,12 @@ 
 
 	private $mode;
 	
+	/**
+	 * @param string $magicSql
+	 * @param string $magicSqlCount
+	 * @param WeakrefObjectStorage $objectStorage
+	 * @param string|null $className
+	 */
 	public function __construct($magicSql, $magicSqlCount, array $parameters, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
 	{
 		$this->magicSql = $magicSql;
@@ -166,6 +172,7 @@ 
 
 	/**
 	 * @param int $offset
+	 * @param integer $limit
 	 * @return PageIterator
 	 */
 	public function take($offset, $limit)

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace Mouf\Database\TDBM;
 
-use Doctrine\DBAL\Driver\Connection;
 use Doctrine\DBAL\Statement;
 use Mouf\Database\MagicQuery;
 use Porpaginas\Result;

src/Mouf/Database/TDBM/TDBMObject.php

Doc Comments +7 added lines

@@ -35,6 +35,9 @@ 
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
 {
 
+    /**
+     * @param string $var
+     */
     public function __get($var)
     {
         return $this->get($var);
@@ -51,6 +54,10 @@ 
         return $this->has($var);
     }
 
+    /**
+     * @param string $var
+     * @param string|null $value
+     */
     public function __set($var, $value)
     {
         $this->set($var, $value);

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

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
     public function rewind()
     {
         $this->_dbLoadIfNotLoaded();
-        if (count($this->dbRow) > 0) {
+        if (count($this->dbRow)>0) {
             $this->_validIterator = true;
         } else {
             $this->_validIterator = false;