@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | { |
66 | 66 | // First, are there many column or only one? |
67 | 67 | // If one column, we name the setter after it. Otherwise, we name the setter after the table name |
68 | - if (count($this->foreignKey->getLocalColumns()) > 1) { |
|
68 | + if (count($this->foreignKey->getLocalColumns())>1) { |
|
69 | 69 | $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName())); |
70 | 70 | if ($this->alternativeName) { |
71 | 71 | $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns()); |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | if (strpos(strtolower($column), 'id_') === 0) { |
79 | 79 | $column = substr($column, 3); |
80 | 80 | } |
81 | - if (strrpos(strtolower($column), '_id') === strlen($column) - 3) { |
|
82 | - $column = substr($column, 0, strlen($column) - 3); |
|
81 | + if (strrpos(strtolower($column), '_id') === strlen($column)-3) { |
|
82 | + $column = substr($column, 0, strlen($column)-3); |
|
83 | 83 | } |
84 | 84 | $name = TDBMDaoGenerator::toCamelCase($column); |
85 | 85 | if ($this->alternativeName) { |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | private function toIndex($offset) |
85 | 85 | { |
86 | - if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
86 | + if ($offset<0 || filter_var($offset, FILTER_VALIDATE_INT) === false) { |
|
87 | 87 | throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.'); |
88 | 88 | } |
89 | 89 | if ($this->statement === null) { |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | public function next() |
101 | 101 | { |
102 | 102 | // Let's overload the next() method to store the result. |
103 | - if (isset($this->results[$this->key + 1])) { |
|
103 | + if (isset($this->results[$this->key+1])) { |
|
104 | 104 | ++$this->key; |
105 | 105 | $this->current = $this->results[$this->key]; |
106 | 106 | } else { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | public function getCurrentPage() |
114 | 114 | { |
115 | - return floor($this->offset / $this->limit) + 1; |
|
115 | + return floor($this->offset/$this->limit)+1; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | */ |
252 | 252 | public function jsonSerialize() |
253 | 253 | { |
254 | - return array_map(function (AbstractTDBMObject $item) { |
|
254 | + return array_map(function(AbstractTDBMObject $item) { |
|
255 | 255 | return $item->jsonSerialize(); |
256 | 256 | }, $this->toArray()); |
257 | 257 | } |
@@ -245,7 +245,7 @@ |
||
245 | 245 | */ |
246 | 246 | public function jsonSerialize($stopRecursion = false) |
247 | 247 | { |
248 | - return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) { |
|
248 | + return array_map(function(AbstractTDBMObject $item) use ($stopRecursion) { |
|
249 | 249 | return $item->jsonSerialize($stopRecursion); |
250 | 250 | }, $this->toArray()); |
251 | 251 | } |
@@ -83,11 +83,11 @@ discard block |
||
83 | 83 | |
84 | 84 | // Remove all beans and daos from junction tables |
85 | 85 | $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true); |
86 | - $junctionTableNames = array_map(function (Table $table) { |
|
86 | + $junctionTableNames = array_map(function(Table $table) { |
|
87 | 87 | return $table->getName(); |
88 | 88 | }, $junctionTables); |
89 | 89 | |
90 | - $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) { |
|
90 | + $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) { |
|
91 | 91 | return !in_array($table->getName(), $junctionTableNames); |
92 | 92 | }); |
93 | 93 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | // Ok, let's return the list of all tables. |
101 | 101 | // These will be used by the calling script to create Mouf instances. |
102 | 102 | |
103 | - return array_map(function (Table $table) { |
|
103 | + return array_map(function(Table $table) { |
|
104 | 104 | return $table->getName(); |
105 | 105 | }, $tableList); |
106 | 106 | } |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | $usedBeans[] = $beanClassName; |
295 | 295 | // Let's suppress duplicates in used beans (if any) |
296 | 296 | $usedBeans = array_flip(array_flip($usedBeans)); |
297 | - $useStatements = array_map(function ($usedBean) { |
|
297 | + $useStatements = array_map(function($usedBean) { |
|
298 | 298 | return "use $usedBean;\n"; |
299 | 299 | }, $usedBeans); |
300 | 300 | |
@@ -644,7 +644,7 @@ discard block |
||
644 | 644 | $pos = strpos($str, ' '); |
645 | 645 | } |
646 | 646 | $before = substr($str, 0, $pos); |
647 | - $after = substr($str, $pos + 1); |
|
647 | + $after = substr($str, $pos+1); |
|
648 | 648 | $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1); |
649 | 649 | } |
650 | 650 |
@@ -124,7 +124,7 @@ |
||
124 | 124 | public function getIncomingForeignKeys($tableName) |
125 | 125 | { |
126 | 126 | $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true); |
127 | - $junctionTableNames = array_map(function (Table $table) { |
|
127 | + $junctionTableNames = array_map(function(Table $table) { |
|
128 | 128 | return $table->getName(); |
129 | 129 | }, $junctionTables); |
130 | 130 | $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $results = []; |
80 | 80 | |
81 | - for ($i = 0, $count = count($parsed['ORDER']); $i < $count; ++$i) { |
|
81 | + for ($i = 0, $count = count($parsed['ORDER']); $i<$count; ++$i) { |
|
82 | 82 | $orderItem = $parsed['ORDER'][$i]; |
83 | 83 | if ($orderItem['expr_type'] === 'colref') { |
84 | 84 | $parts = $orderItem['no_quotes']['parts']; |
@@ -97,9 +97,9 @@ discard block |
||
97 | 97 | ]; |
98 | 98 | } else { |
99 | 99 | $position = $orderItem['position']; |
100 | - if ($i + 1 < $count) { |
|
101 | - $nextPosition = $parsed['ORDER'][$i + 1]['position']; |
|
102 | - $str = substr($sql, $position, $nextPosition - $position); |
|
100 | + if ($i+1<$count) { |
|
101 | + $nextPosition = $parsed['ORDER'][$i+1]['position']; |
|
102 | + $str = substr($sql, $position, $nextPosition-$position); |
|
103 | 103 | } else { |
104 | 104 | $str = substr($sql, $position); |
105 | 105 | } |
@@ -39,7 +39,7 @@ |
||
39 | 39 | $sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$this->mainTable.')'; |
40 | 40 | |
41 | 41 | $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns(); |
42 | - $pkColumnNames = array_map(function ($pkColumn) { |
|
42 | + $pkColumnNames = array_map(function($pkColumn) { |
|
43 | 43 | return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn); |
44 | 44 | }, $pkColumnNames); |
45 | 45 |
@@ -1064,7 +1064,7 @@ discard block |
||
1064 | 1064 | sort($tables); |
1065 | 1065 | |
1066 | 1066 | return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables), |
1067 | - function () use ($tables) { |
|
1067 | + function() use ($tables) { |
|
1068 | 1068 | return $this->_getLinkBetweenInheritedTablesWithoutCache($tables); |
1069 | 1069 | }); |
1070 | 1070 | } |
@@ -1111,7 +1111,7 @@ discard block |
||
1111 | 1111 | */ |
1112 | 1112 | public function _getRelatedTablesByInheritance($table) |
1113 | 1113 | { |
1114 | - return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) { |
|
1114 | + return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function() use ($table) { |
|
1115 | 1115 | return $this->_getRelatedTablesByInheritanceWithoutCache($table); |
1116 | 1116 | }); |
1117 | 1117 | } |
@@ -1358,7 +1358,7 @@ discard block |
||
1358 | 1358 | $objects = $this->findObjects($mainTable, $filter, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className); |
1359 | 1359 | $page = $objects->take(0, 2); |
1360 | 1360 | $count = $page->count(); |
1361 | - if ($count > 1) { |
|
1361 | + if ($count>1) { |
|
1362 | 1362 | 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."); |
1363 | 1363 | } elseif ($count === 0) { |
1364 | 1364 | return; |
@@ -1385,7 +1385,7 @@ discard block |
||
1385 | 1385 | $objects = $this->findObjectsFromSql($mainTable, $from, $filter, $parameters, null, self::MODE_ARRAY, $className); |
1386 | 1386 | $page = $objects->take(0, 2); |
1387 | 1387 | $count = $page->count(); |
1388 | - if ($count > 1) { |
|
1388 | + if ($count>1) { |
|
1389 | 1389 | 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."); |
1390 | 1390 | } elseif ($count === 0) { |
1391 | 1391 | return; |
@@ -1503,7 +1503,7 @@ discard block |
||
1503 | 1503 | $remoteTable = $remoteFk->getForeignTableName(); |
1504 | 1504 | |
1505 | 1505 | $primaryKeys = $this->getPrimaryKeyValues($bean); |
1506 | - $columnNames = array_map(function ($name) use ($pivotTableName) { |
|
1506 | + $columnNames = array_map(function($name) use ($pivotTableName) { |
|
1507 | 1507 | return $pivotTableName.'.'.$name; |
1508 | 1508 | }, $localFk->getLocalColumns()); |
1509 | 1509 | |
@@ -1526,7 +1526,7 @@ discard block |
||
1526 | 1526 | $table1 = $fks[0]->getForeignTableName(); |
1527 | 1527 | $table2 = $fks[1]->getForeignTableName(); |
1528 | 1528 | |
1529 | - $beanTables = array_map(function (DbRow $dbRow) { |
|
1529 | + $beanTables = array_map(function(DbRow $dbRow) { |
|
1530 | 1530 | return $dbRow->_getDbTableName(); |
1531 | 1531 | }, $bean->_getDbRows()); |
1532 | 1532 | |
@@ -1584,7 +1584,7 @@ discard block |
||
1584 | 1584 | { |
1585 | 1585 | if (!isset($typesForTable[$tableName])) { |
1586 | 1586 | $columns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getColumns(); |
1587 | - $typesForTable[$tableName] = array_map(function (Column $column) { |
|
1587 | + $typesForTable[$tableName] = array_map(function(Column $column) { |
|
1588 | 1588 | return $column->getType(); |
1589 | 1589 | }, $columns); |
1590 | 1590 | } |