thecodingmachine / database.tdbm

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

src/views/tdbmGenerate.php

Spacing +1 added lines, -1 removed lines

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

src/Mouf/Database/TDBM/TDBMService.php

Spacing +11 added lines, -11 removed lines

@@ -699,9 +699,9 @@ 
 		// 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
 		$orderby_bag2 = array();
 		foreach ($orderby_bag as $thing) {
-			if (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
+			if (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
 				$orderby_bag2[] = $thing;
-			} elseif (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
+			} elseif (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
 				$orderby_bag2[] = $thing;
 			} elseif (is_string($thing)) {
 				$orderby_bag2[] = new OrderBySQLString($thing);
@@ -1204,7 +1204,7 @@ 
 		$schemaAnalyzer = $this->schemaAnalyzer;
 
 		foreach ($tables as $currentTable) {
-			$allParents = [ $currentTable ];
+			$allParents = [$currentTable];
 			$currentFk = null;
 			while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
 				$currentTable = $currentFk->getForeignTableName();
@@ -1246,7 +1246,7 @@ 
 		// Let's scan the parent tables
 		$currentTable = $table;
 
-		$parentTables = [ ];
+		$parentTables = [];
 
 		// Get parent relationship
 		while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
@@ -1336,7 +1336,7 @@ 
 	 * @return ResultIterator An object representing an array of results.
 	 * @throws TDBMException
 	 */
-	public function findObjects($mainTable, $filter=null, array $parameters = array(), $orderString=null, array $additionalTablesFetch = array(), $mode = null, $className=null) {
+	public function findObjects($mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, $className = null) {
 		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
 		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
 			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
@@ -1405,7 +1405,7 @@ 
 			throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
 		}
 
-		$mode = $mode?:$this->mode;
+		$mode = $mode ?: $this->mode;
 
 		return new ResultIterator($sql, $countSql, $parameters, $columnDescList, $this->objectStorage, $className, $this, $this->magicQuery, $mode);
 	}
@@ -1419,7 +1419,7 @@ 
 	 * @return AbstractTDBMObject
 	 * @throws TDBMException
 	 */
-	public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className=null) {
+	public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className = null) {
 		$primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
 		$hash = $this->getObjectHash($primaryKeys);
 
@@ -1439,7 +1439,7 @@ 
 			// Only allowed if no inheritance.
 			if (count($tables) === 1) {
 				if ($className === null) {
-					$className = isset($this->tableToBeanMap[$table])?$this->tableToBeanMap[$table]:"Mouf\\Database\\TDBM\\TDBMObject";
+					$className = isset($this->tableToBeanMap[$table]) ? $this->tableToBeanMap[$table] : "Mouf\\Database\\TDBM\\TDBMObject";
 				}
 
 				// Let's construct the bean
@@ -1468,11 +1468,11 @@ 
 	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters.
 	 * @throws TDBMException
 	 */
-	public function findObject($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
+	public function findObject($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
 		$objects = $this->findObjects($mainTable, $filterString, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
 		$page = $objects->take(0, 2);
 		$count = $page->count();
-		if ($count > 1) {
+		if ($count>1) {
 			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
 		} elseif ($count === 0) {
 			return null;
@@ -1492,7 +1492,7 @@ 
 	 * @return AbstractTDBMObject The object we want
 	 * @throws TDBMException
 	 */
-	public function findObjectOrFail($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
+	public function findObjectOrFail($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
 		$bean = $this->findObject($mainTable, $filterString, $parameters, $additionalTablesFetch, $className);
 		if ($bean === null) {
 			throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Spacing +15 added lines, -15 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];
@@ -422,13 +422,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]);
 	}
 
 	/**
@@ -516,23 +516,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;
 	}
@@ -540,7 +540,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;
@@ -567,7 +567,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 */