@@ -77,7 +77,7 @@ |
||
77 | 77 | |
78 | 78 | |
79 | 79 | private function toIndex($offset) { |
80 | - if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
80 | + if ($offset<0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
81 | 81 | throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.'); |
82 | 82 | } |
83 | 83 | if ($this->statement === null) { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | <div class="control-group"> |
30 | 30 | <label class="control-label">Store dates / timestamps in UTC:</label> |
31 | 31 | <div class="controls"> |
32 | - <input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc?'checked="checked"':"" ?>></input> |
|
32 | + <input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc ? 'checked="checked"' : "" ?>></input> |
|
33 | 33 | <span class="help-block">Select this option if you want timestamps to be stored in UTC. |
34 | 34 | If your application supports several time zones, you should select this option to store all dates in |
35 | 35 | the same time zone.</span> |
@@ -699,9 +699,9 @@ discard block |
||
699 | 699 | // 4-2, let's take all the objects out of the orderby bag, and let's make objects from them |
700 | 700 | $orderby_bag2 = array(); |
701 | 701 | foreach ($orderby_bag as $thing) { |
702 | - if (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) { |
|
702 | + if (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) { |
|
703 | 703 | $orderby_bag2[] = $thing; |
704 | - } elseif (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) { |
|
704 | + } elseif (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) { |
|
705 | 705 | $orderby_bag2[] = $thing; |
706 | 706 | } elseif (is_string($thing)) { |
707 | 707 | $orderby_bag2[] = new OrderBySQLString($thing); |
@@ -1204,7 +1204,7 @@ discard block |
||
1204 | 1204 | $schemaAnalyzer = $this->schemaAnalyzer; |
1205 | 1205 | |
1206 | 1206 | foreach ($tables as $currentTable) { |
1207 | - $allParents = [ $currentTable ]; |
|
1207 | + $allParents = [$currentTable]; |
|
1208 | 1208 | $currentFk = null; |
1209 | 1209 | while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) { |
1210 | 1210 | $currentTable = $currentFk->getForeignTableName(); |
@@ -1246,7 +1246,7 @@ discard block |
||
1246 | 1246 | // Let's scan the parent tables |
1247 | 1247 | $currentTable = $table; |
1248 | 1248 | |
1249 | - $parentTables = [ ]; |
|
1249 | + $parentTables = []; |
|
1250 | 1250 | |
1251 | 1251 | // Get parent relationship |
1252 | 1252 | while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) { |
@@ -1336,7 +1336,7 @@ discard block |
||
1336 | 1336 | * @return ResultIterator An object representing an array of results. |
1337 | 1337 | * @throws TDBMException |
1338 | 1338 | */ |
1339 | - public function findObjects($mainTable, $filter=null, array $parameters = array(), $orderString=null, array $additionalTablesFetch = array(), $mode = null, $className=null) { |
|
1339 | + public function findObjects($mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, $className = null) { |
|
1340 | 1340 | // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection. |
1341 | 1341 | if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) { |
1342 | 1342 | throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable)); |
@@ -1405,7 +1405,7 @@ discard block |
||
1405 | 1405 | throw new TDBMException("Unknown fetch mode: '".$this->mode."'"); |
1406 | 1406 | } |
1407 | 1407 | |
1408 | - $mode = $mode?:$this->mode; |
|
1408 | + $mode = $mode ?: $this->mode; |
|
1409 | 1409 | |
1410 | 1410 | return new ResultIterator($sql, $countSql, $parameters, $columnDescList, $this->objectStorage, $className, $this, $this->magicQuery, $mode); |
1411 | 1411 | } |
@@ -1419,7 +1419,7 @@ discard block |
||
1419 | 1419 | * @return AbstractTDBMObject |
1420 | 1420 | * @throws TDBMException |
1421 | 1421 | */ |
1422 | - public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className=null) { |
|
1422 | + public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className = null) { |
|
1423 | 1423 | $primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys); |
1424 | 1424 | $hash = $this->getObjectHash($primaryKeys); |
1425 | 1425 | |
@@ -1439,7 +1439,7 @@ discard block |
||
1439 | 1439 | // Only allowed if no inheritance. |
1440 | 1440 | if (count($tables) === 1) { |
1441 | 1441 | if ($className === null) { |
1442 | - $className = isset($this->tableToBeanMap[$table])?$this->tableToBeanMap[$table]:"Mouf\\Database\\TDBM\\TDBMObject"; |
|
1442 | + $className = isset($this->tableToBeanMap[$table]) ? $this->tableToBeanMap[$table] : "Mouf\\Database\\TDBM\\TDBMObject"; |
|
1443 | 1443 | } |
1444 | 1444 | |
1445 | 1445 | // Let's construct the bean |
@@ -1468,11 +1468,11 @@ discard block |
||
1468 | 1468 | * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters. |
1469 | 1469 | * @throws TDBMException |
1470 | 1470 | */ |
1471 | - public function findObject($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) { |
|
1471 | + public function findObject($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) { |
|
1472 | 1472 | $objects = $this->findObjects($mainTable, $filterString, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className); |
1473 | 1473 | $page = $objects->take(0, 2); |
1474 | 1474 | $count = $page->count(); |
1475 | - if ($count > 1) { |
|
1475 | + if ($count>1) { |
|
1476 | 1476 | 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."); |
1477 | 1477 | } elseif ($count === 0) { |
1478 | 1478 | return null; |
@@ -1492,7 +1492,7 @@ discard block |
||
1492 | 1492 | * @return AbstractTDBMObject The object we want |
1493 | 1493 | * @throws TDBMException |
1494 | 1494 | */ |
1495 | - public function findObjectOrFail($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) { |
|
1495 | + public function findObjectOrFail($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) { |
|
1496 | 1496 | $bean = $this->findObject($mainTable, $filterString, $parameters, $additionalTablesFetch, $className); |
1497 | 1497 | if ($bean === null) { |
1498 | 1498 | throw new NoBeanFoundException("No result found for query on table '".$mainTable."'"); |