@@ -108,7 +108,7 @@ |
||
| 108 | 108 | public function rewind() |
| 109 | 109 | { |
| 110 | 110 | $this->_dbLoadIfNotLoaded(); |
| 111 | - if (count($this->dbRow) > 0) { |
|
| 111 | + if (count($this->dbRow)>0) { |
|
| 112 | 112 | $this->_validIterator = true; |
| 113 | 113 | } else { |
| 114 | 114 | $this->_validIterator = false; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | public function getUpperCamelCaseName() { |
| 63 | 63 | // First, are there many column or only one? |
| 64 | 64 | // If one column, we name the setter after it. Otherwise, we name the setter after the table name |
| 65 | - if (count($this->foreignKey->getLocalColumns()) > 1) { |
|
| 65 | + if (count($this->foreignKey->getLocalColumns())>1) { |
|
| 66 | 66 | $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName())); |
| 67 | 67 | if ($this->alternativeName) { |
| 68 | 68 | $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns()); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * @param '.$referencedBeanName.' $object |
| 145 | 145 | */ |
| 146 | 146 | public function '.$setterName.'('.$referencedBeanName.' $object = null) { |
| 147 | - $this->setRef(' . var_export($this->foreignKey->getName(), true) . ', $object, '.var_export($tableName, true).'); |
|
| 147 | + $this->setRef(' . var_export($this->foreignKey->getName(), true).', $object, '.var_export($tableName, true).'); |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | '; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | }"; |
| 208 | 208 | $this->ensureDirectoryExist($possibleFileName); |
| 209 | - file_put_contents($possibleFileName ,$str); |
|
| 209 | + file_put_contents($possibleFileName, $str); |
|
| 210 | 210 | @chmod($possibleFileName, 0664); |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -226,11 +226,11 @@ discard block |
||
| 226 | 226 | foreach ($table->getColumns() as $column) { |
| 227 | 227 | $comments = $column->getComment(); |
| 228 | 228 | $matches = array(); |
| 229 | - if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0){ |
|
| 229 | + if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) { |
|
| 230 | 230 | $defaultSort = $data['column_name']; |
| 231 | - if (count($matches == 3)){ |
|
| 231 | + if (count($matches == 3)) { |
|
| 232 | 232 | $defaultSortDirection = $matches[2]; |
| 233 | - }else{ |
|
| 233 | + } else { |
|
| 234 | 234 | $defaultSortDirection = 'ASC'; |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0]; |
| 417 | 417 | |
| 418 | 418 | $this->ensureDirectoryExist($possibleBaseFileName); |
| 419 | - file_put_contents($possibleBaseFileName ,$str); |
|
| 419 | + file_put_contents($possibleBaseFileName, $str); |
|
| 420 | 420 | @chmod($possibleBaseFileName, 0664); |
| 421 | 421 | |
| 422 | 422 | $possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace."\\".$className); |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | } |
| 448 | 448 | "; |
| 449 | 449 | $this->ensureDirectoryExist($possibleFileName); |
| 450 | - file_put_contents($possibleFileName ,$str); |
|
| 450 | + file_put_contents($possibleFileName, $str); |
|
| 451 | 451 | @chmod($possibleFileName, 0664); |
| 452 | 452 | } |
| 453 | 453 | } |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | $possibleFileName = $this->rootPath.$possibleFileNames[0]; |
| 524 | 524 | |
| 525 | 525 | $this->ensureDirectoryExist($possibleFileName); |
| 526 | - file_put_contents($possibleFileName ,$str); |
|
| 526 | + file_put_contents($possibleFileName, $str); |
|
| 527 | 527 | } |
| 528 | 528 | |
| 529 | 529 | /** |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | * @return string |
| 535 | 535 | */ |
| 536 | 536 | public static function toCamelCase($str) { |
| 537 | - $str = strtoupper(substr($str,0,1)).substr($str,1); |
|
| 537 | + $str = strtoupper(substr($str, 0, 1)).substr($str, 1); |
|
| 538 | 538 | while (true) { |
| 539 | 539 | if (strpos($str, "_") === false && strpos($str, " ") === false) { |
| 540 | 540 | break; |
@@ -544,9 +544,9 @@ discard block |
||
| 544 | 544 | if ($pos === false) { |
| 545 | 545 | $pos = strpos($str, " "); |
| 546 | 546 | } |
| 547 | - $before = substr($str,0,$pos); |
|
| 548 | - $after = substr($str,$pos+1); |
|
| 549 | - $str = $before.strtoupper(substr($after,0,1)).substr($after,1); |
|
| 547 | + $before = substr($str, 0, $pos); |
|
| 548 | + $after = substr($str, $pos+1); |
|
| 549 | + $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1); |
|
| 550 | 550 | } |
| 551 | 551 | return $str; |
| 552 | 552 | } |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | Type::GUID => 'string' |
| 628 | 628 | ]; |
| 629 | 629 | |
| 630 | - return isset($map[$type->getName()])?$map[$type->getName()]:$type->getName(); |
|
| 630 | + return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName(); |
|
| 631 | 631 | } |
| 632 | 632 | |
| 633 | 633 | /** |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | |
| 643 | 643 | foreach ($tables as $table) { |
| 644 | 644 | $tableName = $table->getName(); |
| 645 | - $tableToBeanMap[$tableName] = $beanNamespace . "\\" . self::getBeanNameFromTableName($tableName); |
|
| 645 | + $tableToBeanMap[$tableName] = $beanNamespace."\\".self::getBeanNameFromTableName($tableName); |
|
| 646 | 646 | } |
| 647 | 647 | return $tableToBeanMap; |
| 648 | 648 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $fksByMethodName = []; |
| 289 | 289 | |
| 290 | 290 | foreach ($fksByTable as $tableName => $fksForTable) { |
| 291 | - if (count($fksForTable) > 1) { |
|
| 291 | + if (count($fksForTable)>1) { |
|
| 292 | 292 | foreach ($fksForTable as $fk) { |
| 293 | 293 | $methodName = 'get'.TDBMDaoGenerator::toCamelCase($fk->getLocalTableName()).'By'; |
| 294 | 294 | |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | |
| 389 | 389 | $finalDescs = []; |
| 390 | 390 | foreach ($descs as $descArray) { |
| 391 | - if (count($descArray) > 1) { |
|
| 391 | + if (count($descArray)>1) { |
|
| 392 | 392 | foreach ($descArray as $desc) { |
| 393 | 393 | $desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName())."By".TDBMDaoGenerator::toCamelCase($desc['table']->getName()); |
| 394 | 394 | $finalDescs[] = $desc; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @Action |
| 41 | 41 | * //@Admin |
| 42 | 42 | */ |
| 43 | - public function defaultAction($name, $selfedit="false") { |
|
| 43 | + public function defaultAction($name, $selfedit = "false") { |
|
| 44 | 44 | $this->initController($name, $selfedit); |
| 45 | 45 | |
| 46 | 46 | // Fill variables |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * @param string $name |
| 88 | 88 | * @param bool $selfedit |
| 89 | 89 | */ |
| 90 | - public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit="false") { |
|
| 90 | + public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = "false") { |
|
| 91 | 91 | $this->initController($name, $selfedit); |
| 92 | 92 | |
| 93 | 93 | self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * @param bool $storeInUtc |
| 109 | 109 | * @throws \Mouf\MoufException |
| 110 | 110 | */ |
| 111 | - public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit="false", $storeInUtc = null) { |
|
| 111 | + public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = "false", $storeInUtc = null) { |
|
| 112 | 112 | $moufManager->setVariable("tdbmDefaultDaoNamespace_".$name, $daonamespace); |
| 113 | 113 | $moufManager->setVariable("tdbmDefaultBeanNamespace_".$name, $beannamespace); |
| 114 | 114 | $moufManager->setVariable("tdbmDefaultDaoFactoryName_".$name, $daofactoryclassname); |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | $moufManager->bindComponentViaSetter($instanceName, "setTdbmService", $name); |
| 156 | 156 | $moufManager->bindComponentViaSetter($daofactoryinstancename, "set".$daoName, $instanceName); |
| 157 | 157 | |
| 158 | - $tableToBeanMap[$table] = $beannamespace . "\\" . TDBMDaoGenerator::getBeanNameFromTableName($table); |
|
| 158 | + $tableToBeanMap[$table] = $beannamespace."\\".TDBMDaoGenerator::getBeanNameFromTableName($table); |
|
| 159 | 159 | } |
| 160 | 160 | $tdbmServiceDescriptor = $moufManager->getInstanceDescriptor($name); |
| 161 | 161 | $tdbmServiceDescriptor->getSetterProperty("setTableToBeanMap")->setValue($tableToBeanMap); |
@@ -144,7 +144,7 @@ |
||
| 144 | 144 | * @param string $selfedit |
| 145 | 145 | * @throws \Mouf\MoufException |
| 146 | 146 | */ |
| 147 | - public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") { |
|
| 147 | + public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = "false") { |
|
| 148 | 148 | $this->selfedit = $selfedit; |
| 149 | 149 | |
| 150 | 150 | if ($selfedit == "true") { |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | public function explainAmbiguity() { |
| 20 | 20 | $all_paths = $this->getAllPossiblePaths(); |
| 21 | 21 | |
| 22 | - $i=0; |
|
| 22 | + $i = 0; |
|
| 23 | 23 | $width_px = 0; |
| 24 | 24 | $height_px = 0; |
| 25 | 25 | $global_height_px = 0; |
@@ -50,11 +50,11 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | private static function getAllPossiblePathsRec($sub_table_paths) |
| 52 | 52 | { |
| 53 | - if (count($sub_table_paths)==0) |
|
| 53 | + if (count($sub_table_paths) == 0) |
|
| 54 | 54 | return array(); |
| 55 | 55 | |
| 56 | 56 | $table_path = array_shift($sub_table_paths); |
| 57 | - $possible_sub_paths = AmbiguityException::getAllPossiblePathsRec($sub_table_paths); |
|
| 57 | + $possible_sub_paths = AmbiguityException::getAllPossiblePathsRec($sub_table_paths); |
|
| 58 | 58 | $return_table_paths = array(); |
| 59 | 59 | foreach ($table_path['paths'] as $path) { |
| 60 | 60 | if (count($possible_sub_paths)>0) |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | * @throws TDBMException |
| 95 | 95 | * @throws TDBMInvalidOperationException |
| 96 | 96 | */ |
| 97 | - public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys=array(), TDBMService $tdbmService=null, array $dbRow = array()) { |
|
| 97 | + public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array()) { |
|
| 98 | 98 | $this->object = $object; |
| 99 | 99 | $this->dbTableName = $table_name; |
| 100 | 100 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory. |
| 142 | 142 | * @param string $state |
| 143 | 143 | */ |
| 144 | - public function _setStatus($state){ |
|
| 144 | + public function _setStatus($state) { |
|
| 145 | 145 | $this->status = $state; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $sql = "SELECT * FROM ".$connection->quoteIdentifier($this->dbTableName)." WHERE ".$sql_where; |
| 164 | 164 | $result = $connection->executeQuery($sql, $parameters); |
| 165 | 165 | |
| 166 | - if ($result->rowCount()==0) |
|
| 166 | + if ($result->rowCount() == 0) |
|
| 167 | 167 | { |
| 168 | 168 | throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" with ID \"".$this->TDBMObject_id."\"."); |
| 169 | 169 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | * Implement the unique JsonSerializable method |
| 311 | 311 | * @return array |
| 312 | 312 | */ |
| 313 | - public function jsonSerialize(){ |
|
| 313 | + public function jsonSerialize() { |
|
| 314 | 314 | $this->_dbLoadIfNotLoaded(); |
| 315 | 315 | return $this->dbRow; |
| 316 | 316 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | /** |
| 338 | 338 | * Override the native php clone function for TDBMObjects |
| 339 | 339 | */ |
| 340 | - public function __clone(){ |
|
| 340 | + public function __clone() { |
|
| 341 | 341 | $this->_dbLoadIfNotLoaded(); |
| 342 | 342 | //First lets set the status to new (to enter the save function) |
| 343 | 343 | $this->status = TDBMObjectStateEnum::STATE_NEW; |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | $pkValues = array_values($firstRefDbRow->_getPrimaryKeys()); |
| 370 | 370 | $localColumns = $fk->getLocalColumns(); |
| 371 | 371 | |
| 372 | - for ($i=0, $count=count($localColumns); $i<$count; $i++) { |
|
| 372 | + for ($i = 0, $count = count($localColumns); $i<$count; $i++) { |
|
| 373 | 373 | $dbRow[$localColumns[$i]] = $pkValues[$i]; |
| 374 | 374 | } |
| 375 | 375 | } |
@@ -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) { |