Skip to content

Commit

Permalink
Merge pull request #273 from dsavina/chore/codestyle-indentation
Browse files Browse the repository at this point in the history
Chore - Fix indentation in generated methods 'find'/'findOne'
  • Loading branch information
homersimpsons committed Jun 10, 2022
2 parents fbee465 + 07907b0 commit 1da21c2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/Utils/BeanDescriptor.php
Expand Up @@ -1370,13 +1370,13 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
$typeName = $element->getDatabaseType()->getName();
if ($typeName === Type::DATETIME_IMMUTABLE) {
$filterArrayCode .= sprintf(
" %s => \$this->tdbmService->getConnection()->convertToDatabaseValue(%s, %s),\n",
" %s => \$this->tdbmService->getConnection()->convertToDatabaseValue(%s, %s),\n",
var_export($element->getColumnName(), true),
$element->getSafeVariableName(),
var_export($typeName, true)
);
} else {
$filterArrayCode .= ' '.var_export($element->getColumnName(), true).' => '.$element->getSafeVariableName().",\n";
$filterArrayCode .= ' '.var_export($element->getColumnName(), true).' => '.$element->getSafeVariableName().",\n";
}
} elseif ($element instanceof ObjectBeanPropertyDescriptor) {
$foreignKey = $element->getForeignKey();
Expand All @@ -1388,10 +1388,10 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
$targetedElement = new ScalarBeanPropertyDescriptor($foreignTable, $foreignTable->getColumn($foreignColumn), $this->namingStrategy, $this->annotationParser);
if ($first || $element->isCompulsory() && $index->isUnique()) {
// First parameter for index is not nullable
$filterArrayCode .= ' '.var_export($localColumn, true).' => '.$element->getSafeVariableName().'->'.$targetedElement->getGetterName()."(),\n";
$filterArrayCode .= ' '.var_export($localColumn, true).' => '.$element->getSafeVariableName().'->'.$targetedElement->getGetterName()."(),\n";
} else {
// Other parameters for index is not nullable
$filterArrayCode .= ' '.var_export($localColumn, true).' => ('.$element->getSafeVariableName().' !== null) ? '.$element->getSafeVariableName().'->'.$targetedElement->getGetterName()."() : null,\n";
$filterArrayCode .= ' '.var_export($localColumn, true).' => ('.$element->getSafeVariableName().' !== null) ? '.$element->getSafeVariableName().'->'.$targetedElement->getGetterName()."() : null,\n";
}
}
}
Expand All @@ -1418,7 +1418,7 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
$docBlock->setWordWrap(false);

$body = "\$filter = [
".$filterArrayCode." ];
".$filterArrayCode."];
return \$this->findOne(\$filter, [], \$additionalTablesFetch);
";
} else {
Expand All @@ -1434,7 +1434,7 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
$docBlock->setWordWrap(false);

$body = "\$filter = [
".$filterArrayCode." ];
".$filterArrayCode."];
return \$this->find(\$filter, [], \$orderBy, \$additionalTablesFetch, \$mode);
";
}
Expand Down

0 comments on commit 1da21c2

Please sign in to comment.