Skip to content

Commit 9ddf3c9

Browse files
Mau04Mau04
authored
Merge branch 'master' into fix-on-update-timestamp
2 parents 9a64308 + 4f36eea commit 9ddf3c9

27 files changed

+48
-82
lines changed

‎src/Propel/Generator/Behavior/AggregateColumn/AggregateColumnBehavior.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ public function objectMethods(ObjectBuilder $builder): string
9393
if (!$this->getParameter('foreign_table')) {
9494
throw new InvalidArgumentException(sprintf('You must define a \'foreign_table\' parameter for the \'aggregate_column\' behavior in the \'%s\' table', $this->getTable()->getName()));
9595
}
96-
$script = '';
97-
$script .= $this->addObjectCompute($builder);
96+
$script = $this->addObjectCompute($builder);
9897
$script .= $this->addObjectUpdate();
9998

10099
return $script;

‎src/Propel/Generator/Behavior/AggregateColumn/AggregateColumnRelationBehavior.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,7 @@ protected function getUpdateRelated(AbstractOMBuilder $builder): string
194194
*/
195195
public function queryMethods(AbstractOMBuilder $builder): string
196196
{
197-
$script = '';
198-
199-
$script .= $this->addQueryFindRelated($builder);
197+
$script = $this->addQueryFindRelated($builder);
200198
$script .= $this->addQueryUpdateRelated($builder);
201199

202200
return $script;

‎src/Propel/Generator/Behavior/AggregateMultipleColumns/AggregateMultipleColumnsBehavior.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ private function addAutoupdateBehaviorToForeignTable(): void
220220
*/
221221
public function objectMethods(ObjectBuilder $builder): string
222222
{
223-
$script = '';
224-
$script .= $this->addObjectCompute($builder);
223+
$script = $this->addObjectCompute($builder);
225224
$script .= $this->addObjectUpdate();
226225

227226
return $script;

‎src/Propel/Generator/Behavior/Archivable/ArchivableBehaviorObjectBuilderModifier.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ public function preDelete(AbstractOMBuilder $builder): ?string
142142
public function objectMethods(AbstractOMBuilder $builder): string
143143
{
144144
$this->builder = $builder;
145-
$script = '';
146-
$script .= $this->addGetArchive($builder);
145+
$script = $this->addGetArchive($builder);
147146
$script .= $this->addArchive($builder);
148147
$script .= $this->addRestoreFromArchive($builder);
149148
$script .= $this->addPopulateFromArchive($builder);

‎src/Propel/Generator/Behavior/Archivable/ArchivableBehaviorQueryBuilderModifier.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ public function postUpdateQuery(AbstractOMBuilder $builder): ?string
113113
*/
114114
public function queryMethods(AbstractOMBuilder $builder): string
115115
{
116-
$script = '';
117-
$script .= $this->addArchive($builder);
116+
$script = $this->addArchive($builder);
118117
if ($this->behavior->isArchiveOnUpdate()) {
119118
$script .= $this->addSetArchiveOnUpdate($builder);
120119
$script .= $this->addUpdateWithoutArchive($builder);

‎src/Propel/Generator/Behavior/Delegate/DelegateBehavior.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ protected function getDelegateTable(string $delegateTableName): ?Table
151151
*/
152152
public function objectCall(ObjectBuilder $builder): string
153153
{
154-
$plural = false;
155154
$script = '';
156155
foreach ($this->delegates as $delegate => $type) {
157156
$delegateTable = $this->getDelegateTable($delegate);
@@ -160,7 +159,7 @@ public function objectCall(ObjectBuilder $builder): string
160159
$fk = $fks[0];
161160
$ARClassName = $builder->getClassNameFromBuilder($builder->getNewStubObjectBuilder($fk->getTable()));
162161
$ARFQCN = $builder->getNewStubObjectBuilder($fk->getTable())->getFullyQualifiedClassName();
163-
$relationName = $builder->getRefFKPhpNameAffix($fk, $plural);
162+
$relationName = $builder->getRefFKPhpNameAffix($fk);
164163
} else {
165164
$fks = $this->getTable()->getForeignKeysReferencingTable($delegate);
166165
$fk = $fks[0];

‎src/Propel/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifier.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ public function objectMethods(ObjectBuilder $builder): string
9898
{
9999
$this->builder = $builder;
100100

101-
$script = '';
102-
$script .= $this->addSetLocale();
101+
$script = $this->addSetLocale();
103102
$script .= $this->addGetLocale();
104103

105104
$alias = $this->behavior->getParameter('locale_alias');
@@ -175,7 +174,6 @@ protected function addGetLocaleAlias(string $alias): string
175174
*/
176175
protected function addGetTranslation(): string
177176
{
178-
$plural = false;
179177
$i18nTable = $this->behavior->getI18nTable();
180178
$fk = $this->behavior->getI18nForeignKey();
181179

@@ -185,7 +183,7 @@ protected function addGetTranslation(): string
185183
'i18nListVariable' => $this->builder->getRefFKCollVarName($fk),
186184
'localeColumnName' => $this->behavior->getLocaleColumn()->getPhpName(),
187185
'i18nQueryName' => $this->builder->getClassNameFromBuilder($this->builder->getNewStubQueryBuilder($i18nTable)),
188-
'i18nSetterMethod' => $this->builder->getRefFKPhpNameAffix($fk, $plural),
186+
'i18nSetterMethod' => $this->builder->getRefFKPhpNameAffix($fk),
189187
]);
190188
}
191189

@@ -262,13 +260,14 @@ protected function addTranslatedColumnSetter(Column $column): string
262260
$objectBuilder = $this->builder->getNewObjectBuilder($this->behavior->getI18nTable());
263261
$comment = '';
264262
$functionStatement = '';
263+
265264
if ($this->isDateType($column->getType())) {
266265
$objectBuilder->addTemporalMutatorComment($comment, $column);
267-
$objectBuilder->addMutatorOpenOpen($functionStatement, $column);
268266
} else {
269267
$objectBuilder->addMutatorComment($comment, $column);
270-
$objectBuilder->addMutatorOpenOpen($functionStatement, $column);
271268
}
269+
270+
$objectBuilder->addMutatorOpenOpen($functionStatement, $column);
272271
$comment = preg_replace('/^\t/m', '', $comment);
273272
$comment = str_replace('@return $this|' . $i18nTablePhpName, '@return $this|' . $tablePhpName, $comment);
274273
$functionStatement = preg_replace('/^\t/m', '', $functionStatement);

‎src/Propel/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifier.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ public function __construct(I18nBehavior $behavior)
5050
public function queryMethods(QueryBuilder $builder): string
5151
{
5252
$this->builder = $builder;
53-
$script = '';
54-
$script .= $this->addJoinI18n();
53+
$script = $this->addJoinI18n();
5554
$script .= $this->addJoinWithI18n();
5655
$script .= $this->addUseI18nQuery();
5756

‎src/Propel/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifier.php‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,8 @@ public function isVersioningNecessary(?ConnectionInterface \$con = null): bool
343343
if ({$queryClassName}::isVersioningEnabled() && (\$this->isNew() || \$this->isModified()) || \$this->isDeleted()) {
344344
return true;
345345
}";
346-
$plural = false;
347346
foreach ($this->behavior->getVersionableFks() as $fk) {
348-
$fkGetter = $this->builder->getFKPhpNameAffix($fk, $plural);
347+
$fkGetter = $this->builder->getFKPhpNameAffix($fk);
349348
$script .= "
350349
if (null !== (\$object = \$this->get{$fkGetter}(\$con)) && \$object->isVersioningNecessary(\$con)) {
351350
return true;
@@ -428,9 +427,8 @@ public function addVersion(?ConnectionInterface \$con = null)
428427
}
429428
$script .= "
430429
\$version->set{$this->table->getPhpName()}(\$this);";
431-
$plural = false;
432430
foreach ($this->behavior->getVersionableFks() as $fk) {
433-
$fkGetter = $this->builder->getFKPhpNameAffix($fk, $plural);
431+
$fkGetter = $this->builder->getFKPhpNameAffix($fk);
434432
$fkVersionColumnName = $fk->getLocalColumnName() . '_version';
435433
$fkVersionColumnPhpName = $versionTable->getColumn($fkVersionColumnName)->getPhpName();
436434
$script .= "
@@ -534,7 +532,6 @@ public function populateFromVersion(\$version, \$con = null, &\$loadedObjects =
534532
$script .= "
535533
\$this->set" . $col->getPhpName() . '($version->get' . $col->getPhpName() . '());';
536534
}
537-
$plural = false;
538535
foreach ($this->behavior->getVersionableFks() as $fk) {
539536
$foreignTable = $fk->getForeignTable();
540537

@@ -546,7 +543,7 @@ public function populateFromVersion(\$version, \$con = null, &\$loadedObjects =
546543
$fkColumnName = $fk->getLocalColumnName();
547544
$fkColumnPhpName = $fk->getLocalColumn()->getPhpName();
548545
$fkVersionColumnPhpName = $versionTable->getColumn($fkColumnName . '_version')->getPhpName();
549-
$fkPhpname = $this->builder->getFKPhpNameAffix($fk, $plural);
546+
$fkPhpname = $this->builder->getFKPhpNameAffix($fk);
550547
// FIXME: breaks lazy-loading
551548
$script .= "
552549
if (\$fkValue = \$version->get{$fkColumnPhpName}()) {
@@ -564,11 +561,9 @@ public function populateFromVersion(\$version, \$con = null, &\$loadedObjects =
564561
\$this->set{$fkPhpname}(\$related);
565562
}";
566563
}
567-
$plural = true;
568564
foreach ($this->behavior->getVersionableReferrers() as $fk) {
569-
$fkPhpNames = $this->builder->getRefFKPhpNameAffix($fk, $plural);
570-
$plural = false;
571-
$fkPhpName = $this->builder->getRefFKPhpNameAffix($fk, $plural);
565+
$fkPhpNames = $this->builder->getRefFKPhpNameAffix($fk, true);
566+
$fkPhpName = $this->builder->getRefFKPhpNameAffix($fk);
572567
$foreignTable = $fk->getTable();
573568
/** @var \Propel\Generator\Behavior\Versionable\VersionableBehavior $foreignBehavior */
574569
$foreignBehavior = $foreignTable->getBehavior($this->behavior->getId());
@@ -872,12 +867,11 @@ public function compareVersions(int \$fromVersionNumber, int \$toVersionNumber,
872867
*/
873868
protected function addGetLastVersions(string &$script): void
874869
{
875-
$plural = true;
876870
$versionTable = $this->behavior->getVersionTable();
877871
$versionARClassName = $this->builder->getNewStubObjectBuilder($versionTable)->getClassName();
878872
$versionTableMapClassName = $this->builder->getClassNameFromBuilder($this->builder->getNewTableMapBuilder($versionTable));
879873
$fks = $versionTable->getForeignKeysReferencingTable($this->table->getName());
880-
$relCol = $this->builder->getRefFKPhpNameAffix($fks[0], $plural);
874+
$relCol = $this->builder->getRefFKPhpNameAffix($fks[0], true);
881875
$versionGetter = 'get' . $relCol;
882876
$colPrefix = Column::CONSTANT_PREFIX;
883877

‎src/Propel/Generator/Manager/ModelManager.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,9 @@ public function build(): void
7878
// -----------------------------------------------------------------------------------------
7979

8080
// these classes are only generated if they don't already exist
81-
$overwrite = false;
8281
foreach (['objectstub', 'querystub'] as $target) {
8382
$builder = $generatorConfig->getConfiguredBuilder($table, $target);
84-
$nbWrittenFiles += $this->doBuild($builder, $overwrite);
83+
$nbWrittenFiles += $this->doBuild($builder, false);
8584
}
8685

8786
// -----------------------------------------------------------------------------------------
@@ -93,22 +92,21 @@ public function build(): void
9392
if ($col) {
9493
if ($col->isEnumeratedClasses()) {
9594
foreach ($col->getChildren() as $child) {
96-
$overwrite = true;
9795
foreach (['queryinheritance'] as $target) {
9896
if (!$child->getAncestor() && $child->getClassName() === $table->getPhpName()) {
9997
continue;
10098
}
10199
/** @var \Propel\Generator\Builder\Om\QueryInheritanceBuilder $builder */
102100
$builder = $generatorConfig->getConfiguredBuilder($table, $target);
103101
$builder->setChild($child);
104-
$nbWrittenFiles += $this->doBuild($builder, $overwrite);
102+
$nbWrittenFiles += $this->doBuild($builder);
105103
}
106-
$overwrite = false;
104+
107105
foreach (['objectmultiextend', 'queryinheritancestub'] as $target) {
108106
/** @var \Propel\Generator\Builder\Om\MultiExtendObjectBuilder $builder */
109107
$builder = $generatorConfig->getConfiguredBuilder($table, $target);
110108
$builder->setChild($child);
111-
$nbWrittenFiles += $this->doBuild($builder, $overwrite);
109+
$nbWrittenFiles += $this->doBuild($builder, false);
112110
}
113111
}
114112
}
@@ -119,10 +117,9 @@ public function build(): void
119117
// -----------------------------------------------------------------------------------------
120118

121119
// Create [empty] interface if it does not already exist
122-
$overwrite = false;
123120
if ($table->getInterface()) {
124121
$builder = $generatorConfig->getConfiguredBuilder($table, 'interface');
125-
$nbWrittenFiles += $this->doBuild($builder, $overwrite);
122+
$nbWrittenFiles += $this->doBuild($builder, false);
126123
}
127124

128125
// ----------------------------------

0 commit comments

Comments
 (0)